cicy-desktop 2.1.306 → 2.1.308

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.306",
+  "version": "2.1.308",
   "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/backends/sidecar-ipc.js

@@ -159,6 +159,7 @@ function register({ sidecarLogPath } = {}) {
     } else if (result) {
       _lastBootstrapError = { reason: result.reason || result.error || "bootstrap_failed", message: result.message || "", ts: Date.now() };
     } else return;
+    _softRetryAt = Date.now() + 2 * 60 * 1000;
     if (_lastBootstrapError.reason === "wsl_reboot_required") scheduleReboot(90);
     if (HARD_BOOTSTRAP_REASONS.has(_lastBootstrapError.reason)) {
       _autoBootstrapPaused = _lastBootstrapError.reason;
@@ -171,6 +172,7 @@ function register({ sidecarLogPath } = {}) {
   let _rebootScheduled = false;
   let _relayMisses = 0, _relayResetDone = false; // WSL localhost 转发自愈(见 daemon 循环)
   let _unknownStreak = 0, _wslRepairDone = false; // WSL 卡死自愈(见 daemon 循环)
+  let _softRetryAt = 0; // 非硬失败(如 docker_install_failed)也退避 2 分钟,别每 35 秒重跑一遍
   // 防重启循环:WSL 始终起不来时不能每次开机都重启。计数存 db/wsl-reboots.json,最多自动重启 2 次
   // (成功后 :8008 起来时清零)。
   const REBOOT_COUNT_FILE = path.join(os.homedir(), "cicy-ai", "db", "wsl-reboots.json");
@@ -265,6 +267,8 @@ function register({ sidecarLogPath } = {}) {
       } else if (s.running) { _relayMisses = 0; }
       if (!s.running && !s.unknown && _autoBootstrapPaused && Date.now() < _autoBootstrapRetryAt) {
         // 硬失败后退避(见 recordBootstrapResult);卡片显示 lastError,到点自动再试,用户点「重试」也行。
+      } else if (!s.running && !s.unknown && Date.now() < _softRetryAt) {
+        // 上一轮刚失败,2 分钟内不重跑
       } else if (!s.running && !s.unknown) {
         if (_autoBootstrapPaused) log.info(`[docker-daemon] backoff elapsed after ${_autoBootstrapPaused} → auto-retrying bootstrap`);
         log.info(`[docker-daemon] :8008 down (${s.installed ? "installed" : "not installed"}) → auto-bootstrapping WSL cicy-code`);

package/src/sidecar/wsl-docker.js

@@ -95,7 +95,9 @@ async function ensureWslKernel({ emit } = {}) {
 // …连接尝试失败」。实测 `wsl --shutdown` 后恢复。据此标记,bootstrap 遇到就重置一次再重试。
 function isWslVmUnreachable(err) {
   if (!err) return false;
-  const code = err.code === 4294967295 || err.code === -1 || err.code === 0xffffffff;
+  // bash 的退出码只会是 0-255;>255 / -1 / 4294967295 只可能来自 wsl.exe 自己(连不上 VM)。
+  const code = err.code === 4294967295 || err.code === -1 || err.code === 0xffffffff || (typeof err.code === "number" && err.code > 255);
+  if (code) return true;
   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 {}
@@ -139,7 +141,13 @@ function wslRunStream(cmd, { emit, phase = "install-docker", timeout = 900000, d
     child.stderr.on("data", pump);
     const timer = setTimeout(() => { try { child.kill("SIGKILL"); } catch {} reject(Object.assign(new Error("timeout"), { stdout: tail })); }, timeout);
     child.on("error", (e) => { clearTimeout(timer); reject(e); });
-    child.on("close", (code) => { clearTimeout(timer); code === 0 ? resolve({ stdout: tail }) : reject(Object.assign(new Error(`exit ${code}`), { stdout: tail })); });
+    child.on("close", (code) => {
+      clearTimeout(timer);
+      if (code === 0) return resolve({ stdout: tail });
+      const err = Object.assign(new Error(`exit ${code}`), { stdout: tail, code });
+      err.wslVmUnreachable = isWslVmUnreachable(err);
+      reject(err);
+    });
   });
 }
 
@@ -1510,7 +1518,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

@@ -134,3 +134,15 @@ test("an unreachable WSL VM (socket timeout from wsl.exe) resets WSL and retries
   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/);
+});
+
+test("streamed wsl runs flag an unreachable VM too, and soft failures back off 2 min", () => {
+  const w = read("src/sidecar/wsl-docker.js");
+  assert.match(w, /const err = Object\.assign\(new Error\(`exit \$\{code\}`\), \{ stdout: tail, code \}\);\n\s+err\.wslVmUnreachable = isWslVmUnreachable\(err\);/);
+  assert.match(w, /err\.code > 255\)/);
+  assert.match(read("src/backends/sidecar-ipc.js"), /_softRetryAt = Date\.now\(\) \+ 2 \* 60 \* 1000;/);
+});