cicy-desktop 2.1.330 → 2.1.331

package/package.json

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

package/src/main.js

@@ -949,22 +949,29 @@ function ensureAutoLaunch() {
       // (它先起 master 再起 worker,直接起 electron.exe 会缺 master)。登录项指向一个
       // wscript 隐藏启动的 VBS → `cmd /c node .\bin\cicy-desktop`,全程无控制台窗口。
       const fromSource = !electronApp.isPackaged;
-      let opts;
+      let opts, runCmd;
       if (fromSource) {
         const vbs = writeSourceAutostartVbs();
         opts = { openAtLogin: want, path: "wscript.exe", args: ["//B", "//Nologo", vbs] };
+        runCmd = `wscript.exe //B //Nologo "${vbs}"`;
       } else {
         opts = { openAtLogin: want, args: ["--hidden"] };
+        runCmd = `"${process.execPath}" --hidden`;
       }
-      const cur = electronApp.getLoginItemSettings(
-        fromSource ? { path: opts.path, args: opts.args } : undefined
-      );
-      if (cur.openAtLogin !== want) {
+      const probe = () =>
+        electronApp.getLoginItemSettings(fromSource ? { path: opts.path, args: opts.args } : undefined);
+      if (probe().openAtLogin !== want) {
         electronApp.setLoginItemSettings(opts);
         log.info(
           `[autostart] openAtLogin → ${want}${fromSource ? ` (source: ${opts.path} ${opts.args.join(" ")})` : ""}`
         );
       }
+      // Read it back. setLoginItemSettings() returns without throwing on every
+      // Windows node of this fleet and still leaves openAtLogin false, with
+      // HKCU\...\Run untouched — so autostart silently never existed, and a node
+      // whose app went away (e.g. an installer closed it) never came back, not
+      // even after a reboot. When the API did not take, write the Run key.
+      if (probe().openAtLogin !== want) ensureWindowsRunKey(want, runCmd);
     } else if (process.platform === "linux") {
       if (!electronApp.isPackaged) return;
       ensureLinuxAutostart(want);
@@ -974,6 +981,27 @@ function ensureAutoLaunch() {
   }
 }
 
+// Fallback for the silently-failing setLoginItemSettings (see ensureAutoLaunch):
+// own the HKCU Run entry directly. Async so a slow reg.exe never delays startup;
+// failures are logged, never thrown — autostart is best-effort.
+const WIN_RUN_KEY = "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Run";
+const WIN_RUN_NAME = "CiCy Desktop";
+function ensureWindowsRunKey(want, command) {
+  try {
+    const { execFile } = require("child_process");
+    const args = want
+      ? ["add", WIN_RUN_KEY, "/v", WIN_RUN_NAME, "/t", "REG_SZ", "/d", command, "/f"]
+      : ["delete", WIN_RUN_KEY, "/v", WIN_RUN_NAME, "/f"];
+    execFile("reg", args, { windowsHide: true }, (err) => {
+      // deleting an absent value exits non-zero — that is the wanted end state.
+      if (err && want) log.warn(`[autostart] Run-key fallback failed: ${err.message}`);
+      else if (want) log.info(`[autostart] Run-key fallback wrote ${WIN_RUN_NAME} → ${command}`);
+    });
+  } catch (e) {
+    log.warn(`[autostart] Run-key fallback threw: ${e.message}`);
+  }
+}
+
 // 源码模式 Windows 登录自启的隐藏启动器(VBS)。写到 %LOCALAPPDATA%\cicy-desktop,幂等覆盖。
 // 继承当前的 CICY_DEBUG(用 start-cicy-desktop-win.bat 起的就带 =1),其余环境用登录时的用户环境。
 function writeSourceAutostartVbs() {

package/test/autostart-run-key.test.js

@@ -0,0 +1,59 @@
+// Copyright 2026 CiCy AI
+// SPDX-License-Identifier: Apache-2.0
+
+// Windows autostart had no test and never worked. Measured across the fleet:
+// app.setLoginItemSettings({openAtLogin:true}) returns without throwing, yet
+// getLoginItemSettings() still reports false and HKCU\...\Run stays untouched
+// (the key exists and is writable — OneDrive lives there). So every Windows node
+// ran with no autostart at all, which is why one whose app went away never came
+// back, not even after a reboot. ensureAutoLaunch() now reads the setting back
+// and owns the Run entry itself when the API did not take.
+const test = require("node:test");
+const assert = require("node:assert/strict");
+const fs = require("node:fs");
+const path = require("node:path");
+
+const src = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8");
+const fn = src.slice(
+  src.indexOf("function ensureAutoLaunch()"),
+  src.indexOf("function ensureWindowsRunKey")
+);
+
+test("windows autostart verifies the setting instead of trusting the API", () => {
+  // A single getLoginItemSettings() call before the write is not enough — the
+  // regression is entirely in what happens AFTER setLoginItemSettings().
+  assert.match(fn, /const probe = \(\) =>/);
+  assert.match(fn, /if \(probe\(\)\.openAtLogin !== want\) \{[^]*setLoginItemSettings\(opts\)/);
+  assert.match(fn, /if \(probe\(\)\.openAtLogin !== want\) ensureWindowsRunKey\(want, runCmd\)/);
+});
+
+test("the Run-key command differs for packaged vs source runs", () => {
+  // Packaged: the exe itself, hidden. Source: wscript running the VBS launcher,
+  // because starting electron.exe directly skips bin/cicy-desktop's master boot.
+  assert.match(fn, /runCmd = `"\$\{process\.execPath\}" --hidden`/);
+  assert.match(fn, /runCmd = `wscript\.exe \/\/B \/\/Nologo "\$\{vbs\}"`/);
+});
+
+test("ensureWindowsRunKey adds or removes the HKCU Run value, async and non-fatal", () => {
+  const helper = src.slice(
+    src.indexOf("function ensureWindowsRunKey"),
+    src.indexOf("// 源码模式 Windows 登录自启")
+  );
+  assert.match(
+    src,
+    /WIN_RUN_KEY = "HKCU\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Run"/
+  );
+  assert.match(
+    helper,
+    /\["add", WIN_RUN_KEY, "\/v", WIN_RUN_NAME, "\/t", "REG_SZ", "\/d", command, "\/f"\]/
+  );
+  assert.match(helper, /\["delete", WIN_RUN_KEY, "\/v", WIN_RUN_NAME, "\/f"\]/);
+  assert.match(helper, /execFile\("reg", args, \{ windowsHide: true \}/); // no console flash, no startup stall
+  assert.match(helper, /catch \(e\) \{[^]*log\.warn/); // best-effort: never throws into startup
+});
+
+test("autostart still defaults to on and is honoured per-platform", () => {
+  assert.match(fn, /const want = prefs\.openAtLogin !== false/);
+  assert.match(fn, /if \(process\.platform === "darwin"\)/);
+  assert.match(fn, /else if \(process\.platform === "linux"\)/);
+});