cicy-desktop 2.1.294 → 2.1.296

package/package.json

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

package/src/backends/sidecar-ipc.js

@@ -148,14 +148,14 @@ function register({ sidecarLogPath } = {}) {
   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_reboot_required"]);
+  const HARD_BOOTSTRAP_REASONS = new Set(["spawn_blocked", "virtualization_disabled", "wsl_enable_failed", "wsl_kernel_missing", "wsl_reboot_required"]);
   function recordBootstrapResult(result, err) {
     if (err) {
       const code = err && err.code;
       const reason = code === "EPERM" || /spawn EPERM/.test(err.message || "") ? "spawn_blocked" : "bootstrap_exception";
       _lastBootstrapError = { reason, message: err.message, ts: Date.now() };
     } else if (result && result.ok) {
-      _lastBootstrapError = null; _autoBootstrapPaused = null; return;
+      _lastBootstrapError = null; _autoBootstrapPaused = null; try { if (rebootCount() > 0) rebootCount(-99); } catch {} return;
     } else if (result) {
       _lastBootstrapError = { reason: result.reason || result.error || "bootstrap_failed", message: result.message || "", ts: Date.now() };
     } else return;
@@ -169,9 +169,19 @@ function register({ sidecarLogPath } = {}) {
   // WSL 功能启用后必须重启 Windows 才能继续。不等人:自动安排 90 秒后重启(桌面上会有
   // 系统倒计时提示),UI 可「取消」或「立即重启」。每次开机只安排一次。
   let _rebootScheduled = false;
+  // 防重启循环:WSL 始终起不来时不能每次开机都重启。计数存 db/wsl-reboots.json,最多自动重启 2 次
+  // (成功后 :8008 起来时清零)。
+  const REBOOT_COUNT_FILE = path.join(os.homedir(), "cicy-ai", "db", "wsl-reboots.json");
+  function rebootCount(delta) {
+    let c = 0; try { c = Number(JSON.parse(fs.readFileSync(REBOOT_COUNT_FILE, "utf8")).count) || 0; } catch {}
+    if (delta) { c = Math.max(0, c + delta); try { fs.mkdirSync(path.dirname(REBOOT_COUNT_FILE), { recursive: true }); fs.writeFileSync(REBOOT_COUNT_FILE, JSON.stringify({ count: c, ts: Date.now() })); } catch {} }
+    return c;
+  }
   function scheduleReboot(delaySec = 90) {
     if (_rebootScheduled || process.platform !== "win32") return false;
+    if (delaySec > 10 && rebootCount() >= 2) { log.warn("[docker] auto-reboot skipped: already rebooted 2× for WSL without success"); return false; }
     _rebootScheduled = true;
+    rebootCount(+1);
     try {
       require("child_process").execFile("shutdown", ["/r", "/t", String(delaySec), "/c", "CiCy Desktop: WSL2 功能已启用,需要重启 Windows 才能继续安装 Docker;登录后会自动继续。可在 CiCy Desktop 里取消。"], { windowsHide: true }, (err) => {
         if (err) { _rebootScheduled = false; log.warn(`[docker] schedule reboot failed: ${err.message}`); }

package/src/sidecar/docker.js

@@ -640,7 +640,9 @@ async function wslMissing() {
       // wsl.exe 不存在(ENOENT):功能刚启用但还没重启 Windows 时就是这样 —— 按「缺失」处理,
       // 让 ensureWsl 走 needsReboot,而不是当成已就绪去 --import 然后 spawn ENOENT。
       if (err && (err.code === "ENOENT" || /ENOENT/.test(err.message || ""))) return resolve(true);
-      if (/未安装|not installed|--install/i.test(s)) return resolve(true);   // definitely missing
+      // 旧版内置 wsl.exe 存根:任何子命令都只打印用法帮助("wsl.exe [Argument]" / "--install")。
+      // 功能刚启用还没重启时就是这个状态 → 按缺失处理(ensureWsl 走 needsReboot)。
+      if (/未安装|not installed|--install|\[Argument\]|\[参数\]/i.test(s)) return resolve(true);
       if (err && (err.killed || err.signal || err.code === "ETIMEDOUT")) return resolve(null); // timed out → unknown
       resolve(false); // wsl present (errored for another reason → assume OK)
     });
@@ -665,6 +667,18 @@ function featureEnabled(feature) {
   });
 }
 
+const WSL_KERNEL_MSI_URL = process.env.CICY_WSL_KERNEL_URL || "https://wslstorestorage.blob.core.windows.net/wslblob/wsl_update_x64.msi";
+// WSL2 kernel present? The inbox (feature-based) WSL keeps it at System32\lxss\tools\kernel;
+// the Store WSL bundles its own, in which case the file is absent but `wsl --status`
+// reports a kernel version — callers treat "functional + version" as present too.
+function wslKernelPresent() {
+  if (process.platform !== "win32") return true;
+  const sysroot = process.env.SystemRoot || process.env.windir || "C:\\Windows";
+  try { if (fs.existsSync(path.join(sysroot, "System32", "lxss", "tools", "kernel"))) return true; } catch {}
+  try { if (fs.existsSync(path.join(process.env.LOCALAPPDATA || "", "Microsoft", "WindowsApps", "wsl.exe")) && fs.existsSync(path.join(process.env.ProgramFiles || "C:\\Program Files", "WSL", "wsl.exe"))) return true; } catch {}
+  return false;
+}
+
 // Functional WSL probe that needs no elevation: `wsl -l -v` on a machine with
 // the features enabled (and rebooted) either lists distros or says "no installed
 // distributions"; with the features off it prints the "--install" help text.
@@ -673,7 +687,7 @@ function wslFunctional() {
   return new Promise((resolve) => {
     execFile(wslExe(), ["-l", "-v"], { timeout: 25000, windowsHide: true, encoding: "utf16le" }, (err, stdout, stderr) => {
       const s = String((stdout || "") + (stderr || "")).replace(/\u0000/g, "");
-      if (/NAME\s+STATE|没有已安装的分发版|no installed distributions|aka\.ms\/wslstore/i.test(s)) return resolve(true);
+      if (/NAME\s+STATE|没有已安装的分发版|no installed distributions|aka\.ms\/wslstore|名称\s+状态/i.test(s)) return resolve(true);
       resolve(false);
     });
   });
@@ -717,17 +731,18 @@ function elevatedWslSetup({ emit, need = {} } = {}) {
       `$R = "${resultFile.replace(/"/g, '""')}"`,
       'function Say($m) { Add-Content -Path $R -Value ("[" + (Get-Date -Format "HH:mm:ss") + "] " + $m) }',
       'function St($n) { try { (Get-CimInstance Win32_OptionalFeature -Filter ("Name=\'" + $n + "\'")).InstallState } catch { 0 } }',
-      'function En($n) { dism /online /enable-feature /featurename:$n /all /norestart | Out-Null; $c = $LASTEXITCODE; Say ("enable " + $n + " exit=" + $c); return $c }',
+      '$S32 = Join-Path $env:SystemRoot "System32"; $DISM = Join-Path $S32 "dism.exe"; $SFC = Join-Path $S32 "sfc.exe"; $MSIEXEC = Join-Path $S32 "msiexec.exe"',
+      'function En($n) { & $DISM /online /enable-feature /featurename:$n /all /norestart | Out-Null; $c = $LASTEXITCODE; Say ("enable " + $n + " exit=" + $c); return $c }',
       '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) {',
       '  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)',
+      '  & $DISM /online /cleanup-image /restorehealth /norestart | Out-Null; Say ("restorehealth exit=" + $LASTEXITCODE)',
+      '  & $SFC /scannow | Out-Null; Say ("sfc exit=" + $LASTEXITCODE)',
       '  foreach ($f in $bad) { $c = En $f }',
       '}',
-      `if (Test-Path "${msi.replace(/"/g, '""')}") { Start-Process msiexec.exe -ArgumentList "/i","${msi.replace(/"/g, '""')}","/qn","/norestart" -Wait; Say "kernel msi installed" }`,
+      `if (Test-Path "${msi.replace(/"/g, '""')}") { $p = Start-Process $MSIEXEC -ArgumentList "/i","\`"${msi.replace(/"/g, '""')}\`"","/qn","/norestart" -Wait -PassThru; Say ("kernel msi exit=" + $p.ExitCode) }`,
       'Say ("final subsystem=" + (St "Microsoft-Windows-Subsystem-Linux") + " vmPlatform=" + (St "VirtualMachinePlatform"))',
       'Say "DONE"',
     ].join("\r\n");
@@ -814,7 +829,31 @@ async function ensureWsl({ emit } = {}) {
   const subsystemEnabled = await featureEnabled("Microsoft-Windows-Subsystem-Linux");
   const vmPlatformEnabled = await featureEnabled("VirtualMachinePlatform");
   const state = classifyWslPrerequisites({ executableMissing, subsystemEnabled, vmPlatformEnabled });
-  if (state.ready) return { ok: true };
+  if (state.ready) {
+    // 功能都已启用、wsl.exe 也在,但 WSL 本身还不能用(`wsl -l -v` 只打印帮助)= 启用后还没
+    // 重启。别去 --import(必失败),直接进自动重启流程。
+    if (!(await wslFunctional())) {
+      log.warn("[bootstrap] ensure-wsl: features enabled but WSL not functional yet (pending reboot)");
+      emit && emit({ phase: "install-docker", status: "running", message: "WSL 功能已启用但尚未生效,需要重启 Windows…" });
+      return { ok: false, needsReboot: true };
+    }
+    // WSL2 内核(lxss\tools\kernel)缺失时 --import 也必失败。先把 MSI 下到 Downloads,再用
+    // 同一个提权脚本装(功能已启用的话脚本只做装内核这一件事)。
+    if (!wslKernelPresent()) {
+      const msi = path.join(os.homedir(), "Downloads", "wsl_update_x64.msi");
+      try { await ensureDownloaded(WSL_KERNEL_MSI_URL, msi, null, { emit, phase: "install-docker", label: "下载 WSL2 内核" }); }
+      catch (e) { log.warn(`[bootstrap] kernel msi download failed: ${e.message}`); }
+      emit && emit({ phase: "install-docker", status: "running", message: "WSL2 内核未安装,开始安装（会弹一次 UAC，请点「是」）…" });
+      const r = await elevatedWslSetup({ emit, need: {} });
+      if (!wslKernelPresent()) {
+        const message = `WSL2 内核未能安装${r.detail ? `（${r.detail}）` : "（UAC 未确认或 MSI 安装失败）"}——会自动重试。`;
+        log.error(`[bootstrap] ✗ ensure-wsl reason=wsl_kernel_missing ${r.detail || ""}`);
+        emit && emit({ phase: "done", status: "error", message });
+        return { ok: false, needsReboot: false, failed: true, reason: "wsl_kernel_missing", message };
+      }
+    }
+    return { ok: true };
+  }
 
   emit && emit({ phase: "install-docker", status: "running", message: "Docker 需要 WSL2 后端，开始启用所需的 Windows 功能（会弹一次 UAC，请点「是」）…" });
   const r = await elevatedWslSetup({ emit, need: { subsystem: !subsystemEnabled, vmPlatform: !vmPlatformEnabled } });
@@ -930,7 +969,7 @@ module.exports = {
   start, stop, stopContainer, restart, checkStatus, loadImage, loadImageFromTarball,
   downloadImageTarball, imagePresent, dockerOk, installDocker,
   bootstrap, probeHealth, readContainerToken, dockerDesktopExe, desktopDir, downloadsDir, imageTarballPath,
-  launchElevated, elevatedWslSetup, spawnProbe, wslFunctional, wslExe, wslMissing, ensureWsl, virtualizationStatus,
+  launchElevated, elevatedWslSetup, spawnProbe, wslFunctional, wslKernelPresent, wslExe, wslMissing, ensureWsl, virtualizationStatus,
   // platform-agnostic download/retry primitives, reused by native.js
   ensureDownloaded, curlDownload, withRetry, waitUntil, run, headSize,
   // image freshness (修「重建仍用旧镜像」—— 校验 OSS ETag 变了才重下重载)

package/src/sidecar/wsl-docker.js

@@ -241,12 +241,14 @@ function importTarball(dest, installDir) {
     // and the caller can `wsl --shutdown` + retry instead of hanging 10 minutes.
     execFile(docker.wslExe(), ["--import", DISTRO, installDir, dest, "--version", "2"],
       { timeout: 240000, windowsHide: true, encoding: "buffer" },
-      (err, _so, se) => {
+      (err, so, se) => {
         if (err) {
-          // wsl.exe 的报错是 UTF-16 输出(常见:「请启用'虚拟机平台'Windows 功能并确保在 BIOS 中
-          // 启用虚拟化」);解码后拼进 message,抽屉才能显示真正原因而不是「Command failed」。
+          // wsl.exe 的报错是 UTF-16 输出,而且多半写在 stdout(不是 stderr)(常见:「请启用'虚拟机
+          // 平台'Windows 功能并确保在 BIOS 中启用虚拟化」);两路都解码后拼进 message,抽屉才能显示
+          // 真正原因而不是「Command failed」。
           let text = "";
-          try { text = Buffer.isBuffer(se) ? se.toString("utf16le") : String(se || ""); } catch {}
+          const dec = (b) => { try { return Buffer.isBuffer(b) ? b.toString("utf16le") : String(b || ""); } catch { return ""; } };
+          text = (dec(so) + " " + dec(se));
           text = text.replace(/\u0000/g, "").replace(/\s+/g, " ").trim();
           if (text) err.message = `${err.message.split("\n")[0]} — ${text.slice(0, 300)}`;
           err.stderr = text;

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

@@ -28,7 +28,7 @@ test("featureEnabled reads Win32_OptionalFeature (works unelevated), dism only a
 test("wsl --import failures carry wsl.exe's decoded message into the drawer", () => {
   const src = read("src/sidecar/wsl-docker.js");
   assert.match(src, /encoding: "buffer"/);
-  assert.match(src, /se\.toString\("utf16le"\)/);
+  assert.match(src, /toString\("utf16le"\)/);
 });
 
 test("keepalive logon task degrades to LeastPrivilege / HKCU Run when not elevated", () => {
@@ -64,3 +64,18 @@ test("auto-update defaults to on", () => {
 test("a missing wsl.exe (ENOENT, features enabled but not yet rebooted) counts as WSL missing", () => {
   assert.match(read("src/sidecar/docker.js"), /err\.code === "ENOENT"[^\n]*return resolve\(true\)/);
 });
+
+test("features enabled but WSL still the pre-reboot stub → needsReboot; auto-reboot capped at 2", () => {
+  const d = read("src/sidecar/docker.js");
+  assert.match(d, /if \(!\(await wslFunctional\(\)\)\) \{/);
+  assert.match(d, /\[Argument\\\]/);
+  const ipc = read("src/backends/sidecar-ipc.js");
+  assert.match(ipc, /rebootCount\(\) >= 2/);
+});
+
+test("missing WSL2 kernel is installed through the same single elevation", () => {
+  const d = read("src/sidecar/docker.js");
+  assert.match(d, /function wslKernelPresent\(\)/);
+  assert.match(d, /if \(!wslKernelPresent\(\)\) \{[^]*elevatedWslSetup\(\{ emit, need: \{\} \}\)/);
+  assert.match(d, /reason: "wsl_kernel_missing"/);
+});