cicy-desktop 2.1.68 → 2.1.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.68",
+  "version": "2.1.70",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -143,7 +143,8 @@
     "cicy-mihomo-linux-x64": "1.10.4",
     "cicy-mihomo-linux-arm64": "1.10.4",
     "cicy-mihomo-windows-x64": "1.10.4",
-    "cicy-mihomo-windows-arm64": "1.10.4"
+    "cicy-mihomo-windows-arm64": "1.10.4",
+    "cicy-msys2-windows-x64": "1.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.29.0",
@@ -154,4 +155,4 @@
     "prettier": "^3.8.1",
     "supertest": "^6.3.3"
   }
-}
+}

package/src/sidecar/native.js

@@ -28,7 +28,7 @@ const docker = require("./docker"); // ensureDownloaded/withRetry/waitUntil/prob
 // dev/联调 only — read LAZILY (not at require time) so tests/tools can set the
 // env var after loading the module.
 const devExeUrl = () => process.env.CICY_CODE_EXE_URL || "";
-const EXE_PKG  = process.env.CICY_CODE_EXE_PKG || "cicy-code-win32-x64";
+const EXE_PKG  = process.env.CICY_CODE_EXE_PKG || "cicy-code-windows-x64"; // npm spam filter 403s 'win32' names
 const REGISTRY = process.env.CICY_NPM_REGISTRY || "https://registry.npmmirror.com";
 const BIN_DIR  = path.join(os.homedir(), "cicy-ai", "bin");
 // npm prefix dir owned by the sidecar (isolated from the user's global npm).

package/src/sidecar/runtime.js

@@ -30,8 +30,13 @@ const VERSIONS_JSON = path.join(RUNTIME_DIR, "versions.json");
 const REGISTRY = process.env.CICY_NPM_REGISTRY || "https://registry.npmmirror.com";
 const IS_WIN = process.platform === "win32";
 
+// npm subpackage platform suffix. NOTE: Windows is "windows" not "win32" —
+// npm's spam filter 403s NEW package names containing 'win32', so EVERY cicy
+// subpackage (code/mihomo/msys2) is published as *-windows-*. This must match
+// the published names exactly or both the bundled-dir lookup AND the npm-pull
+// fallback fail (a 404 that stranded first start on Windows).
 function plat() {
-  const osStr = IS_WIN ? "win32" : process.platform === "darwin" ? "darwin" : "linux";
+  const osStr = IS_WIN ? "windows" : process.platform === "darwin" ? "darwin" : "linux";
   const archStr = process.arch === "arm64" ? "arm64" : "x64";
   return `${osStr}-${archStr}`;
 }
@@ -46,8 +51,7 @@ const COMPONENTS = {
   },
   "mihomo": {
     kind: "bin",
-    // npm spam filter 403s new names containing 'win32' → windows-* naming
-    pkg: () => `cicy-mihomo-${plat().replace("win32", "windows")}`,
+    pkg: () => `cicy-mihomo-${plat()}`,
     bin: () => (IS_WIN ? "mihomo.exe" : "mihomo"),
   },
   "msys2": {
@@ -105,9 +109,17 @@ function installPayload(comp, ver, payloadDir) {
   fs.rmSync(staging, { recursive: true, force: true });
   fs.mkdirSync(staging, { recursive: true });
   if (c.kind === "dir") {
-    cpDirSync(payloadDir, staging);
+    // The 118MB+ MSYS2 tree ships as a single .tar.gz inside the npm package
+    // (npm handles one big file far better than 10k tiny ones). Extract it;
+    // otherwise the payload is already an unpacked tree → copy.
+    const tgz = (() => { try { return fs.readdirSync(payloadDir).find((f) => /\.tar\.gz$/i.test(f)); } catch { return null; } })();
+    if (tgz) {
+      require("child_process").execFileSync("tar", ["-xzf", path.join(payloadDir, tgz), "-C", staging], { windowsHide: true });
+    } else {
+      cpDirSync(payloadDir, staging);
+    }
     if (!fs.existsSync(path.join(staging, c.check))) {
-      // the tree may be nested one level (package/msys64/usr/...)
+      // the tree may be nested one level (package/msys64/usr/... or root/usr/...)
       const sub = fs.readdirSync(staging).find((d) =>
         fs.existsSync(path.join(staging, d, c.check)));
       if (!sub) { fs.rmSync(staging, { recursive: true, force: true }); throw new Error(`${comp}: ${c.check} missing in package`); }