shellx-cli 0.0.9 → 0.0.11

package/bundle/shellx.js

@@ -138006,8 +138006,8 @@ var GIT_COMMIT_INFO, CLI_VERSION;
 var init_git_commit = __esm({
   "packages/core/dist/src/generated/git-commit.js"() {
     "use strict";
-    GIT_COMMIT_INFO = "979a427a";
-    CLI_VERSION = "0.0.9";
+    GIT_COMMIT_INFO = "fecca9c3";
+    CLI_VERSION = "0.0.10";
   }
 });
 
@@ -150655,7 +150655,7 @@ function createContentGeneratorConfig(config, authType) {
   return contentGeneratorConfig;
 }
 async function createContentGenerator(config, gcConfig, sessionId2) {
-  const version2 = "0.0.9";
+  const version2 = "0.0.11";
   const userAgent2 = `GeminiCLI/${version2} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -384223,7 +384223,7 @@ var require_shellx = __commonJS({
         return combined;
       }
       /**
-       * 通用重试机制
+       * 通用重试机制 - 失败时返回 undefined 而不是抛出异常
        */
       withRetry(operation_1) {
         return __awaiter(this, arguments, void 0, function* (operation, options3 = {}) {
@@ -384233,7 +384233,8 @@ var require_shellx = __commonJS({
               return yield operation();
             } catch (error) {
               if (attempt === retry) {
-                throw error;
+                console.log(`\u274C [Retry] \u91CD\u8BD5 ${retry} \u6B21\u540E\u4ECD\u7136\u5931\u8D25\uFF0C\u8FD4\u56DE undefined:`, error);
+                return void 0;
               }
               if (onRetry) {
                 onRetry(attempt, error);
@@ -384242,7 +384243,7 @@ var require_shellx = __commonJS({
               yield new Promise((resolve23) => setTimeout(resolve23, delay4));
             }
           }
-          throw new Error("\u91CD\u8BD5\u6B21\u6570\u5DF2\u7528\u5B8C");
+          return void 0;
         });
       }
       /**
@@ -384282,7 +384283,7 @@ var require_shellx = __commonJS({
       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) {
@@ -384329,6 +384330,14 @@ var require_shellx = __commonJS({
               throw new Error(`\u70B9\u51FB\u64CD\u4F5C\u5931\u8D25: ${error instanceof Error ? error.message : String(error)}`);
             }
           }), { retry: clickData.retry, delay: 500 });
+          if (!result) {
+            return {
+              success: false,
+              error: "\u70B9\u51FB\u64CD\u4F5C\u5931\u8D25",
+              duration: Date.now() - startTime
+            };
+          }
+          return result;
         });
       }
       /**
@@ -384337,7 +384346,7 @@ var require_shellx = __commonJS({
       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 _a5, _b2;
             try {
               let target;
@@ -384383,6 +384392,14 @@ var require_shellx = __commonJS({
               throw new Error(`\u8F93\u5165\u64CD\u4F5C\u5931\u8D25: ${error instanceof Error ? error.message : String(error)}`);
             }
           }), { retry: inputData.retry, delay: 500 });
+          if (!result) {
+            return {
+              success: false,
+              error: "\u8F93\u5165\u64CD\u4F5C\u5931\u8D25",
+              duration: Date.now() - startTime
+            };
+          }
+          return result;
         });
       }
       /**
@@ -384391,7 +384408,7 @@ var require_shellx = __commonJS({
       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 };
@@ -384417,6 +384434,14 @@ var require_shellx = __commonJS({
               throw new Error(`\u6ED1\u52A8\u64CD\u4F5C\u5931\u8D25: ${error instanceof Error ? error.message : String(error)}`);
             }
           }), { retry: swipeData.retry, delay: 500 });
+          if (!result) {
+            return {
+              success: false,
+              error: "\u6ED1\u52A8\u64CD\u4F5C\u5931\u8D25",
+              duration: Date.now() - startTime
+            };
+          }
+          return result;
         });
       }
       /**
@@ -384425,7 +384450,7 @@ var require_shellx = __commonJS({
       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: `\u6309\u952E\u64CD\u4F5C: ${keyData.key}${keyData.longPress ? " (\u957F\u6309)" : ""}`,
@@ -384450,6 +384475,14 @@ var require_shellx = __commonJS({
               throw new Error(`\u6309\u952E\u64CD\u4F5C\u5931\u8D25: ${error instanceof Error ? error.message : String(error)}`);
             }
           }), { retry: keyData.retry, delay: 500 });
+          if (!result) {
+            return {
+              success: false,
+              error: "\u6309\u952E\u64CD\u4F5C\u5931\u8D25",
+              duration: Date.now() - startTime
+            };
+          }
+          return result;
         });
       }
       /**
@@ -384458,7 +384491,7 @@ var require_shellx = __commonJS({
       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 timeout2 = waitData.timeout || 1e4;
@@ -384466,20 +384499,24 @@ var require_shellx = __commonJS({
               const maxAttempts = Math.floor(timeout2 / interval);
               for (let attempt = 0; attempt < maxAttempts; attempt++) {
                 try {
-                  const result = yield this.client.findElement(selector, {
+                  const result2 = yield this.client.findElement(selector, {
                     timeout: interval,
                     maxResults: 1,
                     visibleOnly: waitData.condition === "visible",
                     clickableOnly: waitData.condition === "clickable"
                   });
-                  if (result.elements.length > 0) {
+                  if (!result2 || result2.success === false) {
+                    yield new Promise((resolve23) => setTimeout(resolve23, interval));
+                    continue;
+                  }
+                  if (result2.elements && result2.elements.length > 0) {
                     if (waitData.condition === "gone") {
                       yield new Promise((resolve23) => setTimeout(resolve23, interval));
                       continue;
                     } else {
                       return {
                         success: true,
-                        data: { element: this.convertElement(result.elements[0]) },
+                        data: { element: this.convertElement(result2.elements[0]) },
                         duration: Date.now() - startTime
                       };
                     }
@@ -384499,6 +384536,14 @@ var require_shellx = __commonJS({
               throw new Error(`\u7B49\u5F85\u64CD\u4F5C\u5931\u8D25: ${error instanceof Error ? error.message : String(error)}`);
             }
           }), { retry: waitData.retry, delay: 500 });
+          if (!result) {
+            return {
+              success: false,
+              error: "\u7B49\u5F85\u64CD\u4F5C\u5931\u8D25",
+              duration: Date.now() - startTime
+            };
+          }
+          return result;
         });
       }
       /**
@@ -384506,10 +384551,10 @@ var require_shellx = __commonJS({
        */
       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, {
+              const result2 = yield this.client.findElement(selector, {
                 pressClick: findData.pressClick,
                 waitAfterMs: findData.waitAfterMs || 5e3,
                 maxResults: findData.maxResults || 1e3,
@@ -384517,17 +384562,32 @@ var require_shellx = __commonJS({
                 clickableOnly: false,
                 multiple: findData.multiple || false
               });
-              const elements = result.elements.map((element) => this.convertElement(element));
+              if (!result2 || result2.success === false) {
+                throw new Error((result2 === null || result2 === void 0 ? void 0 : result2.errorMessage) || "\u67E5\u627E\u5143\u7D20\u5931\u8D25");
+              }
+              if (!result2.elements) {
+                throw new Error("\u672A\u627E\u5230\u5143\u7D20");
+              }
+              const elements = result2.elements.map((element) => this.convertElement(element));
               return {
                 elements,
                 count: elements.length,
                 success: true,
-                found: result.found
+                found: result2.found
               };
             } catch (error) {
               throw new Error(`\u67E5\u627E\u64CD\u4F5C\u5931\u8D25: ${error instanceof Error ? error.message : String(error)}`);
             }
           }), { retry: findData.retry, delay: 500 });
+          if (!result) {
+            return {
+              elements: [],
+              count: 0,
+              success: false,
+              found: false
+            };
+          }
+          return result;
         });
       }
       /**
@@ -384535,18 +384595,27 @@ var require_shellx = __commonJS({
        */
       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, {
+              const result2 = yield this.executeShellCommand(commandData.cmd, {
                 title: `\u6267\u884C\u547D\u4EE4: ${commandData.cmd}`,
                 timeout: commandData.timeout,
                 waitAfterMs: commandData.wait
               });
-              return result;
+              return result2;
             } catch (error) {
               throw new Error(`\u547D\u4EE4\u6267\u884C\u5931\u8D25: ${error instanceof Error ? error.message : String(error)}`);
             }
           }), { retry: commandData.retry, delay: 1e3 });
+          if (!result) {
+            return {
+              success: false,
+              output: "",
+              error: "\u547D\u4EE4\u6267\u884C\u5931\u8D25",
+              duration: 0
+            };
+          }
+          return result;
         });
       }
       executeCode(agentCode, timeout2) {
@@ -384572,7 +384641,7 @@ var require_shellx = __commonJS({
       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: `\u83B7\u53D6\u5E94\u7528\u4FE1\u606F: ${appInfoData.package}`,
@@ -384591,6 +384660,14 @@ var require_shellx = __commonJS({
               throw new Error(`\u83B7\u53D6\u5E94\u7528\u4FE1\u606F\u5931\u8D25: ${error instanceof Error ? error.message : String(error)}`);
             }
           }), { retry: appInfoData.retry, delay: 500 });
+          if (!result) {
+            return {
+              success: false,
+              error: "\u83B7\u53D6\u5E94\u7528\u4FE1\u606F\u5931\u8D25",
+              duration: Date.now() - startTime
+            };
+          }
+          return result;
         });
       }
       /**
@@ -384599,7 +384676,7 @@ var require_shellx = __commonJS({
       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 options3 = {
                 format: screenshotData.format || "png",
@@ -384615,6 +384692,9 @@ var require_shellx = __commonJS({
                 };
               }
               const screenshot = yield this.client.screenShot(options3);
+              if (!screenshot || screenshot.success === false) {
+                throw new Error((screenshot === null || screenshot === void 0 ? void 0 : screenshot.errorMessage) || "\u622A\u56FE\u5931\u8D25");
+              }
               return {
                 success: true,
                 data: screenshot,
@@ -384624,6 +384704,14 @@ var require_shellx = __commonJS({
               throw new Error(`\u622A\u56FE\u64CD\u4F5C\u5931\u8D25: ${error instanceof Error ? error.message : String(error)}`);
             }
           }), { retry: screenshotData.retry, delay: 500 });
+          if (!result) {
+            return {
+              success: false,
+              error: "\u622A\u56FE\u64CD\u4F5C\u5931\u8D25",
+              duration: Date.now() - startTime
+            };
+          }
+          return result;
         });
       }
       /**
@@ -384667,9 +384755,10 @@ var require_shellx = __commonJS({
               }
               results.push(result);
               if (!result.success) {
-                throw new Error(`\u64CD\u4F5C ${index + 1} \u5931\u8D25: ${result.error}`);
+                console.warn(`\u26A0\uFE0F [Actions] \u7B2C ${index + 1} \u4E2A\u64CD\u4F5C\u5931\u8D25: ${result.error}`);
+              } else {
+                console.log(`\u2705 [Actions] \u7B2C ${index + 1} \u4E2A\u64CD\u4F5C\u6267\u884C\u6210\u529F`);
               }
-              console.log(`\u2705 [Actions] \u7B2C ${index + 1} \u4E2A\u64CD\u4F5C\u6267\u884C\u6210\u529F`);
             } catch (error) {
               const errorResult = {
                 success: false,
@@ -384678,7 +384767,6 @@ var require_shellx = __commonJS({
               };
               results.push(errorResult);
               console.error(`\u274C [Actions] \u7B2C ${index + 1} \u4E2A\u64CD\u4F5C\u6267\u884C\u5931\u8D25:`, error);
-              throw error;
             }
           }
           return results;
@@ -385551,11 +385639,7 @@ var require_dist6 = __commonJS({
           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);
-            }
+            task.resolve(responseData);
             break;
           }
         }
@@ -385567,7 +385651,8 @@ var require_dist6 = __commonJS({
             if (taskType) {
               const timer = setTimeout(() => {
                 this.pendingTasks.delete(taskId);
-                reject(new Error(`Task ${taskType} timeout (${timeout2 ? timeout2 : this.config.timeout}ms)`));
+                console.log(`\u23F0 [ShellX] \u4EFB\u52A1\u8D85\u65F6: ${taskType}, \u8FD4\u56DE undefined`);
+                resolve23(void 0);
               }, timeout2 ? timeout2 : this.config.timeout);
               this.pendingTasks.set(taskId, {
                 resolve: resolve23,
@@ -385587,7 +385672,8 @@ var require_dist6 = __commonJS({
                 if (taskType) {
                   this.pendingTasks.delete(taskId);
                 }
-                reject(error);
+                console.log(`\u274C [ShellX] \u53D1\u9001\u6D88\u606F\u5931\u8D25\uFF0C\u8FD4\u56DE undefined:`, error);
+                resolve23(void 0);
               }
             } else {
               console.log("\u23F3 [ShellX] \u8FDE\u63A5\u672A\u5C31\u7EEA\uFF0C\u6D88\u606F\u5DF2\u52A0\u5165\u961F\u5217");
@@ -386227,6 +386313,7 @@ var init_config2 = __esm({
       // private deviceId: string;
       // private deviceAuthKey: string;
       shellxClient;
+      shellxConnected = false;
       deviceInfoContext;
       toolRegistry;
       promptRegistry;
@@ -386384,6 +386471,10 @@ var init_config2 = __esm({
        * Connect to ShellX with retry logic
        */
       async connectToShellX(retryCount = 0) {
+        if (this.shellxConnected) {
+          console.log("ShellX is already connected, skipping reconnection.");
+          return;
+        }
         const deviceId = process23.env["SHELLX_DEVICE_ID"];
         try {
           if (retryCount === 0) {
@@ -386429,6 +386520,7 @@ var init_config2 = __esm({
             }, 15e3);
           });
           this.shellxClient = await Promise.race([createShellXPromise, timeoutPromise]);
+          this.shellxConnected = true;
           console.log("\u2705 ShellX connected successfully!");
         } catch (error) {
           console.warn(`\u274C ShellX connection failed: ${error instanceof Error ? error.message : String(error)}`);
@@ -386767,6 +386859,18 @@ var init_config2 = __esm({
       getDeviceInfoContext() {
         return this.deviceInfoContext;
       }
+      /**
+       * Check if ShellX is currently connected
+       */
+      isShellXConnected() {
+        return this.shellxConnected;
+      }
+      /**
+       * Reset ShellX connection state (useful for manual reconnection)
+       */
+      resetShellXConnection() {
+        this.shellxConnected = false;
+      }
       async createToolRegistry() {
         const registry = new ToolRegistry(this);
         const registerCoreTool = (ToolClass, ...args) => {
@@ -434686,7 +434790,7 @@ async function getPackageJson() {
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.0.9";
+  return "0.0.11";
 }
 
 // packages/cli/src/ui/commands/aboutCommand.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shellx-cli",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "engines": {
     "node": ">=20.0.0"
   },