cicy-desktop 2.1.135 → 2.1.137

package/package.json

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

package/src/backends/auth-loopback.js

@@ -47,6 +47,45 @@ const LOGIN_TIMEOUT_MS = 120_000;
 let _server = null;
 let _state = null;
 let _timeoutHandle = null;
+let _loginWindow = null;
+let _onResult = null;     // the caller's callback, for the user-closes-window case
+let _resultFired = false; // guard: onResult is delivered exactly once
+
+function closeLoginWindow() {
+  const w = _loginWindow;
+  _loginWindow = null;
+  if (w && !w.isDestroyed()) { try { w.removeAllListeners("closed"); w.close(); } catch {} }
+}
+
+// Open the login page in an IN-APP Electron window. This is the fix for "登录弹不出
+//网页": shell.openExternal needs a working default browser, which a fresh Windows
+// profile may not have. An in-app window has no such dependency, and the cloud's
+// 302 to http://127.0.0.1:<port>/cb lands right back in THIS window — the loopback
+// server answers it, firing onResult. Returns false if the window can't be made
+// (then the caller falls back to the system browser).
+function openLoginWindow(url) {
+  const { BrowserWindow } = require("electron");
+  try {
+    closeLoginWindow();
+    _loginWindow = new BrowserWindow({
+      width: 480, height: 760, title: "登录 CiCy", autoHideMenuBar: true, show: true,
+      webPreferences: { nodeIntegration: false, contextIsolation: true, partition: "persist:cicy-login" },
+    });
+    _loginWindow.loadURL(url);
+    // User closed the window before login completed → treat as cancel so the
+    // renderer's "登录中…" state is released instead of hanging until timeout.
+    _loginWindow.on("closed", () => {
+      _loginWindow = null;
+      if (_resultFired) return; // success already delivered; it shuts us down
+      try { _onResult && _onResult({ error: "login window closed" }); } catch {}
+      shutdown("login window closed by user");
+    });
+    return true;
+  } catch (e) {
+    log.warn(`[auth-loopback] in-app login window failed: ${e.message}`);
+    return false;
+  }
+}
 
 function shutdown(reason) {
   if (_timeoutHandle) { clearTimeout(_timeoutHandle); _timeoutHandle = null; }
@@ -54,6 +93,7 @@ function shutdown(reason) {
     try { _server.close(); } catch {}
     _server = null;
   }
+  closeLoginWindow();
   _state = null;
   if (reason) log.info(`[auth-loopback] shutdown: ${reason}`);
 }
@@ -64,6 +104,14 @@ async function startLogin({ onResult } = {}) {
 
   _state = crypto.randomBytes(16).toString("hex");
   const expectedState = _state;
+  _resultFired = false;
+  // Deliver the result to the caller exactly once — the server callback, the
+  // user-closes-window handler, and the timeout all race to be first.
+  _onResult = (payload) => {
+    if (_resultFired) return;
+    _resultFired = true;
+    try { onResult && onResult(payload); } catch {}
+  };
 
   _server = http.createServer((req, res) => {
     let url;
@@ -98,7 +146,7 @@ async function startLogin({ onResult } = {}) {
   <h1 style="color:#c00">登录失败</h1>
   <p>state 校验未通过，请回到 CiCy Desktop 重新点击 Login。</p>
 </body>`);
-      try { onResult && onResult({ error: "state mismatch" }); } catch {}
+      _onResult({ error: "state mismatch" });
       setTimeout(() => shutdown("state mismatch"), 500);
       return;
     }
@@ -110,14 +158,14 @@ async function startLogin({ onResult } = {}) {
   <h1 style="color:#c00">登录失败</h1>
   <p>未收到 token，请回到 CiCy Desktop 重试。</p>
 </body>`);
-      try { onResult && onResult({ error: "no token" }); } catch {}
+      _onResult({ error: "no token" });
       setTimeout(() => shutdown("no token"), 500);
       return;
     }
 
     res.writeHead(200, { "content-type": "text/html; charset=utf-8" });
     res.end(SUCCESS_HTML);
-    try { onResult && onResult({ token, state, reused, accessToken, userId }); } catch {}
+    _onResult({ token, state, reused, accessToken, userId });
     setTimeout(() => shutdown("login complete"), 500);
   });
 
@@ -133,14 +181,18 @@ async function startLogin({ onResult } = {}) {
       });
       const url = `${LOGIN_BASE}?${params.toString()}`;
       log.info(`[auth-loopback] listening :${port}, opening ${url}`);
-      // Best-effort auto-open. On some setups (fresh Windows user with no default
-      // browser, locked-down shell) openExternal silently fails and the user is
-      // left stuck "等回调" with no recourse — so we ALSO return the url to the
-      // renderer (below) to show a manual "open / copy this link" fallback.
-      require("./open-external").openExternalRobust(url).catch((e) => log.warn(`[auth-loopback] open failed: ${e.message}`));
+      // Open the login page IN-APP (an Electron window) — works even when the
+      // machine has no/locked default browser, which is the "登录弹不出网页" bug.
+      // The cloud's 302 to http://127.0.0.1:<port>/cb lands back in this same
+      // window and the loopback server answers it. Only if the window can't be
+      // created do we fall back to the system browser. We still return the url so
+      // the renderer can offer a manual "open / copy link" last resort.
+      if (!openLoginWindow(url)) {
+        require("./open-external").openExternalRobust(url).catch((e) => log.warn(`[auth-loopback] open failed: ${e.message}`));
+      }
 
       _timeoutHandle = setTimeout(() => {
-        try { onResult && onResult({ error: "timeout" }); } catch {}
+        _onResult({ error: "timeout" });
         shutdown("timeout");
       }, LOGIN_TIMEOUT_MS);
 

package/src/backends/sidecar-ipc.js

@@ -16,6 +16,10 @@ const { ipcMain } = require("electron");
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
+const log = require("electron-log");
+// Background-computed docker status lives here; the homepage READS this (never
+// probes WSL live → never blocks the UI / strands it on 「重试检测」).
+const DOCKER_STATUS_FILE = path.join(os.homedir(), "cicy-ai", "db", "docker-status.json");
 const sidecar = require("../sidecar/cicy-code");
 const docker = require("../sidecar/docker");
 const wslDocker = require("../sidecar/wsl-docker"); // Docker-版 via WSL2+Ubuntu (方案 A, win32)
@@ -110,6 +114,46 @@ function register({ sidecarLogPath } = {}) {
   if (registered) return;
   registered = true;
 
+  // ---- Docker status: computed by a dedicated NON-BLOCKING background daemon ----
+  // The homepage's 「重试检测」 / 「未响应」 came from probing WSL live on the UI's
+  // status call: a cold/busy WSL2 VM takes 10-20s to answer, timed out, and got
+  // mis-read as unknown. Instead the daemon below detects status off the UI thread,
+  // caches it (memory + file), AND auto-starts whatever is installed-but-down. The
+  // docker:app-status handler just returns the cache — instant, never blocks.
+  let _dockerStatusCache = null;
+  let _dockerDaemonBusy = false;
+  async function refreshDockerStatus() {
+    try {
+      const s = await appDocker.status(APP_PORT); // { wsl, distro, engineUp, running, unknown }
+      _dockerStatusCache = { installed: !!s.distro, dockerRunning: !!s.engineUp, running: !!s.running, unknown: !!s.unknown, port: APP_PORT, platform: process.platform, ts: Date.now() };
+    } catch (e) {
+      _dockerStatusCache = { installed: false, dockerRunning: false, running: false, unknown: true, port: APP_PORT, platform: process.platform, error: e.message, ts: Date.now() };
+    }
+    try { fs.mkdirSync(path.dirname(DOCKER_STATUS_FILE), { recursive: true }); fs.writeFileSync(DOCKER_STATUS_FILE, JSON.stringify(_dockerStatusCache)); } catch {}
+    return _dockerStatusCache;
+  }
+  async function reconcileDocker() {
+    if (_dockerDaemonBusy) return _dockerStatusCache;
+    _dockerDaemonBusy = true;
+    try {
+      const s = await refreshDockerStatus();
+      // 没启动的给我启动: distro installed but :8009 not healthy (and WSL not unknown)
+      // → bring it up. bootstrap is idempotent: it skips done steps and just runs
+      // startEngine + the container. Skip when not installed (would silently pull
+      // the 444MB rootfs) or unknown (WSL not answering — let the next tick retry).
+      if (s.installed && !s.running && !s.unknown) {
+        log.info("[docker-daemon] installed but :8009 down → auto-starting (bootstrap idempotent)");
+        try { await appDocker.bootstrap(appOpts()); } catch (e) { log.warn(`[docker-daemon] auto-start failed: ${e.message}`); }
+        await refreshDockerStatus();
+      }
+    } finally { _dockerDaemonBusy = false; }
+    return _dockerStatusCache;
+  }
+  function startDockerStatusDaemon() {
+    setTimeout(() => { reconcileDocker().catch(() => {}); }, 2000);     // shortly after startup
+    setInterval(() => { reconcileDocker().catch(() => {}); }, 60000);   // keep fresh + self-heal
+  }
+
   ipcMain.handle("sidecar:status", async () => {
     const running = await sidecar.probeExisting(PORT);
     return { running };
@@ -170,13 +214,14 @@ function register({ sidecarLogPath } = {}) {
   // ---- Docker-版 cicy-code on :8009 — WSL2 + Ubuntu + Docker Engine (方案 A) ----
   // Card states (主人: 状态分清楚): running(:8009 healthy)→打开 / dockerRunning
   // (engine up)→启动 / installed(Ubuntu present)→启动 Docker / else→下载安装.
-  ipcMain.handle("docker:app-status", async () => {
-    try {
-      const s = await appDocker.status(APP_PORT); // { wsl, distro, engineUp, running, unknown }
-      return { installed: !!s.distro, dockerRunning: !!s.engineUp, running: !!s.running, unknown: !!s.unknown, port: APP_PORT, platform: process.platform };
-    } catch (e) {
-      return { installed: false, dockerRunning: false, running: false, port: APP_PORT, platform: process.platform, error: e.message };
-    }
+  ipcMain.handle("docker:app-status", () => {
+    // NON-BLOCKING: return what the background daemon already computed (memory →
+    // file). NEVER probe WSL live here — that's what froze the UI / stranded the
+    // card on 「重试检测」. Kick a refresh if we have nothing cached yet.
+    if (_dockerStatusCache) return _dockerStatusCache;
+    try { return JSON.parse(fs.readFileSync(DOCKER_STATUS_FILE, "utf8")); } catch {}
+    reconcileDocker().catch(() => {});
+    return { installed: false, dockerRunning: false, running: false, unknown: true, port: APP_PORT, platform: process.platform };
   });
 
   // Common run options for the :8009 instance: its own container/volume + the
@@ -422,6 +467,10 @@ function register({ sidecarLogPath } = {}) {
       });
     });
   });
+
+  // Kick the non-blocking docker status daemon: detect on startup + every 60s,
+  // cache to file, and auto-start what's installed-but-down. The UI just reads it.
+  startDockerStatusDaemon();
 }
 
 module.exports = { register };

package/src/sidecar/docker.js

@@ -567,7 +567,7 @@ async function wslMissing() {
   // (wsl didn't answer / timed out). null lets status() report `unknown` instead
   // of falsely concluding "not installed" when WSL is merely stuck.
   return await new Promise((resolve) => {
-    execFile("wsl", ["--status"], { timeout: 8000, windowsHide: true, encoding: "utf16le" }, (err, stdout, stderr) => {
+    execFile("wsl", ["--status"], { timeout: 25000, windowsHide: true, encoding: "utf16le" }, (err, stdout, stderr) => {
       const s = String((stdout || "") + (stderr || "") + (err && err.message ? err.message : ""));
       if (/未安装|not installed|--install/i.test(s)) return resolve(true);   // definitely missing
       if (err && (err.killed || err.signal || err.code === "ETIMEDOUT")) return resolve(null); // timed out → unknown

package/src/sidecar/wsl-docker.js

@@ -98,7 +98,11 @@ async function distroInstalled(distro = DISTRO) {
   if (process.platform !== "win32") return false;
   // ASYNC execFile (sync froze the main process on a cold/stuck WSL → "未响应").
   return await new Promise((resolve) => {
-    execFile("wsl", ["-l", "-q"], { timeout: 8000, windowsHide: true, encoding: "utf16le" }, (err, stdout) => {
+    // 25s, NOT 8s: a COLD WSL2 VM takes 10-20s just to boot before it answers the
+    // first `wsl -l -q`, so an 8s timeout falsely returns null(unknown) → the
+    // homepage gets stuck on 「重试检测」 instead of offering 「安装」. A warm WSL
+    // answers in <1s, so the longer ceiling never bites in the normal case.
+    execFile("wsl", ["-l", "-q"], { timeout: 25000, windowsHide: true, encoding: "utf16le" }, (err, stdout) => {
       // Our timeout killed it / it was signalled → WSL didn't answer → UNKNOWN.
       if (err && (err.killed || err.signal || err.code === "ETIMEDOUT")) return resolve(null);
       // Other errors (wsl missing / non-zero exit) → definitively not our distro.