@ynhcj/xiaoyi-channel 0.0.115-beta → 0.0.115-next

package/dist/src/client.js

@@ -1,36 +1,33 @@
 // WebSocket client cache management
 // Follows feishu/client.ts pattern for caching client instances
 import { XYWebSocketManager } from "./websocket.js";
-// Runtime reference for logging
-let runtime;
-/**
- * Set the runtime for logging in client module.
- */
-export function setClientRuntime(rt) {
-    runtime = rt;
-}
+import { logger } from "./utils/logger.js";
 /**
  * Global cache for WebSocket managers.
  * Key format: `${apiKey}-${agentId}`
+ * Uses globalThis to ensure a single cache across all module copies
+ * (same fix as session-manager.ts for openclaw multi-instance loading).
  */
-const wsManagerCache = new Map();
+const _g = globalThis;
+if (!_g.__xyWsManagerCache) {
+    _g.__xyWsManagerCache = new Map();
+}
+const wsManagerCache = _g.__xyWsManagerCache;
 /**
  * Get or create a WebSocket manager for the given configuration.
  * Reuses existing managers if config matches.
  */
-export function getXYWebSocketManager(config) {
+export function getXYWebSocketManager(config, runtime) {
     const cacheKey = `${config.apiKey}-${config.agentId}`;
     let cached = wsManagerCache.get(cacheKey);
     if (cached && cached.isConfigMatch(config)) {
-        const log = runtime?.log ?? console.log;
         return cached;
     }
     // Create new manager
-    const log = runtime?.log ?? console.log;
-    log(`[WS-MANAGER-CACHE] 🆕 Creating new WebSocket manager: ${cacheKey}, total managers before: ${wsManagerCache.size}`);
+    logger.log(`[WS-MANAGER-CACHE] 🆕 Creating new WebSocket manager: ${cacheKey}, total managers before: ${wsManagerCache.size}`);
     cached = new XYWebSocketManager(config, runtime);
     wsManagerCache.set(cacheKey, cached);
-    log(`[WS-MANAGER-CACHE] 📊 Total managers after creation: ${wsManagerCache.size}`);
+    logger.log(`[WS-MANAGER-CACHE] 📊 Total managers after creation: ${wsManagerCache.size}`);
     return cached;
 }
 /**
@@ -41,21 +38,20 @@ export function removeXYWebSocketManager(config) {
     const cacheKey = `${config.apiKey}-${config.agentId}`;
     const manager = wsManagerCache.get(cacheKey);
     if (manager) {
-        console.log(`🗑️  [WS-MANAGER-CACHE] Removing manager from cache: ${cacheKey}`);
+        logger.log(`🗑️  [WS-MANAGER-CACHE] Removing manager from cache: ${cacheKey}`);
         manager.disconnect();
         wsManagerCache.delete(cacheKey);
-        console.log(`🗑️  [WS-MANAGER-CACHE] Manager removed, remaining managers: ${wsManagerCache.size}`);
+        logger.log(`🗑️  [WS-MANAGER-CACHE] Manager removed, remaining managers: ${wsManagerCache.size}`);
     }
     else {
-        console.log(`⚠️  [WS-MANAGER-CACHE] Manager not found in cache: ${cacheKey}`);
+        logger.log(`⚠️  [WS-MANAGER-CACHE] Manager not found in cache: ${cacheKey}`);
     }
 }
 /**
  * Clear all cached WebSocket managers.
  */
 export function clearXYWebSocketManagers() {
-    const log = runtime?.log ?? console.log;
-    log("Clearing all WebSocket manager caches");
+    logger.log("Clearing all WebSocket manager caches");
     for (const manager of wsManagerCache.values()) {
         manager.disconnect();
     }
@@ -72,36 +68,35 @@ export function getCachedManagerCount() {
  * Helps identify connection issues and orphan connections.
  */
 export function diagnoseAllManagers() {
-    console.log(`Total cached managers: ${wsManagerCache.size}`);
+    logger.log(`Total cached managers: ${wsManagerCache.size}`);
     if (wsManagerCache.size === 0) {
-        console.log("ℹ️  No managers in cache");
+        logger.log("ℹ️  No managers in cache");
         return;
     }
     let orphanCount = 0;
     wsManagerCache.forEach((manager, key) => {
         const diag = manager.getConnectionDiagnostics();
-        console.log(`   Total event listeners on manager: ${diag.totalEventListeners}`);
+        logger.log(`   Total event listeners on manager: ${diag.totalEventListeners}`);
         // Connection
-        console.log(`   🔌 Connection:`);
-        console.log(`      - Exists: ${diag.connection.exists}`);
-        console.log(`      - ReadyState: ${diag.connection.readyState}`);
-        console.log(`      - State connected/ready: ${diag.connection.stateConnected}/${diag.connection.stateReady}`);
-        console.log(`      - Reconnect attempts: ${diag.connection.reconnectAttempts}`);
-        console.log(`      - Listeners on WebSocket: ${diag.connection.listenerCount}`);
-        console.log(`      - Heartbeat active: ${diag.connection.heartbeatActive}`);
-        console.log(`      - Has reconnect timer: ${diag.connection.hasReconnectTimer}`);
+        logger.log(`   🔌 Connection:`);
+        logger.log(`      - Exists: ${diag.connection.exists}`);
+        logger.log(`      - ReadyState: ${diag.connection.readyState}`);
+        logger.log(`      - State connected/ready: ${diag.connection.stateConnected}/${diag.connection.stateReady}`);
+        logger.log(`      - Reconnect attempts: ${diag.connection.reconnectAttempts}`);
+        logger.log(`      - Listeners on WebSocket: ${diag.connection.listenerCount}`);
+        logger.log(`      - Heartbeat active: ${diag.connection.heartbeatActive}`);
+        logger.log(`      - Has reconnect timer: ${diag.connection.hasReconnectTimer}`);
         if (diag.connection.isOrphan) {
-            console.log(`      ⚠️  ORPHAN CONNECTION DETECTED!`);
+            logger.log(`      ⚠️  ORPHAN CONNECTION DETECTED!`);
             orphanCount++;
         }
-        console.log("");
     });
     if (orphanCount > 0) {
-        console.log(`⚠️  Total orphan connections found: ${orphanCount}`);
-        console.log(`💡 Suggestion: These connections should be cleaned up`);
+        logger.log(`⚠️  Total orphan connections found: ${orphanCount}`);
+        logger.log(`💡 Suggestion: These connections should be cleaned up`);
     }
     else {
-        console.log(`✅ No orphan connections found`);
+        logger.log(`✅ No orphan connections found`);
     }
 }
 /**
@@ -113,13 +108,13 @@ export function cleanupOrphanConnections() {
     wsManagerCache.forEach((manager, key) => {
         const diag = manager.getConnectionDiagnostics();
         if (diag.connection.isOrphan) {
-            console.log(`🧹 Cleaning up orphan connections in manager: ${key}`);
+            logger.log(`🧹 Cleaning up orphan connections in manager: ${key}`);
             manager.disconnect();
             cleanedCount++;
         }
     });
     if (cleanedCount > 0) {
-        console.log(`🧹 Cleaned up ${cleanedCount} manager(s) with orphan connections`);
+        logger.log(`🧹 Cleaned up ${cleanedCount} manager(s) with orphan connections`);
     }
     return cleanedCount;
 }

package/dist/src/cspl/call-api.js

@@ -4,12 +4,13 @@ import { URL } from "node:url";
 import { randomBytes } from "node:crypto";
 import { getCsplConfig } from "./config.js";
 import { DEFAULT_HTTP_PORT, HTTP_STATUS_BAD_REQUEST } from "./constants.js";
+import { logger } from "../utils/logger.js";
 function generateTraceId() {
     return randomBytes(16).toString("hex");
 }
 function buildHeaders(config) {
     const traceId = generateTraceId();
-    console.log(`[SENTINEL HOOK] trace-id: ${traceId}`);
+    logger.log(`[SENTINEL HOOK] trace-id: ${traceId}`);
     return {
         "x-hag-trace-id": traceId,
         "x-uid": config.uid,
@@ -65,21 +66,21 @@ export async function callCsplApi(questionText, cfg) {
             res.on("end", () => {
                 try {
                     const result = parseResponse(data);
-                    console.log(`[SENTINEL HOOK] ✅ 请求成功`);
+                    logger.log(`[SENTINEL HOOK] ✅ 请求成功`);
                     resolve(result);
                 }
                 catch (e) {
-                    console.error(`[SENTINEL HOOK] ❌ 请求失败: ${e instanceof Error ? e.message : String(e)}`);
+                    logger.error(`[SENTINEL HOOK] ❌ 请求失败: ${e instanceof Error ? e.message : String(e)}`);
                     reject(e);
                 }
             });
         });
         req.on("error", (error) => {
-            console.error(`[SENTINEL HOOK] ❌ 请求错误: ${error instanceof Error ? error.message : String(error)}`);
+            logger.error(`[SENTINEL HOOK] ❌ 请求错误: ${error instanceof Error ? error.message : String(error)}`);
             reject(error);
         });
         req.on("timeout", () => {
-            console.error(`[SENTINEL HOOK] ⏰ 请求超时 (${config.api.timeout}ms)`);
+            logger.error(`[SENTINEL HOOK] ⏰ 请求超时 (${config.api.timeout}ms)`);
             req.destroy();
             reject(new Error("[SENTINEL HOOK] Request timeout"));
         });

package/dist/src/file-download.js

@@ -2,6 +2,7 @@
 import fetch from "node-fetch";
 import fs from "fs/promises";
 import path from "path";
+import { logger } from "./utils/logger.js";
 /**
  * Download a file from URL to local path.
  */
@@ -19,10 +20,10 @@ export async function downloadFile(url, destPath) {
     }
     catch (error) {
         if (error.name === 'AbortError') {
-            console.log(`Download timeout (30s) for ${url}`);
+            logger.error(`Download timeout (30s) for ${url}`);
             throw new Error(`Download timeout after 30 seconds`);
         }
-        console.log(`Failed to download file from ${url}:`);
+        logger.error(`Failed to download file from ${url}:`);
         throw error;
     }
     finally {
@@ -51,7 +52,7 @@ export async function downloadFilesFromParts(fileParts, tempDir = "/tmp/xy_chann
             });
         }
         catch (error) {
-            console.log(`Failed to download file ${name}:`);
+            logger.error(`Failed to download file ${name}:`);
             // Continue with other files
         }
     }

package/dist/src/file-upload.js

@@ -3,13 +3,14 @@
 import fetch from "node-fetch";
 import fs from "fs/promises";
 import os from "os";
+import { logger } from "./utils/logger.js";
 import path from "path";
 import { calculateSHA256 } from "./utils/crypto.js";
 function isRemoteUrl(filePath) {
     return filePath.startsWith("http://") || filePath.startsWith("https://");
 }
 async function downloadToTempFile(url) {
-    console.log(`[XY File Upload] Downloading remote file: ${url}`);
+    logger.log(`[XY File Upload] Downloading remote file: ${url}`);
     const response = await fetch(url);
     if (!response.ok) {
         throw new Error(`Failed to download remote file: HTTP ${response.status}`);
@@ -18,7 +19,7 @@ async function downloadToTempFile(url) {
     const urlFileName = path.basename(new URL(url).pathname) || "download";
     const tempPath = path.join(os.tmpdir(), `xy-upload-${Date.now()}-${urlFileName}`);
     await fs.writeFile(tempPath, buffer);
-    console.log(`[XY File Upload] Downloaded to temp file: ${tempPath}`);
+    logger.log(`[XY File Upload] Downloaded to temp file: ${tempPath}`);
     return tempPath;
 }
 /**
@@ -39,7 +40,7 @@ export class XYFileUploadService {
      * Returns the objectId (as fileId) for use in A2A messages.
      */
     async uploadFile(filePath, objectType = "TEMPORARY_MATERIAL_DOC") {
-        console.log(`[XY File Upload] Starting file upload: ${filePath}`);
+        logger.log(`[XY File Upload] Starting file upload: ${filePath}`);
         let localFilePath = filePath;
         let isTempFile = false;
         try {
@@ -54,7 +55,7 @@ export class XYFileUploadService {
             const fileSha256 = calculateSHA256(fileBuffer);
             const fileSize = fileBuffer.length;
             // Phase 1: Prepare
-            console.log(`[XY File Upload] Phase 1: Prepare upload for ${fileName}`);
+            logger.log(`[XY File Upload] Phase 1: Prepare upload for ${fileName}`);
             const prepareResp = await fetch(`${this.baseUrl}/osms/v1/file/manager/prepare`, {
                 method: "POST",
                 headers: {
@@ -84,7 +85,7 @@ export class XYFileUploadService {
             }
             const { objectId, draftId, uploadInfos } = prepareData;
             // Phase 2: Upload
-            console.log(`[XY File Upload] Phase 2: Upload file data`);
+            logger.log(`[XY File Upload] Phase 2: Upload file data`);
             const uploadInfo = uploadInfos[0]; // Single-part upload
             const uploadResp = await fetch(uploadInfo.url, {
                 method: uploadInfo.method,
@@ -95,9 +96,9 @@ export class XYFileUploadService {
                 const uploadErrorText = await uploadResp.text();
                 throw new Error(`Upload failed: HTTP ${uploadResp.status}`);
             }
-            console.log(`[XY File Upload] Upload complete`);
+            logger.log(`[XY File Upload] Upload complete`);
             // Phase 3: Complete
-            console.log(`[XY File Upload] Phase 3: Complete upload`);
+            logger.log(`[XY File Upload] Phase 3: Complete upload`);
             const completeResp = await fetch(`${this.baseUrl}/osms/v1/file/manager/complete`, {
                 method: "POST",
                 headers: {
@@ -115,11 +116,11 @@ export class XYFileUploadService {
                 throw new Error(`Complete failed: HTTP ${completeResp.status}`);
             }
             const completeData = await completeResp.json();
-            console.log(`[XY File Upload] File upload successful: ${fileName} → objectId=${objectId}`);
+            logger.log(`[XY File Upload] File upload successful: ${fileName} → objectId=${objectId}`);
             return objectId;
         }
         catch (error) {
-            console.error(`[XY File Upload] File upload failed for ${filePath}:`, error);
+            logger.error(`[XY File Upload] File upload failed for ${filePath}:`, error);
             throw error;
         }
         finally {
@@ -150,7 +151,7 @@ export class XYFileUploadService {
             const fileSha256 = calculateSHA256(fileBuffer);
             const fileSize = fileBuffer.length;
             // Phase 1: Prepare
-            console.log(`[XY File Upload] Phase 1: Prepare upload for ${fileName}`);
+            logger.log(`[XY File Upload] Phase 1: Prepare upload for ${fileName}`);
             const prepareResp = await fetch(`${this.baseUrl}/osms/v1/file/manager/prepare`, {
                 method: "POST",
                 headers: {
@@ -179,23 +180,23 @@ export class XYFileUploadService {
                 throw new Error(`Prepare failed: ${prepareData.desc}`);
             }
             const { objectId, draftId, uploadInfos } = prepareData;
-            console.log(`[XY File Upload] Prepare complete: objectId=${objectId}, draftId=${draftId}`);
+            logger.log(`[XY File Upload] Prepare complete: objectId=${objectId}, draftId=${draftId}`);
             // Phase 2: Upload
-            console.log(`[XY File Upload] Phase 2: Upload file data`);
+            logger.log(`[XY File Upload] Phase 2: Upload file data`);
             const uploadInfo = uploadInfos[0]; // Single-part upload
             const uploadResp = await fetch(uploadInfo.url, {
                 method: uploadInfo.method,
                 headers: uploadInfo.headers,
                 body: fileBuffer,
             });
-            console.log(`[XY File Upload] Upload response status: ${uploadResp.status}`);
+            logger.log(`[XY File Upload] Upload response status: ${uploadResp.status}`);
             if (!uploadResp.ok) {
                 const uploadErrorText = await uploadResp.text();
                 throw new Error(`Upload failed: HTTP ${uploadResp.status}`);
             }
-            console.log(`[XY File Upload] Upload complete`);
+            logger.log(`[XY File Upload] Upload complete`);
             // Phase 3: CompleteAndQuery - get file URL
-            console.log(`[XY File Upload] Phase 3: CompleteAndQuery to get file URL`);
+            logger.log(`[XY File Upload] Phase 3: CompleteAndQuery to get file URL`);
             const completeResp = await fetch(`${this.baseUrl}/osms/v1/file/manager/completeAndQuery`, {
                 method: "POST",
                 headers: {
@@ -218,11 +219,11 @@ export class XYFileUploadService {
             if (!fileUrl) {
                 throw new Error("No file URL returned from completeAndQuery");
             }
-            console.log(`[XY File Upload] File upload successful`);
+            logger.log(`[XY File Upload] File upload successful`);
             return fileUrl;
         }
         catch (error) {
-            console.error(`[XY File Upload] File upload with URL retrieval failed for ${filePath}:`, error);
+            logger.error(`[XY File Upload] File upload with URL retrieval failed for ${filePath}:`, error);
             throw error;
         }
         finally {
@@ -249,7 +250,7 @@ export class XYFileUploadService {
                 });
             }
             catch (error) {
-                console.error(`[XY File Upload] Failed to upload ${filePath}, skipping:`, error);
+                logger.error(`[XY File Upload] Failed to upload ${filePath}, skipping:`, error);
                 // Continue with other files
             }
         }

package/dist/src/formatter.js

@@ -1,15 +1,13 @@
 // OpenClaw → A2A format conversion
 import { v4 as uuidv4 } from "uuid";
 import { getXYWebSocketManager } from "./client.js";
-import { getXYRuntime } from "./runtime.js";
+import { logger } from "./utils/logger.js";
+import { getCurrentTaskId, getCurrentMessageId } from "./task-manager.js";
 /**
  * Send an A2A artifact update response.
  */
 export async function sendA2AResponse(params) {
     const { config, sessionId, taskId, messageId, text, append, final, files, errorCode, errorMessage } = params;
-    const runtime = getXYRuntime();
-    const log = runtime?.log ?? console.log;
-    const errorFn = runtime?.error ?? console.error;
     // Build artifact update event
     const artifact = {
         taskId,
@@ -48,7 +46,7 @@ export async function sendA2AResponse(params) {
             code: errorCode,
             message: errorMessage ?? "任务执行异常，请重试",
         };
-        log(`[A2A_RESPONSE] ⚠️ Including error code: ${errorCode}`);
+        logger.log(`[A2A_RESPONSE] ⚠️ Including error code: ${errorCode}`);
     }
     // Send via WebSocket
     const wsManager = getXYWebSocketManager(config);
@@ -60,13 +58,13 @@ export async function sendA2AResponse(params) {
         msgDetail: JSON.stringify(jsonRpcResponse),
     };
     // 📋 Log complete response body
-    log(`[A2A_RESPONSE] 📤 Sending A2A artifact-update response: taskId: ${taskId}`);
-    log(`[A2A_RESPONSE]   - append: ${append}`);
-    log(`[A2A_RESPONSE]   - final: ${final}`);
-    log(`[A2A_RESPONSE]   - text: ${text.length <= 10 ? text : text.slice(0, 5) + '***' + text.slice(-5)}`);
-    log(`[A2A_RESPONSE]   - files count: ${files?.length ?? 0}`);
+    logger.log(`[A2A_RESPONSE] 📤 Sending A2A artifact-update response: taskId: ${taskId}`);
+    logger.log(`[A2A_RESPONSE]   - append: ${append}`);
+    logger.log(`[A2A_RESPONSE]   - final: ${final}`);
+    logger.log(`[A2A_RESPONSE]   - text: ${text.length <= 10 ? text : text.slice(0, 5) + '***' + text.slice(-5)}`);
+    logger.log(`[A2A_RESPONSE]   - files count: ${files?.length ?? 0}`);
     await wsManager.sendMessage(sessionId, outboundMessage);
-    log(`[A2A_RESPONSE] ✅ Message sent successfully`);
+    logger.log(`[A2A_RESPONSE] ✅ Message sent successfully`);
 }
 /**
  * Send an A2A artifact-update with reasoningText part.
@@ -75,9 +73,6 @@ export async function sendA2AResponse(params) {
  */
 export async function sendReasoningTextUpdate(params) {
     const { config, sessionId, taskId, messageId, text, append = true } = params;
-    const runtime = getXYRuntime();
-    const log = runtime?.log ?? console.log;
-    const error = runtime?.error ?? console.error;
     const artifact = {
         taskId,
         kind: "artifact-update",
@@ -115,12 +110,13 @@ export async function sendReasoningTextUpdate(params) {
  */
 export async function sendStatusUpdate(params) {
     const { config, sessionId, taskId, messageId, text, state } = params;
-    const runtime = getXYRuntime();
-    const log = runtime?.log ?? console.log;
-    const error = runtime?.error ?? console.error;
+    // Dynamic lookup: use latest taskId/messageId from task-manager (handles steer/interrupt),
+    // fall back to closure-captured values
+    const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
+    const currentMessageId = getCurrentMessageId(sessionId) ?? messageId;
     // Build status update event following A2A protocol standard
     const statusUpdate = {
-        taskId,
+        taskId: currentTaskId,
         kind: "status-update",
         final: false, // Status updates should not end the stream
         status: {
@@ -139,7 +135,7 @@ export async function sendStatusUpdate(params) {
     // Build JSON-RPC response
     const jsonRpcResponse = {
         jsonrpc: "2.0",
-        id: messageId,
+        id: currentMessageId,
         result: statusUpdate,
     };
     // Send via WebSocket
@@ -148,13 +144,13 @@ export async function sendStatusUpdate(params) {
         msgType: "agent_response",
         agentId: config.agentId,
         sessionId,
-        taskId,
+        taskId: currentTaskId,
         msgDetail: JSON.stringify(jsonRpcResponse),
     };
     // 📋 Log complete response body
-    log(`[A2A_STATUS] 📤 Sending A2A status-update:`);
-    log(`[A2A_STATUS]   - taskId: ${taskId}`);
-    log(`[A2A_STATUS]   - text: "${text}"`);
+    logger.log(`[A2A_STATUS] 📤 Sending A2A status-update:`);
+    logger.log(`[A2A_STATUS]   - taskId: ${currentTaskId}`);
+    logger.log(`[A2A_STATUS]   - text: "${text}"`);
     await wsManager.sendMessage(sessionId, outboundMessage);
 }
 /**
@@ -162,13 +158,14 @@ export async function sendStatusUpdate(params) {
  */
 export async function sendCommand(params) {
     const { config, sessionId, taskId, messageId, command } = params;
-    const runtime = getXYRuntime();
-    const log = runtime?.log ?? console.log;
-    const error = runtime?.error ?? console.error;
+    // Dynamic lookup: use latest taskId/messageId from task-manager (handles steer/interrupt),
+    // fall back to closure-captured values
+    const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
+    const currentMessageId = getCurrentMessageId(sessionId) ?? messageId;
     // Build artifact update with command as data
     // Wrap command in commands array as per protocol requirement
     const artifact = {
-        taskId,
+        taskId: currentTaskId,
         kind: "artifact-update",
         append: false,
         lastChunk: true,
@@ -188,7 +185,7 @@ export async function sendCommand(params) {
     // Build JSON-RPC response
     const jsonRpcResponse = {
         jsonrpc: "2.0",
-        id: messageId,
+        id: currentMessageId,
         result: artifact,
     };
     // Send via WebSocket
@@ -197,22 +194,19 @@ export async function sendCommand(params) {
         msgType: "agent_response",
         agentId: config.agentId,
         sessionId,
-        taskId,
+        taskId: currentTaskId,
         msgDetail: JSON.stringify(jsonRpcResponse),
     };
     // 📋 Log complete response body
-    log(`[A2A_COMMAND] 📤 Sending A2A command: taskId: ${taskId}`);
+    logger.log(`[A2A_COMMAND] 📤 Sending A2A command: taskId: ${currentTaskId}`);
     await wsManager.sendMessage(sessionId, outboundMessage);
-    log(`[A2A_COMMAND] ✅ Command sent successfully`);
+    logger.log(`[A2A_COMMAND] ✅ Command sent successfully`);
 }
 /**
  * Send a clearContext response.
  */
 export async function sendClearContextResponse(params) {
     const { config, sessionId, messageId } = params;
-    const runtime = getXYRuntime();
-    const log = runtime?.log ?? console.log;
-    const error = runtime?.error ?? console.error;
     // Build JSON-RPC response for clearContext
     const jsonRpcResponse = {
         jsonrpc: "2.0",
@@ -238,16 +232,13 @@ export async function sendClearContextResponse(params) {
         msgDetail: JSON.stringify(jsonRpcResponse),
     };
     await wsManager.sendMessage(sessionId, outboundMessage);
-    log(`Sent clearContext response: sessionId=${sessionId}`);
+    logger.log(`Sent clearContext response: sessionId=${sessionId}`);
 }
 /**
  * Send a tasks/cancel response.
  */
 export async function sendTasksCancelResponse(params) {
     const { config, sessionId, taskId, messageId } = params;
-    const runtime = getXYRuntime();
-    const log = runtime?.log ?? console.log;
-    const error = runtime?.error ?? console.error;
     // 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 = {
@@ -274,16 +265,13 @@ export async function sendTasksCancelResponse(params) {
         msgDetail: JSON.stringify(jsonRpcResponse),
     };
     await wsManager.sendMessage(sessionId, outboundMessage);
-    log(`Sent tasks/cancel response: sessionId=${sessionId}, taskId=${taskId}`);
+    logger.log(`Sent tasks/cancel response: sessionId=${sessionId}, taskId=${taskId}`);
 }
 /**
  * Send a Trigger response with pushData content.
  */
 export async function sendTriggerResponse(params) {
     const { config, sessionId, taskId, messageId, content } = params;
-    const runtime = getXYRuntime();
-    const log = runtime?.log ?? console.log;
-    const error = runtime?.error ?? console.error;
     // Build JSON-RPC response for Trigger
     const jsonRpcResponse = {
         jsonrpc: "2.0",
@@ -318,7 +306,7 @@ export async function sendTriggerResponse(params) {
         taskId,
         msgDetail: JSON.stringify(jsonRpcResponse),
     };
-    log(`[TRIGGER_RESPONSE] Sending Trigger response: sessionId=${sessionId}, taskId=${taskId}`);
+    logger.log(`[TRIGGER_RESPONSE] Sending Trigger response: sessionId=${sessionId}, taskId=${taskId}`);
     await wsManager.sendMessage(sessionId, outboundMessage);
-    log(`[TRIGGER_RESPONSE] Trigger response sent successfully`);
+    logger.log(`[TRIGGER_RESPONSE] Trigger response sent successfully`);
 }

package/dist/src/heartbeat.js

@@ -1,5 +1,6 @@
 // Heartbeat management for WebSocket connections
 import WebSocket from "ws";
+import { logger } from "./utils/logger.js";
 /**
  * Manages heartbeat for a WebSocket connection.
  * Supports both application-level (30s) and protocol-level (20s) heartbeats.
@@ -23,8 +24,8 @@ export class HeartbeatManager {
         this.onTimeout = onTimeout;
         this.serverName = serverName;
         this.onHeartbeatSuccess = onHeartbeatSuccess;
-        this.log = logFn ?? console.log;
-        this.error = errorFn ?? console.error;
+        this.log = logFn ?? ((msg, ...args) => logger.log(msg, ...args));
+        this.error = errorFn ?? ((msg, ...args) => logger.error(msg, ...args));
     }
     /**
      * Start heartbeat monitoring.
@@ -67,7 +68,7 @@ export class HeartbeatManager {
      */
     sendHeartbeat() {
         if (this.ws.readyState !== WebSocket.OPEN) {
-            console.warn(`Cannot send heartbeat for ${this.serverName}: WebSocket not open`);
+            this.log(`Cannot send heartbeat for ${this.serverName}: WebSocket not open`);
             return;
         }
         try {

package/dist/src/login-token-handler.js

@@ -2,6 +2,7 @@
 // 监听 LoginTokenEvent.ClawAutoLogin 事件，将 clientId 写入 .xiaoyitoken.json
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from "fs";
 import { dirname } from "path";
+import { logger } from "./utils/logger.js";
 const TOKEN_FILE_PATH = "/home/sandbox/.openclaw/.xiaoyitoken.json";
 /**
  * 处理 LoginTokenEvent.ClawAutoLogin 事件
@@ -11,15 +12,13 @@ const TOKEN_FILE_PATH = "/home/sandbox/.openclaw/.xiaoyitoken.json";
  * @param runtime - 运行时环境
  */
 export function handleLoginTokenEvent(context, runtime) {
-    const log = runtime?.log ?? console.log;
-    const error = runtime?.error ?? console.error;
     try {
         const clientId = context.event?.payload?.clientId;
         if (!clientId || typeof clientId !== "string") {
-            error("[LOGIN_TOKEN_HANDLER] invalid payload: missing clientId");
+            logger.error("[LOGIN_TOKEN_HANDLER] invalid payload: missing clientId");
             return;
         }
-        log(`[LOGIN_TOKEN_HANDLER] received login token event, clientId=${clientId}`);
+        logger.log(`[LOGIN_TOKEN_HANDLER] received login token event, clientId=${clientId}`);
         // Ensure directory exists
         const dir = dirname(TOKEN_FILE_PATH);
         if (!existsSync(dir)) {
@@ -44,17 +43,17 @@ export function handleLoginTokenEvent(context, runtime) {
         if (existing) {
             // Update timestamp
             existing.timestamp = now;
-            log(`[LOGIN_TOKEN_HANDLER] updated timestamp for clientId=${clientId}`);
+            logger.log(`[LOGIN_TOKEN_HANDLER] updated timestamp for clientId=${clientId}`);
         }
         else {
             // Insert new entry
             tokens.push({ clientId, timestamp: now });
-            log(`[LOGIN_TOKEN_HANDLER] inserted new entry for clientId=${clientId}`);
+            logger.log(`[LOGIN_TOKEN_HANDLER] inserted new entry for clientId=${clientId}`);
         }
         writeFileSync(TOKEN_FILE_PATH, JSON.stringify(tokens, null, 2), "utf-8");
-        log(`[LOGIN_TOKEN_HANDLER] wrote token file: ${TOKEN_FILE_PATH}`);
+        logger.log(`[LOGIN_TOKEN_HANDLER] wrote token file: ${TOKEN_FILE_PATH}`);
     }
     catch (err) {
-        error("[LOGIN_TOKEN_HANDLER] failed to handle event:", err);
+        logger.error("[LOGIN_TOKEN_HANDLER] failed to handle event:", err);
     }
 }

package/dist/src/message-queue.js

@@ -1,3 +1,4 @@
+import { logger } from "./utils/logger.js";
 const MAX_QUEUE_SIZE = 1000;
 /**
  * Simple message queue for buffering outbound WebSocket messages
@@ -7,7 +8,7 @@ export class MessageQueue {
     items = [];
     log;
     constructor(log) {
-        this.log = log ?? console.log;
+        this.log = log ?? ((msg, ...args) => logger.log(msg, ...args));
     }
     /** Enqueue a message. Drops oldest if over limit. */
     enqueue(message) {