cicy-desktop 2.1.296 → 2.1.297

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.297",
   "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/test/bootstrap-failure-reporting.test.js

@@ -79,3 +79,10 @@ 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/);
+});