@ynhcj/xiaoyi-channel 0.0.134-beta → 0.0.136-beta

package/dist/src/task-manager.js

@@ -1,9 +1,9 @@
 // TaskId Manager - 管理session级别的活跃taskId
-// 支持动态切换taskId，用于steer模式下的消息插队
+// 用于 monitor.ts 检测活跃任务（决定是否并发执行steer消息）
 import { logger } from "./utils/logger.js";
 /**
  * Session到活跃TaskId的映射
- * Key: sessionId (注意：这里用sessionId，不是sessionKey)
+ * Key: sessionId
  * Value: TaskIdBinding
  * Uses globalThis to ensure a single Map across all module copies.
  */
@@ -13,98 +13,39 @@ if (!_g.__xyActiveTaskIds) {
 }
 const activeTaskIds = _g.__xyActiveTaskIds;
 /**
- * 注册或更新session的活跃taskId
- * 返回是否是更新（用于判断是否是第二条消息）
+ * 注册或更新session的活跃taskId。
+ * Returns true if this was an update (session already had an active task).
  */
-export function registerTaskId(sessionId, taskId, messageId, options) {
+export function registerTaskId(sessionId, taskId, messageId) {
     logger.log(`[TASK_MANAGER] 📝 Registering/Updating taskId for session: ${sessionId}`);
-    logger.log(`[TASK_MANAGER]   - New taskId: ${taskId}`);
-    logger.log(`[TASK_MANAGER]   - New messageId: ${messageId}`);
-    logger.log(`[TASK_MANAGER]   - incrementRef: ${options?.incrementRef ?? false}`);
+    logger.log(`[TASK_MANAGER]   - taskId: ${taskId}`);
     const existing = activeTaskIds.get(sessionId);
     if (existing) {
         logger.log(`[TASK_MANAGER]   - Previous taskId: ${existing.currentTaskId}`);
-        logger.log(`[TASK_MANAGER]   - Previous refCount: ${existing.refCount}`);
-        logger.log(`[TASK_MANAGER]   - 🔄 Switching taskId (steer mode detected)`);
-        // 更新taskId，但保持引用计数
+        logger.log(`[TASK_MANAGER]   - 🔄 Updating taskId`);
         existing.currentTaskId = taskId;
         existing.currentMessageId = messageId;
         existing.updatedAt = Date.now();
-        if (options?.incrementRef) {
-            existing.refCount++;
-            logger.log(`[TASK_MANAGER]   - Incremented refCount: ${existing.refCount}`);
-        }
-        logger.log(`[TASK_MANAGER]   - ✅ TaskId updated, refCount=${existing.refCount}`);
-        return { isUpdate: true, refCount: existing.refCount };
+        return true; // isUpdate
     }
     else {
-        // 新注册
         const binding = {
             sessionId,
             currentTaskId: taskId,
             currentMessageId: messageId,
-            refCount: 1,
             updatedAt: Date.now(),
-            locked: false,
         };
         activeTaskIds.set(sessionId, binding);
-        logger.log(`[TASK_MANAGER]   - ✅ TaskId registered (new), refCount=1`);
-        return { isUpdate: false, refCount: 1 };
+        logger.log(`[TASK_MANAGER]   - ✅ TaskId registered (new)`);
+        return false;
     }
 }
 /**
- * 增加引用计数（消息开始处理时调用）
- */
-export function incrementTaskIdRef(sessionId) {
-    const binding = activeTaskIds.get(sessionId);
-    if (binding) {
-        binding.refCount++;
-        logger.log(`[TASK_MANAGER] ➕ Incremented refCount for ${sessionId}: ${binding.refCount}`);
-    }
-}
-/**
- * 减少引用计数，当refCount=0时才真正清理
+ * 移除session的活跃taskId（消息处理完成时调用）。
  */
 export function decrementTaskIdRef(sessionId) {
-    const binding = activeTaskIds.get(sessionId);
-    if (!binding) {
-        logger.log(`[TASK_MANAGER] ⚠️  No binding found for ${sessionId}`);
-        return;
-    }
-    binding.refCount--;
-    logger.log(`[TASK_MANAGER] ➖ Decremented refCount for ${sessionId}: ${binding.refCount}`);
-    if (binding.refCount <= 0 && !binding.locked) {
-        logger.log(`[TASK_MANAGER] 🗑️  RefCount=0 and unlocked, clearing taskId`);
-        activeTaskIds.delete(sessionId);
-    }
-    else {
-        logger.log(`[TASK_MANAGER]   - Keeping binding (refCount=${binding.refCount}, locked=${binding.locked})`);
-    }
-}
-/**
- * 锁定taskId，防止被清理（第一个消息使用）
- */
-export function lockTaskId(sessionId) {
-    const binding = activeTaskIds.get(sessionId);
-    if (binding) {
-        binding.locked = true;
-        logger.log(`[TASK_MANAGER] 🔒 Locked taskId for ${sessionId}`);
-    }
-}
-/**
- * 解锁taskId（第一个消息完成时使用）
- */
-export function unlockTaskId(sessionId) {
-    const binding = activeTaskIds.get(sessionId);
-    if (binding) {
-        binding.locked = false;
-        logger.log(`[TASK_MANAGER] 🔓 Unlocked taskId for ${sessionId}`);
-        // 解锁后，如果refCount=0，立即清理
-        if (binding.refCount <= 0) {
-            logger.log(`[TASK_MANAGER] 🗑️  Unlocked and refCount=0, clearing taskId`);
-            activeTaskIds.delete(sessionId);
-        }
-    }
+    logger.log(`[TASK_MANAGER] 🗑️  Removing taskId for ${sessionId}`);
+    activeTaskIds.delete(sessionId);
 }
 /**
  * 获取session的当前活跃taskId
@@ -126,12 +67,6 @@ export function getCurrentMessageId(sessionId) {
 export function hasActiveTask(sessionId) {
     return activeTaskIds.has(sessionId);
 }
-/**
- * 获取完整的binding信息（用于调试）
- */
-export function getTaskIdBinding(sessionId) {
-    return activeTaskIds.get(sessionId) ?? null;
-}
 /**
  * 获取所有活跃的 task bindings（用于 gateway_stop 通知等场景）
  */

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" || code === "") {
+                                        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,
                 })