cicy-desktop 2.1.303 → 2.1.304

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.303",
+  "version": "2.1.304",
   "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.574",
-    "cicy-code-darwin-arm64": "2.3.574",
-    "cicy-code-linux-x64": "2.3.574",
-    "cicy-code-linux-arm64": "2.3.574",
+    "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-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

@@ -170,6 +170,7 @@ function register({ sidecarLogPath } = {}) {
   // 系统倒计时提示),UI 可「取消」或「立即重启」。每次开机只安排一次。
   let _rebootScheduled = false;
   let _relayMisses = 0, _relayResetDone = false; // WSL localhost 转发自愈(见 daemon 循环)
+  let _unknownStreak = 0, _wslRepairDone = false; // WSL 卡死自愈(见 daemon 循环)
   // 防重启循环:WSL 始终起不来时不能每次开机都重启。计数存 db/wsl-reboots.json,最多自动重启 2 次
   // (成功后 :8008 起来时清零)。
   const REBOOT_COUNT_FILE = path.join(os.homedir(), "cicy-ai", "db", "wsl-reboots.json");
@@ -228,6 +229,21 @@ function register({ sidecarLogPath } = {}) {
       // bootstrap 幂等且可续跑;首次启用 WSL 若要求重启 Windows,下次登录 Desktop
       // 会再次进入这里并从已完成的步骤继续。unknown 表示 WSL 正卡住/未响应,
       // 此时不并发安装,留给下一轮检测或显式「修复 WSL」。
+      // WSL 卡死(所有 wsl 命令 hang → status unknown)也不能等人点「修复 WSL」:连续 3 轮先自动
+      // 修(杀僵进程 + 重启 LxssManager,必要时提权一次);6 轮仍卡死 → 自动重启 Windows(受
+      // 2 次上限保护;重启后 bootstrap 自动重置坏 distro)。
+      if (s.unknown && !s.running) {
+        _unknownStreak += 1;
+        if (_unknownStreak === 3 && !_wslRepairDone && appDocker.repairWsl) {
+          _wslRepairDone = true;
+          auditDestructiveIpc(log, "docker:self-heal-wsl-wedged", null, { streak: _unknownStreak });
+          log.warn("[docker-daemon] WSL unresponsive for 3 checks → auto repair (kill wsl.exe, restart LxssManager)");
+          try { const r = await appDocker.repairWsl({ emit: () => {} }); if (r && r.needsReboot) { _lastBootstrapError = { reason: "wsl_wedged", message: "WSL 卡死且服务重启无效,将自动重启 Windows 修复", ts: Date.now() }; scheduleReboot(90); } } catch (e) { log.warn(`[docker-daemon] auto repairWsl failed: ${e.message}`); }
+          await refreshDockerStatus(); return;
+        }
+        if (_unknownStreak >= 6 && !_rebootScheduled) { _lastBootstrapError = { reason: "wsl_wedged", message: "WSL 持续无响应,将自动重启 Windows 修复", ts: Date.now() }; scheduleReboot(90); }
+        return;
+      } else if (!s.unknown) { _unknownStreak = 0; }
       // 容器在里面健康、Windows 侧却连不通 = WSL localhost 转发坏了(实测 wsl --shutdown 后恢复)。
       // 连续 2 轮(≈2 分钟)如此 → 每次开机最多自动重置一次 WSL。数据在 volume 里,容器由
       // unless-stopped 策略自动拉起;不算「销毁」——对用户来说它本来就已经不可用了。

package/src/sidecar/wsl-docker.js

@@ -217,9 +217,21 @@ async function repairWsl({ emit } = {}) {
   if (process.platform !== "win32") return { ok: false, error: "win-only" };
   const say = (m) => { try { emit && emit({ phase: "install-docker", status: "running", message: m }); } catch {} };
   say("尝试重启 WSL 服务(LxssManager)…");
+  // 先把僵住的 wsl.exe 杀掉(它们挂在 LxssManager 上,不杀 Restart-Service 也 hang)。
+  await new Promise((r) => execFile("taskkill", ["/IM", "wsl.exe", "/F"], { timeout: 15000, windowsHide: true }, () => r()));
   await new Promise((r) => execFile("powershell", ["-NoProfile", "-Command", "Restart-Service LxssManager -Force -ErrorAction SilentlyContinue"], { timeout: 30000, windowsHide: true }, () => r()));
   await new Promise((r) => setTimeout(r, 2500));
-  if (await lxssWedged()) {
+  // 「服务状态正常但所有 wsl 命令都 hang」也是卡死(实测):用 `wsl -l -q` 的超时(null)判定,
+  // 不只看 LxssManager 的 STOP_PENDING。非提权重启服务通常没权限 → 再提权试一次(一次 UAC)。
+  const stillHung = async () => (await lxssWedged()) || (await distroInstalled()) === null;
+  if (await stillHung()) {
+    say("普通权限重启 WSL 服务无效,提权再试(会弹一次 UAC)…");
+    try {
+      await docker.launchElevated("powershell.exe", ["-NoProfile", "-Command", "Get-Process wsl,wslhost -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue; Restart-Service LxssManager -Force"], { emit });
+    } catch {}
+    await new Promise((r) => setTimeout(r, 8000));
+  }
+  if (await stillHung()) {
     markWslReset();
     say("WSL 服务仍卡死,需要重启电脑;重启后会自动修复。");
     return { ok: false, needsReboot: true };

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

@@ -113,3 +113,12 @@ test("wsl --status printing usage (old inbox wsl.exe) is not 'missing' when wsl
   const i = d.indexOf("async function wslMissing()");
   assert.match(d.slice(i, i + 2000), /return wslFunctional\(\)\.then\(\(ok\) => resolve\(!ok\)\);/);
 });
+
+test("a wedged WSL (status unknown) is auto-repaired, then auto-rebooted if still hung", () => {
+  const ipc = read("src/backends/sidecar-ipc.js");
+  assert.match(ipc, /_unknownStreak === 3 && !_wslRepairDone/);
+  assert.match(ipc, /docker:self-heal-wsl-wedged/);
+  assert.match(ipc, /_unknownStreak >= 6 && !_rebootScheduled/);
+  const w = read("src/sidecar/wsl-docker.js");
+  assert.match(w, /const stillHung = async \(\) => \(await lxssWedged\(\)\) \|\| \(await distroInstalled\(\)\) === null;/);
+});