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

package/dist/src/client.js

@@ -1,14 +1,7 @@
 // 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}`
@@ -24,19 +17,17 @@ 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;
 }
 /**
@@ -47,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();
     }
@@ -78,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`);
     }
 }
 /**
@@ -119,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.d.ts

@@ -1,3 +1,9 @@
 import type { ClawdbotConfig } from "openclaw/plugin-sdk";
+import { type CsplConfig } from "./config.js";
 import type { ApiResponse } from "./constants.js";
 export declare function callCsplApi(questionText: string, cfg: ClawdbotConfig): Promise<ApiResponse>;
+/**
+ * Call CSPL API with a pre-resolved CsplConfig.
+ * Used by after_tool_call hook which has session context but not ClawdbotConfig.
+ */
+export declare function callCsplApiWithConfig(questionText: string, config: CsplConfig): Promise<ApiResponse>;

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

@@ -1,15 +1,17 @@
 // SENTINEL HOOK API 请求模块
+import http from "node:http";
 import https from "node:https";
 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,
@@ -42,18 +44,12 @@ function parseResponse(data) {
     }
     return json;
 }
-export async function callCsplApi(questionText, cfg) {
-    const config = getCsplConfig(cfg);
-    const headers = buildHeaders(config);
-    const payload = {
-        questionText,
-        textSource: config.textSource,
-        action: config.action,
-        extra: JSON.stringify({ userId: config.uid }),
-    };
+function doApiRequest(url, headers, payload, timeout) {
+    const isHttp = url.startsWith("http://");
+    const module = isHttp ? http : https;
+    const options = buildRequestOptions(url, headers, timeout);
     return new Promise((resolve, reject) => {
-        const options = buildRequestOptions(config.api.url, headers, config.api.timeout);
-        const req = https.request(options, (res) => {
+        const req = module.request(options, (res) => {
             if (res.statusCode && res.statusCode >= HTTP_STATUS_BAD_REQUEST) {
                 reject(new Error(`[SENTINEL HOOK] HTTP error: ${res.statusCode}`));
                 return;
@@ -65,21 +61,21 @@ export async function callCsplApi(questionText, cfg) {
             res.on("end", () => {
                 try {
                     const result = parseResponse(data);
-                    console.log(`[SENTINEL HOOK] ✅ 请求成功`);
+                    logger.log(`[SENTINEL HOOK] ✅ 请求成功, securityResult=${result?.data?.securityResult ?? "N/A"}`);
                     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] ⏰ 请求超时 (${timeout}ms)`);
             req.destroy();
             reject(new Error("[SENTINEL HOOK] Request timeout"));
         });
@@ -87,3 +83,28 @@ export async function callCsplApi(questionText, cfg) {
         req.end();
     });
 }
+export async function callCsplApi(questionText, cfg) {
+    const config = getCsplConfig(cfg);
+    const headers = buildHeaders(config);
+    const payload = {
+        questionText,
+        textSource: config.textSource,
+        action: config.action,
+        extra: JSON.stringify({ userId: config.uid }),
+    };
+    return doApiRequest(config.api.url, headers, payload, config.api.timeout);
+}
+/**
+ * Call CSPL API with a pre-resolved CsplConfig.
+ * Used by after_tool_call hook which has session context but not ClawdbotConfig.
+ */
+export async function callCsplApiWithConfig(questionText, config) {
+    const headers = buildHeaders(config);
+    const payload = {
+        questionText,
+        textSource: config.textSource,
+        action: config.action,
+        extra: JSON.stringify({ userId: config.uid }),
+    };
+    return doApiRequest(config.api.url, headers, payload, config.api.timeout);
+}

package/dist/src/cspl/config.d.ts

@@ -1,4 +1,5 @@
 import type { ClawdbotConfig } from "openclaw/plugin-sdk";
+import type { XYChannelConfig } from "../types.js";
 export interface ApiConfig {
     url: string;
     timeout: number;
@@ -15,5 +16,14 @@ export interface CsplConfig {
 /**
  * 构建 CSPL 配置。uid 和 apiKey 复用 XYChannelConfig，避免重复配置。
  * serviceUrl 从 .xiaoyienv 文件读取，skillId 写死在常量中。
+ *
+ * Accepts either ClawdbotConfig (legacy after_tool_call path) or
+ * XYChannelConfig (AgentToolResultMiddleware path).  Config is cached
+ * after the first successful call so subsequent calls can omit the arg.
  */
-export declare function getCsplConfig(cfg: ClawdbotConfig): CsplConfig;
+export declare function getCsplConfig(cfg?: ClawdbotConfig): CsplConfig;
+/**
+ * Initialize CSPL config from an already-resolved XYChannelConfig.
+ * Used by AgentToolResultMiddleware which has session context but not ClawdbotConfig.
+ */
+export declare function initCsplConfigFromXYConfig(xyConfig: XYChannelConfig): CsplConfig;

package/dist/src/cspl/config.js

@@ -27,10 +27,17 @@ function readServiceUrl() {
 /**
  * 构建 CSPL 配置。uid 和 apiKey 复用 XYChannelConfig，避免重复配置。
  * serviceUrl 从 .xiaoyienv 文件读取，skillId 写死在常量中。
+ *
+ * Accepts either ClawdbotConfig (legacy after_tool_call path) or
+ * XYChannelConfig (AgentToolResultMiddleware path).  Config is cached
+ * after the first successful call so subsequent calls can omit the arg.
  */
 export function getCsplConfig(cfg) {
     if (cachedConfig)
         return cachedConfig;
+    if (!cfg) {
+        throw new Error("[SENTINEL HOOK] CSPL config not initialized: pass ClawdbotConfig on first call");
+    }
     const xyConfig = resolveXYConfig(cfg);
     const serviceUrl = readServiceUrl();
     cachedConfig = {
@@ -48,3 +55,26 @@ export function getCsplConfig(cfg) {
     logger.log("[SENTINEL HOOK] Config loaded (uid/apiKey from XYChannelConfig)");
     return cachedConfig;
 }
+/**
+ * Initialize CSPL config from an already-resolved XYChannelConfig.
+ * Used by AgentToolResultMiddleware which has session context but not ClawdbotConfig.
+ */
+export function initCsplConfigFromXYConfig(xyConfig) {
+    if (cachedConfig)
+        return cachedConfig;
+    const serviceUrl = readServiceUrl();
+    cachedConfig = {
+        api: {
+            url: `${serviceUrl}${API_URL_SUFFIX}`,
+            timeout: CSPL_STATIC_CONFIG.api.timeout,
+        },
+        uid: xyConfig.uid,
+        apiKey: xyConfig.apiKey,
+        skillId: CSPL_STATIC_CONFIG.skillId,
+        requestFrom: CSPL_STATIC_CONFIG.requestFrom,
+        textSource: CSPL_STATIC_CONFIG.textSource,
+        action: CSPL_STATIC_CONFIG.action,
+    };
+    logger.log("[SENTINEL HOOK] Config loaded via XYChannelConfig");
+    return cachedConfig;
+}

package/dist/src/cspl/middleware.d.ts

@@ -0,0 +1,8 @@
+import type { AgentToolResultMiddleware } from "openclaw/plugin-sdk/agent-harness-runtime";
+/**
+ * Create the CSPL AgentToolResultMiddleware.
+ *
+ * Gets XYChannelConfig from session context (via sessionKey) to initialize
+ * the CSPL API config on first call, then caches it for subsequent calls.
+ */
+export declare function createCsplMiddleware(): AgentToolResultMiddleware;

package/dist/src/cspl/middleware.js

@@ -0,0 +1,90 @@
+// CSPL AgentToolResultMiddleware
+// Replaces the after_tool_call hook with a middleware that intercepts tool results
+// BEFORE they reach the LLM, enabling true security interruption.
+import { callCsplApiWithConfig } from "./call-api.js";
+import { getCsplConfig, initCsplConfigFromXYConfig } from "./config.js";
+import { ALLOWED_TOOLS, MAX_TEXT_LENGTH, MAX_TOTAL_LENGTH, MIN_TEXT_LENGTH, STEER_ABORT_MESSAGE, } from "./constants.js";
+import { parseSecurityResult, processText, validateAndTruncateText, } from "./utils.js";
+import { getSessionContext } from "../tools/session-manager.js";
+import { logger } from "../utils/logger.js";
+/**
+ * Extract text content from an OpenClawAgentToolResult.
+ */
+function extractMiddlewareResultText(event) {
+    const result = event.result;
+    if (!result?.content || !Array.isArray(result.content)) {
+        return "";
+    }
+    const texts = [];
+    // Special handling for web_fetch: text is in details.text
+    if (event.toolName === "web_fetch" && result.details?.text) {
+        texts.push(String(result.details.text));
+    }
+    else {
+        for (const item of result.content) {
+            if (item?.type === "text" && typeof item.text === "string") {
+                texts.push(item.text);
+            }
+        }
+    }
+    return texts.length > 0 ? texts.join("; ") : "";
+}
+/**
+ * Create the CSPL AgentToolResultMiddleware.
+ *
+ * Gets XYChannelConfig from session context (via sessionKey) to initialize
+ * the CSPL API config on first call, then caches it for subsequent calls.
+ */
+export function createCsplMiddleware() {
+    return async (event, ctx) => {
+        if (!ALLOWED_TOOLS.includes(event.toolName)) {
+            return;
+        }
+        try {
+            const resultText = extractMiddlewareResultText(event);
+            const resultLength = resultText.length;
+            if (resultLength <= MIN_TEXT_LENGTH || resultLength > MAX_TOTAL_LENGTH) {
+                return;
+            }
+            logger.log(`[CSPL MIDDLEWARE] Scanning tool result: toolName=${event.toolName}, textLength=${resultLength}`);
+            // Build CSPL request payload
+            const questionText = {
+                subSceneID: "TOOL_OUTPUT",
+                tool: event.toolName,
+                output: [{ content: "" }],
+            };
+            const originText = processText(resultText);
+            questionText.output[0].content = originText;
+            let finalJson = JSON.stringify(questionText);
+            if (finalJson.length > MAX_TEXT_LENGTH) {
+                const diff = finalJson.length - MAX_TEXT_LENGTH;
+                const { text: trimmed } = validateAndTruncateText(originText, MAX_TEXT_LENGTH - diff);
+                questionText.output[0].content = trimmed;
+                finalJson = JSON.stringify(questionText);
+            }
+            // Get CSPL config (cached after first call)
+            // Try session context first (XYChannelConfig), then fall back to cached config
+            const sessionCtx = getSessionContext(ctx.sessionKey ?? "");
+            const csplConfig = sessionCtx
+                ? initCsplConfigFromXYConfig(sessionCtx.config)
+                : getCsplConfig();
+            const csplStartTime = Date.now();
+            const response = await callCsplApiWithConfig(finalJson, csplConfig);
+            const csplElapsed = Date.now() - csplStartTime;
+            const result = parseSecurityResult(response);
+            logger.log(`[CSPL MIDDLEWARE] Security result: status=${result.status}, toolName=${event.toolName}, elapsed=${csplElapsed}ms`);
+            if (result.status === "REJECT") {
+                logger.log(`[CSPL MIDDLEWARE] REJECT - replacing tool result with security message`);
+                return {
+                    result: {
+                        content: [{ type: "text", text: STEER_ABORT_MESSAGE }],
+                        details: {},
+                    },
+                };
+            }
+        }
+        catch (err) {
+            logger.error(`[CSPL MIDDLEWARE] Error: ${err}`);
+        }
+    };
+}

package/dist/src/cspl/steer-context.d.ts

@@ -0,0 +1,7 @@
+import type { ClawdbotConfig, RuntimeEnv } from "openclaw/plugin-sdk";
+export declare function setCsplSteerContext(cfg: ClawdbotConfig, runtime: RuntimeEnv): void;
+/**
+ * Inject a steer message into the given session by constructing a synthetic
+ * A2A message and dispatching it through handleXYMessage.
+ */
+export declare function injectCsplSteer(sessionId: string, taskId: string, message: string): Promise<boolean>;

package/dist/src/cspl/steer-context.js

@@ -0,0 +1,47 @@
+import { handleXYMessage } from "../bot.js";
+import { logger } from "../utils/logger.js";
+import { randomUUID } from "node:crypto";
+let cachedCfg = null;
+let cachedRuntime = null;
+export function setCsplSteerContext(cfg, runtime) {
+    cachedCfg = cfg;
+    cachedRuntime = runtime;
+}
+/**
+ * Inject a steer message into the given session by constructing a synthetic
+ * A2A message and dispatching it through handleXYMessage.
+ */
+export async function injectCsplSteer(sessionId, taskId, message) {
+    if (!cachedCfg || !cachedRuntime) {
+        logger.error("[CSPL STEER] No cached cfg/runtime, cannot inject steer");
+        return false;
+    }
+    const syntheticMessage = {
+        jsonrpc: "2.0",
+        method: "tasks/send",
+        id: `cspl-steer-${randomUUID()}`,
+        params: {
+            sessionId,
+            id: taskId,
+            agentLoginSessionId: "",
+            message: {
+                role: "user",
+                parts: [{ kind: "text", text: message }],
+            },
+        },
+    };
+    logger.log(`[CSPL STEER] Injecting steer for sessionId=${sessionId}, taskId=${taskId}`);
+    try {
+        await handleXYMessage({
+            cfg: cachedCfg,
+            runtime: cachedRuntime,
+            message: syntheticMessage,
+            accountId: "default",
+        });
+        return true;
+    }
+    catch (err) {
+        logger.error(`[CSPL STEER] Failed to inject steer: ${err}`);
+        return false;
+    }
+}

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
             }
         }