cicy-desktop 2.1.290 → 2.1.292

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.290",
+  "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();
+      });
   });
 }
 
@@ -1081,6 +1093,13 @@ async function status(port = 8008) {
 // downloads and exit-100. A second caller just attaches to the in-flight run.
 let _bootstrapInFlight = null;
 let _bootstrapBeat = 0; // 上次进度事件时间 —— 心跳,用于判定 in-flight 是否卡死
+// 所有跟随同一次安装的进度订阅者 + 最近事件缓存:守护循环先起的安装没有 UI,用户随后点
+// 「安装」打开抽屉时,把已发生的步骤回放给它,之后的事件也同时推给它,而不是只有一句
+// 「正在跟随同一进度…」。
+const _bootstrapListeners = new Set();
+let _bootstrapRecent = [];
+let _bootstrapT0 = 0;
+const BOOTSTRAP_RECENT_MAX = 60;
 // 没有任何进度事件超过这个时长 = wedged(`wsl --import` 静默最久 ~1-4 分钟,留足余量)。
 const BOOTSTRAP_STALL_MS = 6 * 60 * 1000;
 
@@ -1092,7 +1111,11 @@ async function bootstrap(opts = {}) {
     // 丢弃它、重起一次;否则正常并发跟随同一进度。
     const stalled = Date.now() - _bootstrapBeat > BOOTSTRAP_STALL_MS;
     if (!stalled) {
-      try { opts.onProgress && opts.onProgress({ phase: "install-docker", status: "running", message: "安装已在进行中,正在跟随同一进度…" }); } catch {}
+      if (opts.onProgress) {
+        try { opts.onProgress({ phase: "install-docker", status: "running", message: `安装已在进行中(${Math.round((Date.now() - _bootstrapT0) / 1000)}s 前开始),正在跟随同一进度…` }); } catch {}
+        for (const ev of _bootstrapRecent) { try { opts.onProgress(ev); } catch {} }
+        _bootstrapListeners.add(opts.onProgress);
+      }
       return _bootstrapInFlight;
     }
     log.warn(`[bootstrap] in-flight 卡死(${Math.round((Date.now() - _bootstrapBeat) / 1000)}s 无进度)→ 丢弃僵死的,重起一次`);
@@ -1101,9 +1124,16 @@ async function bootstrap(opts = {}) {
   }
   // 包一层 onProgress:每来一个事件就刷新心跳,卡死检测才准。
   _bootstrapBeat = Date.now();
-  const userOnProgress = opts.onProgress;
-  const wrapped = { ...opts, onProgress: (ev) => { _bootstrapBeat = Date.now(); try { userOnProgress && userOnProgress(ev); } catch {} } };
-  _bootstrapInFlight = _bootstrap(wrapped).finally(() => { _bootstrapInFlight = null; });
+  _bootstrapT0 = Date.now();
+  _bootstrapListeners.clear();
+  _bootstrapRecent = [];
+  if (opts.onProgress) _bootstrapListeners.add(opts.onProgress);
+  const wrapped = { ...opts, onProgress: (ev) => {
+    _bootstrapBeat = Date.now();
+    _bootstrapRecent.push(ev); if (_bootstrapRecent.length > BOOTSTRAP_RECENT_MAX) _bootstrapRecent.shift();
+    for (const fn of _bootstrapListeners) { try { fn(ev); } catch {} }
+  } };
+  _bootstrapInFlight = _bootstrap(wrapped).finally(() => { _bootstrapInFlight = null; _bootstrapListeners.clear(); });
   return _bootstrapInFlight;
 }
 

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", () => {
@@ -30,3 +36,9 @@ test("keepalive logon task degrades to LeastPrivilege / HKCU Run when not elevat
   assert.match(src, /writeKeepaliveFiles\(\{ runLevel: "LeastPrivilege" \}\)/);
   assert.match(src, /CurrentVersion\\\\Run/);
 });
+
+test("a second bootstrap caller gets the in-flight run's progress (replay + live)", () => {
+  const src = read("src/sidecar/wsl-docker.js");
+  assert.match(src, /for \(const ev of _bootstrapRecent\) \{ try \{ opts\.onProgress\(ev\); \} catch \{\} \}\n\s+_bootstrapListeners\.add\(opts\.onProgress\);/);
+  assert.match(src, /for \(const fn of _bootstrapListeners\) \{ try \{ fn\(ev\); \} catch \{\} \}/);
+});