@ynhcj/xiaoyi-channel 0.0.28-beta → 0.0.30-beta

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

@@ -9,7 +9,19 @@ import { logger } from "../utils/logger.js";
 export const searchFileTool = {
     name: "search_file",
     label: "Search File",
-    description: "搜索手机文件系统的文件。根据关键词搜索文件名称或内容，返回匹配的文件列表（包括文件名、路径、大小、修改时间等信息）。注意:操作超时时间为60秒,请勿重复调用此工具,如果超时或失败,最多重试一次。",
+    description: `搜索手机文件系统的文件。
+
+【重要】使用约束：此工具仅在用户显著说明要从手机搜索时才执行，例如：
+- "从我手机里面搜索xxxx"
+- "从手机文件系统找一下xxxx"
+- "在手机上查找文件xxxx"
+- "搜索手机里的文件"
+
+如果用户没有明确说明从手机搜索（如仅说"搜索文件"、"找一下xxxx"），应默认从 openclaw 本地的文件系统查询，不要调用此工具。
+
+功能说明：根据关键词搜索文件名称或内容，返回匹配的文件列表（包括文件名、路径、大小、修改时间等信息）。
+
+注意事项：操作超时时间为60秒，请勿重复调用此工具，如果超时或失败，最多重试一次。`,
     parameters: {
         type: "object",
         properties: {

package/dist/src/tools/send-file-to-user-tool.js

@@ -112,7 +112,7 @@ c. fileLocalUrls 与 fileRemoteUrls 任意一个不为空即可，两者都提
 
 注意事项：
 a. 支持传入数组或 JSON 字符串格式
-b. 操作超时时间为60秒，请勿重复调用此工具，如果超时或失败，最多重试一次`,
+b. 操作超时时间为2分钟（120秒），请勿重复调用此工具，如果超时或失败，最多重试一次`,
     parameters: {
         type: "object",
         properties: {
@@ -125,166 +125,194 @@ b. 操作超时时间为60秒，请勿重复调用此工具，如果超时或失
         },
     },
     async execute(toolCallId, params) {
-        logger.log(`[SEND_FILE_TO_USER_TOOL] 🚀 Starting execution`);
-        logger.log(`[SEND_FILE_TO_USER_TOOL]   - toolCallId: ${toolCallId}`);
-        logger.log(`[SEND_FILE_TO_USER_TOOL]   - params (raw):`, JSON.stringify(params));
-        logger.log(`[SEND_FILE_TO_USER_TOOL]   - timestamp: ${new Date().toISOString()}`);
-        // Validate that at least one parameter is provided
-        if (!params.fileLocalUrls && !params.fileRemoteUrls) {
-            logger.error(`[SEND_FILE_TO_USER_TOOL] ❌ Missing both fileLocalUrls and fileRemoteUrls parameters`);
-            throw new Error("At least one of fileLocalUrls or fileRemoteUrls must be provided");
-        }
-        // Normalize fileLocalUrls parameter
-        let fileLocalUrls = [];
-        if (params.fileLocalUrls) {
-            logger.log(`[SEND_FILE_TO_USER_TOOL] 🔄 Normalizing fileLocalUrls parameter...`);
-            fileLocalUrls = normalizeToArray(params.fileLocalUrls);
-            if (fileLocalUrls.length === 0) {
-                logger.error(`[SEND_FILE_TO_USER_TOOL] ❌ fileLocalUrls array is empty`);
-                throw new Error("fileLocalUrls array cannot be empty");
-            }
-            logger.log(`[SEND_FILE_TO_USER_TOOL] ✅ Normalized fileLocalUrls:`, JSON.stringify(fileLocalUrls));
-        }
-        // Normalize fileRemoteUrls parameter
-        let fileRemoteUrls = [];
-        if (params.fileRemoteUrls) {
-            logger.log(`[SEND_FILE_TO_USER_TOOL] 🔄 Normalizing fileRemoteUrls parameter...`);
-            fileRemoteUrls = normalizeToArray(params.fileRemoteUrls);
-            if (fileRemoteUrls.length === 0) {
-                logger.error(`[SEND_FILE_TO_USER_TOOL] ❌ fileRemoteUrls array is empty`);
-                throw new Error("fileRemoteUrls array cannot be empty");
+        // Set timeout for the entire operation (2 minutes)
+        const TOOL_TIMEOUT = 120000; // 2 minutes in milliseconds
+        let timeoutHandle = null;
+        // Create a timeout promise
+        const timeoutPromise = new Promise((_, reject) => {
+            timeoutHandle = setTimeout(() => {
+                reject(new Error("操作超时（2分钟）"));
+            }, TOOL_TIMEOUT);
+        });
+        // Create the main execution promise
+        const executionPromise = (async () => {
+            logger.log(`[SEND_FILE_TO_USER_TOOL] 🚀 Starting execution`);
+            logger.log(`[SEND_FILE_TO_USER_TOOL]   - toolCallId: ${toolCallId}`);
+            logger.log(`[SEND_FILE_TO_USER_TOOL]   - params (raw):`, JSON.stringify(params));
+            logger.log(`[SEND_FILE_TO_USER_TOOL]   - timestamp: ${new Date().toISOString()}`);
+            // Validate that at least one parameter is provided
+            if (!params.fileLocalUrls && !params.fileRemoteUrls) {
+                logger.error(`[SEND_FILE_TO_USER_TOOL] ❌ Missing both fileLocalUrls and fileRemoteUrls parameters`);
+                throw new Error("At least one of fileLocalUrls or fileRemoteUrls must be provided");
             }
-            logger.log(`[SEND_FILE_TO_USER_TOOL] ✅ Normalized fileRemoteUrls:`, JSON.stringify(fileRemoteUrls));
-        }
-        // Get session context
-        logger.log(`[SEND_FILE_TO_USER_TOOL] 🔍 Attempting to get session context...`);
-        const sessionContext = getCurrentSessionContext();
-        if (!sessionContext) {
-            logger.error(`[SEND_FILE_TO_USER_TOOL] ❌ FAILED: No active session found!`);
-            logger.error(`[SEND_FILE_TO_USER_TOOL]   - toolCallId: ${toolCallId}`);
-            throw new Error("No active XY session found. Send file to user tool can only be used during an active conversation.");
-        }
-        logger.log(`[SEND_FILE_TO_USER_TOOL] ✅ Session context found`);
-        logger.log(`[SEND_FILE_TO_USER_TOOL]   - sessionId: ${sessionContext.sessionId}`);
-        logger.log(`[SEND_FILE_TO_USER_TOOL]   - taskId: ${sessionContext.taskId}`);
-        logger.log(`[SEND_FILE_TO_USER_TOOL]   - messageId: ${sessionContext.messageId}`);
-        const { config, sessionId, taskId, messageId } = sessionContext;
-        // Get WebSocket manager
-        logger.log(`[SEND_FILE_TO_USER_TOOL] 🔌 Getting WebSocket manager...`);
-        const wsManager = getXYWebSocketManager(config);
-        logger.log(`[SEND_FILE_TO_USER_TOOL] ✅ WebSocket manager obtained`);
-        // Create upload service
-        const uploadService = new XYFileUploadService(config.fileUploadUrl, config.apiKey, config.uid);
-        // Collect all local file paths to upload
-        const allLocalPaths = [...fileLocalUrls];
-        const downloadedFiles = [];
-        // Download remote files to local temp directory
-        if (fileRemoteUrls.length > 0) {
-            logger.log(`[SEND_FILE_TO_USER_TOOL] 📥 Downloading ${fileRemoteUrls.length} remote files...`);
-            for (let i = 0; i < fileRemoteUrls.length; i++) {
-                const remoteUrl = fileRemoteUrls[i];
-                logger.log(`[SEND_FILE_TO_USER_TOOL] 📥 Downloading remote file ${i + 1}/${fileRemoteUrls.length}: ${remoteUrl}`);
-                try {
-                    const localPath = await downloadRemoteFile(remoteUrl);
-                    allLocalPaths.push(localPath);
-                    downloadedFiles.push(localPath);
-                }
-                catch (error) {
-                    logger.error(`[SEND_FILE_TO_USER_TOOL] ❌ Failed to download file ${i + 1}:`, error);
-                    throw new Error(`Failed to download remote file ${remoteUrl}: ${error instanceof Error ? error.message : String(error)}`);
+            // Normalize fileLocalUrls parameter
+            let fileLocalUrls = [];
+            if (params.fileLocalUrls) {
+                logger.log(`[SEND_FILE_TO_USER_TOOL] 🔄 Normalizing fileLocalUrls parameter...`);
+                fileLocalUrls = normalizeToArray(params.fileLocalUrls);
+                if (fileLocalUrls.length === 0) {
+                    logger.error(`[SEND_FILE_TO_USER_TOOL] ❌ fileLocalUrls array is empty`);
+                    throw new Error("fileLocalUrls array cannot be empty");
                 }
+                logger.log(`[SEND_FILE_TO_USER_TOOL] ✅ Normalized fileLocalUrls:`, JSON.stringify(fileLocalUrls));
             }
-            logger.log(`[SEND_FILE_TO_USER_TOOL] ✅ Downloaded ${downloadedFiles.length} remote files`);
-        }
-        // Upload all local files and get fileIds
-        logger.log(`[SEND_FILE_TO_USER_TOOL] 📤 Uploading ${allLocalPaths.length} files...`);
-        const uploadedFiles = [];
-        for (let i = 0; i < allLocalPaths.length; i++) {
-            const localPath = allLocalPaths[i];
-            logger.log(`[SEND_FILE_TO_USER_TOOL] 📤 Uploading file ${i + 1}/${allLocalPaths.length}: ${localPath}`);
-            try {
-                // Upload file using three-phase upload
-                const fileId = await uploadService.uploadFile(localPath);
-                if (!fileId) {
-                    logger.error(`[SEND_FILE_TO_USER_TOOL] ❌ Failed to upload file: ${localPath} (fileId is empty)`);
-                    throw new Error(`Failed to upload file: ${localPath}`);
+            // Normalize fileRemoteUrls parameter
+            let fileRemoteUrls = [];
+            if (params.fileRemoteUrls) {
+                logger.log(`[SEND_FILE_TO_USER_TOOL] 🔄 Normalizing fileRemoteUrls parameter...`);
+                fileRemoteUrls = normalizeToArray(params.fileRemoteUrls);
+                if (fileRemoteUrls.length === 0) {
+                    logger.error(`[SEND_FILE_TO_USER_TOOL] ❌ fileRemoteUrls array is empty`);
+                    throw new Error("fileRemoteUrls array cannot be empty");
                 }
-                // Get filename and mime type
-                const fileName = localPath.split("/").pop() || "unknown";
-                const mimeType = getMimeTypeFromFilename(fileName);
-                uploadedFiles.push({ fileName, fileId, mimeType });
-                logger.log(`[SEND_FILE_TO_USER_TOOL] ✅ File uploaded successfully: ${fileName} -> ${fileId}`);
+                logger.log(`[SEND_FILE_TO_USER_TOOL] ✅ Normalized fileRemoteUrls:`, JSON.stringify(fileRemoteUrls));
             }
-            catch (error) {
-                logger.error(`[SEND_FILE_TO_USER_TOOL] ❌ Failed to upload file ${i + 1}:`, error);
-                throw new Error(`Failed to upload file ${localPath}: ${error instanceof Error ? error.message : String(error)}`);
+            // Get session context
+            logger.log(`[SEND_FILE_TO_USER_TOOL] 🔍 Attempting to get session context...`);
+            const sessionContext = getCurrentSessionContext();
+            if (!sessionContext) {
+                logger.error(`[SEND_FILE_TO_USER_TOOL] ❌ FAILED: No active session found!`);
+                logger.error(`[SEND_FILE_TO_USER_TOOL]   - toolCallId: ${toolCallId}`);
+                throw new Error("No active XY session found. Send file to user tool can only be used during an active conversation.");
             }
-        }
-        // Clean up downloaded files
-        if (downloadedFiles.length > 0) {
-            logger.log(`[SEND_FILE_TO_USER_TOOL] 🧹 Cleaning up ${downloadedFiles.length} downloaded files...`);
-            for (const downloadedFile of downloadedFiles) {
+            logger.log(`[SEND_FILE_TO_USER_TOOL] ✅ Session context found`);
+            logger.log(`[SEND_FILE_TO_USER_TOOL]   - sessionId: ${sessionContext.sessionId}`);
+            logger.log(`[SEND_FILE_TO_USER_TOOL]   - taskId: ${sessionContext.taskId}`);
+            logger.log(`[SEND_FILE_TO_USER_TOOL]   - messageId: ${sessionContext.messageId}`);
+            const { config, sessionId, taskId, messageId } = sessionContext;
+            // Get WebSocket manager
+            logger.log(`[SEND_FILE_TO_USER_TOOL] 🔌 Getting WebSocket manager...`);
+            const wsManager = getXYWebSocketManager(config);
+            logger.log(`[SEND_FILE_TO_USER_TOOL] ✅ WebSocket manager obtained`);
+            // Create upload service
+            const uploadService = new XYFileUploadService(config.fileUploadUrl, config.apiKey, config.uid);
+            // Collect all local file paths to upload
+            const allLocalPaths = [...fileLocalUrls];
+            const downloadedFiles = [];
+            // Download remote files to local temp directory
+            if (fileRemoteUrls.length > 0) {
+                logger.log(`[SEND_FILE_TO_USER_TOOL] 📥 Downloading ${fileRemoteUrls.length} remote files...`);
+                for (let i = 0; i < fileRemoteUrls.length; i++) {
+                    const remoteUrl = fileRemoteUrls[i];
+                    logger.log(`[SEND_FILE_TO_USER_TOOL] 📥 Downloading remote file ${i + 1}/${fileRemoteUrls.length}: ${remoteUrl}`);
+                    try {
+                        const localPath = await downloadRemoteFile(remoteUrl);
+                        allLocalPaths.push(localPath);
+                        downloadedFiles.push(localPath);
+                    }
+                    catch (error) {
+                        logger.error(`[SEND_FILE_TO_USER_TOOL] ❌ Failed to download file ${i + 1}:`, error);
+                        throw new Error(`Failed to download remote file ${remoteUrl}: ${error instanceof Error ? error.message : String(error)}`);
+                    }
+                }
+                logger.log(`[SEND_FILE_TO_USER_TOOL] ✅ Downloaded ${downloadedFiles.length} remote files`);
+            }
+            // Upload all local files and get fileIds
+            logger.log(`[SEND_FILE_TO_USER_TOOL] 📤 Uploading ${allLocalPaths.length} files...`);
+            const uploadedFiles = [];
+            for (let i = 0; i < allLocalPaths.length; i++) {
+                const localPath = allLocalPaths[i];
+                logger.log(`[SEND_FILE_TO_USER_TOOL] 📤 Uploading file ${i + 1}/${allLocalPaths.length}: ${localPath}`);
                 try {
-                    await fs.unlink(downloadedFile);
-                    logger.log(`[SEND_FILE_TO_USER_TOOL] ✅ Cleaned up: ${downloadedFile}`);
+                    // Upload file using three-phase upload
+                    const fileId = await uploadService.uploadFile(localPath);
+                    if (!fileId) {
+                        logger.error(`[SEND_FILE_TO_USER_TOOL] ❌ Failed to upload file: ${localPath} (fileId is empty)`);
+                        throw new Error(`Failed to upload file: ${localPath}`);
+                    }
+                    // Get filename and mime type
+                    const fileName = localPath.split("/").pop() || "unknown";
+                    const mimeType = getMimeTypeFromFilename(fileName);
+                    uploadedFiles.push({ fileName, fileId, mimeType });
+                    logger.log(`[SEND_FILE_TO_USER_TOOL] ✅ File uploaded successfully: ${fileName} -> ${fileId}`);
                 }
                 catch (error) {
-                    logger.warn(`[SEND_FILE_TO_USER_TOOL] ⚠️ Failed to clean up file ${downloadedFile}:`, error);
+                    logger.error(`[SEND_FILE_TO_USER_TOOL] ❌ Failed to upload file ${i + 1}:`, error);
+                    throw new Error(`Failed to upload file ${localPath}: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }
-        }
-        // Build and send agent_response messages for each file
-        logger.log(`[SEND_FILE_TO_USER_TOOL] 📦 Building and sending agent_response messages...`);
-        const sentFiles = [];
-        for (const uploadedFile of uploadedFiles) {
-            const { fileName, fileId, mimeType } = uploadedFile;
-            const agentResponse = {
-                msgType: "agent_response",
-                agentId: config.agentId,
-                sessionId: sessionId,
-                taskId: taskId,
-                msgDetail: JSON.stringify({
-                    jsonrpc: "2.0",
-                    id: taskId,
-                    result: {
-                        kind: "artifact-update",
-                        append: true,
-                        lastChunk: false,
-                        final: false,
-                        artifact: {
-                            artifactId: taskId,
-                            parts: [
-                                {
-                                    kind: "file",
-                                    file: {
-                                        name: fileName,
-                                        mimeType: mimeType,
-                                        fileId: fileId,
+            // Clean up downloaded files
+            if (downloadedFiles.length > 0) {
+                logger.log(`[SEND_FILE_TO_USER_TOOL] 🧹 Cleaning up ${downloadedFiles.length} downloaded files...`);
+                for (const downloadedFile of downloadedFiles) {
+                    try {
+                        await fs.unlink(downloadedFile);
+                        logger.log(`[SEND_FILE_TO_USER_TOOL] ✅ Cleaned up: ${downloadedFile}`);
+                    }
+                    catch (error) {
+                        logger.warn(`[SEND_FILE_TO_USER_TOOL] ⚠️ Failed to clean up file ${downloadedFile}:`, error);
+                    }
+                }
+            }
+            // Build and send agent_response messages for each file
+            logger.log(`[SEND_FILE_TO_USER_TOOL] 📦 Building and sending agent_response messages...`);
+            const sentFiles = [];
+            for (const uploadedFile of uploadedFiles) {
+                const { fileName, fileId, mimeType } = uploadedFile;
+                const agentResponse = {
+                    msgType: "agent_response",
+                    agentId: config.agentId,
+                    sessionId: sessionId,
+                    taskId: taskId,
+                    msgDetail: JSON.stringify({
+                        jsonrpc: "2.0",
+                        id: taskId,
+                        result: {
+                            kind: "artifact-update",
+                            append: true,
+                            lastChunk: false,
+                            final: false,
+                            artifact: {
+                                artifactId: taskId,
+                                parts: [
+                                    {
+                                        kind: "file",
+                                        file: {
+                                            name: fileName,
+                                            mimeType: mimeType,
+                                            fileId: fileId,
+                                        },
                                     },
-                                },
-                            ],
+                                ],
+                            },
                         },
+                        error: { code: 0 },
+                    }),
+                };
+                // Send WebSocket message
+                await wsManager.sendMessage(sessionId, agentResponse);
+                sentFiles.push({ fileName, fileId });
+                logger.log(`[SEND_FILE_TO_USER_TOOL] ✅ Sent file to user: ${fileName} (fileId: ${fileId})`);
+            }
+            logger.log(`[SEND_FILE_TO_USER_TOOL] 🎉 Successfully sent ${sentFiles.length} files to user`);
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: JSON.stringify({
+                            sentFiles,
+                            count: sentFiles.length,
+                            message: `成功发送 ${sentFiles.length} 个文件到用户设备`
+                        }),
                     },
-                    error: { code: 0 },
-                }),
+                ],
             };
-            // Send WebSocket message
-            await wsManager.sendMessage(sessionId, agentResponse);
-            sentFiles.push({ fileName, fileId });
-            logger.log(`[SEND_FILE_TO_USER_TOOL] ✅ Sent file to user: ${fileName} (fileId: ${fileId})`);
+        })();
+        // Race between execution and timeout
+        try {
+            const result = await Promise.race([executionPromise, timeoutPromise]);
+            // Clear timeout if execution completed
+            if (timeoutHandle) {
+                clearTimeout(timeoutHandle);
+            }
+            return result;
+        }
+        catch (error) {
+            // Clear timeout on error
+            if (timeoutHandle) {
+                clearTimeout(timeoutHandle);
+            }
+            throw error;
         }
-        logger.log(`[SEND_FILE_TO_USER_TOOL] 🎉 Successfully sent ${sentFiles.length} files to user`);
-        return {
-            content: [
-                {
-                    type: "text",
-                    text: JSON.stringify({
-                        sentFiles,
-                        count: sentFiles.length,
-                        message: `成功发送 ${sentFiles.length} 个文件到用户设备`
-                    }),
-                },
-            ],
-        };
     },
 };

package/dist/src/tools/session-manager.d.ts

@@ -37,5 +37,8 @@ export declare function runWithSessionContext<T>(context: SessionContext, callba
  * Get the current session context from AsyncLocalStorage.
  * This is the recommended way to access session context in tools.
  * Returns null if not running within a session context.
+ *
+ * Enhanced version: Automatically fetches the latest taskId from task-manager
+ * to support interruption scenarios where a new message updates the taskId.
  */
 export declare function getCurrentSessionContext(): SessionContext | null;

package/dist/src/tools/session-manager.js

@@ -3,6 +3,7 @@
 import { AsyncLocalStorage } from "async_hooks";
 import { logger } from "../utils/logger.js";
 import { configManager } from "../utils/config-manager.js";
+import { getCurrentTaskId, getCurrentMessageId } from "../task-manager.js";
 // Map of sessionKey -> SessionContextWithRef
 const activeSessions = new Map();
 // AsyncLocalStorage for thread-safe session context isolation
@@ -116,16 +117,39 @@ export function runWithSessionContext(context, callback) {
  * Get the current session context from AsyncLocalStorage.
  * This is the recommended way to access session context in tools.
  * Returns null if not running within a session context.
+ *
+ * Enhanced version: Automatically fetches the latest taskId from task-manager
+ * to support interruption scenarios where a new message updates the taskId.
  */
 export function getCurrentSessionContext() {
+    // 1. Get base context from AsyncLocalStorage
     const context = asyncLocalStorage.getStore() ?? null;
-    if (context) {
-        logger.log(`[SESSION_MANAGER] ✅ Got current session context from AsyncLocalStorage`);
-        logger.log(`[SESSION_MANAGER]   - sessionId: ${context.sessionId}`);
-        logger.log(`[SESSION_MANAGER]   - taskId: ${context.taskId}`);
-    }
-    else {
+    if (!context) {
         logger.warn(`[SESSION_MANAGER] ⚠️  No session context in AsyncLocalStorage`);
+        return null;
+    }
+    // 2. Get latest taskId and messageId from task-manager
+    const latestTaskId = getCurrentTaskId(context.sessionId);
+    const latestMessageId = getCurrentMessageId(context.sessionId);
+    // 3. If task-manager has a newer taskId, use the latest value
+    if (latestTaskId && latestTaskId !== context.taskId) {
+        logger.log(`[SESSION_MANAGER] 🔄 TaskId updated (interruption detected)`);
+        logger.log(`[SESSION_MANAGER]   - sessionId: ${context.sessionId}`);
+        logger.log(`[SESSION_MANAGER]   - Old taskId: ${context.taskId}`);
+        logger.log(`[SESSION_MANAGER]   - New taskId: ${latestTaskId}`);
+        logger.log(`[SESSION_MANAGER]   - Old messageId: ${context.messageId}`);
+        logger.log(`[SESSION_MANAGER]   - New messageId: ${latestMessageId ?? context.messageId}`);
+        // Return updated context (create new object, don't modify original)
+        return {
+            ...context,
+            taskId: latestTaskId,
+            messageId: latestMessageId ?? context.messageId,
+        };
     }
+    // 4. No update needed, return original context
+    logger.log(`[SESSION_MANAGER] ✅ Got current session context from AsyncLocalStorage`);
+    logger.log(`[SESSION_MANAGER]   - sessionId: ${context.sessionId}`);
+    logger.log(`[SESSION_MANAGER]   - taskId: ${context.taskId}`);
+    logger.log(`[SESSION_MANAGER]   - messageId: ${context.messageId}`);
     return context;
 }

package/package.json

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