cicy-desktop 2.1.304 → 2.1.306

package/package.json

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

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) });
       });
   });
@@ -844,11 +856,20 @@ async function runContainer({ port = 8008, container = "cicy-code-docker", volum
 // must then NOT open with a wrong/host token — that strands the user at login).
 // 原则:执行什么命令、输出什么、报什么错,全都要可见(onLog),且每一步可重试。
 // onLog({ status, message }) —— 上层把它接进 drawer。不传也安全(默认静默 + 写 log 文件)。
+// 失败节流:WSL 卡死时每次 readContainerToken 都会起 wsl.exe 挂 8s+,多个调用方(标签恢复 /
+// openTeam / 守护循环)每 10 秒来一次 → 僵死的 wsl.exe 越积越多。读不到就记一下,60 秒内直接返回 ""。
+let _tokenFailAt = 0;
 async function readContainerToken(port = 8008, container = "cicy-code-docker", volume = "cicy-team-8008", { onLog } = {}) {
   const say = (status, message) => {
     try { (status === "error" ? log.warn : log.info)(`[readContainerToken] ${message}`); } catch (e) {}
     try { onLog && onLog({ status, message }); } catch (e) {}
   };
+  if (Date.now() - _tokenFailAt < 60000) return "";
+  const _r = await _readContainerTokenOnce(port, container, volume, say);
+  if (!_r) _tokenFailAt = Date.now();
+  return _r;
+}
+async function _readContainerTokenOnce(port, container, volume, say) {
   const volCmd = `cat /var/lib/docker/volumes/${volume}/_data/cicy-ai/global.json`;
   const execCmd = `docker exec ${container} cat /home/cicy/cicy-ai/global.json`;
   for (let attempt = 1; attempt <= 5; attempt++) {
@@ -1288,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);
 

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

@@ -122,3 +122,15 @@ test("a wedged WSL (status unknown) is auto-repaired, then auto-rebooted if stil
   const w = read("src/sidecar/wsl-docker.js");
   assert.match(w, /const stillHung = async \(\) => \(await lxssWedged\(\)\) \|\| \(await distroInstalled\(\)\) === null;/);
 });
+
+test("readContainerToken throttles after a failure so a wedged WSL is not hammered", () => {
+  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"/);
+});