shellx-ai 1.0.10 → 1.0.12

package/dist/index.d.ts

@@ -25,7 +25,6 @@ export interface PendingTask {
     reject: (err: Error) => void;
     timer: number;
     type: string;
-    commandType?: string;
 }
 /**
  * Enhanced WebSocket Task Client with protocol-aware task methods
@@ -59,7 +58,7 @@ export declare class ConnectionTaskClient {
     private handleMessage;
     private processServerMessage;
     private handleJsonDataResponse;
-    sendMessage(message: WsClient, taskType?: string, commandType?: string): Promise<any>;
+    sendMessage(message: WsClient, taskType?: string, timeout?: number): Promise<any>;
     /**
      * Find UI elements on the screen
      */
@@ -90,7 +89,7 @@ export declare class ConnectionTaskClient {
     /**
      * Execute an action sequence
      */
-    executeAction(actionSequence: ActionSequence, taskId?: string): Promise<any>;
+    executeAction(actionSequence: ActionSequence, taskId?: string, timeeout?: number): Promise<any>;
     /**
      * Execute promptflow actions
      */
@@ -130,7 +129,7 @@ export declare class ConnectionTaskClient {
      * @param taskType 任务类型
      * @returns Promise<{taskId: string, promise: Promise<any>}>
      */
-    sendMessageWithTaskId(message: WsClient, taskType?: string, definedTaskId?: string): Promise<{
+    sendMessageWithTaskId(message: WsClient, taskType: string, definedTaskId?: string, timeout?: number): Promise<{
         taskId: string;
         promise: Promise<any>;
     }>;
@@ -168,7 +167,6 @@ export declare class ConnectionTaskClient {
      */
     getTaskInfo(taskId: string): {
         type: string;
-        commandType?: string;
     } | null;
     /**
      * 批量完成指定类型的任务

package/dist/index.js

@@ -71,7 +71,6 @@ function getWebSocket() {
         }
         // Node.js环境下动态导入ws模块
         try {
-            // @ts-ignore - Dynamic import may not have types
             const wsModule = yield Promise.resolve().then(() => __importStar(require('ws')));
             return wsModule.default || wsModule;
         }
@@ -81,6 +80,9 @@ function getWebSocket() {
         }
     });
 }
+function isPendingTask(taskType) {
+    return taskType && taskType !== "command";
+}
 /**
  * Enhanced WebSocket Task Client with protocol-aware task methods
  */
@@ -105,7 +107,11 @@ class ConnectionTaskClient {
             var _a, _b;
             try {
                 this.wsUrl = yield this.authenticateDevice(this.deviceId);
-                console.log('Initializing WebSocket client...' + this.wsUrl);
+                if (!this.wsUrl) {
+                    this.config.onError(new Event("connection"));
+                    return;
+                }
+                console.log('Initializing ShellX client wsUrl:' + this.wsUrl + " deviceId: " + this.deviceId);
                 // 获取适合当前环境的WebSocket构造函数
                 const WebSocketConstructor = yield getWebSocket();
                 this.ws = new WebSocketConstructor(this.wsUrl);
@@ -150,6 +156,7 @@ class ConnectionTaskClient {
     }
     authenticateDevice(deviceId) {
         return __awaiter(this, void 0, void 0, function* () {
+            let fallbackUrl = undefined;
             // 1. 优先检测本地服务
             try {
                 // fetch超时实现
@@ -161,9 +168,9 @@ class ConnectionTaskClient {
                 if (localResp.ok) {
                     const info = yield localResp.json();
                     if (info && (info.status === 'ok' || info.status === 1) && info.uuid) {
-                        if (deviceId == info.uuid) {
+                        if (deviceId == undefined || deviceId == info.uuid) {
                             const localUuid = info.uuid;
-                            const fallbackUrl = `ws://127.0.0.1:9091/api/s/${localUuid}`;
+                            fallbackUrl = `ws://127.0.0.1:9091/api/s/${localUuid}`;
                             console.log('✅ [Auth] 本地ShellX服务可用，使用本地 /info 返回的 uuid:', localUuid, '，服务地址:', fallbackUrl);
                             return fallbackUrl;
                         }
@@ -173,11 +180,15 @@ class ConnectionTaskClient {
             catch (e) {
                 // 本地不可用，继续走远程
             }
-            const fallbackUrl = `ws://127.0.0.1:9091/api/s/${deviceId}`;
+            if (deviceId == undefined) {
+                console.warn('❌ [Auth] 设备ID未设置，本地未连接USB，请设置环境变量 SHELLX_DEVICE_ID 或者 USB连接设备');
+                return undefined;
+            }
             // 2. 远程认证逻辑
             authKey = (0, utils_1.getEnvVar)('SHELLX_AUTH_KEY');
             if (!authKey) {
-                throw new Error('SHELLX_AUTH_KEY environment variable is required');
+                authKey = (0, uuid_1.v4)();
+                console.log('✅ [Auth] SHELLX_AUTH_KEY 环境变量未设置, 生成新的authKey: ' + authKey);
             }
             try {
                 console.log('🔑 [Auth] 正在认证设备...');
@@ -189,6 +200,12 @@ class ConnectionTaskClient {
                     },
                 });
                 console.log('ShellX.ai设备认证响应:', jsonData);
+                // 验证认证响应是否有效
+                // 如果接口返回 null 或者缺少必要字段，说明设备未注册
+                if (!jsonData || jsonData === null || !jsonData.machine || !jsonData.authenticate) {
+                    console.error('❌ [Auth] ShellX.ai设备未注册或认证信息无效');
+                    return `wss://shellx.ai/api/s/${deviceId}`;
+                }
                 // const jsonData = JSON.parse(data);
                 console.log('✅ [Auth] ShellX.ai设备认证成功');
                 console.log(`📡 [Auth] 设备ID: ${jsonData.authenticate}`);
@@ -249,19 +266,16 @@ class ConnectionTaskClient {
             try {
                 authKey = (0, utils_1.getEnvVar)('SHELLX_AUTH_KEY');
                 if (!authKey) {
-                    console.error('❌ [Auth] SHELLX_AUTH_KEY 环境变量未设置');
-                    return;
+                    authKey = (0, uuid_1.v4)();
+                    console.log('✅ [Auth] SHELLX_AUTH_KEY 环境变量未设置, 生成新的authKey: ' + authKey);
                 }
-                console.log('🔑 [Auth] 发送认证消息...');
-                // 从URL中提取认证密钥（如果URL包含认证信息）
-                // 发送认证消息
                 const authMessage = { authenticate: authKey };
                 console.log('📤 [Auth] 发送认证消息:', { authenticate: authKey });
                 if (this.ws && this.wsConnected) {
                     this.ws.send((0, cbor_1.encode)(authMessage));
                 }
                 else {
-                    console.error('❌ [Auth] WebSocket未连接，无法发送认证消息');
+                    console.error('❌ [Auth] ShellX 未连接，无法发送认证消息');
                 }
             }
             catch (error) {
@@ -373,42 +387,43 @@ class ConnectionTaskClient {
                     }
                     break;
                 case 'action':
-                    /*
                     if (jsonData.action_event) {
-                      responseData = jsonData.action_event;
-                      shouldResolve = true;
-                    }*/
-                    // 命令，按键，滑动，点击，等待，查找，等待，屏幕截图，屏幕信息，屏幕变化，应用列表， 需要自己处理
+                        responseData = jsonData.action_event;
+                        shouldResolve = true;
+                    }
+                    break;
+                case 'actions':
+                    if (jsonData.actions) {
+                        responseData = jsonData.actions;
+                        shouldResolve = true;
+                    }
                     break;
             }
             if (shouldResolve) {
                 clearTimeout(task.timer);
                 this.pendingTasks.delete(taskId);
-                if ((responseData === null || responseData === void 0 ? void 0 : responseData.success) === false) {
-                    task.reject(new Error(responseData.errorMessage || 'Task failed'));
-                }
-                else {
-                    task.resolve(responseData);
-                }
+                // 始终 resolve，保持原始响应数据结构不变
+                task.resolve(responseData);
                 break; // Only resolve the first matching task
             }
         }
     }
-    sendMessage(message, taskType, commandType) {
+    sendMessage(message, taskType, timeout) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
                 const taskId = (0, uuid_1.v4)();
                 if (taskType) {
                     const timer = setTimeout(() => {
                         this.pendingTasks.delete(taskId);
-                        reject(new Error(`Task ${taskType} timeout (${this.config.timeout}ms)`));
-                    }, this.config.timeout);
+                        // 超时时返回 undefined 而不是 reject
+                        console.log(`⏰ [ShellX] 任务超时: ${taskType}, 返回 undefined`);
+                        resolve(undefined);
+                    }, timeout ? timeout : this.config.timeout);
                     this.pendingTasks.set(taskId, {
                         resolve,
                         reject,
                         timer,
-                        type: taskType,
-                        commandType,
+                        type: taskType
                     });
                     console.log(`📋 [ShellX] 创建任务: ${taskId}, 类型: ${taskType}}`);
                 }
@@ -423,7 +438,9 @@ class ConnectionTaskClient {
                         if (taskType) {
                             this.pendingTasks.delete(taskId);
                         }
-                        reject(error);
+                        // 发送失败时返回 undefined 而不是 reject
+                        console.log(`❌ [ShellX] 发送消息失败，返回 undefined:`, error);
+                        resolve(undefined);
                     }
                 }
                 else {
@@ -510,9 +527,9 @@ class ConnectionTaskClient {
     /**
      * Execute an action sequence
      */
-    executeAction(actionSequence, taskId) {
+    executeAction(actionSequence, taskId, timeeout) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.sendMessageWithTaskId({ actions: actionSequence }, 'action', taskId);
+            return this.sendMessageWithTaskId({ actions: actionSequence }, 'action', taskId, timeeout);
         });
     }
     /**
@@ -579,19 +596,19 @@ class ConnectionTaskClient {
      * @param taskType 任务类型
      * @returns Promise<{taskId: string, promise: Promise<any>}>
      */
-    sendMessageWithTaskId(message, taskType, definedTaskId) {
+    sendMessageWithTaskId(message, taskType, definedTaskId, timeout) {
         return new Promise((resolve) => {
             let taskId = definedTaskId;
             if (taskId == null) {
                 taskId = (0, uuid_1.v4)();
             }
-            if (taskType) {
+            if (isPendingTask(taskType)) {
                 const timer = setTimeout(() => {
                     if (taskId != null) {
                         this.pendingTasks.delete(taskId);
                     }
                     console.log(`⏰ [ShellX] 任务超时: ${taskId}, 类型: ${taskType}`);
-                }, this.config.timeout);
+                }, timeout ? timeout : this.config.timeout);
                 this.pendingTasks.set(taskId, {
                     resolve: () => { },
                     reject: () => { },
@@ -605,7 +622,7 @@ class ConnectionTaskClient {
                     console.log(Date.now() + ' 📤 [ShellX] 发送消息:', JSON.stringify(message));
                     this.ws.send((0, cbor_1.encode)(message));
                     const promise = new Promise((promiseResolve, promiseReject) => {
-                        if (taskType) {
+                        if (isPendingTask(taskType)) {
                             if (taskId != null) {
                                 const task = this.pendingTasks.get(taskId);
                                 if (task) {
@@ -621,7 +638,7 @@ class ConnectionTaskClient {
                     resolve({ taskId, promise });
                 }
                 catch (error) {
-                    if (taskType) {
+                    if (isPendingTask(taskType)) {
                         this.pendingTasks.delete(taskId);
                     }
                     resolve({ taskId, promise: Promise.reject(error) });
@@ -667,7 +684,7 @@ class ConnectionTaskClient {
         });
     }
     flushQueue() {
-        while (this.messageQueue.length > 0 && this.ws) {
+        while (this.messageQueue.length > 0 && this.ws && this.shellxConnected) {
             const message = this.messageQueue.shift();
             if (message) {
                 try {
@@ -676,6 +693,9 @@ class ConnectionTaskClient {
                 }
                 catch (error) {
                     console.error('Failed to send queued message:', error);
+                    // Re-queue the message if sending fails
+                    this.messageQueue.unshift(message);
+                    break;
                 }
             }
         }
@@ -760,8 +780,7 @@ class ConnectionTaskClient {
             return null;
         }
         return {
-            type: task.type,
-            commandType: task.commandType,
+            type: task.type
         };
     }
     /**

package/dist/shellx.d.ts

@@ -40,10 +40,6 @@ export declare class ShellX {
      * 处理 shell 输出数据
      */
     handleShellOutput(chunks: [any, number, Uint8Array[]]): void;
-    /**
-     * 判断输出是否属于特定命令
-     */
-    private isOutputForCommand;
     /**
      * 清理命令输出，去除输入的命令内容
      */
@@ -53,31 +49,7 @@ export declare class ShellX {
      */
     private combineSessionOutputs;
     /**
-     * 转义正则表达式特殊字符
-     */
-    private escapeRegExp;
-    /**
-     * 检查命令是否完成
-     */
-    private checkCommandCompletion;
-    /**
-     * 检查输出是否包含错误指示器
-     */
-    private hasErrorIndicators;
-    /**
-     * 判断命令是否完成（基于时间）
-     */
-    private isCommandComplete;
-    /**
-     * 解析命令 Promise
-     */
-    private resolveCommand;
-    /**
-     * 生成命令唯一标识
-     */
-    private generateCommandKey;
-    /**
-     * 通用重试机制
+     * 通用重试机制 - 失败时返回 undefined 而不是抛出异常
      */
     private withRetry;
     /**
@@ -116,6 +88,8 @@ export declare class ShellX {
      * 执行命令 - 兼容现有的 shell 命令执行
      */
     executeCommand(commandData: Command): Promise<CommandResult>;
+    executeCodeEval(context: any, code: string, timeout?: number): Promise<any>;
+    executeCode(agentCode: string, context: any, timeout?: number): Promise<any>;
     /**
      * 获取应用信息
      */

package/dist/shellx.js

@@ -16,11 +16,7 @@ exports.ShellX = void 0;
 exports.createShellX = createShellX;
 exports.createShellXWithShellMonitoring = createShellXWithShellMonitoring;
 const uuid_1 = require("uuid");
-const utils_1 = require("./utils");
-// 导入 WebSocketTaskClient 类
 const index_1 = __importDefault(require("./index"));
-// 安全地获取环境变量，兼容浏览器和Node.js环境
-let authKey = (0, utils_1.getEnvVar)('SHELLX_AUTH_KEY');
 const COMMAND_PTY_SID = 999;
 /**
  * ShellX automation utilities for common patterns
@@ -63,27 +59,24 @@ class ShellX {
                 for (const data of dataArrays) {
                     output += new TextDecoder().decode(data);
                 }
-                console.log(`📟 [Shell] 收到输出 (Session ${sessionId}): ${output.trim()}`);
+                /*console.log(
+                  `📟 [Shell] 收到输出 (Session ${sessionId}): ${output.trim()}`,
+                );*/
                 // 为每个等待的命令累积输出
-                for (const [commandKey, commandPromise] of this.shellCommandPromises.entries()) {
-                    // 检查是否该命令相关的输出
-                    if (this.isOutputForCommand(output, commandPromise.command, sessionId)) {
-                        // 存储该 session 的输出
-                        if (!commandPromise.sessionOutputs.has(sessionId)) {
-                            commandPromise.sessionOutputs.set(sessionId, '');
-                        }
-                        const currentSessionOutput = commandPromise.sessionOutputs.get(sessionId) || '';
-                        commandPromise.sessionOutputs.set(sessionId, currentSessionOutput + output);
-                        // 更新总输出
-                        commandPromise.output = this.combineSessionOutputs(commandPromise.sessionOutputs);
-                        console.log(`📊 [Shell] 命令 ${commandKey} 累积输出长度: ${commandPromise.output.length}`);
-                        // 调用输出回调（传递清理后的输出）
-                        if (commandPromise.options.onOutput) {
-                            const cleanOutput = this.cleanCommandOutput(output, commandPromise.command);
-                            commandPromise.options.onOutput(cleanOutput);
-                        }
-                        // 检查是否满足完成条件
-                        this.checkCommandCompletion(commandKey, commandPromise, output);
+                for (const [commandKey, commandPromise,] of this.shellCommandPromises.entries()) {
+                    if (!commandPromise.sessionOutputs.has(sessionId)) {
+                        commandPromise.sessionOutputs.set(sessionId, '');
+                    }
+                    const currentSessionOutput = commandPromise.sessionOutputs.get(sessionId) || '';
+                    commandPromise.sessionOutputs.set(sessionId, currentSessionOutput + output);
+                    commandPromise.output = this.combineSessionOutputs(commandPromise.sessionOutputs);
+                    /*console.log(
+                      `📊 [Shell] 命令 ${commandKey} 累积输出长度: ${commandPromise.output.length}`,
+                    );*/
+                    // 调用输出回调（传递清理后的输出）
+                    if (commandPromise.options.onOutput) {
+                        const cleanOutput = this.cleanCommandOutput(output, commandPromise.command);
+                        commandPromise.options.onOutput(cleanOutput);
                     }
                 }
             }
@@ -92,56 +85,11 @@ class ShellX {
             }
         }
     }
-    /**
-     * 判断输出是否属于特定命令
-     */
-    isOutputForCommand(output, command, sessionId) {
-        // 如果输出包含命令本身，说明是命令回显
-        if (output.includes(command)) {
-            return true;
-        }
-        // 如果有多个命令在等待，按时间顺序分配
-        const waitingCommands = Array.from(this.shellCommandPromises.keys());
-        if (waitingCommands.length === 1) {
-            return true; // 只有一个命令在等待，所有输出都属于它
-        }
-        // 多个命令时，根据 sessionId 和命令创建时间进行启发式匹配
-        return true; // 暂时返回 true，让所有命令都接收输出
-    }
     /**
      * 清理命令输出，去除输入的命令内容
      */
     cleanCommandOutput(output, command) {
-        if (!output || !command) {
-            return output;
-        }
-        let cleanOutput = output;
-        // 去除命令回显（命令本身）
-        cleanOutput = cleanOutput.replace(new RegExp(this.escapeRegExp(command), 'g'), '');
-        // 去除可能的命令提示符前缀和后缀
-        const promptPatterns = [
-            /^\s*[^$#>\s]*[#$>]\s*/, // 匹配提示符前缀
-            /^\s*[^$#>\s]*@[^$#>\s]*[#$>]\s*/, // 匹配 user@host 格式
-            /^\s*[^$#>\s]*:\s*[^$#>\s]*[#$>]\s*/, // 匹配 path: 格式
-            /\s*[^$#>\s]*[#$>]\s*$/, // 匹配提示符后缀
-            /\s*[^$#>\s]*@[^$#>\s]*[#$>]\s*$/, // 匹配 user@host 后缀
-            /\s*[^$#>\s]*:\s*[^$#>\s]*[#$>]\s*$/, // 匹配 path: 后缀
-            /\s*\d+\|[^$#>\s]*[#$>]\s*$/, // 匹配 Android 格式后缀
-        ];
-        for (const pattern of promptPatterns) {
-            cleanOutput = cleanOutput.replace(pattern, '');
-        }
-        // 去除多余的空行和空格
-        cleanOutput = cleanOutput.replace(/^\s+|\s+$/g, ''); // 去除首尾空白
-        cleanOutput = cleanOutput.replace(/\n\s*\n/g, '\n'); // 去除多余空行
-        // 如果清理后为空，返回空字符串
-        if (cleanOutput.trim().length === 0) {
-            return '';
-        }
-        console.log(`🧹 [Shell] 清理命令输出:`);
-        console.log(`   原始: "${output.trim()}"`);
-        console.log(`   清理后: "${cleanOutput.trim()}"`);
-        return cleanOutput;
+        return output.replace(command, '');
     }
     /**
      * 合并多个 session 的输出
@@ -156,75 +104,7 @@ class ShellX {
         return combined;
     }
     /**
-     * 转义正则表达式特殊字符
-     */
-    escapeRegExp(string) {
-        return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    }
-    /**
-     * 检查命令是否完成
-     */
-    checkCommandCompletion(commandKey, commandPromise, newOutput) {
-        const { resolve, startTime, options, output, command } = commandPromise;
-        console.log(`🔍 [Shell] 检查命令 "${command}" 完成条件，当前输出长度: ${output.length}`);
-        if (this.isCommandComplete(output, command)) {
-            console.log(`✅ [Shell] 命令 "${command}" 执行完成 (检测到提示符)`);
-            this.resolveCommand(commandKey, {
-                success: true,
-                output: output.trim(),
-                duration: Date.now() - startTime
-            });
-            return;
-        }
-        console.log(`⏳ [Shell] 命令 "${command}" 继续等待完成...`);
-    }
-    /**
-     * 检查输出是否包含错误指示器
-     */
-    hasErrorIndicators(output) {
-        const errorPatterns = [
-            /error/i,
-            /failed/i,
-            /not found/i,
-            /permission denied/i,
-            /command not found/i,
-            /no such file/i,
-            /syntax error/i
-        ];
-        return errorPatterns.some(pattern => pattern.test(output));
-    }
-    /**
-     * 判断命令是否完成（基于时间）
-     */
-    isCommandComplete(output, command) {
-        // 简化逻辑：只基于时间判断，不依赖提示符检测
-        // 命令完成由超时机制控制
-        return false; // 让超时机制处理命令完成
-    }
-    /**
-     * 解析命令 Promise
-     */
-    resolveCommand(commandKey, result) {
-        const commandPromise = this.shellCommandPromises.get(commandKey);
-        if (commandPromise) {
-            console.log(`✅ [Shell] 解析命令 Promise: ${commandKey}`);
-            // 清理最终输出结果
-            const cleanResult = Object.assign(Object.assign({}, result), { output: this.cleanCommandOutput(result.output, commandPromise.command) });
-            commandPromise.resolve(cleanResult);
-            this.shellCommandPromises.delete(commandKey);
-        }
-        else {
-            console.log(`⚠️ [Shell] 未找到命令 Promise: ${commandKey}`);
-        }
-    }
-    /**
-     * 生成命令唯一标识
-     */
-    generateCommandKey(command) {
-        return `cmd_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
-    }
-    /**
-     * 通用重试机制
+     * 通用重试机制 - 失败时返回 undefined 而不是抛出异常
      */
     withRetry(operation_1) {
         return __awaiter(this, arguments, void 0, function* (operation, options = {}) {
@@ -235,7 +115,8 @@ class ShellX {
                 }
                 catch (error) {
                     if (attempt === retry) {
-                        throw error;
+                        console.log(`❌ [Retry] 重试 ${retry} 次后仍然失败，返回 undefined:`, error);
+                        return undefined;
                     }
                     if (onRetry) {
                         onRetry(attempt, error);
@@ -244,7 +125,7 @@ class ShellX {
                     yield new Promise(resolve => setTimeout(resolve, delay));
                 }
             }
-            throw new Error('重试次数已用完');
+            return undefined;
         });
     }
     /**
@@ -284,7 +165,7 @@ class ShellX {
     click(clickData) {
         return __awaiter(this, void 0, void 0, function* () {
             const startTime = Date.now();
-            return this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     let target;
                     if (clickData.targetElementId) {
@@ -340,6 +221,15 @@ class ShellX {
                     throw new Error(`点击操作失败: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }), { retry: clickData.retry, delay: 500 });
+            // 如果 withRetry 返回 undefined，返回失败的 ActionResult
+            if (!result) {
+                return {
+                    success: false,
+                    error: '点击操作失败',
+                    duration: Date.now() - startTime
+                };
+            }
+            return result;
         });
     }
     /**
@@ -348,7 +238,7 @@ class ShellX {
     input(inputData) {
         return __awaiter(this, void 0, void 0, function* () {
             const startTime = Date.now();
-            return this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b;
                 try {
                     let target;
@@ -398,6 +288,14 @@ class ShellX {
                     throw new Error(`输入操作失败: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }), { retry: inputData.retry, delay: 500 });
+            if (!result) {
+                return {
+                    success: false,
+                    error: '输入操作失败',
+                    duration: Date.now() - startTime
+                };
+            }
+            return result;
         });
     }
     /**
@@ -406,7 +304,7 @@ class ShellX {
     swipe(swipeData) {
         return __awaiter(this, void 0, void 0, function* () {
             const startTime = Date.now();
-            return this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const from = { x: swipeData.fromX, y: swipeData.fromY };
                     const to = { x: swipeData.toX, y: swipeData.toY };
@@ -433,6 +331,14 @@ class ShellX {
                     throw new Error(`滑动操作失败: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }), { retry: swipeData.retry, delay: 500 });
+            if (!result) {
+                return {
+                    success: false,
+                    error: '滑动操作失败',
+                    duration: Date.now() - startTime
+                };
+            }
+            return result;
         });
     }
     /**
@@ -441,7 +347,7 @@ class ShellX {
     pressKey(keyData) {
         return __awaiter(this, void 0, void 0, function* () {
             const startTime = Date.now();
-            return this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const action = {
                         title: `按键操作: ${keyData.key}${keyData.longPress ? ' (长按)' : ''}`,
@@ -467,6 +373,14 @@ class ShellX {
                     throw new Error(`按键操作失败: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }), { retry: keyData.retry, delay: 500 });
+            if (!result) {
+                return {
+                    success: false,
+                    error: '按键操作失败',
+                    duration: Date.now() - startTime
+                };
+            }
+            return result;
         });
     }
     /**
@@ -475,7 +389,7 @@ class ShellX {
     wait(waitData) {
         return __awaiter(this, void 0, void 0, function* () {
             const startTime = Date.now();
-            return this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const selector = this.convertSelector(waitData);
                     const timeout = waitData.timeout || 10000;
@@ -489,7 +403,12 @@ class ShellX {
                                 visibleOnly: waitData.condition === 'visible',
                                 clickableOnly: waitData.condition === 'clickable'
                             });
-                            if (result.elements.length > 0) {
+                            // 如果服务器返回失败，跳过本次尝试
+                            if (!result || result.success === false) {
+                                yield new Promise(resolve => setTimeout(resolve, interval));
+                                continue;
+                            }
+                            if (result.elements && result.elements.length > 0) {
                                 if (waitData.condition === 'gone') {
                                     // 等待元素消失，继续等待
                                     yield new Promise(resolve => setTimeout(resolve, interval));
@@ -524,6 +443,14 @@ class ShellX {
                     throw new Error(`等待操作失败: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }), { retry: waitData.retry, delay: 500 });
+            if (!result) {
+                return {
+                    success: false,
+                    error: '等待操作失败',
+                    duration: Date.now() - startTime
+                };
+            }
+            return result;
         });
     }
     /**
@@ -531,7 +458,7 @@ class ShellX {
      */
     find(findData) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const selector = this.convertSelector(findData);
                     const result = yield this.client.findElement(selector, {
@@ -542,6 +469,13 @@ class ShellX {
                         clickableOnly: false,
                         multiple: findData.multiple || false
                     });
+                    // 检查服务器是否返回了失败响应
+                    if (!result || result.success === false) {
+                        throw new Error((result === null || result === void 0 ? void 0 : result.errorMessage) || '查找元素失败');
+                    }
+                    if (!result.elements) {
+                        throw new Error('未找到元素');
+                    }
                     const elements = result.elements.map(element => this.convertElement(element));
                     return {
                         elements,
@@ -554,6 +488,15 @@ class ShellX {
                     throw new Error(`查找操作失败: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }), { retry: findData.retry, delay: 500 });
+            if (!result) {
+                return {
+                    elements: [],
+                    count: 0,
+                    success: false,
+                    found: false
+                };
+            }
+            return result;
         });
     }
     /**
@@ -561,7 +504,7 @@ class ShellX {
      */
     executeCommand(commandData) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const result = yield this.executeShellCommand(commandData.cmd, {
                         title: `执行命令: ${commandData.cmd}`,
@@ -574,6 +517,35 @@ class ShellX {
                     throw new Error(`命令执行失败: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }), { retry: commandData.retry, delay: 1000 });
+            if (!result) {
+                return {
+                    success: false,
+                    output: '',
+                    error: '命令执行失败',
+                    duration: 0
+                };
+            }
+            return result;
+        });
+    }
+    executeCodeEval(context, code, timeout) {
+        const evalInstance = require('eval');
+        return evalInstance(code, context, true);
+    }
+    executeCode(agentCode, context, timeout) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // console.log('executeCode', agentCode);
+            // Interpreter.global = context;
+            // const evalFunc = getEvalInstance(context);
+            // 如果没有指定 timeout，直接执行
+            if (!timeout) {
+                return yield this.executeCodeEval(context, agentCode);
+            }
+            // 使用 timeout 执行 - 修复：await 应该在 Promise.race 上，而不是在内部的 promise 上
+            return yield Promise.race([
+                this.executeCodeEval(context, agentCode),
+                new Promise((_, reject) => setTimeout(() => reject(new Error(`代码执行超时: ${timeout}ms`)), timeout))
+            ]);
         });
     }
     /**
@@ -582,7 +554,7 @@ class ShellX {
     getAppInfo(appInfoData) {
         return __awaiter(this, void 0, void 0, function* () {
             const startTime = Date.now();
-            return this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const action = {
                         title: `获取应用信息: ${appInfoData.package}`,
@@ -602,6 +574,14 @@ class ShellX {
                     throw new Error(`获取应用信息失败: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }), { retry: appInfoData.retry, delay: 500 });
+            if (!result) {
+                return {
+                    success: false,
+                    error: '获取应用信息失败',
+                    duration: Date.now() - startTime
+                };
+            }
+            return result;
         });
     }
     /**
@@ -610,7 +590,7 @@ class ShellX {
     takeScreenshot() {
         return __awaiter(this, arguments, void 0, function* (screenshotData = {}) {
             const startTime = Date.now();
-            return this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const options = {
                         format: screenshotData.format || 'png',
@@ -627,6 +607,10 @@ class ShellX {
                         };
                     }
                     const screenshot = yield this.client.screenShot(options);
+                    // 检查服务器是否返回了失败响应
+                    if (!screenshot || screenshot.success === false) {
+                        throw new Error((screenshot === null || screenshot === void 0 ? void 0 : screenshot.errorMessage) || '截图失败');
+                    }
                     return {
                         success: true,
                         data: screenshot,
@@ -637,6 +621,14 @@ class ShellX {
                     throw new Error(`截图操作失败: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }), { retry: screenshotData.retry, delay: 500 });
+            if (!result) {
+                return {
+                    success: false,
+                    error: '截图操作失败',
+                    duration: Date.now() - startTime
+                };
+            }
+            return result;
         });
     }
     /**
@@ -687,11 +679,13 @@ class ShellX {
                         result = yield this.takeScreenshot(action);
                     }
                     results.push(result);
-                    // 如果操作失败且不允许继续，则抛出错误
+                    // 记录操作结果但不抛出错误，让调用者决定如何处理失败的操作
                     if (!result.success) {
-                        throw new Error(`操作 ${index + 1} 失败: ${result.error}`);
+                        console.warn(`⚠️ [Actions] 第 ${index + 1} 个操作失败: ${result.error}`);
+                    }
+                    else {
+                        console.log(`✅ [Actions] 第 ${index + 1} 个操作执行成功`);
                     }
-                    console.log(`✅ [Actions] 第 ${index + 1} 个操作执行成功`);
                 }
                 catch (error) {
                     const errorResult = {
@@ -701,7 +695,7 @@ class ShellX {
                     };
                     results.push(errorResult);
                     console.error(`❌ [Actions] 第 ${index + 1} 个操作执行失败:`, error);
-                    throw error; // 停止执行后续操作
+                    // 不再抛出错误，继续执行后续操作
                 }
             }
             return results;
@@ -1005,27 +999,17 @@ class ShellX {
                 // 设置超时
                 const timeoutId = setTimeout(() => {
                     if (this.shellCommandPromises.has(commandKey)) {
+                        console.log(`✅ [Shell] 命令  ${command} 执行完成`);
                         const commandPromise = this.shellCommandPromises.get(commandKey);
                         this.shellCommandPromises.delete(commandKey);
-                        if (commandPromise && commandPromise.output.trim().length > 0) {
-                            resolve({
-                                success: true,
-                                output: commandPromise.output.trim(),
-                                duration: Date.now() - startTime
-                            });
-                        }
-                        else {
-                            resolve({
-                                success: true,
-                                output: "",
-                                error: `Command timeout after ${timeout}ms, but got partial output`,
-                                duration: Date.now() - startTime
-                            });
-                        }
+                        resolve({
+                            success: true,
+                            output: commandPromise ? commandPromise.output.trim() : "",
+                            duration: Date.now() - startTime
+                        });
                     }
                 }, timeout);
                 try {
-                    // 构建 shell 命令操作
                     const shellAction = {
                         title,
                         actions: [{
@@ -1038,7 +1022,7 @@ class ShellX {
                         }
                     };
                     // 发送命令
-                    yield this.client.executeAction(shellAction, commandKey);
+                    yield this.client.sendMessageWithTaskId({ actions: shellAction }, 'command', commandKey, timeout);
                     console.log(`📤 [Shell] 命令已发送: ${commandKey}`);
                 }
                 catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shellx-ai",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "shellx is a powerful WebSocket-based client for controlling shell commands and UI automation on remote devices.",
   "repository": {
     "url": "git+https://github.com/10cl/shellx.git",
@@ -33,7 +33,9 @@
     "cbor": "^9.0.0",
     "dotenv": "^16.4.5",
     "ofetch": "^1.4.1",
-    "uuid": "^11.1.0"
+    "uuid": "^11.1.0",
+    "promptflow-eval": "1.0.0",
+    "@babel/standalone": "^7.18.13"
   },
   "optionalDependencies": {
     "node-fetch": "^3.3.2",
@@ -47,6 +49,7 @@
     "langchain": "^0.1.34",
     "promptflow-eval": "1.0.0",
     "promptflow-template": "1.0.0",
+    "eval": "^0.1.8",
     "promptflowx": "^0.1.9",
     "ts-jest": "^29.4.0",
     "ts-node": "^10.9.2",