cicy-desktop 2.1.137 → 2.1.139

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.137",
+  "version": "2.1.139",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {

package/src/sidecar/wsl-docker.js

@@ -119,12 +119,26 @@ async function distroInstalled(distro = DISTRO) {
 // Raw `wsl --import` of the rootfs as an ISOLATED v2 distro.
 function importTarball(dest, installDir) {
   return new Promise((resolve, reject) => {
+    // 240s, NOT 600s: a 444MB import finishes in well under 4min on a healthy WSL.
+    // If it runs longer it has WEDGED (the whole WSL subsystem hangs — every later
+    // `wsl` call then blocks and the app goes 未响应). Bound it short so we FAIL FAST
+    // and the caller can `wsl --shutdown` + retry instead of hanging 10 minutes.
     execFile("wsl", ["--import", DISTRO, installDir, dest, "--version", "2"],
-      { timeout: 600000, windowsHide: true },
+      { timeout: 240000, windowsHide: true },
       (err, _so, se) => { if (err) { err.stderr = String(se || ""); return reject(err); } resolve(); });
   });
 }
 
+// `wsl --shutdown`: hard-reset the ENTIRE WSL VM. This is the only reliable cure
+// when WSL wedges (a hung `wsl --import` leaves every subsequent `wsl` call
+// blocking → the app freezes). Unlike `wsl --list/-d` it doesn't query the wedged
+// VM, so it returns even when WSL is stuck. Use it as recovery between retries.
+function wslShutdown() {
+  return new Promise((resolve) => {
+    execFile("wsl", ["--shutdown"], { timeout: 30000, windowsHide: true }, () => resolve());
+  });
+}
+
 // `wsl --terminate <distro>`: stop the distro so the NEXT `wsl -d` cold-boots it
 // clean. This is the fix for the「引擎没起来」-on-fresh-install failure: a distro
 // straight out of `wsl --import` is frequently half-initialized / unresponsive,
@@ -157,10 +171,17 @@ async function installDistro({ emit } = {}) {
   try {
     await importTarball(dest, installDir);
   } catch (e) {
-    // Most likely the shared WSL2 kernel component is missing — install it
-    // (idempotent) and retry once.
-    emit && emit({ phase: "container", status: "running", message: "需要 WSL2 内核,正在安装后重试…" });
-    await ensureWslKernel({ emit });
+    // Import failed or WEDGED (our 4-min timeout fired). Recover hard, then retry once:
+    //   1) `wsl --shutdown` — clears a wedged WSL VM (the real cause of the 8-min hang
+    //      + app freeze). Without this the retry hits the same stuck VM and hangs again.
+    //   2) ensure the WSL2 kernel (import also fails when it's missing).
+    //   3) unregister any half-registered distro a wedged import left behind, so the
+    //      retry imports clean.
+    log.warn(`[installDistro] import failed/wedged (${e.message}) → wsl --shutdown + retry`);
+    emit && emit({ phase: "container", status: "running", message: "导入卡住,重置 WSL(--shutdown)后重试…" });
+    try { await wslShutdown(); } catch {}
+    try { await ensureWslKernel({ emit }); } catch {}
+    try { await new Promise((r) => execFile("wsl", ["--unregister", DISTRO], { timeout: 30000, windowsHide: true }, () => r())); } catch {}
     await importTarball(dest, installDir);
   }
   // 3) Force a clean cold boot. A freshly-imported distro is often wedged, so the
@@ -349,7 +370,12 @@ async function runContainer({ port = 8009, container = "cicy-code-docker", volum
     .filter(([, v]) => v != null && v !== "")
     .map(([k, v]) => `-e ${k}='${String(v).replace(/'/g, "'\\''")}'`)
     .join(" ");
-  const cmd = `docker run -d --name ${container} --restart unless-stopped -p 127.0.0.1:${port}:8008 -e CICY_PUBLIC=1 -v ${volume}:/home/cicy ${shareMountArg()} ${envArgs} ${IMAGE}`;
+  // --dns: WSL2's auto resolv.conf points the distro at the host NAT gateway
+  // (172.x.x.1), which docker's default DNS forwarding does NOT reach from inside a
+  // bridge container → every lookup is EAI_AGAIN and cicy-code's startup `npm i`
+  // crash-loops the container (:8009 never comes up). Pin public resolvers: Aliyun
+  // 223.5.5.5 (CN-fast) first, Google 8.8.8.8 as the overseas fallback.
+  const cmd = `docker run -d --name ${container} --restart unless-stopped --dns 223.5.5.5 --dns 8.8.8.8 -p 127.0.0.1:${port}:8008 -e CICY_PUBLIC=1 -v ${volume}:/home/cicy ${shareMountArg()} ${envArgs} ${IMAGE}`;
   await wslRun(cmd, { timeout: 60000 });
   ensureDesktopShortcut(volume, port).catch(() => {});
   return { started: true };