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

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/openclaw.plugin.json

@@ -3,6 +3,9 @@
   "channels": ["xiaoyi-channel"],
   "providers": ["xiaoyiprovider"],
   "providerDiscoveryEntry": "./dist/provider-discovery.js",
+  "contracts": {
+    "agentToolResultMiddleware": ["pi"]
+  },
   "skills": [],
   "configSchema": {
     "type": "object",

package/package.json

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