shellx-cli 0.0.7 → 0.0.8

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 = "6f44563b";
-    CLI_VERSION = "0.0.6";
+    GIT_COMMIT_INFO = "979a427a";
+    CLI_VERSION = "0.0.8";
   }
 });
 
@@ -150655,7 +150655,7 @@ function createContentGeneratorConfig(config, authType) {
   return contentGeneratorConfig;
 }
 async function createContentGenerator(config, gcConfig, sessionId2) {
-  const version2 = "0.0.7";
+  const version2 = "0.0.8";
   const userAgent2 = `GeminiCLI/${version2} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -236819,13 +236819,53 @@ async function ensureInstallDir() {
     await fs32.promises.mkdir(SHELLX_BIN_DIR, { recursive: true });
   }
 }
+async function copyFileWithSkip(source2, dest) {
+  try {
+    await fs32.promises.copyFile(source2, dest);
+    return true;
+  } catch (error) {
+    if (error.code === "EBUSY" || error.code === "EPERM" || error.code === "EACCES" || error.code === "ETXTBSY") {
+      console.log(`Skipping ${path31.basename(dest)} (file is in use or locked)`);
+      return false;
+    }
+    throw error;
+  }
+}
+async function copyDirContents(sourceDir, destDir) {
+  let total = 0;
+  let skipped = 0;
+  const entries = await fs32.promises.readdir(sourceDir, { withFileTypes: true });
+  for (const entry of entries) {
+    const sourcePath = path31.join(sourceDir, entry.name);
+    const destPath = path31.join(destDir, entry.name);
+    if (entry.isDirectory()) {
+      if (!fs32.existsSync(destPath)) {
+        await fs32.promises.mkdir(destPath, { recursive: true });
+      }
+      const result = await copyDirContents(sourcePath, destPath);
+      total += result.total;
+      skipped += result.skipped;
+    } else {
+      total++;
+      const success = await copyFileWithSkip(sourcePath, destPath);
+      if (!success) {
+        skipped++;
+      }
+    }
+  }
+  return { total, skipped };
+}
 async function extractShellX(assetPath) {
+  let tempDir = null;
   try {
     await ensureInstallDir();
+    tempDir = path31.join(os13.tmpdir(), `shellx-extract-${Date.now()}`);
+    await fs32.promises.mkdir(tempDir, { recursive: true });
+    console.log("Extracting to temporary directory:", tempDir);
     const isLinux2 = process.platform === "linux";
     if (isLinux2) {
       await new Promise((resolve23, reject) => {
-        const unzip = child_process.spawn("unzip", ["-o", assetPath, "-d", SHELLX_BIN_DIR]);
+        const unzip = child_process.spawn("unzip", ["-o", assetPath, "-d", tempDir]);
         unzip.on("error", reject);
         unzip.on("close", (code) => {
           if (code === 0)
@@ -236835,13 +236875,20 @@ async function extractShellX(assetPath) {
         });
       });
     } else {
-      await (0, import_extract_zip.default)(assetPath, { dir: SHELLX_BIN_DIR });
+      await (0, import_extract_zip.default)(assetPath, { dir: tempDir });
+    }
+    console.log("Copying files to installation directory...");
+    const { total, skipped } = await copyDirContents(tempDir, SHELLX_BIN_DIR);
+    if (skipped > 0) {
+      console.log(`Copied ${total - skipped}/${total} files (${skipped} files skipped due to being in use)`);
+    } else {
+      console.log(`All ${total} files copied successfully`);
     }
     const assetDir = path31.dirname(assetPath);
     const sourceApkPath = path31.join(assetDir, "shellx.apk");
-    await fs32.promises.copyFile(sourceApkPath, SHELLX_APK_FILE);
+    await copyFileWithSkip(sourceApkPath, SHELLX_APK_FILE);
     const sourceApkSignPath = path31.join(assetDir, "shellx.apk.sha256");
-    await fs32.promises.copyFile(sourceApkSignPath, SHELLX_APK_SIGN_FILE);
+    await copyFileWithSkip(sourceApkSignPath, SHELLX_APK_SIGN_FILE);
     console.log("ShellX extracted successfully.");
     const version2 = path31.basename(assetPath).split("-")[2].replace(".zip", "");
     await fs32.promises.writeFile(SHELLX_VERSION_FILE, version2);
@@ -236850,6 +236897,14 @@ async function extractShellX(assetPath) {
   } catch (error) {
     console.error("Failed to extract ShellX:", error);
     return false;
+  } finally {
+    if (tempDir && fs32.existsSync(tempDir)) {
+      try {
+        await fs32.promises.rm(tempDir, { recursive: true, force: true });
+      } catch (error) {
+        console.log("Failed to clean up temporary directory:", error);
+      }
+    }
   }
 }
 async function launchShellX(justStart = true) {
@@ -386325,14 +386380,17 @@ var init_config2 = __esm({
         this.toolRegistry = await this.createToolRegistry();
         logCliConfiguration(this, new StartSessionEvent(this, this.toolRegistry));
       }
-      async refreshAuth(authMethod, isRetry = false) {
-        let existingHistory = [];
-        if (this.geminiClient && this.geminiClient.isInitialized()) {
-          existingHistory = this.geminiClient.getHistory();
-        }
-        const newContentGeneratorConfig = createContentGeneratorConfig(this, authMethod);
+      /**
+       * Connect to ShellX with retry logic
+       */
+      async connectToShellX(retryCount = 0) {
         const deviceId = process23.env["SHELLX_DEVICE_ID"];
         try {
+          if (retryCount === 0) {
+            console.log("\u{1F50C} Connecting to ShellX...");
+          } else {
+            console.log(`\u{1F504} Retry attempt ${retryCount}: Reconnecting to ShellX...`);
+          }
           let connectionResolved = false;
           const createShellXPromise = new Promise(async (resolve23, reject) => {
             try {
@@ -386371,33 +386429,49 @@ var init_config2 = __esm({
             }, 15e3);
           });
           this.shellxClient = await Promise.race([createShellXPromise, timeoutPromise]);
-          console.log("ShellX connection successful");
-          const newGeminiClient = new GeminiClient(this);
-          await newGeminiClient.initialize(newContentGeneratorConfig);
-          const fromGenaiToVertex = this.contentGeneratorConfig?.authType === AuthType2.USE_GEMINI && authMethod === AuthType2.LOGIN_WITH_GOOGLE;
-          this.contentGeneratorConfig = newContentGeneratorConfig;
-          this.geminiClient = newGeminiClient;
-          if (existingHistory.length > 0) {
-            this.geminiClient.setHistory(existingHistory, {
-              stripThoughts: fromGenaiToVertex
-            });
-          }
-          this.inFallbackMode = false;
+          console.log("\u2705 ShellX connected successfully!");
         } catch (error) {
-          console.warn(/* @__PURE__ */ new Date() + " ShellX connection failed or timed out");
-          console.log("Checking ShellX installation status...");
+          console.warn(`\u274C ShellX connection failed: ${error instanceof Error ? error.message : String(error)}`);
+          console.log("");
+          console.log("\u{1F4E6} Checking ShellX installation...");
           const shellxResult = await ensureShellXAndLaunch();
           if (shellxResult.success) {
-            console.log("ShellX:", shellxResult.message);
+            console.log(`\u2705 ${shellxResult.message}`);
           } else {
-            console.warn("ShellX:", shellxResult.message);
-          }
-          if (!isRetry) {
-            console.log("Retrying auth refresh in 10 seconds...");
-            await new Promise((resolve23) => setTimeout(resolve23, 1e4));
-            return await this.refreshAuth(authMethod, true);
-          }
+            console.error(`\u274C ${shellxResult.message}`);
+            console.log("");
+            console.log("Please ensure:");
+            console.log("  1. ShellX app is installed on your Android device");
+            console.log("  2. Device is connected via ADB");
+            console.log("  3. USB debugging is enabled");
+            console.log('  4. Run "adb devices" to verify device connection');
+          }
+          const retryDelay = Math.min(5e3 + retryCount * 2e3, 3e4);
+          console.log("");
+          console.log(`\u23F3 Retrying in ${retryDelay / 1e3} seconds...`);
+          console.log(`   (Attempt ${retryCount + 1})`);
+          console.log("");
+          await new Promise((resolve23) => setTimeout(resolve23, retryDelay));
+          return await this.connectToShellX(retryCount + 1);
+        }
+      }
+      async refreshAuth(authMethod) {
+        let existingHistory = [];
+        if (this.geminiClient && this.geminiClient.isInitialized()) {
+          existingHistory = this.geminiClient.getHistory();
+        }
+        const newContentGeneratorConfig = createContentGeneratorConfig(this, authMethod);
+        const newGeminiClient = new GeminiClient(this);
+        await newGeminiClient.initialize(newContentGeneratorConfig);
+        const fromGenaiToVertex = this.contentGeneratorConfig?.authType === AuthType2.USE_GEMINI && authMethod === AuthType2.LOGIN_WITH_GOOGLE;
+        this.contentGeneratorConfig = newContentGeneratorConfig;
+        this.geminiClient = newGeminiClient;
+        if (existingHistory.length > 0) {
+          this.geminiClient.setHistory(existingHistory, {
+            stripThoughts: fromGenaiToVertex
+          });
         }
+        this.inFallbackMode = false;
       }
       getSessionId() {
         return this.sessionId;
@@ -433799,6 +433873,7 @@ var useAuthCommand = (settings, setAuthError, config) => {
       }
       try {
         setIsAuthenticating(true);
+        await config.connectToShellX();
         await config.refreshAuth(authType);
         console.log(`Authenticated via "${authType}".`);
       } catch (e4) {
@@ -434609,7 +434684,7 @@ async function getPackageJson() {
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.0.7";
+  return "0.0.8";
 }
 
 // packages/cli/src/ui/commands/aboutCommand.ts
@@ -434947,7 +435022,7 @@ init_open();
 import process31 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO2 = "6f44563b";
+var GIT_COMMIT_INFO2 = "979a427a";
 
 // packages/cli/src/ui/commands/bugCommand.ts
 init_dist5();
@@ -458807,7 +458882,7 @@ function AuthInProgress({
       flexDirection: "column",
       padding: 1,
       width: "100%",
-      children: timedOut ? /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: Colors.AccentRed, children: "Authentication timed out. Please try again." }) : /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { flexDirection: "column", gap: 1, children: [
+      children: timedOut ? /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: Colors.AccentRed, children: "Authentication timed out. Please try again. Ensure your Android device is connected and USB debugging is enabled before continuing." }) : /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { flexDirection: "column", gap: 1, children: [
         /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Text, { children: [
           /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(build_default, { type: "dots" }),
           " Waiting for authentication... (Press ESC or CTRL+C to cancel)"
@@ -470300,7 +470375,7 @@ ${queuedText}` : queuedText;
           AuthInProgress,
           {
             onTimeout: () => {
-              setAuthError("Authentication timed out. Please try again.");
+              setAuthError("Authentication timed out. Please try again. Ensure your Android device is connected and USB debugging is enabled before continuing.");
               cancelAuthentication();
               openAuthDialog();
             }

package/package.json

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