shellx-cli 0.0.21 → 0.0.23

package/bundle/shellx.js

@@ -143076,7 +143076,7 @@ var GIT_COMMIT_INFO, CLI_VERSION;
 var init_git_commit = __esm({
   "packages/core/dist/src/generated/git-commit.js"() {
     "use strict";
-    GIT_COMMIT_INFO = "0db37712";
+    GIT_COMMIT_INFO = "c04c6e88";
     CLI_VERSION = "0.15.0-nightly.20251107.b8eeb553";
   }
 });
@@ -233003,7 +233003,7 @@ async function createContentGenerator(config, gcConfig, sessionId2) {
     if (gcConfig.fakeResponses) {
       return FakeContentGenerator.fromFile(gcConfig.fakeResponses);
     }
-    const version3 = "0.0.21";
+    const version3 = "0.0.23";
     const userAgent = `GeminiCLI/${version3} (${process.platform}; ${process.arch})`;
     const baseHeaders = {
       "User-Agent": userAgent
@@ -302330,7 +302330,7 @@ async function getClientMetadata() {
   if (!clientMetadataPromise) {
     clientMetadataPromise = (async () => ({
       ideName: "GEMINI_CLI",
-      ideVersion: "0.0.21",
+      ideVersion: "0.0.23",
       platform: getPlatform(),
       updateChannel: await getReleaseChannel(__dirname3)
     }))();
@@ -331751,7 +331751,7 @@ var require_dist9 = __commonJS({
         return __awaiter(this, void 0, void 0, function* () {
           var _a5, _b2;
           try {
-            this.wsUrl = yield this.authenticateDevice(this.deviceId);
+            this.wsUrl = yield this.authenticateDevice();
             if (!this.wsUrl) {
               this.config.onError(new Event("connection"));
               this.reconnect();
@@ -331805,7 +331805,7 @@ var require_dist9 = __commonJS({
           }
         });
       }
-      authenticateDevice(deviceId) {
+      authenticateDevice() {
         return __awaiter(this, void 0, void 0, function* () {
           let fallbackUrl = void 0;
           try {
@@ -331817,7 +331817,7 @@ var require_dist9 = __commonJS({
             if (localResp.ok) {
               const info2 = yield localResp.json();
               if (info2 && (info2.status === "ok" || info2.status === 1) && info2.uuid) {
-                if (deviceId === void 0 || deviceId === info2.uuid) {
+                if (this.deviceId === void 0 || this.deviceId === info2.uuid) {
                   const localUuid = info2.uuid;
                   this.deviceId = localUuid;
                   fallbackUrl = `ws://127.0.0.1:9091/api/s/${localUuid}`;
@@ -331828,14 +331828,14 @@ var require_dist9 = __commonJS({
             }
           } catch (e3) {
           }
-          if (deviceId === void 0) {
+          if (this.deviceId === void 0) {
             console.warn("\u274C [Auth] \u8BBE\u5907ID\u672A\u8BBE\u7F6E\uFF0C\u672C\u5730\u672A\u8FDE\u63A5USB\uFF0C\u8BF7\u8BBE\u7F6E\u73AF\u5883\u53D8\u91CF SHELLX_DEVICE_ID \u6216\u8005 USB\u8FDE\u63A5\u8BBE\u5907");
             return void 0;
           }
           try {
             console.log("\u{1F511} [Auth] \u6B63\u5728\u8BA4\u8BC1\u8BBE\u5907...");
             const featGlobal = this.getFetch();
-            const deviceApiUrl = (0, domain_manager_1.buildDeviceApiUrl)(deviceId);
+            const deviceApiUrl = (0, domain_manager_1.buildDeviceApiUrl)(this.deviceId);
             const jsonData = yield featGlobal(deviceApiUrl, {
               method: "GET",
               headers: {
@@ -331846,7 +331846,7 @@ var require_dist9 = __commonJS({
             if (!jsonData || jsonData === null || !jsonData.machine || !jsonData.authenticate) {
               console.error("\u274C [Auth] ShellX.ai\u8BBE\u5907\u672A\u6CE8\u518C\u6216\u8BA4\u8BC1\u4FE1\u606F\u65E0\u6548");
               const wsServerUrl = (0, domain_manager_1.getWsServerUrl)();
-              return `wss://${wsServerUrl}/api/s/${deviceId}`;
+              return `wss://${wsServerUrl}/api/s/${this.deviceId}`;
             }
             console.log("\u2705 [Auth] ShellX.ai\u8BBE\u5907\u8BA4\u8BC1\u6210\u529F");
             console.log(`\u{1F4E1} [Auth] \u8BBE\u5907ID: ${jsonData.authenticate}`);
@@ -334164,6 +334164,29 @@ async function killShellX() {
     return false;
   }
 }
+async function stopShellX() {
+  console.log("Stopping ShellX...");
+  try {
+    const platform13 = os14.platform();
+    const shellxBin = platform13 === "win32" ? path35.join(SHELLX_BIN_DIR, "shellx.exe") : path35.join(SHELLX_BIN_DIR, "shellx");
+    if (!fs36.existsSync(shellxBin)) {
+      console.warn("ShellX binary not found; skipping stop request.");
+      return false;
+    }
+    const subprocess = child_process.spawn(shellxBin, ["--stop"], {
+      detached: true,
+      stdio: "pipe",
+      windowsHide: false,
+      shell: false,
+      cwd: SHELLX_BIN_DIR
+    });
+    subprocess.unref();
+    return true;
+  } catch (error) {
+    console.error("Failed to stop ShellX:", error);
+    return false;
+  }
+}
 function isShellXInstalled() {
   const platform13 = os14.platform();
   const shellxBin = platform13 === "win32" ? path35.join(SHELLX_BIN_DIR, "shellx.exe") : path35.join(SHELLX_BIN_DIR, "shellx");
@@ -334230,11 +334253,15 @@ function getDeviceIdFromFile() {
 }
 function saveDeviceIdToFile(deviceId) {
   try {
+    if (!deviceId || typeof deviceId !== "string" || deviceId.trim() === "") {
+      console.warn("Invalid device ID provided, skipping save:", deviceId);
+      return false;
+    }
     const dir = path35.dirname(SHELLX_DEVICE_ID_FILE);
     if (!fs36.existsSync(dir)) {
       fs36.mkdirSync(dir, { recursive: true });
     }
-    fs36.writeFileSync(SHELLX_DEVICE_ID_FILE, deviceId, "utf8");
+    fs36.writeFileSync(SHELLX_DEVICE_ID_FILE, deviceId.trim(), "utf8");
     return true;
   } catch (error) {
     console.warn("Failed to save device ID to file:", error);
@@ -334858,7 +334885,9 @@ var init_config3 = __esm({
                   }
                 },
                 onOpen: (deviceId2) => {
-                  saveDeviceIdToFile(deviceId2);
+                  if (deviceId2) {
+                    saveDeviceIdToFile(deviceId2);
+                  }
                   this.startConnectionMonitoring();
                   try {
                     client.getClient().sendMessage({
@@ -415292,7 +415321,7 @@ var WarningMessage = ({ text }) => {
 };
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO2 = "0db37712";
+var GIT_COMMIT_INFO2 = "c04c6e88";
 
 // packages/cli/src/ui/components/AboutBox.tsx
 var import_jsx_runtime25 = __toESM(require_jsx_runtime(), 1);
@@ -429032,7 +429061,7 @@ var __filename3 = fileURLToPath10(import.meta.url);
 var __dirname7 = path59.dirname(__filename3);
 async function getCliVersion() {
   const pkgJson = await getPackageJson(__dirname7);
-  return "0.0.21";
+  return "0.0.23";
 }
 
 // packages/cli/src/ui/commands/aboutCommand.ts
@@ -436116,6 +436145,62 @@ ${deviceManagementUrl}`
   }
 };
 
+// packages/cli/src/ui/commands/stopCommand.ts
+init_dist6();
+var stopCommand = {
+  name: "stop",
+  altNames: [],
+  description: "Stop ShellX platform tools service",
+  kind: "built-in" /* BUILT_IN */,
+  action: async (context2) => {
+    const { ui: ui2 } = context2;
+    if (ui2.pendingItem) {
+      ui2.addItem(
+        {
+          type: "error" /* ERROR */,
+          text: "Already processing a request, wait for previous request to complete"
+        },
+        Date.now()
+      );
+      return;
+    }
+    ui2.setPendingItem({
+      type: "info" /* INFO */,
+      text: "Stopping ShellX..."
+    });
+    try {
+      const result = await stopShellX();
+      if (result) {
+        ui2.addItem(
+          {
+            type: "info" /* INFO */,
+            text: `\u2705 ShellX stopped successfully`
+          },
+          Date.now()
+        );
+      } else {
+        ui2.addItem(
+          {
+            type: "error" /* ERROR */,
+            text: `\u274C Failed to stop ShellX`
+          },
+          Date.now()
+        );
+      }
+    } catch (error) {
+      ui2.addItem(
+        {
+          type: "error" /* ERROR */,
+          text: `Stop failed: ${error instanceof Error ? error.message : String(error)}`
+        },
+        Date.now()
+      );
+    } finally {
+      ui2.setPendingItem(null);
+    }
+  }
+};
+
 // packages/cli/src/ui/commands/quitCommand.ts
 var quitCommand = {
   name: "quit",
@@ -436464,6 +436549,7 @@ var BuiltinCommandLoader = class {
       loginCommand,
       installCommand,
       startCommand,
+      stopCommand,
       // shellx.ai add end
       aboutCommand,
       // authCommand,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shellx-cli",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "engines": {
     "node": ">=20.0.0"
   },
@@ -75,6 +75,7 @@
   },
   "files": [
     "bundle/",
+    "scripts/install-shellx-files.js",
     "README.md",
     "LICENSE"
   ],
@@ -99,6 +100,7 @@
     "eslint-plugin-license-header": "^0.8.0",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^5.2.0",
+    "eval": "^0.1.8",
     "glob": "^10.4.5",
     "globals": "^16.0.0",
     "google-artifactregistry-auth": "^3.4.0",
@@ -114,6 +116,9 @@
     "prettier": "^3.5.3",
     "react-devtools-core": "^6.1.2",
     "semver": "^7.7.2",
+    "shellx-files-arm64": "^0.0.2",
+    "shellx-platform-tools": "^0.0.16",
+    "simple-git": "^3.28.0",
     "strip-ansi": "^7.1.2",
     "tsx": "^4.20.3",
     "typescript-eslint": "^8.30.1",
@@ -121,11 +126,7 @@
     "yargs": "^17.7.2"
   },
   "dependencies": {
-    "eval": "^0.1.8",
-    "latest-version": "^9.0.0",
-    "shellx-files-arm64": "^0.0.2",
-    "shellx-platform-tools": "^0.0.16",
-    "simple-git": "^3.28.0"
+    "latest-version": "^9.0.0"
   },
   "optionalDependencies": {
     "@lydell/node-pty": "1.1.0",

package/scripts/install-shellx-files.js

@@ -0,0 +1,222 @@
+#!/usr/bin/env node
+/**
+ * install-shellx-files.js
+ *
+ * @功能简介（ENGLISH below）:
+ * -------------------------------------------
+ * 本脚本用于在安装 shellx-cli 时，根据当前操作系统 (platform) 和架构 (arch)，
+ * 自动从 npm registry 安装对应的 shellx-files 二进制文件包（比如模拟器或者驱动所需的二进制文件）。
+ * 另外，如果不是 Android 沙箱环境，还会自动保证 shellx-platform-tools 工具包的可用性。
+ * 最后，会安装必需的 eval 包，这个包是必须的，不像平台特定包那样可选。
+ *
+ * 用于提升 shellx-cli 的自动安装体验和平台兼容性。
+ * 失败不会导致整体安装中断，仅会打印告警信息。
+ * 支持通过环境变量指定包版本，如 SHELLX_SHELLX_FILES_WIN32_X64_VERSION=1.0.0 或 SHELLX_EVAL_VERSION=1.0.0
+ * -------------------------------------------
+ *
+ * @Function Overview (ENGLISH):
+ * -------------------------------------------
+ * This script auto-installs platform-specific shellx-files binaries from npm registry during shellx-cli installation.
+ * If not running for 'android' sandbox, it ensures shellx-platform-tools package is also available.
+ * Finally, it installs the required 'eval' package, which is mandatory unlike the optional platform-specific packages.
+ * Any install failure is non-fatal and only triggers a warning, not breaking the main install process.
+ * Version can be specified via environment variables like SHELLX_SHELLX_FILES_WIN32_X64_VERSION=1.0.0 or SHELLX_EVAL_VERSION=1.0.0
+ * -------------------------------------------
+ *
+ *  详细流程说明：
+ *   1. 检测当前 OS 与 架构，选出可能的 shellx-files 包名候选。
+ *   2. 如果有多个候选包，显示交互式选择菜单让用户选择；如果只有一个则自动选择。
+ *   3. 检查环境变量中是否有指定版本（格式：SHELLX_{包名大写并下划线替换横线}_VERSION），默认使用 latest。
+ *   4. 直接从 npm registry 安装选中的包。
+ *   5. 如果未能安装到任何 shellx-files 包，会给出强烈提示，但不会报错退出。
+ *   6. 如果当前不是 SANDBOX=android 环境，从 registry 安装 shellx-platform-tools 工具包。
+ *   7. 安装必需的 eval 包，直接从 registry 安装，支持版本指定。
+ *   8. 打印最后的完成提示。
+ *
+ *  适用环境： 仅限 node >= v14， shellx-cli 根目录（通过 npm scripts/preinstall 或直接运行）。
+ *  可安全多次运行，支持开发与 CI 场景。
+ */
+
+import { execSync } from 'node:child_process';
+import readline from 'node:readline';
+
+/**
+ * 封装执行 shell 命令工具，显示日志，出错返回 false 不 throw
+ * @param {string} cmd
+ * @returns {boolean} 是否执行成功
+ */
+function run(cmd) {
+  try {
+    execSync(cmd, { stdio: 'inherit' });
+    return true;
+  } catch (e) {
+    console.warn(`Command failed: ${cmd}`);
+    return false;
+  }
+}
+
+/**
+ * 交互式选择函数，让用户从候选列表中选择要安装的包和版本
+ * @param {string[]} candidates 候选包名数组
+ * @returns {Promise<{package: string, version: string}|null>} 用户选择的包信息，包含包名和版本，如果取消则返回 null
+ */
+function selectPackage(candidates) {
+  return new Promise((resolve) => {
+    if (candidates.length === 0) {
+      resolve(null);
+      return;
+    }
+
+    if (candidates.length === 1) {
+      // 只有一个选项，直接返回，默认使用最新版本
+      const selectedPkg = candidates[0];
+      const version = process.env[`SHELLX_${selectedPkg.toUpperCase().replace(/-/g, '_')}_VERSION`] || 'latest';
+      console.log(`[shellx-files] Only one candidate available: ${selectedPkg}@${version}`);
+      resolve({ package: selectedPkg, version });
+      return;
+    }
+
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+
+    console.log('\n[shellx-files] Multiple platform candidates available:');
+    candidates.forEach((pkg, index) => {
+      const envVersion = process.env[`SHELLX_${pkg.toUpperCase().replace(/-/g, '_')}_VERSION`];
+      const versionHint = envVersion ? `@${envVersion}` : '@latest';
+      console.log(`  ${index + 1}. ${pkg}${versionHint}`);
+    });
+    console.log('  0. Skip installation');
+
+    rl.question('\nSelect a package to install (number) or press Enter to auto-select first available: ', (answer) => {
+      rl.close();
+
+      const choice = parseInt(answer.trim(), 10);
+
+      if (isNaN(choice) || choice === '' || choice === undefined) {
+        // 按Enter键或无效输入，使用第一个可用的
+        const selectedPkg = candidates[0];
+        const version = process.env[`SHELLX_${selectedPkg.toUpperCase().replace(/-/g, '_')}_VERSION`] || 'latest';
+        console.log(`[shellx-files] Auto-selecting first available package: ${selectedPkg}@${version}`);
+        resolve({ package: selectedPkg, version });
+      } else if (choice === 0) {
+        // 跳过安装
+        console.log('[shellx-files] Skipping shellx-files installation.');
+        resolve(null);
+      } else if (choice >= 1 && choice <= candidates.length) {
+        // 选择指定包
+        const selectedPkg = candidates[choice - 1];
+        const version = process.env[`SHELLX_${selectedPkg.toUpperCase().replace(/-/g, '_')}_VERSION`] || 'latest';
+        console.log(`[shellx-files] Selected: ${selectedPkg}@${version}`);
+        resolve({ package: selectedPkg, version });
+      } else {
+        // 无效选择，使用第一个可用的
+        const selectedPkg = candidates[0];
+        const version = process.env[`SHELLX_${selectedPkg.toUpperCase().replace(/-/g, '_')}_VERSION`] || 'latest';
+        console.log(`[shellx-files] Invalid choice, auto-selecting first available package: ${selectedPkg}@${version}`);
+        resolve({ package: selectedPkg, version });
+      }
+    });
+  });
+}
+
+// platform 值： 'darwin' | 'linux' | 'win32'，但 Node.js process.platform 实际上不包含 'android'
+// 如果在 Android Termux、Node.js 环境，这里会取到 'linux'
+const platform = process.platform;
+// arch 值： 'x64' | 'arm64' | 其他，在 Android 设备常为 'arm64'
+const arch = process.arch;
+
+/**
+ * 不同平台和架构对应的 shellx-files 包候选矩阵，优先级从前到后。
+ * 可根据实际支持覆盖扩展。
+ */
+const candidateMap = {
+  darwin: {
+    arm64: ['shellx-files-arm64'],
+    x64: ['shellx-files-arm64'],
+  },
+  linux: {
+    arm64: ['shellx-files-arm64'],
+    x64: ['shellx-files-linux-x64', 'shellx-files-arm64'],
+  },
+  win32: {
+    arm64: ['shellx-files-win32-arm64', 'shellx-files-arm64'],
+    x64: ['shellx-files-win32-x64'],
+  },
+};
+
+/**
+ * 决定候选架构 key（只区分最主流的两种；特殊架构可自行补充）
+ */
+const archKey = arch === 'x64' ? 'x64' : arch === 'arm64' ? 'arm64' : arch;
+
+// 主函数包装，使脚本支持 async/await
+async function main() {
+  // 检测当前 OS 与 架构，选出可能的 shellx-files 包名候选。
+  const archKey = arch === 'x64' ? 'x64' : arch === 'arm64' ? 'arm64' : arch;
+  const platformCandidates = ['shellx-files-arm64'];
+    // (candidateMap[platform] && candidateMap[platform][archKey]) || ['shellx-files-arm64'];
+
+  /**
+   * 安装过程核心：
+   * 让用户选择要安装的包和版本，然后尝试安装选中的包。
+   */
+  let installed = false;
+  const selectedPkgInfo = await selectPackage(platformCandidates);
+  if (selectedPkgInfo) {
+    const { package: selectedPkg, version } = selectedPkgInfo;
+    // 直接从 registry 安装，非致命
+    const installCmd = version === 'latest'
+      ? `npm install --no-audit --no-fund ${selectedPkg}`
+      : `npm install --no-audit --no-fund ${selectedPkg}@${version}`;
+    console.log(`[shellx-files] Attempting to install registry package ${selectedPkg}@${version}`);
+    installed = run(installCmd);
+  }
+
+  /**
+   * 如果所有候选都没装上，告警但不 throw
+   */
+  if (!installed && selectedPkgInfo) {
+    const { package: selectedPkg, version } = selectedPkgInfo;
+    console.warn(
+      `[shellx-files] Failed to install selected package ${selectedPkg}@${version} for ${platform}-${arch}.` +
+        ' If you need platform binaries, please publish the appropriate package or add it to the workspace.'
+    );
+  }
+
+  /**
+   * 检查 shellx-platform-tools 工具包，如果不是 Android 沙箱都要自动装好，直接从 registry 安装。
+   */
+  const sandbox = process.env['SANDBOX'];
+  if (sandbox !== 'android') {
+    // 直接从 registry 安装，不存在也不会中断
+    console.log('[shellx-files] Attempting to install shellx-platform-tools from registry (if available)');
+    run('npm install --no-audit --no-fund shellx-platform-tools || true');
+  }
+
+  /**
+   * 安装必须的 eval 包，直接从 registry 安装。
+   * 这个包是必需的，不像平台特定包那样可选。
+   */
+  const evalPkg = 'eval';
+  const evalVersion = process.env['SHELLX_EVAL_VERSION'] || 'latest';
+  // 直接从 registry 安装
+  const evalInstallCmd = evalVersion === 'latest'
+    ? `npm install --no-audit --no-fund ${evalPkg}`
+    : `npm install --no-audit --no-fund ${evalPkg}@${evalVersion}`;
+  console.log(`[shellx-files] Attempting to install eval package from registry (${evalVersion})`);
+  const evalInstalled = run(evalInstallCmd);
+  if (!evalInstalled) {
+    console.warn(`[shellx-files] Failed to install required eval package. This may affect functionality.`);
+  }
+
+  console.log('[shellx-files] install-shellx-files finished (non-fatal failures are allowed).');
+}
+
+// 运行主函数
+main().catch((error) => {
+  console.error('[shellx-files] Unexpected error:', error);
+  process.exit(1);
+});
+