cicy-desktop 2.1.296 → 2.1.298

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

@@ -119,6 +119,19 @@ jobs:
           if (-not $exe) { Write-Error "no exe found in dist"; exit 1 }
           $base = "oss://cicy-1372193042-cn/releases"
 
+          # 0) WSL2 内核裸文件(一次性,已存在就跳过):精简版 Windows 没有 msiexec 装不了
+          #    wsl_update_x64.msi,桌面端改为直接下这个文件放到 System32\lxss\tools\kernel。
+          $kernelKey = "$base/wsl-kernel/kernel"
+          & $oss stat "$kernelKey" 2>$null | Out-Null
+          if ($LASTEXITCODE -ne 0) {
+            Write-Host "Publishing raw WSL2 kernel -> $kernelKey"
+            Invoke-WebRequest -Uri "https://wslstorestorage.blob.core.windows.net/wslblob/wsl_update_x64.msi" -OutFile wsl_update_x64.msi
+            $kdir = Join-Path $PWD "wsl-kernel-extract"
+            Start-Process msiexec.exe -ArgumentList "/a","`"$PWD\wsl_update_x64.msi`"","/qn","TARGETDIR=$kdir" -Wait
+            $kfile = Get-ChildItem $kdir -Recurse -File | Where-Object { $_.Name -eq "kernel" } | Select-Object -First 1
+            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" }
+
           # 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.296",
+  "version": "2.1.298",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {

package/src/sidecar/docker.js

@@ -668,6 +668,8 @@ 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";
+// 裸内核文件(由发布工作流从 MSI 解出后放到 OSS):精简版 Windows 没有 msiexec 时直接放到位。
+const WSL_KERNEL_RAW_URL = process.env.CICY_WSL_KERNEL_RAW_URL || (require("./mirrors").OSS_RELEASES_BASE + "/wsl-kernel/kernel");
 // 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.
@@ -742,7 +744,15 @@ function elevatedWslSetup({ emit, need = {} } = {}) {
       '  & $SFC /scannow | Out-Null; Say ("sfc exit=" + $LASTEXITCODE)',
       '  foreach ($f in $bad) { $c = En $f }',
       '}',
-      `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) }`,
+      `$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) }`,
+      `  if (-not (Test-Path $KFILE)) {`,
+      `    Say "msiexec missing or failed — downloading the raw WSL2 kernel file"`,
+      `    New-Item -ItemType Directory -Force $KDIR | Out-Null`,
+      `    try { Invoke-WebRequest -UseBasicParsing -Uri "${WSL_KERNEL_RAW_URL}" -OutFile $KFILE; Say ("kernel file " + (Get-Item $KFILE).Length + " bytes") } catch { Say ("kernel download failed: " + $_.Exception.Message) }`,
+      `  }`,
+      `}`,
       'Say ("final subsystem=" + (St "Microsoft-Windows-Subsystem-Linux") + " vmPlatform=" + (St "VirtualMachinePlatform"))',
       'Say "DONE"',
     ].join("\r\n");

package/src/sidecar/wsl-docker.js

@@ -559,11 +559,48 @@ function toWslPath(winPath) {
 async function loadImage(winTarballPath, { emit } = {}) {
   emit && emit({ phase: "image", status: "loading", message: "正在导入镜像到 Docker（较大,约 1-3 分钟,下面是实时进度）…" });
   const p = toWslPath(winTarballPath);
-  const { stdout } = await wslRunStream(`docker load -i "${p}"`, { emit, phase: "image", timeout: 600000 });
+  // 精简版 Windows 上见过:发行版里 /mnt/c 没有自动挂载(drvfs 挂载失败),`docker load -i /mnt/c/...`
+  // 直接 "no such file"。先探一下;不可读就试手动挂载;还不行就把包从 Windows 侧通过 stdin 灌进
+  // `docker load`,完全不依赖 /mnt/c。
+  let readable = false;
+  try { await wslRun(`test -r "${p}"`, { timeout: 20000 }); readable = true; } catch {}
+  if (!readable) {
+    try { await wslRun(`mount -t drvfs C: /mnt/c 2>/dev/null || true; test -r "${p}"`, { timeout: 30000 }); readable = true; } catch {}
+  }
+  let stdout = "";
+  if (readable) {
+    ({ stdout } = await wslRunStream(`docker load -i "${p}"`, { emit, phase: "image", timeout: 600000 }));
+  } else {
+    emit && emit({ phase: "image", status: "loading", message: "发行版内看不到 /mnt/c,改为通过管道导入镜像（无实时进度,约 1-3 分钟）…" });
+    stdout = await loadImageViaStdin(winTarballPath, { emit });
+  }
   const m = String(stdout).match(/Loaded image:\s*(\S+)/i);
   if (m && m[1] !== IMAGE) { try { await wslRun(`docker tag ${m[1]} ${IMAGE}`, { timeout: 15000 }); } catch {} }
 }
 
+// `type tarball | wsl -d distro docker load`:从 Windows 侧把镜像包流进发行版,不经过 /mnt/c。
+function loadImageViaStdin(winTarballPath, { emit } = {}) {
+  return new Promise((resolve, reject) => {
+    const child = spawn(docker.wslExe(), ["-d", DISTRO, "-u", "root", "--", "docker", "load"], { windowsHide: true, stdio: ["pipe", "pipe", "pipe"] });
+    let out = "", err = "";
+    const total = (() => { try { return fs.statSync(winTarballPath).size; } catch { return 0; } })();
+    let sent = 0, lastPct = -1;
+    const timer = setTimeout(() => { try { child.kill(); } catch {} reject(new Error("docker load (stdin) timed out")); }, 900000);
+    child.stdout.on("data", (d) => { out += String(d); });
+    child.stderr.on("data", (d) => { err += String(d); });
+    child.on("error", (e) => { clearTimeout(timer); reject(e); });
+    child.on("close", (code) => { clearTimeout(timer); if (code === 0) resolve(out); else reject(new Error(`docker load (stdin) exit ${code}: ${(err || out).slice(0, 300)}`)); });
+    const rs = fs.createReadStream(winTarballPath);
+    rs.on("data", (chunk) => {
+      sent += chunk.length;
+      const pct = total ? Math.floor((sent / total) * 100) : -1;
+      if (pct !== lastPct && pct % 5 === 0) { lastPct = pct; emit && emit({ phase: "image", status: "loading", message: `通过管道导入镜像… ${pct}%`, progress: pct }); }
+    });
+    rs.on("error", (e) => { try { child.kill(); } catch {} reject(e); });
+    rs.pipe(child.stdin);
+  });
+}
+
 // 修复「卡在旧镜像」: imagePresent() 只看本地有没有 `:latest`,旧镜像在就永远跳过下载。
 // 改成校验 OSS tarball ETag:缺镜像、或 ETag 跟上次 load 不一致 → 重下重载(删旧缓存包)。
 // 非破坏性:不删发行版/不删 volume。返回是否真刷新了。与 colima 端逻辑一致。

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

@@ -79,3 +79,17 @@ test("missing WSL2 kernel is installed through the same single elevation", () =>
   assert.match(d, /if \(!wslKernelPresent\(\)\) \{[^]*elevatedWslSetup\(\{ emit, need: \{\} \}\)/);
   assert.match(d, /reason: "wsl_kernel_missing"/);
 });
+
+test("kernel install falls back to the raw kernel file when msiexec is absent", () => {
+  const d = read("src/sidecar/docker.js");
+  assert.match(d, /WSL_KERNEL_RAW_URL/);
+  assert.match(d, /msiexec missing or failed/);
+  assert.match(read(".github/workflows/windows-exe-release.yml"), /wsl-kernel\/kernel/);
+});
+
+test("image load survives a missing /mnt/c mount (drvfs retry, then stdin pipe)", () => {
+  const w = read("src/sidecar/wsl-docker.js");
+  assert.match(w, /mount -t drvfs C: \/mnt\/c/);
+  assert.match(w, /function loadImageViaStdin\(/);
+  assert.match(w, /\["-d", DISTRO, "-u", "root", "--", "docker", "load"\]/);
+});