cicy-desktop 2.1.240 → 2.1.242

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.240",
+  "version": "2.1.242",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -139,10 +139,10 @@
   "//optionalDependencies": "(2026-06 回调): mac/linux 改回 native cicy-code(:8008,colima 在 16G mac 上压垮内存)→ 重新内置 cicy-code-<plat> / cicy-mihomo-<plat>,localbin.fromBundle 零网络 seed(npm 仅作更新通道,带 npmmirror→npmjs 回退)。这些由 scripts/sync-runtime-deps.cjs 在 tag-push 时同步到最新版。npm 的 os/cpu 字段保证每个平台只装自己那份。Windows 仍走 docker(WSL :8009),它那份 cicy-code-windows 用不到但 bundle 着无害。",
   "optionalDependencies": {
     "electron": "41.0.3",
-    "cicy-code-darwin-x64": "2.3.202",
-    "cicy-code-darwin-arm64": "2.3.202",
-    "cicy-code-linux-x64": "2.3.202",
-    "cicy-code-linux-arm64": "2.3.202",
+    "cicy-code-darwin-x64": "2.3.203",
+    "cicy-code-darwin-arm64": "2.3.203",
+    "cicy-code-linux-x64": "2.3.203",
+    "cicy-code-linux-arm64": "2.3.203",
     "cicy-code-windows-x64": "2.3.193",
     "cicy-mihomo-darwin-x64": "1.10.4",
     "cicy-mihomo-darwin-arm64": "1.10.4",

package/src/backends/local-teams.js

@@ -572,8 +572,10 @@ async function pullCustomTeams() {
     for (const [k, v] of Object.entries(nodes)) { if (v?.cloud_team_id != null) byCloudId[String(v.cloud_team_id)] = k; }
     let added = 0, updated = 0;
     for (const t of list.teams) {
-      if (t.kind !== "custom") continue;
-      const host = String(t.host_url || t.hostUrl || "").trim();
+      // custom teams (remote URL) OR any team with a zero-trust gateway address:
+      // gateway teams are reached at <slug>.gw.cicy-ai.com (preferred over host_url).
+      if (t.kind !== "custom" && !t.gateway_url) continue;
+      const host = String(t.gateway_url || t.host_url || t.hostUrl || "").trim();
       if (!host) continue;
       const tid = t.teamId || t.id || null;
       const localId = tid != null ? byCloudId[String(tid)] : null;
@@ -1099,4 +1101,26 @@ function avatarForUrl(url) {
   return "";
 }
 
-module.exports = { list, openTeam, reloadTeam, closeLocalWindows, addTeam, removeTeam, updateTeam, upgradeTeam, syncAllLocalTeams, setAvatar, getAvatars, avatarForUrl };
+// Remove teams tied to a cloud ACCOUNT (remote base_url — pulled from the cloud
+// via pullCustomTeams, or user-added remote nodes) so switching/leaving an account
+// doesn't leak them onto the next user. LOCAL machine teams on THIS device
+// (localhost base_url) are kept — they belong to the box, not the account. The
+// next login re-pulls the new account's own teams fresh.
+async function purgeAccountTeams() {
+  let removed = 0;
+  try {
+    await writeNodes((nodes) => {
+      for (const id of Object.keys(nodes)) {
+        let host = "";
+        try { host = new URL(String(nodes[id]?.base_url || "")).hostname.toLowerCase(); } catch {}
+        const isLocal = host === "" || host === "127.0.0.1" || host === "localhost" || host === "::1";
+        if (!isLocal) { delete nodes[id]; removed++; }
+      }
+      return nodes;
+    });
+  } catch (e) { log.warn(`[local-teams] purgeAccountTeams failed: ${e.message}`); }
+  if (removed) { _cache = null; _cacheUntil = 0; log.info(`[local-teams] purged ${removed} account team(s) (login/logout)`); }
+  return removed;
+}
+
+module.exports = { list, openTeam, reloadTeam, closeLocalWindows, addTeam, removeTeam, updateTeam, upgradeTeam, syncAllLocalTeams, purgeAccountTeams, setAvatar, getAvatars, avatarForUrl };

package/src/main.js

@@ -998,6 +998,17 @@ electronApp.whenReady().then(async () => {
     // renderer. A completed email login is thus indistinguishable downstream.
     const onAuthResult = (payload) => {
       if (payload && payload.token) {
+        // Account isolation: if a DIFFERENT user is signing in, drop the previous
+        // account's cloud/remote teams so they don't leak onto this account. The
+        // login below re-pulls this account's own teams fresh. Local machine
+        // teams (localhost) are kept — they belong to the device.
+        try {
+          const prevUid = String((readGlobalConfig(GLOBAL_JSON)?.desktopAuth?.userId) || "");
+          const nextUid = payload.userId != null ? String(payload.userId) : "";
+          if (prevUid && nextUid && prevUid !== nextUid) {
+            require("./backends/local-teams").purgeAccountTeams().catch(() => {});
+          }
+        } catch {}
         saveDesktopAuth(payload);
         // Now that we have a real owner-bound login token, report this
         // machine to the cloud (best-effort; safe to call repeatedly —
@@ -1067,6 +1078,8 @@ electronApp.whenReady().then(async () => {
     __ipcMainAuth.handle("auth:logout", () => {
       try {
         updateGlobalConfig(GLOBAL_JSON, (c) => { delete c.desktopAuth; return c; });
+        // Drop this account's cloud/remote teams on logout (local machines stay).
+        require("./backends/local-teams").purgeAccountTeams().catch(() => {});
         log.info("[auth] desktop login cleared (explicit logout)");
       } catch (e) { log.warn(`[auth] logout clear failed: ${e.message}`); }
       return { ok: true };
@@ -1123,6 +1136,19 @@ electronApp.whenReady().then(async () => {
       .catch((e) => log.warn(`[cloud] device-info/register (on launch) failed: ${e.message}`));
   } catch (e) { log.warn(`[cloud] device-info launch hook failed: ${e.message}`); }
 
+  // Periodic device heartbeat → lets the ops backend show per-device liveness.
+  // Re-POST /api/device/register every 60s (idempotent upsert by owner+deviceId;
+  // cloud records last_seen on each call → "active if now - last_seen < N min").
+  // Runs in MAIN, not the renderer, so it keeps beating even when the homepage
+  // window is hidden/minimized. Best-effort, no-op when not logged in;
+  // registerDevice reads cached deviceInfo (no network detection per beat).
+  try {
+    const cc = require("./cloud/cloud-client");
+    const HEARTBEAT_MS = Math.max(15000, Number(process.env.CICY_DEVICE_HEARTBEAT_MS || 60000));
+    const beat = setInterval(() => { try { cc.registerDevice().catch(() => {}); } catch (_) {} }, HEARTBEAT_MS);
+    if (beat && typeof beat.unref === "function") beat.unref();
+  } catch (e) { log.warn(`[cloud] device heartbeat setup failed: ${e.message}`); }
+
   // Cloud↔desktop title reconcile. The homepage drives the FAST cadence by window
   // visibility (聚焦 ~3s / 切回立即,见 App.jsx + localTeams:syncCloud IPC). This
   // 30s timer is just the SLOW fallback for when no homepage window is open / it's

package/src/sidecar/native.js

@@ -143,7 +143,15 @@ async function start({ port = 8008, logPath = null, emit, version = null } = {})
   };
   // --helper removed : boot cicy-code in normal mode (full tmux-based
   // multi-agent), not the single headless 团队助手.
-  const child = spawn(exe, ["--desktop"], { stdio, detached: true, windowsHide: true, env });
+  const args = ["--desktop"];
+  // Host role: if a zero-trust gateway is provisioned (~/cicy-ai/db/gateway.json
+  // with url+token), boot with --gateway so this machine dials OUT and becomes
+  // reachable through the gateway (no inbound port). Absent → plain local boot.
+  try {
+    const gwPath = require("path").join(require("os").homedir(), "cicy-ai", "db", "gateway.json");
+    if (require("fs").existsSync(gwPath)) args.push("--gateway");
+  } catch { /* best-effort */ }
+  const child = spawn(exe, args, { stdio, detached: true, windowsHide: true, env });
   child.unref();
   try { fs.writeFileSync(PID_FILE, String(child.pid)); } catch {}
   console.log(`[native-sidecar] spawned ${exe} --desktop pid=${child.pid} port=${port} log=${logPath || "(none)"}`);