cicy-desktop 2.1.291 → 2.1.292

package/package.json

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

package/src/sidecar/docker.js

@@ -629,20 +629,21 @@ async function wslMissing() {
   });
 }
 
-// True iff a Windows optional feature reports State : Enabled. NOTE: dism
-// /get-featureinfo prints NOTHING when the caller is not elevated (the desktop
-// normally runs at medium integrity even for an admin account), so an empty
-// answer must not be read as "disabled" — fall back to the functional probe.
+// True iff a Windows optional feature is enabled. Primary source: WMI
+// Win32_OptionalFeature (InstallState 1=Enabled, 2=Disabled) — readable WITHOUT
+// elevation, unlike `dism /get-featureinfo`, which prints nothing at medium
+// integrity (the desktop normally runs unelevated even for admin accounts) and
+// was being misread as "disabled". dism stays as the fallback when WMI is unavailable.
 function featureEnabled(feature) {
   return new Promise((resolve) => {
-    execFile("dism", ["/english", "/online", "/get-featureinfo", `/featurename:${feature}`],
-      { timeout: 30000, windowsHide: true },
-      async (_e, out) => {
-        const text = String(out || "");
-        if (/State\s*:\s*Enabled/i.test(text)) return resolve(true);
-        if (/State\s*:\s*Disabled/i.test(text)) return resolve(false);
-        resolve(await wslFunctional()); // no answer (not elevated) → ask WSL itself
-      });
+    const ps = `(Get-CimInstance Win32_OptionalFeature -Filter "Name='${feature}'").InstallState`;
+    execFile("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", ps], { timeout: 30000, windowsHide: true }, (err, out) => {
+      const v = String(out || "").trim();
+      if (!err && /^[0-9]+$/.test(v)) return resolve(v === "1");
+      execFile("dism", ["/english", "/online", "/get-featureinfo", `/featurename:${feature}`],
+        { timeout: 30000, windowsHide: true },
+        (_e, out2) => resolve(/State\s*:\s*Enabled/i.test(String(out2 || ""))));
+    });
   });
 }
 

package/src/sidecar/wsl-docker.js

@@ -240,8 +240,20 @@ function importTarball(dest, installDir) {
     // `wsl` call then blocks and the app goes 未响应). Bound it short so we FAIL FAST
     // and the caller can `wsl --shutdown` + retry instead of hanging 10 minutes.
     execFile("wsl", ["--import", DISTRO, installDir, dest, "--version", "2"],
-      { timeout: 240000, windowsHide: true },
-      (err, _so, se) => { if (err) { err.stderr = String(se || ""); return reject(err); } resolve(); });
+      { timeout: 240000, windowsHide: true, encoding: "buffer" },
+      (err, _so, se) => {
+        if (err) {
+          // wsl.exe 的报错是 UTF-16 输出(常见:「请启用'虚拟机平台'Windows 功能并确保在 BIOS 中
+          // 启用虚拟化」);解码后拼进 message,抽屉才能显示真正原因而不是「Command failed」。
+          let text = "";
+          try { text = Buffer.isBuffer(se) ? se.toString("utf16le") : String(se || ""); } catch {}
+          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;
+          return reject(err);
+        }
+        resolve();
+      });
   });
 }
 

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

@@ -19,10 +19,16 @@ test("bootstrap failures land in lastError and pause the auto-bootstrap loop unt
   assert.match(src, /logFile: _logFile/);
 });
 
-test("featureEnabled does not treat dism's empty (unelevated) output as disabled", () => {
+test("featureEnabled reads Win32_OptionalFeature (works unelevated), dism only as fallback", () => {
   const src = read("src/sidecar/docker.js");
-  assert.match(src, /if \(\/State\\s\*:\\s\*Disabled\/i\.test\(text\)\) return resolve\(false\);\n\s+resolve\(await wslFunctional\(\)\)/);
-  assert.match(src, /function wslFunctional\(\)/);
+  assert.match(src, /Get-CimInstance Win32_OptionalFeature -Filter "Name='\$\{feature\}'"\)\.InstallState/);
+  assert.match(src, /resolve\(v === "1"\)/);
+});
+
+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"\)/);
 });
 
 test("keepalive logon task degrades to LeastPrivilege / HKCU Run when not elevated", () => {