shellx-cli 0.0.20 → 0.0.22

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 = "d2e9fbc9";
+    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.20";
+    const version3 = "0.0.22";
     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.20",
+      ideVersion: "0.0.22",
       platform: getPlatform(),
       updateChannel: await getReleaseChannel(__dirname3)
     }))();
@@ -319583,7 +319583,7 @@ var require_domain_manager = __commonJS({
       return config.protocol + domain;
     }
     function getWsServerUrl(config = DEFAULT_DOMAIN_CONFIG) {
-      return isChineseUser() ? config.china : config.international;
+      return config.international;
     }
     function buildDeviceApiUrl(deviceId, config = DEFAULT_DOMAIN_CONFIG) {
       return `${getApiBaseUrl(config)}/api/device/${deviceId}`;
@@ -331687,8 +331687,32 @@ var require_dist9 = __commonJS({
       onReconnectFailed: () => {
       }
     };
+    function extractUUIDFromUrl(url2) {
+      try {
+        const uuidMatch = url2.match(/\/(?:api\/[ts]\/)([a-f0-9\-]{36})(?:\?|\/|$)/);
+        if (uuidMatch && uuidMatch[1]) {
+          console.log(`[ShellX] Extracted UUID from WebSocket URL: ${uuidMatch[1]}, url: ${url2}`);
+          return uuidMatch[1];
+        }
+        console.log(`[ShellX] Could not extract UUID from WebSocket URL: ${url2}`);
+        return null;
+      } catch (error) {
+        console.error(`[ShellX] Error extracting UUID from URL: ${error.message}, url: ${url2}`);
+        return null;
+      }
+    }
+    function addSessionIdToUrl(url2) {
+      const uuid = extractUUIDFromUrl(url2);
+      if (!uuid) {
+        console.log(`[ShellX] No UUID found in URL, returning original URL: ${url2}`);
+        return url2;
+      }
+      const separator = url2.includes("?") ? "&" : "?";
+      const urlWithSessionId = `${url2}${separator}session_id=${uuid}`;
+      console.log(`[ShellX] Added session_id to WebSocket URL: ${urlWithSessionId}, session_id: ${uuid}`);
+      return urlWithSessionId;
+    }
     var cbor_1 = require_cbor();
-    var authKey = (0, utils_1.getEnvVar)("SHELLX_AUTH_KEY");
     function getWebSocket() {
       return __awaiter(this, void 0, void 0, function* () {
         if (typeof globalThis.WebSocket !== "undefined") {
@@ -331727,23 +331751,35 @@ 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();
               return;
             }
+            const wsUrlWithSessionId = addSessionIdToUrl(this.wsUrl);
             console.log("Initializing ShellX client wsUrl:" + this.wsUrl + " deviceId: " + this.deviceId);
+            console.log("WebSocket URL with session_id: " + wsUrlWithSessionId);
             const WebSocketConstructor = yield getWebSocket();
-            this.ws = new WebSocketConstructor(this.wsUrl);
+            this.ws = new WebSocketConstructor(wsUrlWithSessionId);
             if (this.ws.binaryType !== void 0) {
               this.ws.binaryType = "arraybuffer";
             }
             this.ws.onopen = () => {
-              console.log("\u{1F517} [ShellX] WebSocket\u8FDE\u63A5\u5DF2\u5EFA\u7ACB\uFF0C\u53D1\u9001\u8BA4\u8BC1\u6D88\u606F..." + this.wsUrl);
+              var _a6, _b3;
+              console.log("\u{1F517} [ShellX] WebSocket\u8FDE\u63A5\u5DF2\u5EFA\u7ACB:" + this.wsUrl);
               this.wsConnected = true;
               this.reconnectAttempts = 0;
-              this.sendAuthenticationMessage();
+              this.shellxConnected = true;
+              (_b3 = (_a6 = this.config).onOpen) === null || _b3 === void 0 ? void 0 : _b3.call(_a6, this.deviceId);
+              this.flushQueue();
+              this.startPing();
+              const isAndroidSandbox = process.env["SANDBOX"] === "android";
+              if (isAndroidSandbox) {
+                this.getScreenInfo();
+              } else {
+                this.getAndWakeScreen();
+              }
             };
             this.ws.onmessage = (event) => {
               this.handleMessage(event);
@@ -331769,7 +331805,7 @@ var require_dist9 = __commonJS({
           }
         });
       }
-      authenticateDevice(deviceId) {
+      authenticateDevice() {
         return __awaiter(this, void 0, void 0, function* () {
           let fallbackUrl = void 0;
           try {
@@ -331781,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}`;
@@ -331792,19 +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;
           }
-          authKey = (0, utils_1.getEnvVar)("SHELLX_AUTH_KEY");
-          if (!authKey) {
-            authKey = (0, uuid_1.v4)();
-            console.log("\u2705 [Auth] SHELLX_AUTH_KEY \u73AF\u5883\u53D8\u91CF\u672A\u8BBE\u7F6E, \u751F\u6210\u65B0\u7684authKey: " + authKey);
-          }
           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: {
@@ -331815,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}`);
@@ -331865,29 +331896,6 @@ var require_dist9 = __commonJS({
           }
         });
       }
-      /**
-       * 发送认证消息
-       */
-      sendAuthenticationMessage() {
-        return __awaiter(this, void 0, void 0, function* () {
-          try {
-            authKey = (0, utils_1.getEnvVar)("SHELLX_AUTH_KEY");
-            if (!authKey) {
-              authKey = (0, uuid_1.v4)();
-              console.log("\u2705 [Auth] SHELLX_AUTH_KEY \u73AF\u5883\u53D8\u91CF\u672A\u8BBE\u7F6E, \u751F\u6210\u65B0\u7684authKey: " + authKey);
-            }
-            const authMessage = { authenticate: authKey };
-            console.log("\u{1F4E4} [Auth] \u53D1\u9001\u8BA4\u8BC1\u6D88\u606F:", { authenticate: authKey });
-            if (this.ws && this.wsConnected) {
-              this.ws.send((0, cbor_1.encode)(authMessage));
-            } else {
-              console.error("\u274C [Auth] ShellX \u672A\u8FDE\u63A5\uFF0C\u65E0\u6CD5\u53D1\u9001\u8BA4\u8BC1\u6D88\u606F");
-            }
-          } catch (error) {
-            console.error("\u274C [Auth] \u53D1\u9001\u8BA4\u8BC1\u6D88\u606F\u5931\u8D25:", error);
-          }
-        });
-      }
       handleMessage(event) {
         let serverMessage;
         try {
@@ -331920,22 +331928,8 @@ var require_dist9 = __commonJS({
         }
       }
       processServerMessage(message) {
-        var _a5, _b2, _c2, _d;
-        this.authenticated = true;
-        if (this.authenticated && !this.shellxConnected) {
-          this.shellxConnected = true;
-          console.log("\u2705 [ShellX] ShellX.ai\u670D\u52A1\u8FDE\u63A5\u6210\u529F\uFF01");
-          (_b2 = (_a5 = this.config).onOpen) === null || _b2 === void 0 ? void 0 : _b2.call(_a5);
-          this.flushQueue();
-          this.startPing();
-          const isAndroidSandbox = process.env["SANDBOX"] === "android";
-          if (isAndroidSandbox) {
-            this.getScreenInfo();
-          } else {
-            this.getAndWakeScreen();
-          }
-        }
-        (_d = (_c2 = this.config).onMessage) === null || _d === void 0 ? void 0 : _d.call(_c2, message);
+        var _a5, _b2;
+        (_b2 = (_a5 = this.config).onMessage) === null || _b2 === void 0 ? void 0 : _b2.call(_a5, message);
         if (message.jsonData) {
           this.handleJsonDataResponse(message.jsonData);
         }
@@ -334170,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");
@@ -334223,7 +334240,35 @@ async function isShellXUpdate() {
   const localVersion = getLocalBinaryVersion();
   return !localVersion || localVersion !== targetVersion;
 }
-var import_extract_zip, shellxFilesArm64Path, SUPPORTED_PLATFORMS, SHELLX_INSTALL_DIR, SHELLX_BIN_DIR, SHELLX_APK_FILE, SHELLX_APK_SIGN_FILE, SHELLX_PLATFORM_TOOLS_PACKAGE, SHELLX_BINARY_VERSION_FILE;
+function getDeviceIdFromFile() {
+  try {
+    if (fs36.existsSync(SHELLX_DEVICE_ID_FILE)) {
+      const deviceId = fs36.readFileSync(SHELLX_DEVICE_ID_FILE, "utf8").trim();
+      return deviceId || null;
+    }
+  } catch (error) {
+    console.warn("Failed to read device ID from file:", error);
+  }
+  return null;
+}
+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.trim(), "utf8");
+    return true;
+  } catch (error) {
+    console.warn("Failed to save device ID to file:", error);
+    return false;
+  }
+}
+var import_extract_zip, shellxFilesArm64Path, SUPPORTED_PLATFORMS, SHELLX_INSTALL_DIR, SHELLX_BIN_DIR, SHELLX_APK_FILE, SHELLX_APK_SIGN_FILE, SHELLX_PLATFORM_TOOLS_PACKAGE, SHELLX_BINARY_VERSION_FILE, SHELLX_DEVICE_ID_FILE;
 var init_shellx_manager = __esm({
   "packages/core/dist/src/shellx/shellx-manager.js"() {
     "use strict";
@@ -334248,6 +334293,7 @@ var init_shellx_manager = __esm({
     SHELLX_APK_SIGN_FILE = path35.join(SHELLX_BIN_DIR, "shellx.apk.sha256");
     SHELLX_PLATFORM_TOOLS_PACKAGE = "shellx-platform-tools";
     SHELLX_BINARY_VERSION_FILE = path35.join(SHELLX_INSTALL_DIR, "binary-version.txt");
+    SHELLX_DEVICE_ID_FILE = path35.join(SHELLX_INSTALL_DIR, "device-id.txt");
   }
 });
 
@@ -334807,7 +334853,10 @@ var init_config3 = __esm({
           console.log("ShellX is already connected, skipping reconnection.");
           return;
         }
-        const deviceId = process24.env["SHELLX_DEVICE_ID"];
+        let deviceId = process24.env["SHELLX_DEVICE_ID"];
+        if (!deviceId) {
+          deviceId = getDeviceIdFromFile() || void 0;
+        }
         try {
           if (retryCount === 0) {
             console.log("\u{1F50C} Connecting to ShellX...");
@@ -334835,7 +334884,10 @@ var init_config3 = __esm({
                     resolve23(client);
                   }
                 },
-                onOpen: () => {
+                onOpen: (deviceId2) => {
+                  if (deviceId2) {
+                    saveDeviceIdToFile(deviceId2);
+                  }
                   this.startConnectionMonitoring();
                   try {
                     client.getClient().sendMessage({
@@ -415269,7 +415321,7 @@ var WarningMessage = ({ text }) => {
 };
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO2 = "d2e9fbc9";
+var GIT_COMMIT_INFO2 = "c04c6e88";
 
 // packages/cli/src/ui/components/AboutBox.tsx
 var import_jsx_runtime25 = __toESM(require_jsx_runtime(), 1);
@@ -429009,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.20";
+  return "0.0.22";
 }
 
 // packages/cli/src/ui/commands/aboutCommand.ts
@@ -433359,7 +433411,7 @@ var checkCwdSync = (dir) => {
     }
   }
 };
-var mkdirSync5 = (dir, opt) => {
+var mkdirSync6 = (dir, opt) => {
   dir = normalizeWindowsPath(dir);
   const umask = opt.umask ?? 18;
   const mode = opt.mode | 448;
@@ -434209,7 +434261,7 @@ var UnpackSync = class extends Unpack {
   }
   [MKDIR](dir, mode) {
     try {
-      return mkdirSync5(normalizeWindowsPath(dir), {
+      return mkdirSync6(normalizeWindowsPath(dir), {
         uid: this.uid,
         gid: this.gid,
         processUid: this.processUid,
@@ -436093,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",
@@ -436441,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.20",
+  "version": "0.0.22",
   "engines": {
     "node": ">=20.0.0"
   },
@@ -16,6 +16,7 @@
     "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.15.0-nightly.20251107.b8eeb553"
   },
   "scripts": {
+    "postinstall": "node scripts/install-shellx-files.js",
     "start": "cross-env NODE_ENV=development node scripts/start.js",
     "start:a2a-server": "CODER_AGENT_PORT=41242 npm run start --workspace @google/gemini-cli-a2a-server",
     "debug": "cross-env DEBUG=1 node --inspect-brk scripts/start.js",
@@ -98,6 +99,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",
@@ -113,6 +115,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",
@@ -120,10 +125,7 @@
     "yargs": "^17.7.2"
   },
   "dependencies": {
-    "eval": "^0.1.8",
-    "latest-version": "^9.0.0",
-    "shellx-files-arm64": "^0.0.2",
-    "simple-git": "^3.28.0"
+    "latest-version": "^9.0.0"
   },
   "optionalDependencies": {
     "@lydell/node-pty": "1.1.0",