cicy-desktop 2.1.99 → 2.1.101

package/package.json

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

package/src/sidecar/docker.js

@@ -28,9 +28,30 @@ const DOCKER_DESKTOP_MIRROR = process.env.CICY_DOCKER_DESKTOP_MIRROR
 // CICY_* env vars forwarded into the container (team onboarding, version pin…).
 const PASS_ENV = ["CICY_TEAM_TOKEN", "CICY_CODE_VERSION", "NPM_REGISTRY", "CICY_NPM_REGISTRY", "CICY_AGENTS", "ENABLE_CDN", "CICY_CLOUDFLARED_TOKEN"];
 
+// Resolve the docker CLI. CRITICAL on Windows: right after Docker Desktop
+// installs, it adds `...\Docker\resources\bin` to the SYSTEM PATH — but the
+// ALREADY-RUNNING cicy-desktop process keeps its stale PATH, so a bare
+// `execFile("docker", …)` ENOENTs and dockerOk() stays false forever (the
+// "已安装但起不来 / 卡在正在启动" bug). Probe the known absolute install paths
+// first; only fall back to PATH (and never cache that fallback, so a later
+// install is picked up).
+let _dockerBin = null;
+function dockerBin() {
+  if (_dockerBin) return _dockerBin;
+  if (process.platform === "win32") {
+    const cands = [
+      path.join(process.env["ProgramFiles"] || "C:\\Program Files", "Docker", "Docker", "resources", "bin", "docker.exe"),
+      path.join(process.env["ProgramW6432"] || "", "Docker", "Docker", "resources", "bin", "docker.exe"),
+      path.join(process.env["LOCALAPPDATA"] || "", "Docker", "Docker", "resources", "bin", "docker.exe"),
+    ].filter((c) => c && !c.startsWith("Docker"));
+    for (const c of cands) { try { if (fs.existsSync(c)) { _dockerBin = c; return c; } } catch {} }
+  }
+  return "docker"; // PATH fallback (mac/linux, or before Docker is installed)
+}
+
 function run(args, { timeout = 30000 } = {}) {
   return new Promise((resolve, reject) => {
-    execFile("docker", args, { timeout, windowsHide: true }, (err, stdout, stderr) => {
+    execFile(dockerBin(), args, { timeout, windowsHide: true }, (err, stdout, stderr) => {
       if (err) { err.stdout = String(stdout || ""); err.stderr = String(stderr || ""); return reject(err); }
       resolve({ stdout: String(stdout), stderr: String(stderr) });
     });
@@ -387,15 +408,44 @@ async function installDocker({ emit, dest } = {}) {
   await ensureDownloaded(DOCKER_DESKTOP_URL, target, DOCKER_DESKTOP_MIRROR, {
     emit, phase: "install-docker", label: "下载 Docker Desktop",
   });
-  e({ phase: "install-docker", status: "running", message: "安装 Docker Desktop（请在弹出的授权框点「是」，装完可能需重启）…" });
-  await new Promise((resolve) => {
+  e({ phase: "install-docker", status: "running", message: "安装 Docker Desktop（请在弹出的管理员授权框点「是」，装完可能需重启）…" });
+  await launchElevated(target, ["install", "--quiet", "--accept-license"], { emit: e });
+}
+
+// Run an admin-manifest exe (Docker Desktop Installer) ELEVATED. A plain
+// child_process.spawn of a requireAdministrator exe from a non-elevated process
+// fails with ERROR_ELEVATION_REQUIRED (740) and never shows UAC — which is why
+// the installer "downloaded but didn't auto-install". ShellExecute with the
+// "runas" verb is the only way to raise the UAC prompt + elevate. We drive it
+// via VBScript/cscript because PowerShell is blocked by 360 on these machines.
+// ShellExecute returns immediately (installer runs in the background); bootstrap
+// then polls dockerOk(). Falls back to a direct spawn if cscript is unavailable.
+function launchElevated(exe, args, { emit } = {}) {
+  return new Promise((resolve) => {
     try {
-      const child = spawn(target, ["install", "--quiet", "--accept-license"], {
-        windowsHide: false, detached: true, stdio: "ignore",
+      const vbs = path.join(os.tmpdir(), "cicy-docker-elevate.vbs");
+      const argStr = args.join(" ").replace(/"/g, '""');
+      const exeEsc = String(exe).replace(/"/g, '""');
+      // chr(34) = a literal double-quote inside the VBS string literals.
+      fs.writeFileSync(vbs,
+        `Set s = CreateObject("Shell.Application")\r\n` +
+        `s.ShellExecute "${exeEsc}", "${argStr}", "", "runas", 1\r\n`,
+        "utf8");
+      const child = spawn("cscript", ["//nologo", vbs], { windowsHide: true, detached: true, stdio: "ignore" });
+      let done = false;
+      const fin = (ok) => { if (done) return; done = true; resolve(ok); };
+      child.on("error", () => {
+        // cscript missing/blocked → best-effort direct spawn (works if elevated).
+        try {
+          emit && emit({ phase: "install-docker", status: "running", message: "提权脚本不可用，尝试直接启动安装包…" });
+          const c2 = spawn(exe, args, { windowsHide: false, detached: true, stdio: "ignore" });
+          c2.on("error", () => fin(false));
+          c2.on("spawn", () => fin(true));
+          c2.on("exit", () => fin(true));
+        } catch { fin(false); }
       });
-      child.on("error", () => resolve());
-      child.on("exit", () => resolve());
-    } catch { resolve(); }
+      child.on("exit", () => fin(true));
+    } catch { resolve(false); }
   });
 }