cicy-desktop 2.1.298 → 2.1.300

package/package.json

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

package/src/backends/sidecar-ipc.js

@@ -147,8 +147,8 @@ function register({ sidecarLogPath } = {}) {
   let _autoBootstrapPaused = null;
   let _autoBootstrapRetryAt = 0; // 硬失败后的自动重试时间点(退避,不是永久暂停:用户不会自己修)
   // 退避:子进程被拦(安全软件开机后一段时间会自己放行)2 分钟一试;其余 15 分钟一试。
-  const AUTO_RETRY_MS = { spawn_blocked: 2 * 60 * 1000, default: 15 * 60 * 1000 };
-  const HARD_BOOTSTRAP_REASONS = new Set(["spawn_blocked", "virtualization_disabled", "wsl_enable_failed", "wsl_kernel_missing", "wsl_reboot_required"]);
+  const AUTO_RETRY_MS = { spawn_blocked: 2 * 60 * 1000, windows_component_store_broken: 6 * 60 * 60 * 1000, virtualization_disabled: 60 * 60 * 1000, default: 15 * 60 * 1000 };
+  const HARD_BOOTSTRAP_REASONS = new Set(["spawn_blocked", "virtualization_disabled", "wsl_enable_failed", "windows_component_store_broken", "wsl_kernel_missing", "wsl_reboot_required"]);
   function recordBootstrapResult(result, err) {
     if (err) {
       const code = err && err.code;
@@ -169,6 +169,7 @@ function register({ sidecarLogPath } = {}) {
   // WSL 功能启用后必须重启 Windows 才能继续。不等人:自动安排 90 秒后重启(桌面上会有
   // 系统倒计时提示),UI 可「取消」或「立即重启」。每次开机只安排一次。
   let _rebootScheduled = false;
+  let _relayMisses = 0, _relayResetDone = false; // WSL localhost 转发自愈(见 daemon 循环)
   // 防重启循环:WSL 始终起不来时不能每次开机都重启。计数存 db/wsl-reboots.json,最多自动重启 2 次
   // (成功后 :8008 起来时清零)。
   const REBOOT_COUNT_FILE = path.join(os.homedir(), "cicy-ai", "db", "wsl-reboots.json");
@@ -227,6 +228,25 @@ function register({ sidecarLogPath } = {}) {
       // bootstrap 幂等且可续跑;首次启用 WSL 若要求重启 Windows,下次登录 Desktop
       // 会再次进入这里并从已完成的步骤继续。unknown 表示 WSL 正卡住/未响应,
       // 此时不并发安装,留给下一轮检测或显式「修复 WSL」。
+      // 容器在里面健康、Windows 侧却连不通 = WSL localhost 转发坏了(实测 wsl --shutdown 后恢复)。
+      // 连续 2 轮(≈2 分钟)如此 → 每次开机最多自动重置一次 WSL。数据在 volume 里,容器由
+      // unless-stopped 策略自动拉起;不算「销毁」——对用户来说它本来就已经不可用了。
+      if (!s.running && !s.unknown && s.installed && appDocker.insideHealthy && appDocker.wslShutdown) {
+        let inside = false;
+        try { inside = await appDocker.insideHealthy(APP_CONTAINER, APP_PORT); } catch {}
+        if (inside) {
+          _relayMisses += 1;
+          if (_relayMisses >= 2 && !_relayResetDone) {
+            _relayResetDone = true;
+            auditDestructiveIpc(log, "docker:self-heal-localhost-relay", null, { container: APP_CONTAINER, misses: _relayMisses });
+            log.warn("[docker-daemon] container healthy inside WSL but 127.0.0.1:8008 unreachable from Windows → wsl --shutdown once to rebuild the localhost relay");
+            try { await appDocker.wslShutdown(); } catch (e) { log.warn(`[docker-daemon] wsl --shutdown failed: ${e.message}`); }
+            await refreshDockerStatus();
+            return;
+          }
+          if (_relayMisses < 2) { log.warn(`[docker-daemon] :${APP_PORT} unreachable from Windows but healthy inside (${_relayMisses}/2)`); return; }
+        } else { _relayMisses = 0; }
+      } else if (s.running) { _relayMisses = 0; }
       if (!s.running && !s.unknown && _autoBootstrapPaused && Date.now() < _autoBootstrapRetryAt) {
         // 硬失败后退避(见 recordBootstrapResult);卡片显示 lastError,到点自动再试,用户点「重试」也行。
       } else if (!s.running && !s.unknown) {

package/src/sidecar/docker.js

@@ -738,7 +738,10 @@ function elevatedWslSetup({ emit, need = {} } = {}) {
       'Say "start admin=$(([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole(\'Administrators\'))"',
       '$feats = @("Microsoft-Windows-Subsystem-Linux","VirtualMachinePlatform")',
       '$bad = @(); foreach ($f in $feats) { if ((St $f) -ne 1) { $c = En $f; if ($c -ne 0 -and $c -ne 3010) { $bad += $f } } }',
-      'if ($bad.Count -gt 0) {',
+      `$REPAIRED = "${path.join(dir, "wsl-repair-attempted.txt").replace(/"/g, '""')}"`,
+      'if ($bad.Count -gt 0 -and (Test-Path $REPAIRED)) { Say "repair already attempted before and the feature still cannot be enabled — skipping the 30-min repair; this Windows image is missing the feature payload (reinstall/repair Windows needed)" }',
+      'if ($bad.Count -gt 0 -and -not (Test-Path $REPAIRED)) {',
+      '  Set-Content -Path $REPAIRED -Value (Get-Date -Format s)',
       '  Say "repair: DISM /RestoreHealth (component store refused: $($bad -join \',\')) — this can take 10-30 min"',
       '  & $DISM /online /cleanup-image /restorehealth /norestart | Out-Null; Say ("restorehealth exit=" + $LASTEXITCODE)',
       '  & $SFC /scannow | Out-Null; Say ("sfc exit=" + $LASTEXITCODE)',
@@ -768,7 +771,7 @@ function elevatedWslSetup({ emit, need = {} } = {}) {
       try { lines = fs.readFileSync(resultFile, "utf8").split(/\r?\n/).filter(Boolean); } catch {}
       for (const l of lines.slice(seen)) {
         emit && emit({ phase: "install-docker", status: "running", message: `提权脚本：${l.replace(/^\[[^\]]*\] /, "")}` });
-        if (/exit=(?!0\b|3010\b)\d+/.test(l)) detail = l;
+        if (/exit=(?!0\b|3010\b)\d+|repair already attempted/.test(l)) detail = l;
       }
       seen = lines.length;
       if (lines.some((l) => /DONE/.test(l))) break;
@@ -869,10 +872,13 @@ async function ensureWsl({ emit } = {}) {
   const r = await elevatedWslSetup({ emit, need: { subsystem: !subsystemEnabled, vmPlatform: !vmPlatformEnabled } });
   const a = r.subsystem, b = r.vmPlatform;
   if (!a || !b) {
-    const message = `WSL 功能未能全部启用（Linux 子系统=${a ? "已启用" : "失败"}，虚拟机平台=${b ? "已启用" : "失败"}${r.detail ? `；${r.detail}` : "；通常是 UAC 被取消或当前账号无管理员权限"}）——会自动重试；也可以点「重试」。`;
+    const storeBroken = /exit=(14107|3017)|repair already attempted/.test(r.detail || "");
+    const message = storeBroken
+      ? `Windows 系统组件缺失或损坏，无法启用「虚拟机平台」（DISM 修复后仍失败，错误 14107）。这台 Windows 需要用安装镜像修复（DISM /Source）或重装系统后才能使用 WSL2/Docker。`
+      : `WSL 功能未能全部启用（Linux 子系统=${a ? "已启用" : "失败"}，虚拟机平台=${b ? "已启用" : "失败"}${r.detail ? `；${r.detail}` : "；通常是 UAC 被取消或当前账号无管理员权限"}）——会自动重试；也可以点「重试」。`;
     log.error(`[bootstrap] ✗ ensure-wsl reason=wsl_enable_failed subsystem=${a} vmPlatform=${b}`);
     emit && emit({ phase: "done", status: "error", message });
-    return { ok: false, needsReboot: false, failed: true, reason: "wsl_enable_failed", message };
+    return { ok: false, needsReboot: false, failed: true, reason: storeBroken ? "windows_component_store_broken" : "wsl_enable_failed", message };
   }
   // Best-effort: also pull the WSL2 kernel/plumbing when the executable itself
   // is missing. Feature-only repairs must stop here and wait for reboot.

package/src/sidecar/wsl-docker.js

@@ -620,6 +620,16 @@ async function ensureFreshImage({ emit } = {}) {
   return true;
 }
 
+// 容器内部视角的健康:docker exec 进容器用 node 探 127.0.0.1:8008。用来区分「容器真挂了」和
+// 「容器好好的、只是 WSL 的 localhost 转发坏了」(后者 Windows 侧 :8008 打不通,实测
+// `wsl --shutdown` 后 75 秒恢复)。
+async function insideHealthy(container = "cicy-code-docker-8008", port = 8008) {
+  try {
+    await wslRun(`docker exec ${container} node -e "fetch('http://127.0.0.1:${port}/api/health').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))"`, { timeout: 20000 });
+    return true;
+  } catch { return false; }
+}
+
 // HTTP /health probe on 127.0.0.1:port from Windows — WSL2 forwards localhost,
 // so a container published on :port is reachable here. Reuse docker.js's probe.
 const probeHealth = docker.probeHealth;
@@ -1602,6 +1612,7 @@ async function readMihomoSelections(container = "cicy-code-docker-8008") {
 }
 
 module.exports = {
+  insideHealthy, wslShutdown,
   bootstrap, status, restart, stop, dockerRestart, recreate, update, upgrade, runContainer, readContainerToken,
   distroInstalled, dockerInstalled, dockerEngineUp, imagePresent, probeHealth, wslRun, hasGatewayKey,
   readMihomoConfig, readMihomoSelections, parseMihomoSelections,

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

@@ -93,3 +93,17 @@ test("image load survives a missing /mnt/c mount (drvfs retry, then stdin pipe)"
   assert.match(w, /function loadImageViaStdin\(/);
   assert.match(w, /\["-d", DISTRO, "-u", "root", "--", "docker", "load"\]/);
 });
+
+test("a broken component store is reported once and backed off for hours, not re-repaired every 15 min", () => {
+  const d = read("src/sidecar/docker.js");
+  assert.match(d, /wsl-repair-attempted\.txt/);
+  assert.match(d, /reason: storeBroken \? "windows_component_store_broken" : "wsl_enable_failed"/);
+  assert.match(read("src/backends/sidecar-ipc.js"), /windows_component_store_broken: 6 \* 60 \* 60 \* 1000/);
+});
+
+test("broken WSL localhost relay (healthy inside, unreachable from Windows) is reset once per boot", () => {
+  assert.match(read("src/sidecar/wsl-docker.js"), /async function insideHealthy\(/);
+  const ipc = read("src/backends/sidecar-ipc.js");
+  assert.match(ipc, /_relayMisses >= 2 && !_relayResetDone/);
+  assert.match(ipc, /docker:self-heal-localhost-relay/);
+});

package/test/docker-preflight-and-always-allow.test.js

@@ -14,7 +14,7 @@ test("ensureWsl explains a disabled-virtualization host in the log and the card"
   assert.match(ensure, /reason: "virtualization_disabled"/);
   assert.match(ensure, /log\.error\(`\[bootstrap\] ✗ ensure-wsl reason=virtualization_disabled/);
   assert.match(ensure, /BIOS/);
-  assert.match(ensure, /reason: "wsl_enable_failed", message/);
+  assert.match(ensure, /reason: storeBroken \? "windows_component_store_broken" : "wsl_enable_failed", message/);
   assert.match(read("src/sidecar/wsl-docker.js"), /const reason = w\.reason \|\| "wsl_enable_failed"; fail\(reason, w\.message\)/);
   const ipc = read("src/backends/sidecar-ipc.js");
   assert.match(ipc, /lastError: \(!s\.running && _lastBootstrapError\)/);