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

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
-import { xyPlugin } from "./src/channel.js";
 /**
  * Xiaoyi Channel Plugin Entry Point.
  * Exports the plugin for OpenClaw to load.
@@ -13,4 +12,3 @@ declare const plugin: {
     register(api: OpenClawPluginApi): void;
 };
 export default plugin;
-export { xyPlugin };

package/dist/index.js

@@ -1,5 +1,6 @@
 import { emptyPluginConfigSchema } from "openclaw/plugin-sdk";
 import { xyPlugin } from "./src/channel.js";
+import { xiaoyiProvider } from "./src/provider.js";
 import { setXYRuntime } from "./src/runtime.js";
 import { tryInjectSteer } from "./src/steer-injector.js";
 import { callCsplApi } from "./src/cspl/call-api.js";
@@ -18,13 +19,14 @@ const plugin = {
     register(api) {
         setXYRuntime(api.runtime);
         api.registerChannel({ plugin: xyPlugin });
-        // CSPL after_tool_call hook: 监听工具结果，发送至 CSPL API 进行安全检测
+        api.registerProvider(xiaoyiProvider);
+        // SENTINEL HOOK after_tool_call hook: 监听工具结果，发送至安全检测 API 进行安全检测
         // 如果响应为 REJECT，注入 steer 消息中止当前对话
         api.on("after_tool_call", async (event, ctx) => {
             if (!ALLOWED_TOOLS.includes(event.toolName)) {
                 return;
             }
-            console.log(`[CSPL] after_tool_call triggered: toolName=${event.toolName}, sessionKey=${ctx.sessionKey ?? "none"}`);
+            console.log(`[SENTINEL HOOK] after_tool_call triggered: toolName=${event.toolName}, sessionKey=${ctx.sessionKey ?? "none"}`);
             try {
                 const resultText = extractResultText(event, event.toolName);
                 const resultLength = resultText.length;
@@ -33,6 +35,7 @@ const plugin = {
                 }
                 // 构造 sentinel_hook 格式的 payload: { tool, output: [{ content }] }
                 const questionText = {
+                    subSceneID: 'TOOL_OUTPUT',
                     tool: event.toolName,
                     output: [{ content: "" }],
                 };
@@ -47,17 +50,15 @@ const plugin = {
                 }
                 const response = await callCsplApi(finalJson, api.config);
                 const result = parseSecurityResult(response);
-                console.log(`[CSPL] Security result: status=${result.status}`);
+                console.log(`[SENTINEL HOOK] Security result: status=${result.status}`);
                 if (result.status === "REJECT") {
                     await tryInjectSteer(ctx.sessionKey, STEER_ABORT_MESSAGE);
                 }
             }
             catch (err) {
-                api.logger.error(`[CSPL] after_tool_call error: ${err}`);
+                api.logger.error(`[SENTINEL HOOK] after_tool_call error: ${err}`);
             }
         });
     },
 };
 export default plugin;
-// Also export the plugin directly for testing
-export { xyPlugin };

package/dist/src/bot.d.ts

@@ -8,6 +8,7 @@ export interface HandleXYMessageParams {
     runtime: RuntimeEnv;
     message: A2AJsonRpcRequest;
     accountId: string;
+    webSocketSessionId?: string;
 }
 /**
  * Handle an incoming A2A message.

package/dist/src/bot.js

@@ -1,14 +1,15 @@
 import { getXYRuntime } from "./runtime.js";
 import { setCachedContext } from "./steer-injector.js";
 import { createXYReplyDispatcher } from "./reply-dispatcher.js";
-import { parseA2AMessage, extractTextFromParts, extractFileParts, extractPushId, extractTriggerData } from "./parser.js";
+import { parseA2AMessage, extractTextFromParts, extractFileParts, extractPushId, extractDeviceType, extractTriggerData } from "./parser.js";
 import { downloadFilesFromParts } from "./file-download.js";
 import { resolveXYConfig } from "./config.js";
 import { sendStatusUpdate, sendClearContextResponse, sendTasksCancelResponse, sendA2AResponse } from "./formatter.js";
 import { registerSession, unregisterSession, runWithSessionContext } from "./tools/session-manager.js";
 import { configManager } from "./utils/config-manager.js";
 import { addPushId } from "./utils/pushid-manager.js";
-import { getPushDataById } from "./utils/pushdata-manager.js";
+import { getPushDataById, getPushDataAfterTimestamp } from "./utils/pushdata-manager.js";
+import { saveRuntimeInfo } from "./utils/runtime-manager.js";
 import { registerTaskId, decrementTaskIdRef, lockTaskId, unlockTaskId, hasActiveTask, } from "./task-manager.js";
 /**
  * Handle an incoming A2A message.
@@ -16,7 +17,7 @@ import { registerTaskId, decrementTaskIdRef, lockTaskId, unlockTaskId, hasActive
  * Runtime is expected to be validated before calling this function.
  */
 export async function handleXYMessage(params) {
-    const { cfg, runtime, message, accountId } = params;
+    const { cfg, runtime, message, accountId, webSocketSessionId } = params;
     const log = runtime?.log ?? console.log;
     const error = runtime?.error ?? console.error;
     // 每次收到消息时更新缓存，供 steer 注入使用
@@ -26,8 +27,6 @@ export async function handleXYMessage(params) {
     try {
         // Check for special messages BEFORE parsing (these have different param structures)
         const messageMethod = message.method;
-        log(`[BOT-ENTRY] <<<<<<< Received message with method: ${messageMethod}, id: ${message.id} >>>>>>>`);
-        log(`[BOT-ENTRY] Stack trace for debugging:`, new Error().stack?.split('\n').slice(1, 4).join('\n'));
         // Handle clearContext messages (params only has sessionId)
         if (messageMethod === "clearContext" || messageMethod === "clear_context") {
             const sessionId = message.params?.sessionId;
@@ -66,31 +65,49 @@ export async function handleXYMessage(params) {
         // 如果消息中包含 Trigger 事件数据，直接返回 pushData 内容，不走正常流程
         const triggerData = extractTriggerData(parsed.parts);
         if (triggerData) {
-            log(`[BOT] 📌 Detected Trigger message with pushDataId: ${triggerData.pushDataId}`);
+            log(`[BOT] 📌 Detected Trigger message`);
             log(`[BOT]   - Session ID: ${parsed.sessionId}`);
             log(`[BOT]   - Task ID: ${parsed.taskId}`);
             try {
-                // 读取 pushData
-                const pushDataItem = await getPushDataById(triggerData.pushDataId);
-                if (!pushDataItem) {
-                    error(`[BOT] ❌ pushData not found for ID: ${triggerData.pushDataId}`);
-                    return;
-                }
-                log(`[BOT] ✅ Found pushData, sending direct response`);
-                log(`[BOT]   - pushDataId: ${pushDataItem.pushDataId}`);
-                log(`[BOT]   - time: ${pushDataItem.time}`);
-                log(`[BOT]   - content length: ${pushDataItem.dataDetail.length} chars`);
                 const config = resolveXYConfig(cfg);
-                // 直接发送响应（final=true，不走 openclaw 流程）
-                await sendA2AResponse({
-                    config,
-                    sessionId: parsed.sessionId,
-                    taskId: parsed.taskId,
-                    messageId: parsed.messageId,
-                    text: pushDataItem.dataDetail,
-                    append: false,
-                    final: true,
-                });
+                if ("pushDataId" in triggerData) {
+                    // 单条查询：按 pushDataId 返回
+                    log(`[BOT]   - Type: pushDataId = ${triggerData.pushDataId}`);
+                    const pushDataItem = await getPushDataById(triggerData.pushDataId);
+                    if (!pushDataItem) {
+                        error(`[BOT] ❌ pushData not found for ID: ${triggerData.pushDataId}`);
+                        return;
+                    }
+                    log(`[BOT] ✅ Found pushData, sending direct response`);
+                    await sendA2AResponse({
+                        config,
+                        sessionId: parsed.sessionId,
+                        taskId: parsed.taskId,
+                        messageId: parsed.messageId,
+                        text: pushDataItem.dataDetail,
+                        append: false,
+                        final: true,
+                    });
+                }
+                else {
+                    // 批量查询：按 timestamp 返回所有之后的 push 数据
+                    log(`[BOT]   - Type: timestamp = ${triggerData.timestamp}`);
+                    const items = await getPushDataAfterTimestamp(triggerData.timestamp);
+                    const result = items.map(item => ({
+                        pushDataId: item.pushDataId,
+                        pushData: item.dataDetail,
+                    }));
+                    log(`[BOT] ✅ Found ${result.length} pushData items after timestamp, sending response`);
+                    await sendA2AResponse({
+                        config,
+                        sessionId: parsed.sessionId,
+                        taskId: parsed.taskId,
+                        messageId: parsed.messageId,
+                        text: JSON.stringify(result),
+                        append: false,
+                        final: true,
+                    });
+                }
                 log(`[BOT] ✅ Trigger response sent successfully, exiting early`);
                 return; // 提前返回，不继续处理
             }
@@ -120,9 +137,6 @@ export async function handleXYMessage(params) {
         const pushId = extractPushId(parsed.parts);
         if (pushId) {
             log(`[BOT] 📌 Extracted push_id from user message`);
-            log(`[BOT]   - Session ID: ${parsed.sessionId}`);
-            log(`[BOT]   - Push ID preview: ${pushId.substring(0, 20)}...`);
-            log(`[BOT]   - Full push_id: ${pushId}`);
             configManager.updatePushId(parsed.sessionId, pushId);
             // 持久化 pushId 到本地文件（异步，不阻塞主流程）
             addPushId(pushId).catch((err) => {
@@ -132,6 +146,18 @@ export async function handleXYMessage(params) {
         else {
             log(`[BOT] ℹ️  No push_id found in message, will use config default`);
         }
+        // Extract deviceType if present (same level as push_id in systemVariables)
+        const deviceType = extractDeviceType(parsed.parts);
+        if (deviceType) {
+            log(`[BOT] 📱 Extracted deviceType from user message: ${deviceType}`);
+        }
+        // 保存 runtime 信息到 .xiaoyiruntime 文件（异步，不阻塞主流程）
+        saveRuntimeInfo(webSocketSessionId || parsed.sessionId, // SESSION_ID (WebSocket 层级，如果没有则 fallback)
+        parsed.sessionId, // CONVERSATION_ID (param 里的 sessionId)
+        parsed.taskId // TASK_ID (param.id)
+        ).catch((err) => {
+            error(`[BOT] Failed to save runtime info:`, err);
+        });
         // Resolve configuration (needed for status updates)
         const config = resolveXYConfig(cfg);
         // ✅ Resolve agent route (following feishu pattern)
@@ -147,12 +173,6 @@ export async function handleXYMessage(params) {
             },
         });
         log(`xy: resolved route accountId=${route.accountId}, sessionKey=${route.sessionKey}`);
-        // 🔑 注册session（带引用计数）
-        log(`[BOT] 📝 About to register session for tools...`);
-        log(`[BOT]   - sessionKey: ${route.sessionKey}`);
-        log(`[BOT]   - sessionId: ${parsed.sessionId}`);
-        log(`[BOT]   - taskId: ${parsed.taskId}`);
-        log(`[BOT]   - isSecondMessage: ${isSecondMessage}`);
         registerSession(route.sessionKey, {
             config,
             sessionId: parsed.sessionId,
@@ -160,7 +180,6 @@ export async function handleXYMessage(params) {
             messageId: parsed.messageId,
             agentId: route.accountId,
         });
-        log(`[BOT] ✅ Session registered for tools`);
         // 🔑 发送初始状态更新（第二条消息也要发，用新taskId）
         log(`[STATUS] Sending initial status update for session ${parsed.sessionId}`);
         void sendStatusUpdate({
@@ -221,9 +240,7 @@ export async function handleXYMessage(params) {
         });
         // 🔑 创建dispatcher（dispatcher会自动使用动态taskId）
         log(`[BOT-DISPATCHER] 🎯 Creating reply dispatcher`);
-        log(`[BOT-DISPATCHER]   - session: ${parsed.sessionId}`);
         log(`[BOT-DISPATCHER]   - taskId: ${parsed.taskId}`);
-        log(`[BOT-DISPATCHER]   - isSecondMessage: ${isSecondMessage}`);
         const { dispatcher, replyOptions, markDispatchIdle, startStatusInterval } = createXYReplyDispatcher({
             cfg,
             runtime,
@@ -233,19 +250,12 @@ export async function handleXYMessage(params) {
             accountId: route.accountId,
             isSteerFollower: isSecondMessage, // 🔑 标记第二条消息
         });
-        log(`[BOT-DISPATCHER] ✅ Reply dispatcher created successfully`);
         // 🔑 只有第一条消息启动状态定时器
         // 第二条消息会很快返回，不需要定时器
         if (!isSecondMessage) {
             startStatusInterval();
             log(`[BOT-DISPATCHER] ✅ Status interval started for first message`);
         }
-        else {
-            log(`[BOT-DISPATCHER] ⏭️  Skipped status interval for steer follower`);
-        }
-        log(`xy: dispatching to agent (session=${parsed.sessionId})`);
-        // Dispatch to OpenClaw core using correct API (following feishu pattern)
-        log(`[BOT] 🚀 Starting dispatcher with session: ${route.sessionKey}`);
         // Build session context for AsyncLocalStorage
         const sessionContext = {
             config,
@@ -253,13 +263,14 @@ export async function handleXYMessage(params) {
             taskId: parsed.taskId,
             messageId: parsed.messageId,
             agentId: route.accountId,
+            deviceType,
         };
+        log(`[BOT-DISPATCH] ⏳ withReplyDispatcher starting, sessionKey=${route.sessionKey}`);
         await core.channel.reply.withReplyDispatcher({
             dispatcher,
             onSettled: () => {
                 log(`[BOT] 🏁 onSettled called for session: ${route.sessionKey}`);
                 log(`[BOT]   - isSecondMessage: ${isSecondMessage}`);
-                markDispatchIdle();
                 // 🔑 减少引用计数
                 decrementTaskIdRef(parsed.sessionId);
                 // 🔑 如果是第一条消息完成，解锁
@@ -273,12 +284,32 @@ export async function handleXYMessage(params) {
             },
             run: () => 
             // 🔐 Use AsyncLocalStorage to provide session context to tools
-            runWithSessionContext(sessionContext, () => core.channel.reply.dispatchReplyFromConfig({
-                ctx: ctxPayload,
-                cfg,
-                dispatcher,
-                replyOptions,
-            })),
+            runWithSessionContext(sessionContext, async () => {
+                log(`[BOT-DISPATCH] ⏳ dispatchReplyFromConfig starting...`);
+                log(`[BOT-DISPATCH]   - sessionKey: ${ctxPayload.SessionKey}`);
+                log(`[BOT-DISPATCH]   - provider: ${ctxPayload.Provider}`);
+                log(`[BOT-DISPATCH]   - surface: ${ctxPayload.Surface}`);
+                log(`[BOT-DISPATCH]   - from: ${ctxPayload.From}`);
+                log(`[BOT-DISPATCH]   - body length: ${ctxPayload.Body?.length ?? 0}`);
+                try {
+                    const result = await core.channel.reply.dispatchReplyFromConfig({
+                        ctx: ctxPayload,
+                        cfg,
+                        dispatcher,
+                        replyOptions,
+                    });
+                    log(`[BOT-DISPATCH] ✅ dispatchReplyFromConfig returned`);
+                    log(`[BOT-DISPATCH]   - result: ${JSON.stringify(result)}`);
+                    return result;
+                }
+                catch (dispatchErr) {
+                    error(`[BOT-DISPATCH] ❌ dispatchReplyFromConfig threw`);
+                    error(`[BOT-DISPATCH]   - error name: ${dispatchErr instanceof Error ? dispatchErr.name : "unknown"}`);
+                    error(`[BOT-DISPATCH]   - error message: ${String(dispatchErr)}`);
+                    error(`[BOT-DISPATCH]   - error stack: ${dispatchErr instanceof Error ? dispatchErr.stack?.slice(0, 500) : "N/A"}`);
+                    throw dispatchErr;
+                }
+            }),
         });
         log(`[BOT] ✅ Dispatcher completed for session: ${parsed.sessionId}`);
         log(`xy: dispatch complete (session=${parsed.sessionId})`);
@@ -336,19 +367,3 @@ function buildXYMediaPayload(mediaList) {
         MediaTypes: mediaTypes.length > 0 ? mediaTypes : undefined,
     };
 }
-/**
- * Infer OpenClaw media type from file type string.
- */
-function inferMediaType(fileType) {
-    const lower = fileType.toLowerCase();
-    if (lower.includes("image") || /\.(jpg|jpeg|png|gif|bmp|webp)$/i.test(lower)) {
-        return "image";
-    }
-    if (lower.includes("video") || /\.(mp4|avi|mov|mkv|webm)$/i.test(lower)) {
-        return "video";
-    }
-    if (lower.includes("audio") || /\.(mp3|wav|ogg|m4a)$/i.test(lower)) {
-        return "audio";
-    }
-    return "file";
-}

package/dist/src/channel.js

@@ -1,7 +1,6 @@
 import { resolveXYConfig, listXYAccountIds, getDefaultXYAccountId } from "./config.js";
 import { xyConfigSchema } from "./config-schema.js";
 import { xyOutbound } from "./outbound.js";
-import { xyOnboardingAdapter } from "./onboarding.js";
 import { locationTool } from "./tools/location-tool.js";
 import { noteTool } from "./tools/note-tool.js";
 import { searchNoteTool } from "./tools/search-note-tool.js";
@@ -22,9 +21,17 @@ import { searchAlarmTool } from "./tools/search-alarm-tool.js";
 import { modifyAlarmTool } from "./tools/modify-alarm-tool.js";
 import { deleteAlarmTool } from "./tools/delete-alarm-tool.js";
 import { sendFileToUserTool } from "./tools/send-file-to-user-tool.js";
-import { xiaoyiCollectionTool } from "./tools/xiaoyi-collection-tool.js";
 import { viewPushResultTool } from "./tools/view-push-result-tool.js";
 import { imageReadingTool } from "./tools/image-reading-tool.js";
+import { timestampToUtc8Tool } from "./tools/timestamp-to-utc8-tool.js";
+import { xiaoyiCollectionTool } from "./tools/xiaoyi-collection-tool.js";
+import { xiaoyiAddCollectionTool } from "./tools/xiaoyi-add-collection-tool.js";
+import { xiaoyiDeleteCollectionTool } from "./tools/xiaoyi-delete-collection-tool.js";
+import { saveMediaToGalleryTool } from "./tools/save-media-to-gallery-tool.js";
+import { saveFileToPhoneTool } from "./tools/save-file-to-phone-tool.js";
+import { filterToolsByDevice } from "./tools/device-tool-map.js";
+import { getCurrentSessionContext } from "./tools/session-manager.js";
+import { logger } from "./utils/logger.js";
 /**
  * Xiaoyi Channel Plugin for OpenClaw.
  * Implements Xiaoyi A2A protocol with dual WebSocket connections.
@@ -63,8 +70,13 @@ export const xyPlugin = {
         schema: xyConfigSchema,
     },
     outbound: xyOutbound,
-    onboarding: xyOnboardingAdapter,
-    agentTools: [locationTool, noteTool, searchNoteTool, modifyNoteTool, calendarTool, searchCalendarTool, searchContactTool, searchPhotoGalleryTool, uploadPhotoTool, xiaoyiGuiTool, xiaoyiCollectionTool, callPhoneTool, searchMessageTool, sendMessageTool, searchFileTool, uploadFileTool, createAlarmTool, searchAlarmTool, modifyAlarmTool, deleteAlarmTool, sendFileToUserTool, viewPushResultTool, imageReadingTool],
+    agentTools: () => {
+        const allTools = [locationTool, noteTool, searchNoteTool, modifyNoteTool, calendarTool, searchCalendarTool, searchContactTool, searchPhotoGalleryTool, uploadPhotoTool, xiaoyiGuiTool, callPhoneTool, searchMessageTool, sendMessageTool, searchFileTool, uploadFileTool, createAlarmTool, searchAlarmTool, modifyAlarmTool, deleteAlarmTool, sendFileToUserTool, viewPushResultTool, imageReadingTool, timestampToUtc8Tool, xiaoyiCollectionTool, xiaoyiAddCollectionTool, xiaoyiDeleteCollectionTool, saveMediaToGalleryTool, saveFileToPhoneTool];
+        const ctx = getCurrentSessionContext();
+        const filtered = filterToolsByDevice(allTools, ctx?.deviceType);
+        logger.log(`[DEVICE-FILTER] deviceType=${ctx?.deviceType ?? "(none)"}, tools: ${allTools.length} → ${filtered.length} (${filtered.map(t => t.name).join(", ")})`);
+        return filtered;
+    },
     messaging: {
         normalizeTarget: (raw) => {
             const trimmed = raw.trim();
@@ -81,6 +93,22 @@ export const xyPlugin = {
             hint: "<sessionId>",
         },
     },
+    bindings: {
+        compileConfiguredBinding: ({ conversationId }) => {
+            const sessionId = conversationId.trim();
+            if (!sessionId)
+                return null;
+            return {
+                conversationId: sessionId,
+                parentConversationId: undefined,
+            };
+        },
+        matchInboundConversation: ({ compiledBinding, conversationId }) => {
+            return compiledBinding.conversationId === conversationId
+                ? { conversationId, matchPriority: 2 }
+                : null;
+        },
+    },
     reload: {
         configPrefixes: ["channels.xiaoyi-channel"],
     },

package/dist/src/client.js

@@ -72,21 +72,14 @@ export function getCachedManagerCount() {
  * Helps identify connection issues and orphan connections.
  */
 export function diagnoseAllManagers() {
-    console.log("========================================");
-    console.log("📊 WebSocket Manager Global Diagnostics");
-    console.log("========================================");
     console.log(`Total cached managers: ${wsManagerCache.size}`);
-    console.log("");
     if (wsManagerCache.size === 0) {
         console.log("ℹ️  No managers in cache");
-        console.log("========================================");
         return;
     }
     let orphanCount = 0;
     wsManagerCache.forEach((manager, key) => {
         const diag = manager.getConnectionDiagnostics();
-        console.log(`📌 Manager: ${key}`);
-        console.log(`   Shutting down: ${diag.isShuttingDown}`);
         console.log(`   Total event listeners on manager: ${diag.totalEventListeners}`);
         // Connection
         console.log(`   🔌 Connection:`);
@@ -110,7 +103,6 @@ export function diagnoseAllManagers() {
     else {
         console.log(`✅ No orphan connections found`);
     }
-    console.log("========================================");
 }
 /**
  * Clean up orphan connections across all managers.

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

@@ -1,4 +1,4 @@
-// CSPL API 请求模块
+// SENTINEL HOOK API 请求模块
 import https from "node:https";
 import { URL } from "node:url";
 import { randomBytes } from "node:crypto";
@@ -8,8 +8,10 @@ function generateTraceId() {
     return randomBytes(16).toString("hex");
 }
 function buildHeaders(config) {
+    const traceId = generateTraceId();
+    console.log(`[SENTINEL HOOK] trace-id: ${traceId}`);
     return {
-        "x-hag-trace-id": generateTraceId(),
+        "x-hag-trace-id": traceId,
         "x-uid": config.uid,
         "x-api-key": config.apiKey,
         "x-request-from": config.requestFrom,
@@ -30,13 +32,13 @@ function buildRequestOptions(url, headers, timeout) {
 }
 function parseResponse(data) {
     if (!data?.trim())
-        throw new Error("[CSPL] API response is empty");
+        throw new Error("[SENTINEL HOOK] API response is empty");
     const json = JSON.parse(data);
     if (json.retCode && json.retCode !== "0") {
-        throw new Error(`[CSPL] API error: ${json.retMsg || "unknown"}`);
+        throw new Error(`[SENTINEL HOOK] API error: ${json.retMsg || "unknown"}`);
     }
     if (!json.retCode && json.code) {
-        throw new Error(`[CSPL] Backend error: ${json.desc || "unknown"}`);
+        throw new Error(`[SENTINEL HOOK] Backend error: ${json.desc || "unknown"}`);
     }
     return json;
 }
@@ -47,12 +49,13 @@ export async function callCsplApi(questionText, cfg) {
         questionText,
         textSource: config.textSource,
         action: config.action,
+        extra: JSON.stringify({ userId: config.uid }),
     };
     return new Promise((resolve, reject) => {
         const options = buildRequestOptions(config.api.url, headers, config.api.timeout);
         const req = https.request(options, (res) => {
             if (res.statusCode && res.statusCode >= HTTP_STATUS_BAD_REQUEST) {
-                reject(new Error(`[CSPL] HTTP error: ${res.statusCode}`));
+                reject(new Error(`[SENTINEL HOOK] HTTP error: ${res.statusCode}`));
                 return;
             }
             let data = "";
@@ -61,17 +64,24 @@ export async function callCsplApi(questionText, cfg) {
             });
             res.on("end", () => {
                 try {
-                    resolve(parseResponse(data));
+                    const result = parseResponse(data);
+                    console.log(`[SENTINEL HOOK] ✅ 请求成功`);
+                    resolve(result);
                 }
                 catch (e) {
+                    console.error(`[SENTINEL HOOK] ❌ 请求失败: ${e instanceof Error ? e.message : String(e)}`);
                     reject(e);
                 }
             });
         });
-        req.on("error", reject);
+        req.on("error", (error) => {
+            console.error(`[SENTINEL HOOK] ❌ 请求错误: ${error instanceof Error ? error.message : String(error)}`);
+            reject(error);
+        });
         req.on("timeout", () => {
+            console.error(`[SENTINEL HOOK] ⏰ 请求超时 (${config.api.timeout}ms)`);
             req.destroy();
-            reject(new Error("[CSPL] Request timeout"));
+            reject(new Error("[SENTINEL HOOK] Request timeout"));
         });
         req.write(JSON.stringify(payload));
         req.end();

package/dist/src/cspl/config.js

@@ -7,7 +7,7 @@ import { logger } from "../utils/logger.js";
 let cachedConfig = null;
 function readServiceUrl() {
     if (!fs.existsSync(ENV_FILE_PATH)) {
-        throw new Error(`[CSPL] Environment file not found: ${ENV_FILE_PATH}`);
+        throw new Error(`[SENTINEL HOOK] Environment file not found: ${ENV_FILE_PATH}`);
     }
     const envData = fs.readFileSync(ENV_FILE_PATH, "utf-8");
     for (const line of envData.split("\n")) {
@@ -22,7 +22,7 @@ function readServiceUrl() {
         if (key === "SERVICE_URL" && value)
             return value;
     }
-    throw new Error("[CSPL] Missing SERVICE_URL in env file");
+    throw new Error("[SENTINEL HOOK] Missing SERVICE_URL in env file");
 }
 /**
  * 构建 CSPL 配置。uid 和 apiKey 复用 XYChannelConfig，避免重复配置。
@@ -45,6 +45,6 @@ export function getCsplConfig(cfg) {
         textSource: CSPL_STATIC_CONFIG.textSource,
         action: CSPL_STATIC_CONFIG.action,
     };
-    logger.log("[CSPL] Config loaded (uid/apiKey from XYChannelConfig)");
+    logger.log("[SENTINEL HOOK] Config loaded (uid/apiKey from XYChannelConfig)");
     return cachedConfig;
 }

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

@@ -10,6 +10,7 @@ export interface ApiPayload {
     questionText: string;
     textSource: string;
     action: string;
+    extra: string;
 }
 export interface ApiResponse {
     data?: {
@@ -25,7 +26,7 @@ export declare const MIN_TEXT_LENGTH = 0;
 export declare const MAX_TEXT_LENGTH = 4096;
 export declare const MAX_TOTAL_LENGTH = 40960;
 export declare const regex: RegExp;
-export declare const DEFAULT_HTTP_PORT = 80;
+export declare const DEFAULT_HTTP_PORT = 443;
 export declare const HTTP_STATUS_BAD_REQUEST = 400;
 export declare const ENV_FILE_PATH = "/home/sandbox/.openclaw/.xiaoyienv";
 export declare const API_URL_SUFFIX = "/celia-claw/v1/rest-api/skill/execute";

package/dist/src/cspl/constants.js

@@ -3,7 +3,7 @@ export const MIN_TEXT_LENGTH = 0;
 export const MAX_TEXT_LENGTH = 4096;
 export const MAX_TOTAL_LENGTH = 40960;
 export const regex = /[^\u4e00-\u9fa5a-zA-Z0-9\s\.,!?;:，。！？；：""\'\'（）()\[\]【】]/;
-export const DEFAULT_HTTP_PORT = 80;
+export const DEFAULT_HTTP_PORT = 443;
 export const HTTP_STATUS_BAD_REQUEST = 400;
 export const ENV_FILE_PATH = "/home/sandbox/.openclaw/.xiaoyienv";
 export const API_URL_SUFFIX = "/celia-claw/v1/rest-api/skill/execute";

package/dist/src/file-upload.js

@@ -55,12 +55,10 @@ export class XYFileUploadService {
                 throw new Error(`Prepare failed: HTTP ${prepareResp.status}`);
             }
             const prepareData = await prepareResp.json();
-            console.log(`[XY File Upload] Prepare response:`, JSON.stringify(prepareData, null, 2));
             if (prepareData.code !== "0") {
                 throw new Error(`Prepare failed: ${prepareData.desc}`);
             }
             const { objectId, draftId, uploadInfos } = prepareData;
-            console.log(`[XY File Upload] Prepare complete: objectId=${objectId}, draftId=${draftId}`);
             // Phase 2: Upload
             console.log(`[XY File Upload] Phase 2: Upload file data`);
             const uploadInfo = uploadInfos[0]; // Single-part upload
@@ -69,11 +67,8 @@ export class XYFileUploadService {
                 headers: uploadInfo.headers,
                 body: fileBuffer,
             });
-            console.log(`[XY File Upload] Upload response status: ${uploadResp.status}, url: ${uploadInfo.url}`);
-            console.log(`[XY File Upload] Upload response headers:`, JSON.stringify(Object.fromEntries(uploadResp.headers.entries()), null, 2));
             if (!uploadResp.ok) {
                 const uploadErrorText = await uploadResp.text();
-                console.log(`[XY File Upload] Upload error response:`, uploadErrorText);
                 throw new Error(`Upload failed: HTTP ${uploadResp.status}`);
             }
             console.log(`[XY File Upload] Upload complete`);
@@ -96,7 +91,6 @@ export class XYFileUploadService {
                 throw new Error(`Complete failed: HTTP ${completeResp.status}`);
             }
             const completeData = await completeResp.json();
-            console.log(`[XY File Upload] Complete response:`, JSON.stringify(completeData, null, 2));
             console.log(`[XY File Upload] File upload successful: ${fileName} → objectId=${objectId}`);
             return objectId;
         }
@@ -110,7 +104,6 @@ export class XYFileUploadService {
      * Uses completeAndQuery endpoint to get the file URL directly.
      */
     async uploadFileAndGetUrl(filePath, objectType = "TEMPORARY_MATERIAL_DOC") {
-        console.log(`[XY File Upload] Starting file upload with URL retrieval: ${filePath}`);
         try {
             // Read file
             const fileBuffer = await fs.readFile(filePath);
@@ -143,7 +136,6 @@ export class XYFileUploadService {
                 throw new Error(`Prepare failed: HTTP ${prepareResp.status}`);
             }
             const prepareData = await prepareResp.json();
-            console.log(`[XY File Upload] Prepare response:`, JSON.stringify(prepareData, null, 2));
             if (prepareData.code !== "0") {
                 throw new Error(`Prepare failed: ${prepareData.desc}`);
             }
@@ -160,7 +152,6 @@ export class XYFileUploadService {
             console.log(`[XY File Upload] Upload response status: ${uploadResp.status}`);
             if (!uploadResp.ok) {
                 const uploadErrorText = await uploadResp.text();
-                console.log(`[XY File Upload] Upload error response:`, uploadErrorText);
                 throw new Error(`Upload failed: HTTP ${uploadResp.status}`);
             }
             console.log(`[XY File Upload] Upload complete`);
@@ -183,13 +174,12 @@ export class XYFileUploadService {
                 throw new Error(`CompleteAndQuery failed: HTTP ${completeResp.status}`);
             }
             const completeData = await completeResp.json();
-            console.log(`[XY File Upload] CompleteAndQuery response:`, JSON.stringify(completeData, null, 2));
             // Extract file URL from response
             const fileUrl = completeData?.fileDetailInfo?.url || "";
             if (!fileUrl) {
                 throw new Error("No file URL returned from completeAndQuery");
             }
-            console.log(`[XY File Upload] File upload successful: ${fileName} → URL=${fileUrl}`);
+            console.log(`[XY File Upload] File upload successful`);
             return fileUrl;
         }
         catch (error) {

package/dist/src/formatter.d.ts

@@ -15,6 +15,8 @@ export interface SendA2AResponseParams {
         fileType: string;
         fileId: string;
     }>;
+    errorCode?: number | string;
+    errorMessage?: string;
 }
 /**
  * Send an A2A artifact update response.