cicy-desktop 2.1.67 → 2.1.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.67",
+  "version": "2.1.69",
   "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/cicy-code.js

@@ -42,13 +42,27 @@ let child = null;
 // network, zero npx), upgrades come through runtime.upgrade(). Returns the
 // spawn child or null when the store has no usable binary (legacy fallbacks
 // below take over).
-function startFromRuntime({ logPath, port }) {
+async function startFromRuntime({ logPath, port }) {
   let runtime;
   try { runtime = require("./runtime"); } catch { return null; }
   let exe = null;
   try { exe = runtime.binPath("cicy-code") || runtime.ensureFromBundle("cicy-code"); } catch (e) {
     console.warn(`[cicy-code-sidecar] runtime store unusable: ${e.message}`);
-    return null;
+  }
+  // Bundle absent or empty (npm optionalDependencies are best-effort — a flaky
+  // mirror/network can leave the dep recorded but unpopulated). Don't strand
+  // the user: pull the pinned/latest version from npm into the runtime store.
+  // This is the network fallback to the zero-network bundle seed.
+  if (!exe) {
+    try {
+      const { latest } = await runtime.checkUpdate("cicy-code");
+      if (latest) {
+        console.log(`[cicy-code-sidecar] bundle missing — npm-pulling cicy-code@${latest} into runtime store`);
+        await runtime.fetchVersion("cicy-code", latest);
+        runtime.switchCurrent("cicy-code", latest);
+        exe = runtime.binPath("cicy-code");
+      }
+    } catch (e) { console.warn(`[cicy-code-sidecar] runtime npm-pull failed: ${e.message}`); }
   }
   if (!exe) return null;
 
@@ -87,7 +101,7 @@ async function start({ logPath, port = DEFAULT_PORT, force = false, version = nu
   }
 
   // Runtime store first — uniform across platforms.
-  const rt = startFromRuntime({ logPath, port });
+  const rt = await startFromRuntime({ logPath, port });
   if (rt) { child = rt; return child; }
 
   if (process.platform === "win32") {
@@ -275,7 +289,7 @@ async function update({ logPath, port = DEFAULT_PORT, emit } = {}) {
         emit,
         stop: () => stop({ port }),
         start: async () => {
-          child = startFromRuntime({ logPath, port });
+          child = await startFromRuntime({ logPath, port });
           if (!child) throw new Error("runtime spawn failed");
         },
         verify: async () => {

package/src/sidecar/runtime.js

@@ -105,9 +105,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`); }