cicy-desktop 2.1.60 → 2.1.62

package/package.json

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

package/src/backends/sidecar-ipc.js

@@ -45,10 +45,25 @@ function register({ sidecarLogPath } = {}) {
   ipcMain.handle("docker:bootstrap", async (e) => {
     if (process.platform !== "win32") return { ok: false, error: "docker bootstrap is Windows-only" };
     try {
-      return await docker.bootstrap({
+      const result = await docker.bootstrap({
         port: PORT,
         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. 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");
+          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;
     } catch (err) {
       return { ok: false, error: err.message };
     }

package/src/sidecar/docker.js

@@ -42,6 +42,28 @@ async function dockerOk() {
   catch { return false; }
 }
 
+// Docker Desktop installed on disk? (daemon may still be stopped — dockerOk()
+// only answers "is the daemon up"). Lets bootstrap start the app instead of
+// re-downloading the 500MB installer when it's merely not running.
+function dockerDesktopExe() {
+  const candidates = [
+    path.join(process.env["ProgramFiles"] || "C:\\Program Files", "Docker", "Docker", "Docker Desktop.exe"),
+    path.join(process.env["LOCALAPPDATA"] || "", "Docker", "Docker Desktop.exe"),
+  ];
+  for (const p of candidates) { try { if (p && fs.existsSync(p)) return p; } catch {} }
+  return null;
+}
+
+function startDockerDesktop() {
+  const exe = dockerDesktopExe();
+  if (!exe) return false;
+  try {
+    const child = spawn(exe, [], { detached: true, stdio: "ignore", windowsHide: false });
+    child.unref();
+    return true;
+  } catch { return false; }
+}
+
 async function imagePresent() {
   try { await run(["image", "inspect", IMAGE], { timeout: 8000 }); return true; }
   catch { return false; }
@@ -143,12 +165,15 @@ async function ensureDownloaded(url, dest, mirror, { emit, phase, label } = {})
     return dest;
   }
   const sources = mirror ? [url, mirror] : [url];
+  let lastPct = -1; // throttle: chunks arrive dozens/s — only emit on whole-percent change
   return withRetry(async (attempt) => {
     const src = sources[Math.min(attempt - 1, sources.length - 1)];
     await download(src, dest, {
       resume: true,
       onProgress: ({ received, total }) => {
         const pct = total ? Math.round((received / total) * 100) : 0;
+        if (pct === lastPct) return;
+        lastPct = pct;
         emit && emit({ phase, status: "running", message: label, progress: pct, received, total });
       },
     });
@@ -164,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) => {
@@ -182,7 +221,15 @@ async function loadImage({ emit } = {}) {
   await ensureDownloaded(R2_TARBALL, tmp, null, { emit, phase: "image", label: "下载镜像" });
   emit && emit({ phase: "image", status: "running", message: "docker load…", progress: 100 });
   console.log(`[docker-sidecar] docker load…`);
-  await run(["load", "-i", tmp], { timeout: 300000 });
+  const { stdout } = await run(["load", "-i", tmp], { timeout: 300000 });
+  // The tarball's embedded tag may be a pinned version (e.g. :2.1.6) while we
+  // run IMAGE (:latest). Re-tag whatever was loaded so imagePresent()/start()
+  // match — otherwise every start() re-downloads the tarball forever.
+  const m = String(stdout).match(/Loaded image:\s*(\S+)/i);
+  if (m && m[1] !== IMAGE) {
+    try { await run(["tag", m[1], IMAGE]); console.log(`[docker-sidecar] tagged ${m[1]} -> ${IMAGE}`); }
+    catch (e) { console.warn(`[docker-sidecar] re-tag failed: ${e.message}`); }
+  }
   // Only delete AFTER a successful load — a failed load keeps the tarball so the
   // next attempt skips the re-download. (imagePresent() gates re-entry anyway.)
   try { fs.unlinkSync(tmp); } catch {}
@@ -197,6 +244,13 @@ async function checkStatus() {
 // id } or null when Docker isn't ready (homepage guides the user to install
 // Docker Desktop).
 async function start({ port = 8008 } = {}) {
+  // Something already serves a healthy cicy-code on :port (a legacy-named
+  // container auto-revived by `--restart unless-stopped`, a manual run…).
+  // Adopt it — `docker run` would just lose the port-bind fight.
+  if (await probeHealth(port)) {
+    console.log(`[docker-sidecar] :${port} already healthy — adopting existing instance`);
+    return { docker: true, container: CONTAINER, adopted: true };
+  }
   if (!(await dockerOk())) {
     console.warn("[docker-sidecar] Docker not available — homepage will guide install");
     return null;
@@ -261,6 +315,17 @@ async function bootstrap({ onProgress, port = 8008 } = {}) {
   // 1) Docker present?
   if (await dockerOk()) {
     emit({ phase: "install-docker", status: "skip", message: "Docker 已安装，跳过" });
+  } else if (dockerDesktopExe()) {
+    // Installed but the daemon is down — just launch Docker Desktop, never
+    // re-download/re-run the installer ("步骤走过的不要再走").
+    emit({ phase: "install-docker", status: "running", message: "Docker 已安装，正在启动 Docker Desktop…" });
+    startDockerDesktop();
+    const up = await waitUntil(dockerOk, { totalMs: 300000, everyMs: 5000 });
+    if (!up) {
+      emit({ phase: "install-docker", status: "error", message: "Docker Desktop 启动超时——手动打开它等图标变绿，再点「重试」" });
+      return { ok: false, reason: "docker_not_ready" };
+    }
+    emit({ phase: "install-docker", status: "done", message: "Docker 就绪" });
   } else {
     await installDocker({ emit });
     emit({ phase: "install-docker", status: "running", message: "等待 Docker 启动（如需授权/重启，完成后会自动继续）…" });
@@ -285,12 +350,19 @@ async function bootstrap({ onProgress, port = 8008 } = {}) {
     }
   }
 
-  // 3) Container — start() already reuses/replaces by name.
-  emit({ phase: "container", status: "running", message: "启动 cicy-code 容器…" });
-  const child = await start({ port });
-  if (!child) {
-    emit({ phase: "container", status: "error", message: "容器启动失败" });
-    return { ok: false, reason: "container_start_failed" };
+  // 3) Container — skip when :port is already healthy (idempotent re-entry);
+  // start() additionally adopts an existing instance instead of port-fighting.
+  if (await probeHealth(port)) {
+    emit({ phase: "container", status: "skip", message: "本地服务已在运行，跳过" });
+  } else {
+    emit({ phase: "container", status: "running", message: "启动 cicy-code 容器…" });
+    let child = null;
+    try { child = await start({ port }); }
+    catch (e) { emit({ phase: "container", status: "error", message: `容器启动失败：${e.message}` }); return { ok: false, reason: "container_start_failed" }; }
+    if (!child) {
+      emit({ phase: "container", status: "error", message: "容器启动失败" });
+      return { ok: false, reason: "container_start_failed" };
+    }
   }
 
   // 4) Health
@@ -300,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 };