cicy-desktop 2.1.61 → 2.1.63

package/package.json

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

package/src/backends/homepage-window.js

@@ -1,27 +1,20 @@
 // Homepage window — primary CiCy Desktop window. Singleton; closing it
 // does NOT quit the app.
 //
-// URL selection (HARDCODED — no env/dev-URL switch, no Vite):
-//   - Windows: the remote Cloudflare worker https://desktop.cicy-ai.com — keeps
-//     Win shipping without rebuilding (Win release cadence is slower than
-//     render's). Falls back to the local file:// SPA if unreachable.
-//   - Mac/Linux: the bundled local SPA file:// — works offline, fast, no remote
-//     dependency, no mixed-content concerns when embedding the team-assistant
-//     webview (the cicy-desktop preload's IPC bridge still attaches).
+// URL selection (HARDCODED — no env/dev-URL switch, no Vite): ALL platforms
+// load the bundled local file:// SPA — works offline, fast, no remote
+// dependency, no mixed-content concerns when embedding the team-assistant
+// webview (the cicy-desktop preload's IPC bridge still attaches). The remote
+// Cloudflare worker is only a fallback if the bundled SPA fails to load.
 
 const path = require("path");
 const { BrowserWindow } = require("electron");
 const log = require("electron-log");
 
-// Hardcoded homepage source — no Vite / CICY_HOMEPAGE_URL dev-URL switch.
-//   - mac/linux: the bundled file:// SPA (offline, fast, no remote dependency).
-//   - Windows:   the remote Cloudflare worker (Win release cadence is slower
-//                than render's, so it loads the homepage remotely).
-const REMOTE_URL = "https://desktop.cicy-ai.com/"; // Cloudflare worker (remote homepage)
+const REMOTE_URL = "https://desktop.cicy-ai.com/"; // Cloudflare worker (fallback only)
 const LOCAL_INDEX = path.join(__dirname, "homepage-react", "index.html");
 
 function pickHomepageURL() {
-  if (process.platform === "win32") return REMOTE_URL;
   return `file://${LOCAL_INDEX}`;
 }
 
@@ -83,16 +76,13 @@ async function openHomepage() {
   homepage.webContents.on("console-message", (_e, level, msg, line, source) => {
     if (level >= 1) console.log(`[homepage:console L${line}] ${msg}  (${source})`);
   });
-  // If the dev URL (Vite / SSH tunnel) is unreachable, fall back to the
-  // local bundled file:// SPA so the window never stays blank.
+  // If the bundled file:// SPA fails to load (corrupt/missing install), fall
+  // back to the remote Cloudflare homepage so the window never stays blank.
   homepage.webContents.on("did-fail-load", (_e, code, desc, url) => {
     console.error(`[homepage] did-fail-load ${code} ${desc} ${url}`);
-    const fallback = `file://${LOCAL_INDEX}`;
-    // If the remote (Windows) Cloudflare homepage is unreachable, fall back to
-    // the bundled local SPA so the window never stays blank.
-    if (url && url.startsWith(REMOTE_URL.replace(/\/$/, "")) && url !== fallback) {
-      log.warn(`[homepage] remote homepage unreachable, falling back to ${fallback}`);
-      homepage.loadURL(fallback);
+    if (url && url.startsWith("file://")) {
+      log.warn(`[homepage] bundled homepage failed, falling back to ${REMOTE_URL}`);
+      homepage.loadURL(REMOTE_URL);
     }
   });
   homepage.on("closed", () => { homepage = null; });

package/src/backends/sidecar-ipc.js

@@ -50,11 +50,17 @@ function register({ sidecarLogPath } = {}) {
         onProgress: (ev) => { try { e.sender.send("docker:bootstrap-progress", ev); } catch {} },
       });
       // Healthy local stack → make sure it shows up as a team ("本地团队就加
-      // 上去了"). addTeam dedups by host:port, so re-runs are no-ops.
+      // 上去了"). addTeam dedups by host:port, so re-runs are no-ops. The
+      // api_token must be the CONTAINER's own (volume global.json) — the
+      // host's token is a different credential and fails verify.
       if (result && result.ok) {
         try {
           const lt = require("./local-teams");
-          await lt.addTeam({ base_url: `http://127.0.0.1:${PORT}`, name: "本地团队" });
+          const tok = await docker.readContainerToken(PORT);
+          await lt.addTeam({
+            base_url: `http://127.0.0.1:${PORT}`, name: "本地团队",
+            ...(tok ? { api_token: tok } : {}),
+          });
         } catch { /* best-effort — the stack itself is up */ }
       }
       return result;

package/src/sidecar/docker.js

@@ -189,6 +189,20 @@ async function ensureDownloaded(url, dest, mirror, { emit, phase, label } = {})
   });
 }
 
+// The container's cicy-code mints its own api_token in its volume-persisted
+// global.json — the HOST's global.json token is a different credential and
+// won't verify. Read the real one out of whatever container publishes :port
+// (works for adopted legacy-named containers too).
+async function readContainerToken(port = 8008) {
+  try {
+    const { stdout } = await run(["ps", "--filter", `publish=${port}`, "--format", "{{.Names}}"]);
+    const name = stdout.trim().split("\n")[0];
+    if (!name) return "";
+    const r = await run(["exec", name, "cat", "/home/cicy/cicy-ai/global.json"], { timeout: 10000 });
+    return (JSON.parse(r.stdout).api_token || "");
+  } catch { return ""; }
+}
+
 // HTTP /health probe of the container on :port.
 function probeHealth(port = 8008, timeoutMs = 2500) {
   return new Promise((resolve) => {
@@ -358,4 +372,4 @@ async function bootstrap({ onProgress, port = 8008 } = {}) {
   return { ok: healthy, container: CONTAINER };
 }
 
-module.exports = { start, stop, checkStatus, loadImage, imagePresent, dockerOk, installDocker, bootstrap, probeHealth };
+module.exports = { start, stop, checkStatus, loadImage, imagePresent, dockerOk, installDocker, bootstrap, probeHealth, readContainerToken };