cicy-desktop 2.1.184 → 2.1.186

package/.github/workflows/linux-app-release.yml

@@ -40,12 +40,21 @@ jobs:
       # linux-arm64 用户的包里塞的是 x64 二进制。强制把两个 linux 架构都装进 node_modules,
       # electron-builder 两架构都打包,localbin 按用户机器选。必须在所有 npm install 之后。
       - name: Bundle BOTH linux arches of cicy-code/mihomo (runner is single-arch)
+        shell: bash
         run: |
-          pkgs=$(node -e "const o=require('./package.json').optionalDependencies||{}; const w=['cicy-code-linux-x64','cicy-code-linux-arm64','cicy-mihomo-linux-x64','cicy-mihomo-linux-arm64']; console.log(w.filter(p=>o[p]).map(p=>p+'@'+o[p]).join(' '))")
-          echo "force-installing both arches: $pkgs"
-          npm install --no-save --no-audit --force $pkgs
+          set -e
+          # npm pack(不看 os/cpu/lockfile)+ 解压,绕开 `npm install --force` 在已有 lockfile 上的 no-op。
+          for pkg in cicy-code-linux-x64 cicy-code-linux-arm64 cicy-mihomo-linux-x64 cicy-mihomo-linux-arm64; do
+            ver=$(node -e "const o=require('./package.json').optionalDependencies||{}; process.stdout.write(o['$pkg']||'')")
+            [ -z "$ver" ] && { echo "skip $pkg"; continue; }
+            bin=cicy-code; case "$pkg" in cicy-mihomo*) bin=mihomo;; esac
+            if [ -f "node_modules/$pkg/$bin" ]; then echo "$pkg present"; continue; fi
+            echo "npm pack $pkg@$ver → node_modules/$pkg"
+            tmp=$(mktemp -d); ( cd "$tmp" && npm pack "$pkg@$ver" --silent ); tar -xzf "$tmp"/*.tgz -C "$tmp"
+            rm -rf "node_modules/$pkg"; mkdir -p "node_modules/$pkg"; cp -R "$tmp/package/." "node_modules/$pkg/"; rm -rf "$tmp"
+          done
           ls node_modules | grep -E 'cicy-(code|mihomo)-linux' || true
-          for a in x64 arm64; do test -f "node_modules/cicy-code-linux-$a/cicy-code" || { echo "::error::cicy-code-linux-$a binary missing"; exit 1; }; done
+          for a in x64 arm64; do test -f "node_modules/cicy-code-linux-$a/cicy-code" || { echo "::error::cicy-code-linux-$a missing"; exit 1; }; done
 
       # NOTE: the homepage SPA is rebuilt automatically by the prebuild:linux npm
       # hook (scripts/build-homepage.cjs) right before `npm run build:linux` below,

package/.github/workflows/mac-app-release.yml

@@ -44,13 +44,22 @@ jobs:
       # 装进 node_modules(--force 绕过 EBADPLATFORM),让 electron-builder 两架构都打包,
       # localbin 按用户机器选对应那份。必须在所有 npm install 之后(否则被剪枝)。
       - name: Bundle BOTH macOS arches of cicy-code/mihomo (runner is single-arch)
+        shell: bash
         run: |
-          pkgs=$(node -e "const o=require('./package.json').optionalDependencies||{}; const w=['cicy-code-darwin-x64','cicy-code-darwin-arm64','cicy-mihomo-darwin-x64','cicy-mihomo-darwin-arm64']; console.log(w.filter(p=>o[p]).map(p=>p+'@'+o[p]).join(' '))")
-          echo "force-installing both arches: $pkgs"
-          npm install --no-save --no-audit --force $pkgs
-          echo "--- bundled darwin subpackages ---"
-          ls node_modules | grep -E 'cicy-(code|mihomo)-darwin' || true
-          for a in x64 arm64; do test -f "node_modules/cicy-code-darwin-$a/cicy-code" || { echo "::error::cicy-code-darwin-$a binary missing after force-install"; exit 1; }; done
+          set -e
+          # `npm install --force` 在已有 lockfile 的项目里会判 "up to date" 跳过非本机架构
+          # → 改用 `npm pack`(纯按名下 tarball,不看 os/cpu/lockfile)+ 解压进 node_modules。
+          for pkg in cicy-code-darwin-x64 cicy-code-darwin-arm64 cicy-mihomo-darwin-x64 cicy-mihomo-darwin-arm64; do
+            ver=$(node -e "const o=require('./package.json').optionalDependencies||{}; process.stdout.write(o['$pkg']||'')")
+            [ -z "$ver" ] && { echo "skip $pkg (not pinned)"; continue; }
+            bin=cicy-code; case "$pkg" in cicy-mihomo*) bin=mihomo;; esac
+            if [ -f "node_modules/$pkg/$bin" ]; then echo "$pkg present (native arch)"; continue; fi
+            echo "npm pack $pkg@$ver → node_modules/$pkg"
+            tmp=$(mktemp -d); ( cd "$tmp" && npm pack "$pkg@$ver" --silent ); tar -xzf "$tmp"/*.tgz -C "$tmp"
+            rm -rf "node_modules/$pkg"; mkdir -p "node_modules/$pkg"; cp -R "$tmp/package/." "node_modules/$pkg/"; rm -rf "$tmp"
+          done
+          echo "--- bundled darwin subpackages ---"; ls node_modules | grep -E 'cicy-(code|mihomo)-darwin' || true
+          for a in x64 arm64; do test -f "node_modules/cicy-code-darwin-$a/cicy-code" || { echo "::error::cicy-code-darwin-$a binary missing"; exit 1; }; done
 
       # NOTE: the homepage SPA is rebuilt automatically by the prebuild:mac npm
       # hook (scripts/build-homepage.cjs) right before `npm run build:mac` below,

package/package.json

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

package/src/main.js

@@ -881,32 +881,37 @@ electronApp.whenReady().then(async () => {
   // colima VM 在 16G mac 上把内存压垮被 jetsam SIGKILL。Windows 仍走 docker(WSL :8009,
   // 由 sidecar-ipc 管),不在这里起 native。
   if (process.platform !== "win32") {
-    // Start bundled cicy-code daemon as a sidecar. Reuses an existing instance on
-    // :8008 if one is already running (probeExisting → adopt, never double-spawn).
+    const sidecarPort = Number(process.env.CICY_CODE_PORT || 8008);
+    const lt = require("./backends/local-teams");
+
+    // 占位卡(主人: "先有一个 :8008 占位"): 开机**立刻无条件**注册本地团队,homepage 永远有
+    // 这张卡 —— :8008 没起来时显示「未运行」+ 启动/安装入口(不会再空首页);起来后下面的
+    // probe 循环 upsert 一次,状态翻 running + 触发 gateway key/teamId 注入。addTeam 幂等。
+    lt.addTeam({ base_url: `http://127.0.0.1:${sidecarPort}`, name: i18n.t("localTeams.defaultName") })
+      .then((r) => { if (r && r.id) log.info(`[Sidecar] local team placeholder registered (${r.id})`); })
+      .catch((e) => log.warn(`[Sidecar] placeholder register failed: ${e.message}`));
+
+    // 起 native cicy-code(npx cicy-code,见 cicy-code.js)。已在跑就 adopt,不双开。
     cicyCodeSidecar
       .start({ logPath: path.join(os.homedir(), "logs", "cicy-code-sidecar.log") })
       .then((c) => { if (c) log.info(`[Sidecar] cicy-code spawned pid=${c.pid}`); })
       .catch((e) => log.warn(`[Sidecar] cicy-code start failed: ${e.message}`));
     startSidecarWatchdog();
 
-    // Auto-register the local sidecar as 本地团队 once :8008 answers (主人: 一装好就要
-    // 有占位卡)。addTeam upserts by host:port + auto-fills api_token, so re-runs are
-    // no-ops. A fresh boot may seed/npm-pull the binary first, so probe up to ~90s.
+    // :8008 起来后 upsert 一次:刷新卡状态 + 让 addTeam 去云端拿这个本地 team 的 gateway
+    // key + teamId 注入 global.json(主人: 启动之后先去拿 llm api_key 和 team id)。
     (async () => {
-      const sidecarPort = Number(process.env.CICY_CODE_PORT || 8008);
-      const lt = require("./backends/local-teams");
-      for (let i = 0; i < 30; i++) {
+      for (let i = 0; i < 40; i++) {
         try {
           if (await cicyCodeSidecar.probeExisting(sidecarPort)) {
             const r = await lt.addTeam({ base_url: `http://127.0.0.1:${sidecarPort}`, name: i18n.t("localTeams.defaultName") });
-            if (r && r.ok) log.info(`[Sidecar] local team ${r.upserted ? "refreshed" : "registered"} (${r.id})`);
-            else log.warn(`[Sidecar] local team auto-register failed: ${r && r.error}`);
+            if (r && r.id) log.info(`[Sidecar] local team ready (${r.id}) — key/teamId synced`);
             return;
           }
-        } catch (e) { log.warn(`[Sidecar] local team auto-register error: ${e.message}`); }
+        } catch (e) { log.warn(`[Sidecar] local team refresh error: ${e.message}`); }
         await new Promise((res) => setTimeout(res, 3000));
       }
-      log.warn(`[Sidecar] local team auto-register gave up — :${sidecarPort} never came up`);
+      log.warn(`[Sidecar] :${sidecarPort} never came up within ~2min (card stays as 未运行)`);
     })();
   }
 

package/src/sidecar/cicy-code.js

@@ -18,7 +18,56 @@ const os = require("os");
 const http = require("http");
 const net = require("net");
 const path = require("path");
-const { spawn, execFileSync } = require("child_process");
+const { spawn, execFileSync, execFile } = require("child_process");
+
+// ── Node runtime bootstrap ───────────────────────────────────────────────────
+// 主人(2026-06): native cicy-code 走 `npx cicy-code`,需要一个**可用**的 Node。但用户
+// 机器可能没 node,或 node 太老(实测 josephs 是 node v13/npx6,老 npx 跑不动)。所以:
+// 系统有 node≥20 就用;没有/太老 → 下载 Node 24 到 ~/cicy-ai/runtime/node(免 sudo,
+// 用户自己拥有);下载也失败 → 提示用户去 nodejs.org 自己装。
+const NODE_VER = process.env.CICY_NODE_VERSION || "v24.18.0";
+const NODE_HOME = path.join(os.homedir(), "cicy-ai", "runtime", "node");
+const NODE_SEARCH = ["/usr/local/bin", "/opt/homebrew/bin", path.join(os.homedir(), ".local", "bin"), path.join(NODE_HOME, "bin")];
+function nodeMajor(bin) {
+  try { const m = String(execFileSync(bin, ["-v"], { encoding: "utf8", timeout: 5000 })).match(/v(\d+)\./); return m ? Number(m[1]) : 0; } catch { return 0; }
+}
+function findUsableNode() {
+  for (const d of NODE_SEARCH) {
+    const node = path.join(d, "node"), npx = path.join(d, "npx");
+    try { if (fs.existsSync(node) && fs.existsSync(npx) && nodeMajor(node) >= 20) return d; } catch {}
+  }
+  return null;
+}
+const pexec = (cmd, args, timeout) => new Promise((res, rej) => execFile(cmd, args, { timeout, windowsHide: true }, (e) => (e ? rej(e) : res())));
+// Returns a bin dir with node+npx (node≥20), or null. emit streams progress to a drawer.
+async function ensureNode({ emit } = {}) {
+  const e = emit || (() => {});
+  let dir = findUsableNode();
+  if (dir) return dir;
+  const arch = process.arch === "arm64" ? "arm64" : "x64";
+  const fname = `node-${NODE_VER}-darwin-${arch}.tar.gz`;
+  const urls = [
+    `https://cdn.npmmirror.com/binaries/node/${NODE_VER}/${fname}`, // CN-fast
+    `https://nodejs.org/dist/${NODE_VER}/${fname}`,                 // 官方兜底
+  ];
+  e({ phase: "node", status: "running", message: `未检测到可用 Node,正在安装 Node ${NODE_VER}(约 50MB)…` });
+  fs.mkdirSync(NODE_HOME, { recursive: true });
+  const tmp = path.join(os.tmpdir(), `cicy-${fname}`);
+  for (const url of urls) {
+    try {
+      await pexec("curl", ["-fL", "--retry", "2", "-o", tmp, url], 300000);
+      await pexec("tar", ["-xzf", tmp, "-C", NODE_HOME, "--strip-components", "1"], 120000);
+      if (fs.existsSync(path.join(NODE_HOME, "bin", "node")) && fs.existsSync(path.join(NODE_HOME, "bin", "npx"))) {
+        try { fs.unlinkSync(tmp); } catch {}
+        e({ phase: "node", status: "done", message: `Node ${NODE_VER} 安装完成` });
+        return path.join(NODE_HOME, "bin");
+      }
+    } catch (err) { console.warn(`[cicy-code-sidecar] node install failed (${url}): ${err.message}`); }
+  }
+  try { fs.unlinkSync(tmp); } catch {}
+  e({ phase: "node", status: "error", message: "Node 自动安装失败 —— 请打开 https://nodejs.org 下载安装 Node(LTS),装好后点「重试」" });
+  return null;
+}
 
 const DEFAULT_PORT = Number(process.env.CICY_CODE_PORT || 8008);
 
@@ -91,13 +140,11 @@ async function startFromRuntime({ logPath, port }) {
   return c;
 }
 
-async function start({ logPath, port = DEFAULT_PORT, force = false, version = null } = {}) {
+async function start({ logPath, port = DEFAULT_PORT, force = false, version = null, emit = null } = {}) {
   if (child && !force) return child;
 
-  // 主人(2026-06 方向回调): mac 资源吃不消 docker —— colima VM 在 16G 机上把内存压垮,
-  // jetsam 拿 SIGKILL 乱杀进程(cicy-code 被误伤)。所以 macOS/Linux 改回 native cicy-code
-  // (:8008,本机直接跑二进制,省掉 4–8G 的 VM)。Windows 仍走 docker(WSL :8009,由
-  // sidecar-ipc 管),native 一律不起。
+  // 主人(2026-06 方向回调): mac 资源吃不消 docker(colima VM 压垮内存被 jetsam 杀)→
+  // macOS/Linux 改回 native cicy-code(:8008,走 `npx cicy-code`)。Windows 仍走 docker。
   if (process.platform === "win32") return null;
 
   if (!force && await probeExisting(port)) {
@@ -105,47 +152,35 @@ async function start({ logPath, port = DEFAULT_PORT, force = false, version = nu
     return null;
   }
 
-  // UNIFIED model (主人指令): run our OWN binary at ~/.local/bin/cicy-code on
-  // every platform — never `npx cicy-code` (which reuses a stale globally-installed
-  // copy and shadows updates). localbin seeds from the bundled subpackage on first
-  // run (zero network) and uses npm ONLY as a download channel for updates; the run
-  // path is always stable.
-  const localbin = require("./localbin");
-  let exe = localbin.currentLink();
-  if (!exe) {
-    try { exe = (await localbin.ensure({ version }))?.exe; }
-    catch (e) { console.warn(`[cicy-code-sidecar] localbin ensure failed: ${e.message}`); }
-  } else {
-    // Present — let ensure() do a zero-network bundle upgrade if cicy-desktop
-    // itself was updated and now ships a newer cicy-code (版本高了就更新).
-    try { await localbin.ensure({ version }); } catch {}
-  }
-  if (!exe) { console.warn("[cicy-code-sidecar] no cicy-code binary available"); return null; }
-
-  // 主人: 不再 seed host mihomo —— docker-only 后 mihomo 只在容器里跑(host 不用)。
-  // 内置的 cicy-mihomo-<plat> 依赖已从 package.json 移除。
+  // 1) 确保有可用 Node(系统 node≥20,否则装 Node 24;再不行提示用户去 nodejs.org 自己装)。
+  const nodeBinDir = await ensureNode({ emit });
+  if (!nodeBinDir) { console.warn("[cicy-code-sidecar] no usable Node — cannot npx cicy-code"); return null; }
 
+  // 2) `npx cicy-code` —— npm 按本机真实架构拉 cicy-code-<plat>,文件用户自己拥有(无跨架构/
+  //    权限坑)。用上面那个 Node 的 npx,并把它的 bin 放 PATH 首位让 npx 找到自己的 node/npm。
   let stdio = ["ignore", "ignore", "ignore"];
   if (logPath) {
     fs.mkdirSync(path.dirname(logPath), { recursive: true });
     const fd = fs.openSync(logPath, "a");
     stdio = ["ignore", fd, fd];
   }
+  const npxAbs = path.join(nodeBinDir, "npx");
+  const childPath = `${nodeBinDir}:${NODE_SEARCH.join(":")}:${process.env.PATH || ""}`;
+  const registry = process.env.CICY_NPM_REGISTRY || "https://registry.npmmirror.com";
   const env = {
     ...process.env,
     CICY_CODE_PORT: String(port),
     PORT: String(port),
+    npm_config_registry: registry,
+    PATH: childPath, // 给 npx 自己找 node/npm
   };
-  // --helper removed (主人指令): Windows now runs cicy-code in normal mode (full
-  // tmux-based multi-agent), same as mac/linux — no longer the single headless
-  // 团队助手.
-  const args = ["--desktop"];
-  // 退出保活(主人):mac/linux 把 native cicy-code spawn 成 detached + unref,让它脱离
-  // Electron 的进程组——退出 App 不带走 daemon(及其 tmux agent),下次启动 probeExisting
-  // 探到就 adopt。Windows 不走这条(docker)。
+  const spec = version ? `cicy-code@${version}`
+    : (process.env.CICY_CODE_VERSION ? `cicy-code@${process.env.CICY_CODE_VERSION}` : "cicy-code");
+  emit && emit({ phase: "cicy-code", status: "running", message: "启动 cicy-code(首次会下载 + 装依赖,请稍候)…" });
+  // 退出保活(主人):detached + unref → 关 App 不带走 daemon(及其 tmux agent),下次 adopt。
   const detached = process.platform !== "win32";
-  child = spawn(exe, args, { stdio, detached, windowsHide: true, env });
-  console.log(`[cicy-code-sidecar] spawned ${exe} ${args.join(" ")} pid=${child.pid} port=${port} detached=${detached} log=${logPath || "(none)"}`);
+  child = spawn(npxAbs, ["-y", spec], { stdio, detached, windowsHide: true, env });
+  console.log(`[cicy-code-sidecar] spawned ${npxAbs} -y ${spec} pid=${child.pid} port=${port} registry=${registry} detached=${detached} log=${logPath || "(none)"}`);
   if (detached) { try { child.unref(); } catch {} }
 
   child.on("exit", (code, signal) => {