cicy-desktop 2.1.169 → 2.1.171

package/package.json

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

package/src/backends/sidecar-ipc.js

@@ -63,47 +63,26 @@ function readDockerTeams() { try { return JSON.parse(fs.readFileSync(DOCKER_TEAM
 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 读它
 
-// 确保这个 docker(按 volume)有独立云端 team;返回 { teamId, title, apiKey } 或 null。
+// docker 团队的权威来源 = cloud(w-10122 #197):POST /api/team/docker/register 按
+// (deviceId, port) get-or-create。幂等;失效/换设备/丢本机缓存都不会建重复 team;kind='docker';
+// 软删后同 (device,port) 可重建;title 云端缺省 'Docker :<port>'(不回退 owner 名)。
+// 本机 docker-teams.json 只当 cloud 不可达时的 offline fallback(缓存 teamId+key)。
+// mac(colima)/ windows(WSL)同一套(这里平台无关,只有 appDocker 分平台)。
 async function ensureDockerTeam() {
-  if (!cc || !cc.loginToken || !cc.loginToken()) return null; // 未登录 → 先不带 key,登录后重建容器再补(绝不借 8008)
+  if (!cc || !cc.loginToken || !cc.loginToken()) return null; // 未登录 → 先不带 key,登录后重建容器再补
+  const cachedFallback = () => {
+    try { const c = readDockerTeams()[APP_VOLUME]; if (c && c.apiKey) { dockerTeamReg = { teamId: c.teamId, title: c.title, apiKey: c.apiKey }; return dockerTeamReg; } } catch {}
+    return null;
+  };
   try {
-    const store = readDockerTeams();
-    let rec = store[APP_VOLUME];
-    if (!rec || !rec.teamId) {
-      const created = await cc.createTeam({ title: "Docker 团队", 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 };
-      writeDockerTeams(store);
-      dockerTeamReg = { teamId: created.teamId, title: "Docker 团队", apiKey: created.apiKey };
+    const r = await cc.registerDockerTeam({ port: APP_PORT });
+    if (r && r.ok && r.apiKey) {
+      dockerTeamReg = { teamId: r.teamId, title: r.title || `Docker :${APP_PORT}`, apiKey: r.apiKey };
+      try { const store = readDockerTeams(); store[APP_VOLUME] = { teamId: r.teamId, title: dockerTeamReg.title, apiKey: r.apiKey }; writeDockerTeams(store); } catch {}
       return dockerTeamReg;
     }
-    // 既有 team:若还没强制过标题(老数据/上面那个 bug 建的),补一次 PATCH 成 "Docker
-    // 团队",然后打上 titleForced 标记 —— 只补这一次,之后用户自己改名不会被覆盖。
-    if (!rec.titleForced) {
-      try { await cc.renameTeam(rec.teamId, "Docker 团队"); } catch {}
-      rec.title = "Docker 团队"; rec.titleForced = true;
-      store[APP_VOLUME] = rec; writeDockerTeams(store);
-    }
-    // 「如果没有就 create,有就直接用」(主人)。本机记了 teamId,但云端拿不到它的 key
-    // (team 被删 / 换了账号 / 设备重置 —— 等于实际上没有了)→ 视同没有,重新 create 一个
-    // 存回本机。这就是手动「清 docker-teams.json + 重建」做的事,自动化掉。
-    const apiKey = await cc.getTeamApiKey(rec.teamId);
-    if (!apiKey) {
-      const created = await cc.createTeam({ title: "Docker 团队", kind: "cloud" });
-      if (created && created.ok) {
-        try { await cc.renameTeam(created.teamId, "Docker 团队"); } catch {}
-        store[APP_VOLUME] = { teamId: created.teamId, title: "Docker 团队", titleForced: true };
-        writeDockerTeams(store);
-        dockerTeamReg = { teamId: created.teamId, title: "Docker 团队", apiKey: created.apiKey };
-        return dockerTeamReg;
-      }
-    }
-    dockerTeamReg = { teamId: rec.teamId, title: rec.title, apiKey };
-    return dockerTeamReg;
-  } catch (e) { return null; }
+    return cachedFallback(); // cloud 返回异常 → offline 兜底
+  } catch (e) { return cachedFallback(); } // cloud 不可达 → offline 兜底
 }
 
 let registered = false;
@@ -146,6 +125,21 @@ function register({ sidecarLogPath } = {}) {
         log.info("[docker-daemon] installed but :8009 down → auto-starting (bootstrap idempotent)");
         try { await appDocker.bootstrap(await appOpts()); } catch (e) { log.warn(`[docker-daemon] auto-start failed: ${e.message}`); }
         await refreshDockerStatus();
+      } else if (s.running) {
+        // 自愈:容器在跑,但很可能是「首次启动时还没登录 / key 还没就位就建好了」的没 key 容器
+        // —— runContainer 见到 :8009 健康就直接 adopt 不重建,key 永远进不去(Windows 实测的
+        // 'llm key 没拿到')。这里:已能拿到 key + 容器里确实没 key → 带 key 重建一次(volume
+        // 数据保留)。mac/win 同一套(hasGatewayKey 两个 docker 模块都实现了)。
+        try {
+          const opts = await appOpts();
+          if (opts.env && opts.env.CICY_AI_GATEWAY_LLM_API_KEY && appDocker.hasGatewayKey
+              && !(await appDocker.hasGatewayKey(APP_CONTAINER))) {
+            log.info("[docker-daemon] 容器在跑但没网关 key → 带 key 重建(数据保留)");
+            await appDocker.recreate(opts);
+            try { await registerAppTeam(); } catch {}
+            await refreshDockerStatus();
+          }
+        } catch (e) { log.warn(`[docker-daemon] key self-heal failed: ${e.message}`); }
       }
     } finally { _dockerDaemonBusy = false; }
     return _dockerStatusCache;

package/src/cloud/cloud-client.js

@@ -358,6 +358,34 @@ async function createTeam({ title = "", kind = "cloud" } = {}) {
   return { ok: false, status: res.status, reason: res.reason };
 }
 
+// Docker 团队的权威来源(w-10122 #197):POST /api/team/docker/register —— cloud 按
+// (deviceId, port) get-or-create。一机一 port 一 team(8009/8010…),幂等:同 (device,port)
+// 返同一 key;不同 port 不同 team;kind='docker';软删后同 (device,port) 可重建。title 传了
+// 就用桌面的,没传云端缺省 'Docker :<port>'(不回退 owner 名)。替代 createTeam + 本机缓存。
+async function registerDockerTeam({ port, title = "" } = {}) {
+  const token = loginToken();
+  if (!token) return { ok: false, reason: "not_logged_in" };
+  if (!port) return { ok: false, reason: "port_required" };
+  const body = { deviceId: getDeviceId(), port: Number(port) };
+  if (title) body.title = title;
+  const res = await cloudFetch("/api/team/docker/register", { method: "POST", body });
+  if (res.ok && res.json && (res.json.success || res.json.teamId)) {
+    return {
+      ok: true,
+      teamId: res.json.teamId,
+      apiKey: res.json.apiKey,
+      title: res.json.title,
+      titleVersion: Number(res.json.titleVersion) || 0,
+      kind: res.json.kind || "docker",
+      port: res.json.port,
+      gatewayUrl: res.json.gatewayUrl || GATEWAY_URL,
+      protocols: res.json.protocols || ["anthropic", "openai"],
+    };
+  }
+  log.warn(`[cloud] docker team register failed status=${res.status} reason=${res.reason || ""}`);
+  return { ok: false, status: res.status, reason: res.reason, json: res.json };
+}
+
 // 改某 team 的标题(PATCH /api/teams/:id {title})——和 DockerCard 改名同一个端点。
 // 用途:建完 docker 独立 team 后**强制**把云端标题设成 "Docker 团队"(POST /api/teams
 // 不保证用我们传的 title,常回退成 owner/device 名 = 8008 的标题,卡片就显示错了)。
@@ -466,6 +494,7 @@ module.exports = {
   registerTeam,
   listTeams,
   createTeam,
+  registerDockerTeam,
   renameTeam,
   getTeamApiKey,
   injectGatewayKey,

package/src/sidecar/colima-docker.js

@@ -446,7 +446,13 @@ async function upgrade({ onProgress, port = 8009, container = "cicy-code-docker-
   return await _bootstrap({ onProgress, port, container, volume, env });
 }
 
+// 容器里有没有注入网关 key(reconcile 自愈用):printenv 看 CICY_AI_GATEWAY_LLM_API_KEY。
+async function hasGatewayKey(container = "cicy-code-docker-8009") {
+  try { const { stdout } = await dk(`exec ${container} printenv CICY_AI_GATEWAY_LLM_API_KEY`, { timeout: 8000 }); return /sk-/.test(String(stdout || "")); }
+  catch { return false; }
+}
+
 module.exports = {
   bootstrap, status, restart, stop, dockerRestart, recreate, update, upgrade, runContainer, readContainerToken,
-  vmExists, colimaInstalled, dockerCliInstalled, engineUp, imagePresent, probeHealth,
+  vmExists, colimaInstalled, dockerCliInstalled, engineUp, imagePresent, probeHealth, hasGatewayKey,
 };

package/src/sidecar/wsl-docker.js

@@ -727,7 +727,13 @@ async function upgrade({ onProgress, port = 8009, container = "cicy-code-docker"
   return await _bootstrap({ onProgress, port, container, volume, env });
 }
 
+// 容器里有没有注入网关 key(reconcile 自愈用):printenv 看 CICY_AI_GATEWAY_LLM_API_KEY。
+async function hasGatewayKey(container = "cicy-code-docker") {
+  try { const { stdout } = await wslRun(`docker exec ${container} printenv CICY_AI_GATEWAY_LLM_API_KEY`, { timeout: 8000 }); return /sk-/.test(String(stdout || "")); }
+  catch { return false; }
+}
+
 module.exports = {
   bootstrap, status, restart, stop, dockerRestart, recreate, update, upgrade, runContainer, readContainerToken,
-  distroInstalled, dockerInstalled, dockerEngineUp, imagePresent, probeHealth, wslRun,
+  distroInstalled, dockerInstalled, dockerEngineUp, imagePresent, probeHealth, wslRun, hasGatewayKey,
 };