cicy-desktop 2.1.276 → 2.1.277

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.276",
+  "version": "2.1.277",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -143,10 +143,10 @@
   "//optionalDependencies": "(2026-06 回调): mac/linux 改回 native cicy-code(:8008,colima 在 16G mac 上压垮内存)→ 重新内置 cicy-code-<plat> / cicy-mihomo-<plat>,localbin.fromBundle 零网络 seed(npm 仅作更新通道,带 npmmirror→npmjs 回退)。这些由 scripts/sync-runtime-deps.cjs 在 tag-push 时同步到最新版。npm 的 os/cpu 字段保证每个平台只装自己那份。Windows 仍走 docker(WSL :8009),它那份 cicy-code-windows 用不到但 bundle 着无害。",
   "optionalDependencies": {
     "electron": "41.0.3",
-    "cicy-code-darwin-x64": "2.3.558",
-    "cicy-code-darwin-arm64": "2.3.558",
-    "cicy-code-linux-x64": "2.3.558",
-    "cicy-code-linux-arm64": "2.3.558",
+    "cicy-code-darwin-x64": "2.3.563",
+    "cicy-code-darwin-arm64": "2.3.563",
+    "cicy-code-linux-x64": "2.3.563",
+    "cicy-code-linux-arm64": "2.3.563",
     "cicy-code-windows-x64": "2.3.193",
     "cicy-mihomo-darwin-x64": "1.10.4",
     "cicy-mihomo-darwin-arm64": "1.10.4",

package/src/sidecar/docker.js

@@ -17,6 +17,7 @@ const http = require("http");
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
+const { classifyWslPrerequisites } = require("./wsl-prerequisites");
 
 const IMAGE     = process.env.CICY_DOCKER_IMAGE || "cicybot/cicy-code:latest";
 // Image tarball on Aliyun OSS (oss-cn-shanghai, public-read) — CN-domestic and
@@ -660,7 +661,12 @@ async function dismEnableFeature(feature, label, { emit } = {}) {
 // features are verified-enabled (a Windows reboot is then needed before Docker
 // can use WSL2), or { failed } if a feature couldn't be enabled.
 async function ensureWsl({ emit } = {}) {
-  if (!(await wslMissing())) return { ok: true };
+  const executableMissing = await wslMissing();
+  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 };
+
   emit && emit({ phase: "install-docker", status: "running", message: "Docker 需要 WSL2 后端，开始启用所需的 Windows 功能…" });
   const a = await dismEnableFeature("Microsoft-Windows-Subsystem-Linux", "启用 WSL 功能 1/2 · Linux 子系统", { emit });
   const b = await dismEnableFeature("VirtualMachinePlatform", "启用 WSL 功能 2/2 · 虚拟机平台", { emit });
@@ -668,10 +674,12 @@ async function ensureWsl({ emit } = {}) {
     emit && emit({ phase: "done", status: "error", message: "WSL 功能未能全部启用——请点「重试」" });
     return { ok: false, needsReboot: false, failed: true };
   }
-  // Best-effort: also pull the WSL2 kernel/plumbing (no-op until reboot on some
-  // builds; harmless if it errors).
-  await launchElevated("wsl", ["--install", "--no-distribution"], { emit }).catch(() => {});
-  emit && emit({ phase: "install-docker", status: "running", message: "WSL2 功能已启用 ✓，需【重启 Windows】后回来点「重试」继续。" });
+  // Best-effort: also pull the WSL2 kernel/plumbing when the executable itself
+  // is missing. Feature-only repairs must stop here and wait for reboot.
+  if (state.installWsl) {
+    await launchElevated("wsl", ["--install", "--no-distribution"], { emit }).catch(() => {});
+  }
+  emit && emit({ phase: "install-docker", status: "running", message: "WSL2 功能已启用 ✓，请【重启 Windows】；重启后回来点「重试」继续。" });
   return { ok: false, needsReboot: true };
 }
 

package/src/sidecar/wsl-docker.js

@@ -929,11 +929,10 @@ async function _bootstrap({ onProgress, port = 8008, container = "cicy-code-dock
 
   // 1) WSL2 platform
   begin("ensure-wsl");
-  if (await docker.wslMissing()) {
-    const w = await docker.ensureWsl({ emit });
-    if (w.needsReboot) { fail("wsl_reboot_required"); emit({ phase: "done", status: "reboot", message: "WSL2 正在安装——请【重启 Windows】后回来点「重试」继续。" }); finish(false, "wsl_reboot_required"); return { ok: false, reason: "wsl_reboot_required" }; }
-    done();
-  } else done(true);
+  const w = await docker.ensureWsl({ emit });
+  if (w.needsReboot) { fail("wsl_reboot_required"); emit({ phase: "done", status: "reboot", message: "WSL2 所需功能已启用——请【重启 Windows】后回来点「重试」继续。" }); finish(false, "wsl_reboot_required"); return { ok: false, reason: "wsl_reboot_required" }; }
+  if (!w.ok) { fail("wsl_enable_failed"); finish(false, "wsl_enable_failed"); return { ok: false, reason: "wsl_enable_failed" }; }
+  done(true);
 
   // 2) Ubuntu distro
   begin("ensure-distro");

package/src/sidecar/wsl-prerequisites.js

@@ -0,0 +1,15 @@
+// Copyright 2026 CiCy AI
+// SPDX-License-Identifier: Apache-2.0
+
+function classifyWslPrerequisites({ executableMissing, subsystemEnabled, vmPlatformEnabled }) {
+  const featuresReady = subsystemEnabled && vmPlatformEnabled;
+  const ready = !executableMissing && featuresReady;
+  return {
+    ready,
+    enableFeatures: !featuresReady,
+    installWsl: executableMissing,
+    needsReboot: !ready,
+  };
+}
+
+module.exports = { classifyWslPrerequisites };

package/test/wsl-prerequisites.test.js

@@ -0,0 +1,37 @@
+const test = require("node:test");
+const assert = require("node:assert/strict");
+
+const { classifyWslPrerequisites } = require("../src/sidecar/wsl-prerequisites");
+
+test("requires feature enablement and reboot when wsl.exe exists but Windows features are disabled", () => {
+  assert.deepEqual(
+    classifyWslPrerequisites({
+      executableMissing: false,
+      subsystemEnabled: false,
+      vmPlatformEnabled: false,
+    }),
+    { ready: false, enableFeatures: true, installWsl: false, needsReboot: true },
+  );
+});
+
+test("is ready only when wsl.exe and both Windows features are available", () => {
+  assert.deepEqual(
+    classifyWslPrerequisites({
+      executableMissing: false,
+      subsystemEnabled: true,
+      vmPlatformEnabled: true,
+    }),
+    { ready: true, enableFeatures: false, installWsl: false, needsReboot: false },
+  );
+});
+
+test("installs WSL and enables features when wsl.exe is missing", () => {
+  assert.deepEqual(
+    classifyWslPrerequisites({
+      executableMissing: true,
+      subsystemEnabled: false,
+      vmPlatformEnabled: false,
+    }),
+    { ready: false, enableFeatures: true, installWsl: true, needsReboot: true },
+  );
+});