cicy-desktop 2.1.309 → 2.1.310

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.309",
+  "version": "2.1.310",
   "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.578",
-    "cicy-code-darwin-arm64": "2.3.578",
-    "cicy-code-linux-x64": "2.3.578",
-    "cicy-code-linux-arm64": "2.3.578",
+    "cicy-code-darwin-x64": "2.3.580",
+    "cicy-code-darwin-arm64": "2.3.580",
+    "cicy-code-linux-x64": "2.3.580",
+    "cicy-code-linux-arm64": "2.3.580",
     "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

@@ -240,7 +240,21 @@ function register({ sidecarLogPath } = {}) {
           _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}`); }
+          try {
+            const r = await appDocker.repairWsl({ emit: () => {} });
+            if (r && r.needsReboot) {
+              // 旧版 WSL 死锁且服务重启无效:在重启前先装微软新版 WSL(一次 UAC),重启后就不再走
+              // 旧的 LxssManager 路径 —— 否则重启回来还会死锁。装成功时重置重启计数,给新版一次机会。
+              const dk = require("../sidecar/docker");
+              if (dk.modernWslInstalled && !dk.modernWslInstalled() && dk.elevatedWslSetup) {
+                log.warn("[docker-daemon] legacy WSL deadlocked → installing modern WSL before the reboot");
+                try { await dk.elevatedWslSetup({ emit: () => {}, need: {} }); } catch (e) { log.warn(`[docker-daemon] modern WSL install failed: ${e.message}`); }
+                if (dk.modernWslInstalled()) { try { rebootCount(-99); } catch {} }
+              }
+              _lastBootstrapError = { reason: "wsl_wedged", message: dk.modernWslInstalled && dk.modernWslInstalled() ? "已安装新版 WSL,将自动重启 Windows 生效" : "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); }

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

@@ -156,3 +156,7 @@ test("legacy WSL trouble → install modern WSL (MSI mirrored to OSS) in the sin
   assert.match(d, /if \(!modernWslInstalled\(\) && legacyWslTroubleSeen\(\)\) \{/);
   assert.match(read(".github/workflows/windows-exe-release.yml"), /wsl\/wsl\.x64\.msi/);
 });
+
+test("a deadlocked legacy WSL gets modern WSL installed before the automatic reboot", () => {
+  assert.match(read("src/backends/sidecar-ipc.js"), /legacy WSL deadlocked → installing modern WSL before the reboot/);
+});