@ynhcj/xiaoyi-channel 0.0.133-beta → 0.0.135-beta

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

@@ -14,11 +14,13 @@ const TOKEN_FILE_PATH = "/home/sandbox/.openclaw/.xiaoyitoken.json";
 export function handleLoginTokenEvent(context, runtime) {
     try {
         const clientId = context.event?.payload?.clientId;
+        const message = context.event?.payload?.message ?? "";
+        const code = context.event?.payload?.code ?? "";
         if (!clientId || typeof clientId !== "string") {
             logger.error("[LOGIN_TOKEN_HANDLER] invalid payload: missing clientId");
             return;
         }
-        logger.log(`[LOGIN_TOKEN_HANDLER] received login token event, clientId=${clientId}`);
+        logger.log(`[LOGIN_TOKEN_HANDLER] received login token event, clientId=${clientId}, code=${code}`);
         // Ensure directory exists
         const dir = dirname(TOKEN_FILE_PATH);
         if (!existsSync(dir)) {
@@ -41,13 +43,15 @@ export function handleLoginTokenEvent(context, runtime) {
         const now = String(Date.now());
         const existing = tokens.find((t) => t.clientId === clientId);
         if (existing) {
-            // Update timestamp
+            // Update timestamp, message, code
             existing.timestamp = now;
-            logger.log(`[LOGIN_TOKEN_HANDLER] updated timestamp for clientId=${clientId}`);
+            existing.message = message;
+            existing.code = code;
+            logger.log(`[LOGIN_TOKEN_HANDLER] updated entry for clientId=${clientId}`);
         }
         else {
             // Insert new entry
-            tokens.push({ clientId, timestamp: now });
+            tokens.push({ clientId, timestamp: now, message, code });
             logger.log(`[LOGIN_TOKEN_HANDLER] inserted new entry for clientId=${clientId}`);
         }
         writeFileSync(TOKEN_FILE_PATH, JSON.stringify(tokens, null, 2), "utf-8");

package/dist/src/skill-retriever/hooks.js

@@ -5,7 +5,6 @@ const TOOL_RETRIEVER_HEADER = `[系统消息，非用户发言]
 `;
 const TOOL_RETRIEVER_FOOTER = `
 以上是检索到的、与当前用户请求相关但用户尚未安装的skill，请按照TOOLS.md中find-skills中的[隐式推荐触发规则]来判断是否要给用户推荐。
----以下是用户原始请求---
 `;
 const PLUGIN_LOG_PREFIX = "[skill-retriever]";
 const SKIP_KEYWORDS = ["安装", "装一下", "下载", "查询", "查找", "install", "卸载", "删除", "重载", "定时任务", "重装", "进化"];

package/dist/src/skill-retriever/tool-search.js

@@ -123,21 +123,16 @@ export async function searchTools(options) {
             const rawSkills = responseData.content.skills;
             const installedSkills = getInstalledSkills();
             const formattedData = formatSkillData(rawSkills, installedSkills);
-            const topTools = formattedData.slice(0, 2);
-            const allInstalled = topTools.every((tool) => tool.status === "已安装");
-            if (allInstalled) {
-                logger.log(`${PLUGIN_LOG_PREFIX} [DEBUG] All top 2 skills are installed, returning null`);
+            const candidateTools = formattedData.filter((tool) => (tool.rrfScore ?? 0) >= 0.016);
+            logger.log(`${PLUGIN_LOG_PREFIX} [DEBUG] Candidates with rrfScore >= 0.016: ${candidateTools.length}, details: ${candidateTools.map((t) => `${t.skillId}(rrfScore=${t.rrfScore}, status=${t.status})`).join(", ")}`);
+            const hasInstalledInCandidates = candidateTools.some((tool) => tool.status === "已安装");
+            if (hasInstalledInCandidates) {
+                logger.log(`${PLUGIN_LOG_PREFIX} [DEBUG] Candidates contain installed skill, returning null`);
                 return null;
             }
-            const hasInstalledWithHighScore = topTools.some((tool) => tool.status === "已安装" && (tool.rrfScore ?? 0) >= 0.016);
-            if (hasInstalledWithHighScore) {
-                logger.log(`${PLUGIN_LOG_PREFIX} [DEBUG] Top 2 has installed skill with rrfScore >= 0.016, returning null`);
-                return null;
-            }
-            let filteredTools = topTools.filter((tool) => tool.status === "未安装" && (tool.rrfScore ?? 0) >= 0.016);
-            logger.log(`${PLUGIN_LOG_PREFIX} [DEBUG] After filtering uninstalled with rrfScore >= 0.016: ${filteredTools.length}, details: ${filteredTools.map((t) => `${t.skillId}(rrfScore=${t.rrfScore})`).join(", ")}`);
+            const filteredTools = candidateTools.slice(0, 2);
             if (filteredTools.length === 0) {
-                logger.log(`${PLUGIN_LOG_PREFIX} [DEBUG] No uninstalled skills with rrfScore >= 0.016, returning null`);
+                logger.log(`${PLUGIN_LOG_PREFIX} [DEBUG] No candidates with rrfScore >= 0.016, returning null`);
                 return null;
             }
             return {

package/dist/src/tools/calendar-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 /**
  * XY calendar event tool - creates a calendar event on user's device.
  * Requires title, dtStart (start time), and dtEnd (end time) parameters.
@@ -85,6 +87,7 @@ export function createCalendarTool(ctx) {
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 创建日程超时（60秒）", { sessionId, toolCallId });
                     reject(new Error("创建日程超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -110,10 +113,11 @@ export function createCalendarTool(ctx) {
                 // Register event handler
                 wsManager.on("data-event", handler);
                 // Send the command
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/call-phone-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 /**
  * XY call phone tool - makes a phone call on user's device.
  * Requires phoneNumber parameter and optional slotId (0 for primary SIM, 1 for secondary SIM).
@@ -77,6 +79,7 @@ export function createCallPhoneTool(ctx) {
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 拨打电话超时（60秒）", { sessionId, toolCallId });
                     reject(new Error("拨打电话超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -102,10 +105,11 @@ export function createCallPhoneTool(ctx) {
                 // Register event handler
                 wsManager.on("data-event", handler);
                 // Send the command
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/create-alarm-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 // Enum definitions for alarm parameters
 const ALARM_SNOOZE_DURATION_VALUES = [5, 10, 15, 20, 25, 30];
 const ALARM_SNOOZE_TOTAL_VALUES = [0, 1, 3, 5, 10];
@@ -222,6 +224,7 @@ b. 使用该工具之前需获取当前真实时间
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 创建闹钟超时（60秒）", { sessionId, toolCallId });
                     reject(new Error("创建闹钟超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -248,10 +251,11 @@ b. 使用该工具之前需获取当前真实时间
                 // Register event handler
                 wsManager.on("data-event", handler);
                 // Send the command
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/delete-alarm-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 /**
  * XY delete alarm tool - deletes existing alarms on user's device.
  * Requires entityId(s) from search_alarm or create_alarm tool as prerequisite.
@@ -121,6 +123,7 @@ export function createDeleteAlarmTool(ctx) {
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 删除闹钟超时（60秒）", { sessionId, toolCallId });
                     reject(new Error("删除闹钟超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -147,10 +150,11 @@ export function createDeleteAlarmTool(ctx) {
                 // Register event handler
                 wsManager.on("data-event", handler);
                 // Send the command
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/location-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 /**
  * XY location tool - gets user's current location.
  * Returns WGS84 coordinates (latitude, longitude).
@@ -53,6 +55,7 @@ export function createLocationTool(ctx) {
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 获取位置超时（60秒）", { sessionId, toolCallId });
                     reject(new Error("获取位置超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -80,10 +83,11 @@ export function createLocationTool(ctx) {
                 // Note: The WebSocket manager needs to emit 'data-event' when receiving data events
                 wsManager.on("data-event", handler);
                 // Send the command
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 }).then(() => {

package/dist/src/tools/login-token-tool.js

@@ -105,12 +105,23 @@ export function createLoginTokenTool(ctx) {
                                 const diff = Date.now() - tokenTime;
                                 if (diff <= TOKEN_VALIDITY_MS) {
                                     // (3) Found valid token
-                                    logger.log(`[LOGIN_TOKEN] Successfully got login token for clientId=${clientId}`);
+                                    const code = match.code ?? "";
+                                    let resultText;
+                                    if (code === "0") {
+                                        resultText = "获取用户授权成功";
+                                    }
+                                    else if (code === "400") {
+                                        resultText = "小艺App版本较低，获取用户授权失败";
+                                    }
+                                    else {
+                                        resultText = "获取用户授权失败";
+                                    }
+                                    logger.log(`[LOGIN_TOKEN] Got login token for clientId=${clientId}, code=${code}`);
                                     resolve({
                                         content: [
                                             {
                                                 type: "text",
-                                                text: "获取用户授权成功",
+                                                text: resultText,
                                             },
                                         ],
                                     });

package/dist/src/tools/modify-alarm-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 // Enum definitions for alarm parameters (same as create-alarm-tool)
 const ALARM_SNOOZE_DURATION_VALUES = [5, 10, 15, 20, 25, 30];
 const ALARM_SNOOZE_TOTAL_VALUES = [0, 1, 3, 5, 10];
@@ -234,6 +236,7 @@ export function createModifyAlarmTool(ctx) {
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 修改闹钟超时（60秒）", { sessionId, toolCallId });
                     reject(new Error("修改闹钟超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -260,10 +263,11 @@ export function createModifyAlarmTool(ctx) {
                 // Register event handler
                 wsManager.on("data-event", handler);
                 // Send the command
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/modify-note-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 /**
  * XY modify note tool - appends content to an existing note on user's device.
  * Requires entityId from search_notes tool as prerequisite.
@@ -75,6 +77,7 @@ export function createModifyNoteTool(ctx) {
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 修改备忘录超时（60秒）", { sessionId, toolCallId });
                     reject(new Error("修改备忘录超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -101,10 +104,11 @@ export function createModifyNoteTool(ctx) {
                 // Register event handler
                 wsManager.on("data-event", handler);
                 // Send the command
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/note-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 /**
  * Duck-typed ToolInputError: openclaw 按 .name 字段匹配，不用 instanceof。
  * 抛出此错误会让 openclaw 返回 HTTP 400 而非 500，
@@ -92,6 +94,7 @@ export function createNoteTool(ctx) {
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 创建备忘录超时（60秒）", { sessionId, toolCallId });
                     reject(new Error("创建备忘录超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -118,10 +121,11 @@ export function createNoteTool(ctx) {
                 // Register event handler
                 wsManager.on("data-event", handler);
                 // Send the command
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 }).catch((error) => {

package/dist/src/tools/query-app-message-tool.js

@@ -1,6 +1,8 @@
 // QueryAppMessage tool implementation
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 class ToolInputError extends Error {
     status = 400;
     constructor(message) {
@@ -94,6 +96,7 @@ c. 调用工具前需认真检查调用参数是否满足工具要求
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 查询通知消息超时（60秒）", { sessionId, toolCallId: _toolCallId });
                     reject(new Error("查询通知消息超时（60秒）"));
                 }, 60000);
                 const handler = (event) => {
@@ -116,10 +119,11 @@ c. 调用工具前需认真检查调用参数是否满足工具要求
                     }
                 };
                 wsManager.on("data-event", handler);
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/query-memory-data-tool.js

@@ -1,6 +1,8 @@
 // QueryMemoryData tool implementation
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 class ToolInputError extends Error {
     status = 400;
     constructor(message) {
@@ -110,6 +112,7 @@ c. 调用工具前需认真检查调用参数是否满足工具要求
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 查询记忆数据超时（60秒）", { sessionId, toolCallId: _toolCallId });
                     reject(new Error("查询记忆数据超时（60秒）"));
                 }, 60000);
                 const handler = (event) => {
@@ -132,10 +135,11 @@ c. 调用工具前需认真检查调用参数是否满足工具要求
                     }
                 };
                 wsManager.on("data-event", handler);
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/query-todo-task-tool.js

@@ -1,6 +1,8 @@
 // QueryTodoTask tool implementation
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 class ToolInputError extends Error {
     status = 400;
     constructor(message) {
@@ -89,6 +91,7 @@ d. 当只传入 startTime 时，返回该时间点之后的所有任务；当只
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 查询待办任务超时（60秒）", { sessionId, toolCallId: _toolCallId });
                     reject(new Error("查询待办任务超时（60秒）"));
                 }, 60000);
                 const handler = (event) => {
@@ -111,10 +114,11 @@ d. 当只传入 startTime 时，返回该时间点之后的所有任务；当只
                     }
                 };
                 wsManager.on("data-event", handler);
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/save-file-to-phone-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 import { XYFileUploadService } from "../file-upload.js";
 /**
  * Duck-typed ToolInputError: openclaw 按 .name 字段匹配，不用 instanceof。
@@ -117,6 +119,7 @@ export function createSaveFileToPhoneTool(ctx) {
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 保存文件到手机超时（60秒）", { sessionId, toolCallId });
                     reject(new Error("保存文件到手机超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -142,10 +145,11 @@ export function createSaveFileToPhoneTool(ctx) {
                 // Register event handler
                 wsManager.on("data-event", handler);
                 // Send the command
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/save-media-to-gallery-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 import { XYFileUploadService } from "../file-upload.js";
 /**
  * Duck-typed ToolInputError: openclaw 按 .name 字段匹配，不用 instanceof。
@@ -125,6 +127,7 @@ export function createSaveMediaToGalleryTool(ctx) {
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 保存媒体到图库超时（60秒）", { sessionId, toolCallId });
                     reject(new Error("保存媒体到图库超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -150,10 +153,11 @@ export function createSaveMediaToGalleryTool(ctx) {
                 // Register event handler
                 wsManager.on("data-event", handler);
                 // Send the command
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/search-alarm-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 // Enum definitions for alarm search parameters
 const RANGE_TYPE_VALUES = ["all", "next", "current"];
 const ALARM_STATE_VALUES = [0, 1];
@@ -166,6 +168,7 @@ b. 使用该工具之前需获取当前真实时间
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 检索闹钟超时（60秒）", { sessionId, toolCallId });
                     reject(new Error("检索闹钟超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -192,10 +195,11 @@ b. 使用该工具之前需获取当前真实时间
                 // Register event handler
                 wsManager.on("data-event", handler);
                 // Send the command
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/search-calendar-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 /**
  * XY search calendar event tool - searches calendar events on user's device.
  * Returns matching events based on time range and optional title filter.
@@ -137,6 +139,7 @@ d. 如果查询结果返回-303，代表查询结果为空
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 检索日程超时（60秒）", { sessionId, toolCallId });
                     reject(new Error("检索日程超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -163,10 +166,11 @@ d. 如果查询结果返回-303，代表查询结果为空
                 // Register event handler
                 wsManager.on("data-event", handler);
                 // Send the command
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/search-contact-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 /**
  * XY search contact tool - searches contacts on user's device.
  * Returns matching contact information based on name.
@@ -65,6 +67,7 @@ export function createSearchContactTool(ctx) {
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 搜索联系人超时（60秒）", { sessionId, toolCallId });
                     reject(new Error("搜索联系人超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -91,10 +94,11 @@ export function createSearchContactTool(ctx) {
                 // Register event handler
                 wsManager.on("data-event", handler);
                 // Send the command
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/search-email-tool.js

@@ -1,6 +1,8 @@
 // Search Email tool implementation
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 /**
  * XY search email tool - searches emails on user's device (花瓣邮箱).
  * Returns matching emails based on query text and search type.
@@ -89,6 +91,7 @@ b. 使用该工具之前需获取当前真实时间
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 检索邮件超时（60秒）", { sessionId, toolCallId: _toolCallId });
                     reject(new Error("检索邮件超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -114,10 +117,11 @@ b. 使用该工具之前需获取当前真实时间
                 // Register event handler
                 wsManager.on("data-event", handler);
                 // Send the command
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/search-file-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 /**
  * XY search file tool - searches files on user's device file system.
  * Returns matching files based on keyword search in file name or content.
@@ -77,6 +79,7 @@ export function createSearchFileTool(ctx) {
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 搜索文件超时（60秒）", { sessionId, toolCallId });
                     reject(new Error("搜索文件超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -104,10 +107,11 @@ export function createSearchFileTool(ctx) {
                 // Register event handler
                 wsManager.on("data-event", handler);
                 // Send the command
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/search-message-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 /**
  * XY search message tool - searches SMS messages on user's device.
  * Returns matching messages based on content keyword search.
@@ -66,6 +68,7 @@ export function createSearchMessageTool(ctx) {
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 搜索短信超时（60秒）", { sessionId, toolCallId });
                     reject(new Error("搜索短信超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -93,10 +96,11 @@ export function createSearchMessageTool(ctx) {
                 // Register event handler
                 wsManager.on("data-event", handler);
                 // Send the command
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/search-note-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 /**
  * XY search note tool - searches notes on user's device.
  * Returns matching notes based on query string.
@@ -64,6 +66,7 @@ export function createSearchNoteTool(ctx) {
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 搜索备忘录超时（60秒）", { sessionId, toolCallId });
                     reject(new Error("搜索备忘录超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -90,10 +93,11 @@ export function createSearchNoteTool(ctx) {
                 // Register event handler
                 wsManager.on("data-event", handler);
                 // Send the command
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 }).then(() => {

package/dist/src/tools/search-photo-gallery-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 /**
  * XY search photo gallery tool - searches photos in user's gallery.
  * Returns local mediaUri strings that can be used with upload_photo tool.
@@ -72,7 +74,8 @@ export function createSearchPhotoGalleryTool(ctx) {
             // Get WebSocket manager
             const wsManager = getXYWebSocketManager(config);
             // Search for photos
-            const outputs = await searchPhotos(wsManager, config, sessionId, taskId, messageId, params.query);
+            const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
+            const outputs = await searchPhotos(wsManager, config, sessionId, currentTaskId, messageId, params.query);
             return {
                 content: [
                     {
@@ -125,6 +128,7 @@ async function searchPhotos(wsManager, config, sessionId, taskId, messageId, que
     return new Promise((resolve, reject) => {
         const timeout = setTimeout(() => {
             wsManager.off("data-event", handler);
+            logger.error("超时: 搜索照片超时（60秒）", { sessionId });
             reject(new Error("搜索照片超时（60秒）"));
         }, 60000);
         const handler = (event) => {

package/dist/src/tools/send-email-tool.js

@@ -1,6 +1,8 @@
 // Send Email tool implementation
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 class ToolInputError extends Error {
     status = 400;
     constructor(message) {
@@ -90,6 +92,7 @@ c. 调用工具前需认真检查调用参数是否满足工具要求
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 发送邮件超时（60秒）", { sessionId, toolCallId: _toolCallId });
                     reject(new Error("发送邮件超时（60秒）"));
                 }, 60000);
                 const handler = (event) => {
@@ -112,10 +115,11 @@ c. 调用工具前需认真检查调用参数是否满足工具要求
                     }
                 };
                 wsManager.on("data-event", handler);
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/send-message-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 /**
  * XY send message tool - sends SMS message on user's device.
  * Requires phoneNumber (with +86 prefix) and content parameters.
@@ -87,6 +89,7 @@ export function createSendMessageTool(ctx) {
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 发送短信超时（60秒）", { sessionId, toolCallId });
                     reject(new Error("发送短信超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -114,10 +117,11 @@ export function createSendMessageTool(ctx) {
                 // Register event handler
                 wsManager.on("data-event", handler);
                 // Send the command
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/upload-file-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 /**
  * XY upload file tool - uploads local files to get publicly accessible URLs.
  * Requires file URIs from search_file tool as prerequisite.
@@ -94,7 +96,8 @@ export function createUploadFileTool(ctx) {
             // Get WebSocket manager
             const wsManager = getXYWebSocketManager(config);
             // Get public URLs for the files
-            const fileUrls = await getFileUrls(wsManager, config, sessionId, taskId, messageId, fileInfos);
+            const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
+            const fileUrls = await getFileUrls(wsManager, config, sessionId, currentTaskId, messageId, fileInfos);
             return {
                 content: [
                     {
@@ -151,6 +154,7 @@ async function getFileUrls(wsManager, config, sessionId, taskId, messageId, file
     return new Promise((resolve, reject) => {
         const timeout = setTimeout(() => {
             wsManager.off("data-event", handler);
+            logger.error("超时: 获取文件URL超时（60秒）", { sessionId });
             reject(new Error("获取文件URL超时（60秒）"));
         }, 60000);
         const handler = (event) => {

package/dist/src/tools/upload-photo-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 /**
  * XY upload photo tool - uploads local photos to get publicly accessible URLs.
  * Requires mediaUris from search_photo_gallery tool as prerequisite.
@@ -75,7 +77,8 @@ export function createUploadPhotoTool(ctx) {
             // Get WebSocket manager
             const wsManager = getXYWebSocketManager(config);
             // Get public URLs for the photos
-            const imageUrls = await getPhotoUrls(wsManager, config, sessionId, taskId, messageId, mediaUris);
+            const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
+            const imageUrls = await getPhotoUrls(wsManager, config, sessionId, currentTaskId, messageId, mediaUris);
             return {
                 content: [
                     {
@@ -134,6 +137,7 @@ async function getPhotoUrls(wsManager, config, sessionId, taskId, messageId, med
     return new Promise((resolve, reject) => {
         const timeout = setTimeout(() => {
             wsManager.off("data-event", handler);
+            logger.error("超时: 获取照片URL超时（60秒）", { sessionId });
             reject(new Error("获取照片URL超时（60秒）"));
         }, 60000);
         const handler = (event) => {

package/dist/src/tools/xiaoyi-add-collection-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 import { XYFileUploadService } from "../file-upload.js";
 /**
  * Duck-typed ToolInputError: openclaw 按 .name 字段匹配，不用 instanceof。
@@ -143,6 +145,7 @@ export function createXiaoyiAddCollectionTool(ctx) {
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 添加小艺收藏超时（60秒）", { sessionId, toolCallId });
                     reject(new Error("添加小艺收藏超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -168,10 +171,11 @@ export function createXiaoyiAddCollectionTool(ctx) {
                 // Register event handler
                 wsManager.on("data-event", handler);
                 // Send the command
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/xiaoyi-collection-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 /**
  * Duck-typed ToolInputError: openclaw 按 .name 字段匹配，不用 instanceof。
  * 抛出此错误会让 openclaw 返回 HTTP 400 而非 500，
@@ -98,6 +100,7 @@ export function createXiaoyiCollectionTool(ctx) {
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 查询小艺收藏超时（60秒）", { sessionId, toolCallId });
                     reject(new Error("查询小艺收藏超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -124,10 +127,11 @@ export function createXiaoyiCollectionTool(ctx) {
                 // Register event handler
                 wsManager.on("data-event", handler);
                 // Send the command
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/xiaoyi-delete-collection-tool.js

@@ -1,5 +1,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 /**
  * Duck-typed ToolInputError: openclaw 按 .name 字段匹配，不用 instanceof。
  * 抛出此错误会让 openclaw 返回 HTTP 400 而非 500，
@@ -114,6 +116,7 @@ export function createXiaoyiDeleteCollectionTool(ctx) {
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
+                    logger.error("超时: 删除小艺收藏超时（60秒）", { sessionId, toolCallId });
                     reject(new Error("删除小艺收藏超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -139,10 +142,11 @@ export function createXiaoyiDeleteCollectionTool(ctx) {
                 // Register event handler
                 wsManager.on("data-event", handler);
                 // Send the command
+                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 })

package/dist/src/tools/xiaoyi-gui-tool.js

@@ -2,6 +2,7 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
 import { getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
 /**
  * XiaoYi GUI tool - executes phone app interactions through GUI agent.
  * Simulates user interactions on phone screen (click, swipe, input, navigation, etc.)
@@ -63,6 +64,7 @@ export function createXiaoyiGuiTool(ctx) {
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("gui-agent-response", handler);
+                    logger.error("超时: XiaoYi GUI Agent 操作超时（5分钟）", { sessionId, toolCallId });
                     reject(new Error("XiaoYi GUI Agent 操作超时（5分钟）"));
                 }, 180000); // 5 minutes timeout
                 // Listen for GUI agent response events
@@ -101,7 +103,7 @@ export function createXiaoyiGuiTool(ctx) {
                 sendCommand({
                     config,
                     sessionId,
-                    taskId,
+                    taskId: currentTaskId,
                     messageId,
                     command,
                 }).then(() => {

package/package.json

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