cicy-desktop 2.1.157 → 2.1.159

package/package.json

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

package/src/backends/sidecar-ipc.js

@@ -39,7 +39,13 @@ const PORT = Number(process.env.CICY_CODE_PORT || 8008);
 // Desktop is missing the card installs it first (installer downloads to the
 // user's Desktop). The whole cicy home is persisted to a named volume so the
 // entire container state survives recreation (主人: "把整个 docker 挂出来").
-const APP_PORT = Number(process.env.CICY_DOCKER_APP_PORT || 8009);
+// macOS is DOCKER-ONLY (主人指令: native 退役 — native 跑在宿主机无隔离会动用户数据).
+// So on darwin the docker cicy-code IS the PRIMARY on :8008 (the slot the rest of the app
+// already talks to; native no longer spawns there — see src/sidecar/cicy-code.js). The
+// existing daemon/reconcile/ensureDockerTeam/appOpts machinery below just retargets to 8008
+// — independent cloud team key, named-volume isolation, auto-start all come for free.
+// win32 keeps the Docker-版 as an optional 2nd instance on :8009 alongside native :8008 (next).
+const APP_PORT = Number(process.env.CICY_DOCKER_APP_PORT || (process.platform === "darwin" ? 8008 : 8009));
 // container / volume 名都带上 port —— 一台机可以跑多个 docker(不同端口),各自
 // 独立容器 + 独立 volume(数据隔离)+ 独立云端 team。docker-teams.json 也按 volume
 // (含 port)区分。
@@ -77,6 +83,9 @@ const DOCKER_TEAMS_FILE = path.join(os.homedir(), "cicy-ai", "db", "docker-teams
 function readDockerTeams() { try { return JSON.parse(fs.readFileSync(DOCKER_TEAMS_FILE, "utf8")) || {}; } catch { return {}; } }
 function writeDockerTeams(obj) { try { fs.mkdirSync(path.dirname(DOCKER_TEAMS_FILE), { recursive: true }); fs.writeFileSync(DOCKER_TEAMS_FILE, JSON.stringify(obj, null, 2)); } catch {} }
 let dockerTeamReg = null; // { teamId, title, apiKey } — 缓存,appOpts 读它
+// 主实例(APP_PORT===PORT,即 darwin docker-only 的 :8008)就是「本地团队」,不该叫
+// 「Docker 团队」(那是第二实例 :8009 用的)。docker-only 下它是唯一/主团队。
+const APP_TEAM_TITLE = (APP_PORT === PORT) ? "本地团队" : "Docker 团队";
 
 // 确保这个 docker(按 volume)有独立云端 team;返回 { teamId, title, apiKey } 或 null。
 async function ensureDockerTeam() {
@@ -85,21 +94,21 @@ async function ensureDockerTeam() {
     const store = readDockerTeams();
     let rec = store[APP_VOLUME];
     if (!rec || !rec.teamId) {
-      const created = await cc.createTeam({ title: "Docker 团队", kind: "cloud" });
+      const created = await cc.createTeam({ title: APP_TEAM_TITLE, kind: "cloud" });
       if (!created || !created.ok) return null;
-      // 强制把云端标题设成 "Docker 团队":POST /api/teams 常忽略我们传的 title、
-      // 回退成 owner/device 名(= 8008 的标题),卡片就显示成 8008 的了。PATCH 一下盖掉。
-      try { await cc.renameTeam(created.teamId, "Docker 团队"); } catch {}
-      store[APP_VOLUME] = { teamId: created.teamId, title: "Docker 团队", titleForced: true };
+      // 强制把云端标题设成 APP_TEAM_TITLE:POST /api/teams 常忽略我们传的 title、
+      // 回退成 owner/device 名,卡片就显示错了。PATCH 一下盖掉。
+      try { await cc.renameTeam(created.teamId, APP_TEAM_TITLE); } catch {}
+      store[APP_VOLUME] = { teamId: created.teamId, title: APP_TEAM_TITLE, titleForced: true };
       writeDockerTeams(store);
-      dockerTeamReg = { teamId: created.teamId, title: "Docker 团队", apiKey: created.apiKey };
+      dockerTeamReg = { teamId: created.teamId, title: APP_TEAM_TITLE, apiKey: created.apiKey };
       return dockerTeamReg;
     }
     // 既有 team:若还没强制过标题(老数据/上面那个 bug 建的),补一次 PATCH 成 "Docker
     // 团队",然后打上 titleForced 标记 —— 只补这一次,之后用户自己改名不会被覆盖。
     if (!rec.titleForced) {
-      try { await cc.renameTeam(rec.teamId, "Docker 团队"); } catch {}
-      rec.title = "Docker 团队"; rec.titleForced = true;
+      try { await cc.renameTeam(rec.teamId, APP_TEAM_TITLE); } catch {}
+      rec.title = APP_TEAM_TITLE; rec.titleForced = true;
       store[APP_VOLUME] = rec; writeDockerTeams(store);
     }
     const apiKey = await cc.getTeamApiKey(rec.teamId);

package/src/main.js

@@ -817,6 +817,11 @@ X-GNOME-Autostart-enabled=true
 let _sidecarWatchdogTimer = null;
 function startSidecarWatchdog({ intervalMs = 30_000 } = {}) {
   if (_sidecarWatchdogTimer) return;
+  // macOS is docker-only: cicy-code lives in the Colima container on :8008, kept alive by
+  // the docker daemon's reconcile (sidecar-ipc) + the container's --restart unless-stopped.
+  // The native restart this watchdog does is a no-op on darwin (start() returns null), so it
+  // would just spam "sidecar unreachable → restart" every tick. Skip it entirely on darwin.
+  if (process.platform === "darwin") return;
   let consecutiveFailures = 0;
   let restartInFlight = false;
 

package/src/sidecar/cicy-code.js

@@ -100,22 +100,13 @@ async function startFromRuntime({ logPath, port }) {
 async function start({ logPath, port = DEFAULT_PORT, force = false, version = null } = {}) {
   if (child && !force) return child;
 
-  // macOS: DOCKER-ONLY (主人指令: native 退役). The native sidecar runs cicy-code
-  // directly on the host → it can touch the user's real files with no isolation.
-  // The container persists everything in a named docker volume instead, so user
-  // data is isolated. Delegate to the docker sidecar: it adopts a healthy :8008,
-  // else runs the cicy-code image with -p ${port}:8008 (Docker Desktop / colima
-  // auto-forward -p to the Mac's localhost, so no --network host needed). Returns
-  // null when docker isn't up yet → the homepage docker card guides the user.
-  if (process.platform === "darwin") {
-    try {
-      const docker = require("./docker");
-      const r = await docker.start({ port });
-      if (r) console.log(`[cicy-code-sidecar] docker cicy-code on :${port} (${r.adopted ? "adopted" : r.id || "started"})`);
-      else console.warn("[cicy-code-sidecar] docker not ready — homepage docker card will guide install");
-    } catch (e) { console.warn(`[cicy-code-sidecar] docker start failed: ${e.message}`); }
-    return null; // no native child on mac
-  }
+  // macOS: DOCKER-ONLY (主人指令: native 退役). The native daemon runs cicy-code directly
+  // on the host with full access to the user's real files — no isolation. On darwin we no
+  // longer spawn it; the docker cicy-code (Colima container, named-volume isolated) IS the
+  // primary on :8008, brought up + kept alive by the docker daemon in src/backends/
+  // sidecar-ipc.js (APP_PORT=8008 on darwin). probeExisting()/watchdog still work — they
+  // just observe the container's :8008. Returning null here = "no native child".
+  if (process.platform === "darwin") return null;
 
   if (!force && await probeExisting(port)) {
     console.log(`[cicy-code-sidecar] existing instance on :${port}, reusing`);