cicy-desktop 2.1.307 → 2.1.309

package/.github/workflows/windows-exe-release.yml

@@ -132,6 +132,21 @@ jobs:
             if ($kfile) { & $oss cp "$($kfile.FullName)" "$kernelKey" -f --acl public-read } else { Write-Warning "kernel not found in msi extract" }
           } else { Write-Host "WSL2 kernel already on OSS, skip" }
 
+          # 0b) 新版 WSL 的 MSI(一次性,已存在就跳过):老 Win10 自带旧版 WSL 反复死锁,桌面端改为装新版。
+          $wslKey = "$base/wsl/wsl.x64.msi"
+          & $oss stat "$wslKey" 2>$null | Out-Null
+          if ($LASTEXITCODE -ne 0) {
+            $rel = Invoke-RestMethod -Uri "https://api.github.com/repos/microsoft/WSL/releases/latest" -Headers @{ "User-Agent" = "cicy-desktop-ci" }
+            $asset = $rel.assets | Where-Object { $_.name -match 'x64\.msi$' } | Select-Object -First 1
+            if ($asset) {
+              Write-Host "Publishing modern WSL $($rel.tag_name) -> $wslKey"
+              Invoke-WebRequest -Uri $asset.browser_download_url -OutFile wsl.x64.msi
+              & $oss cp "wsl.x64.msi" "$wslKey" -f --acl public-read
+              Set-Content -Path wsl-version.txt -Value $rel.tag_name
+              & $oss cp "wsl-version.txt" "$base/wsl/version.txt" -f --acl public-read
+            } else { Write-Warning "no x64 msi asset in microsoft/WSL latest" }
+          } else { Write-Host "modern WSL msi already on OSS, skip" }
+
           # 1) 永久版本化副本(unique key — 不会被后续发版覆盖)
           $verKey = "$base/cicy-desktop-$version.exe"
           Write-Host "Uploading versioned -> $verKey"

package/package.json

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

package/src/backends/sidecar-ipc.js

@@ -159,6 +159,7 @@ function register({ sidecarLogPath } = {}) {
     } else if (result) {
       _lastBootstrapError = { reason: result.reason || result.error || "bootstrap_failed", message: result.message || "", ts: Date.now() };
     } else return;
+    _softRetryAt = Date.now() + 2 * 60 * 1000;
     if (_lastBootstrapError.reason === "wsl_reboot_required") scheduleReboot(90);
     if (HARD_BOOTSTRAP_REASONS.has(_lastBootstrapError.reason)) {
       _autoBootstrapPaused = _lastBootstrapError.reason;
@@ -171,6 +172,7 @@ function register({ sidecarLogPath } = {}) {
   let _rebootScheduled = false;
   let _relayMisses = 0, _relayResetDone = false; // WSL localhost 转发自愈(见 daemon 循环)
   let _unknownStreak = 0, _wslRepairDone = false; // WSL 卡死自愈(见 daemon 循环)
+  let _softRetryAt = 0; // 非硬失败(如 docker_install_failed)也退避 2 分钟,别每 35 秒重跑一遍
   // 防重启循环:WSL 始终起不来时不能每次开机都重启。计数存 db/wsl-reboots.json,最多自动重启 2 次
   // (成功后 :8008 起来时清零)。
   const REBOOT_COUNT_FILE = path.join(os.homedir(), "cicy-ai", "db", "wsl-reboots.json");
@@ -265,6 +267,8 @@ function register({ sidecarLogPath } = {}) {
       } else if (s.running) { _relayMisses = 0; }
       if (!s.running && !s.unknown && _autoBootstrapPaused && Date.now() < _autoBootstrapRetryAt) {
         // 硬失败后退避(见 recordBootstrapResult);卡片显示 lastError,到点自动再试,用户点「重试」也行。
+      } else if (!s.running && !s.unknown && Date.now() < _softRetryAt) {
+        // 上一轮刚失败,2 分钟内不重跑
       } else if (!s.running && !s.unknown) {
         if (_autoBootstrapPaused) log.info(`[docker-daemon] backoff elapsed after ${_autoBootstrapPaused} → auto-retrying bootstrap`);
         log.info(`[docker-daemon] :8008 down (${s.installed ? "installed" : "not installed"}) → auto-bootstrapping WSL cicy-code`);

package/src/sidecar/docker.js

@@ -612,6 +612,7 @@ function wslExe() {
   if (process.platform !== "win32") return "wsl";
   const sysroot = process.env.SystemRoot || process.env.windir || "C:\\Windows";
   const cands = [
+    path.join(process.env.ProgramFiles || "C:\\Program Files", "WSL", "wsl.exe"), // 新版 WSL(MSI),优先
     path.join(sysroot, "System32", "wsl.exe"),
     path.join(process.env.LOCALAPPDATA || "", "Microsoft", "WindowsApps", "wsl.exe"),
   ];
@@ -670,6 +671,18 @@ function featureEnabled(feature) {
   });
 }
 
+// 新版 WSL(微软独立发布的 MSI,Store 版同源):不走旧的 LxssManager、内核内置、`--status` 等命令
+// 齐全、localhost 转发稳定。老 Win10 自带的旧版 WSL 反复死锁/半死/缺内核,全部由它一次解决。
+// MSI 由发布工作流从 GitHub 镜像到 OSS(国内可下)。
+const WSL_MODERN_MSI_URL = process.env.CICY_WSL_MSI_URL || (require("./mirrors").OSS_RELEASES_BASE + "/wsl/wsl.x64.msi");
+function modernWslInstalled() {
+  if (process.platform !== "win32") return true;
+  try { return fs.existsSync(path.join(process.env.ProgramFiles || "C:\\Program Files", "WSL", "wsl.exe")); } catch { return false; }
+}
+// 这台机器的旧版 WSL 出过死锁/被自动重启过(db/wsl-reboots.json 有计数)→ 下次提权时顺手换新版。
+function legacyWslTroubleSeen() {
+  try { const j = JSON.parse(fs.readFileSync(path.join(os.homedir(), "cicy-ai", "db", "wsl-reboots.json"), "utf8")); return (Number(j.count) || 0) > 0; } catch { return false; }
+}
 const WSL_KERNEL_MSI_URL = process.env.CICY_WSL_KERNEL_URL || "https://wslstorestorage.blob.core.windows.net/wslblob/wsl_update_x64.msi";
 // 裸内核文件(由发布工作流从 MSI 解出后放到 OSS):精简版 Windows 没有 msiexec 时直接放到位。
 const WSL_KERNEL_RAW_URL = process.env.CICY_WSL_KERNEL_RAW_URL || (require("./mirrors").OSS_RELEASES_BASE + "/wsl-kernel/kernel");
@@ -750,6 +763,12 @@ function elevatedWslSetup({ emit, need = {} } = {}) {
       '  & $SFC /scannow | Out-Null; Say ("sfc exit=" + $LASTEXITCODE)',
       '  foreach ($f in $bad) { $c = En $f }',
       '}',
+      `$MODERN = Join-Path $env:ProgramFiles "WSL\\wsl.exe"`,
+      `if (-not (Test-Path $MODERN) -and (Test-Path $MSIEXEC)) {`,
+      `  $wm = Join-Path $env:USERPROFILE "Downloads\\wsl.x64.msi"`,
+      `  Say "installing modern WSL (replaces the legacy inbox WSL: no LxssManager deadlocks, kernel built in) — download ~250MB"`,
+      `  try { if (-not (Test-Path $wm) -or (Get-Item $wm).Length -lt 100000000) { Invoke-WebRequest -UseBasicParsing -Uri "${WSL_MODERN_MSI_URL}" -OutFile $wm }; $p = Start-Process $MSIEXEC -ArgumentList "/i","\`"$wm\`"","/qn","/norestart" -Wait -PassThru; Say ("modern wsl msi exit=" + $p.ExitCode) } catch { Say ("modern wsl install failed: " + $_.Exception.Message) }`,
+      `}`,
       `$KDIR = Join-Path $S32 "lxss\\tools"; $KFILE = Join-Path $KDIR "kernel"`,
       `if (-not (Test-Path $KFILE)) {`,
       `  if ((Test-Path $MSIEXEC) -and (Test-Path "${msi.replace(/"/g, '""')}")) { $p = Start-Process $MSIEXEC -ArgumentList "/i","\`"${msi.replace(/"/g, '""')}\`"","/qn","/norestart" -Wait -PassThru; Say ("kernel msi exit=" + $p.ExitCode) }`,
@@ -849,10 +868,20 @@ async function ensureWsl({ emit } = {}) {
     // 功能都已启用、wsl.exe 也在,但 WSL 本身还不能用(`wsl -l -v` 只打印帮助)= 启用后还没
     // 重启。别去 --import(必失败),直接进自动重启流程。
     if (!(await wslFunctional())) {
+      if (!modernWslInstalled() && legacyWslTroubleSeen()) {
+        // 旧版 WSL 已经死锁/重启过 → 别再等它,换新版 WSL(一次 UAC),装完重启。
+        emit && emit({ phase: "install-docker", status: "running", message: "旧版 WSL 反复无响应,改为安装微软新版 WSL（会弹一次 UAC，请点「是」，下载约 250MB）…" });
+        await elevatedWslSetup({ emit, need: {} });
+      }
       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 };
     }
+    if (!modernWslInstalled() && legacyWslTroubleSeen()) {
+      emit && emit({ phase: "install-docker", status: "running", message: "这台机器的旧版 WSL 出过死锁,升级为微软新版 WSL（会弹一次 UAC，下载约 250MB）…" });
+      await elevatedWslSetup({ emit, need: {} });
+      if (modernWslInstalled()) { emit && emit({ phase: "install-docker", status: "running", message: "新版 WSL 已安装,需要重启 Windows 生效…" }); return { ok: false, needsReboot: true }; }
+    }
     // WSL2 内核(lxss\tools\kernel)缺失时 --import 也必失败。先把 MSI 下到 Downloads,再用
     // 同一个提权脚本装(功能已启用的话脚本只做装内核这一件事)。
     if (!wslKernelPresent()) {
@@ -988,7 +1017,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, wslKernelPresent, wslExe, wslMissing, ensureWsl, virtualizationStatus,
+  launchElevated, elevatedWslSetup, modernWslInstalled, 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

@@ -95,7 +95,9 @@ async function ensureWslKernel({ emit } = {}) {
 // …连接尝试失败」。实测 `wsl --shutdown` 后恢复。据此标记,bootstrap 遇到就重置一次再重试。
 function isWslVmUnreachable(err) {
   if (!err) return false;
-  const code = err.code === 4294967295 || err.code === -1 || err.code === 0xffffffff;
+  // bash 的退出码只会是 0-255;>255 / -1 / 4294967295 只可能来自 wsl.exe 自己(连不上 VM)。
+  const code = err.code === 4294967295 || err.code === -1 || err.code === 0xffffffff || (typeof err.code === "number" && err.code > 255);
+  if (code) return true;
   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 {}
@@ -139,7 +141,13 @@ function wslRunStream(cmd, { emit, phase = "install-docker", timeout = 900000, d
     child.stderr.on("data", pump);
     const timer = setTimeout(() => { try { child.kill("SIGKILL"); } catch {} reject(Object.assign(new Error("timeout"), { stdout: tail })); }, timeout);
     child.on("error", (e) => { clearTimeout(timer); reject(e); });
-    child.on("close", (code) => { clearTimeout(timer); code === 0 ? resolve({ stdout: tail }) : reject(Object.assign(new Error(`exit ${code}`), { stdout: tail })); });
+    child.on("close", (code) => {
+      clearTimeout(timer);
+      if (code === 0) return resolve({ stdout: tail });
+      const err = Object.assign(new Error(`exit ${code}`), { stdout: tail, code });
+      err.wslVmUnreachable = isWslVmUnreachable(err);
+      reject(err);
+    });
   });
 }
 

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

@@ -139,3 +139,20 @@ test("the container update script is pushed with LF endings even from a CRLF che
   assert.match(read("src/sidecar/wsl-docker.js"), /cicy-code-update\.sh"\), "utf8"\)\.replace\(\/\\r\\n\?\/g, "\\n"\)/);
   assert.match(read(".gitattributes"), /\*\.sh text eol=lf/);
 });
+
+test("streamed wsl runs flag an unreachable VM too, and soft failures back off 2 min", () => {
+  const w = read("src/sidecar/wsl-docker.js");
+  assert.match(w, /const err = Object\.assign\(new Error\(`exit \$\{code\}`\), \{ stdout: tail, code \}\);\n\s+err\.wslVmUnreachable = isWslVmUnreachable\(err\);/);
+  assert.match(w, /err\.code > 255\)/);
+  assert.match(read("src/backends/sidecar-ipc.js"), /_softRetryAt = Date\.now\(\) \+ 2 \* 60 \* 1000;/);
+});
+
+test("legacy WSL trouble → install modern WSL (MSI mirrored to OSS) in the single elevation; wslExe prefers it", () => {
+  const d = read("src/sidecar/docker.js");
+  assert.match(d, /function modernWslInstalled\(\)/);
+  assert.match(d, /function legacyWslTroubleSeen\(\)/);
+  assert.match(d, /"WSL", "wsl\.exe"\), \/\/ 新版 WSL/);
+  assert.match(d, /installing modern WSL/);
+  assert.match(d, /if \(!modernWslInstalled\(\) && legacyWslTroubleSeen\(\)\) \{/);
+  assert.match(read(".github/workflows/windows-exe-release.yml"), /wsl\/wsl\.x64\.msi/);
+});