cicy-desktop 2.1.305 → 2.1.307

package/.gitattributes

@@ -0,0 +1,4 @@
+*.js text eol=lf
+*.json text eol=lf
+*.sh text eol=lf
+*.yml text eol=lf

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.305",
+  "version": "2.1.307",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -144,10 +144,10 @@
   "//optionalDependencies": "(2026-06 回调): mac/linux 改回 native cicy-code(:8008,colima 在 16G mac 上压垮内存)→ 重新内置 cicy-code-<plat> / cicy-mihomo-<plat>,localbin.fromBundle 零网络 seed(npm 仅作更新通道,带 npmmirror→npmjs 回退)。这些由 scripts/sync-runtime-deps.cjs 在 tag-push 时同步到最新版。npm 的 os/cpu 字段保证每个平台只装自己那份。Windows 仍走 docker(WSL :8009),它那份 cicy-code-windows 用不到但 bundle 着无害。",
   "optionalDependencies": {
     "electron": "41.0.3",
-    "cicy-code-darwin-x64": "2.3.575",
-    "cicy-code-darwin-arm64": "2.3.575",
-    "cicy-code-linux-x64": "2.3.575",
-    "cicy-code-linux-arm64": "2.3.575",
+    "cicy-code-darwin-x64": "2.3.578",
+    "cicy-code-darwin-arm64": "2.3.578",
+    "cicy-code-linux-x64": "2.3.578",
+    "cicy-code-linux-arm64": "2.3.578",
     "cicy-code-windows-x64": "2.3.193",
     "cicy-mihomo-darwin-x64": "1.10.4",
     "cicy-mihomo-darwin-arm64": "1.10.4",

package/src/sidecar/wsl-docker.js

@@ -90,12 +90,24 @@ async function ensureWslKernel({ emit } = {}) {
 // Run a bash command as root inside the distro. execFile (no host shell) → the
 // command string is passed verbatim to `bash -lc`, so only bash-level quoting
 // matters inside `cmd`.
+// wsl.exe 连不上发行版的 VM(注册了、显示 Running,但 init 不可达):任何 `wsl -d` 立刻以
+// 4294967295(-1)退出,stdout 是 UTF-16 的 Windows 套接字错误「由于连接方在一段时间后没有正确答复
+// …连接尝试失败」。实测 `wsl --shutdown` 后恢复。据此标记,bootstrap 遇到就重置一次再重试。
+function isWslVmUnreachable(err) {
+  if (!err) return false;
+  const code = err.code === 4294967295 || err.code === -1 || err.code === 0xffffffff;
+  let text = "";
+  try { const raw = err.stdout || ""; text = Buffer.isBuffer(raw) ? raw.toString("utf16le") : String(raw); } catch {}
+  try { text += Buffer.from(String(err.stdout || ""), "binary").toString("utf16le"); } catch {}
+  const msg = /连接尝试失败|connection attempt failed|没有正确答复|did not properly respond|0x80072746|0x8007274c/i.test(text + " " + (err.message || ""));
+  return code && msg || (code && /^Command failed: [^\n]*wsl[^\n]*\n?\s*$/.test(err.message || "") && !err.stderr);
+}
 function wslRun(cmd, { timeout = 60000, distro = DISTRO } = {}) {
   return new Promise((resolve, reject) => {
     execFile(docker.wslExe(), ["-d", distro, "-u", "root", "--", "bash", "-lc", cmd],
       { timeout, windowsHide: true, maxBuffer: 1 << 26 },
       (err, stdout, stderr) => {
-        if (err) { err.stdout = String(stdout || ""); err.stderr = String(stderr || ""); return reject(err); }
+        if (err) { err.stdout = String(stdout || ""); err.stderr = String(stderr || ""); err.wslVmUnreachable = isWslVmUnreachable(err); return reject(err); }
         resolve({ stdout: String(stdout), stderr: String(stderr) });
       });
   });
@@ -1297,7 +1309,16 @@ async function _bootstrap({ onProgress, port = 8008, container = "cicy-code-dock
   // 3) Docker Engine inside Ubuntu
   begin("install-docker-engine");
   if (!(await dockerInstalled())) {
-    try { await installDockerEngine({ emit }); } catch (e) { fail("docker_install_failed", e.message); emit({ phase: "install-docker", status: "error", message: `Docker 安装失败：${e.message}（点重试）${errTail(e)}` }); finish(false, "docker_install_failed"); return { ok: false, reason: "docker_install_failed" }; }
+    try { await installDockerEngine({ emit }); } catch (e) {
+      if (e && e.wslVmUnreachable) {
+        // VM 半死:wsl.exe 连不上 init。重置 WSL(terminate + shutdown)后由下一轮自动重试。
+        fail("wsl_vm_unreachable", e.message);
+        emit({ phase: "install-docker", status: "running", message: "wsl.exe 连不上 WSL 虚拟机(半死状态),正在重置 WSL 后自动重试…" });
+        try { await wslTerminate(); } catch {}
+        try { await wslShutdown(); } catch {}
+        finish(false, "wsl_vm_unreachable"); return { ok: false, reason: "wsl_vm_unreachable", message: "WSL 虚拟机无响应,已重置,稍后自动重试" };
+      }
+      fail("docker_install_failed", e.message); emit({ phase: "install-docker", status: "error", message: `Docker 安装失败：${e.message}（点重试）${errTail(e)}` }); finish(false, "docker_install_failed"); return { ok: false, reason: "docker_install_failed" }; }
     done();
   } else done(true);
 
@@ -1489,7 +1510,7 @@ async function update({ onProgress, container = "cicy-code-docker", port = 8008
   emit({ phase: "image", status: "running", message: latest ? t("docker.updating.toVersion", { v: latest }) : t("docker.updating.pulling") });
   // cp 结果出到 drawer(诊断:之前静默失败 → 回落镜像内旧脚本 → 又卡 2 分钟,看不出来)。
   try {
-    const b64 = fs.readFileSync(path.join(__dirname, "container-scripts", "cicy-code-update.sh")).toString("base64");
+    const b64 = Buffer.from(fs.readFileSync(path.join(__dirname, "container-scripts", "cicy-code-update.sh"), "utf8").replace(/\r\n?/g, "\n"), "utf8").toString("base64"); // CI 的 Windows runner 会把 .sh 转成 CRLF → 容器里 shebang 变 /bin/bash\r 执行不了
     await wslRun(buildPushUpdateScriptCommand(b64, container), { timeout: 30000 });
     emit({ phase: "image", status: "running", message: t("docker.updating.scriptReady") });
   } catch (e) {

package/test/bootstrap-failure-reporting.test.js

@@ -127,3 +127,15 @@ test("readContainerToken throttles after a failure so a wedged WSL is not hammer
   const w = read("src/sidecar/wsl-docker.js");
   assert.match(w, /if \(Date\.now\(\) - _tokenFailAt < 60000\) return "";/);
 });
+
+test("an unreachable WSL VM (socket timeout from wsl.exe) resets WSL and retries instead of failing docker install", () => {
+  const w = read("src/sidecar/wsl-docker.js");
+  assert.match(w, /function isWslVmUnreachable\(err\)/);
+  assert.match(w, /err\.wslVmUnreachable = isWslVmUnreachable\(err\)/);
+  assert.match(w, /if \(e && e\.wslVmUnreachable\) \{[^]*await wslTerminate\(\)[^]*await wslShutdown\(\)[^]*reason: "wsl_vm_unreachable"/);
+});
+
+test("the container update script is pushed with LF endings even from a CRLF checkout", () => {
+  assert.match(read("src/sidecar/wsl-docker.js"), /cicy-code-update\.sh"\), "utf8"\)\.replace\(\/\\r\\n\?\/g, "\\n"\)/);
+  assert.match(read(".gitattributes"), /\*\.sh text eol=lf/);
+});