cicy-desktop 2.1.182 → 2.1.184

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

@@ -23,36 +23,10 @@ jobs:
           node-version: "20"
           cache: "npm"
 
-      - name: Setup Go (for cicy-code sidecar build)
-        uses: actions/setup-go@v5
-        with:
-          go-version: '1.25'
-
-      - name: Read cicy-code ref pin
-        id: cicy_code_ref
-        shell: bash
-        run: |
-          ref="$(cat .cicy-code-ref | tr -d '[:space:]')"
-          echo "ref=${ref}" >> "$GITHUB_OUTPUT"
-          if ! [[ "$ref" =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then
-            echo "::error::.cicy-code-ref must be a release tag (vX.Y.Z), got: $ref"
-            exit 1
-          fi
-
-      - name: Checkout cicy-code as sibling
-        uses: actions/checkout@v4
-        with:
-          repository: cicy-ai/cicy-code
-          ref: ${{ steps.cicy_code_ref.outputs.ref }}
-          path: cicy-code
-
-      - name: Build cicy-code sidecar binaries (linux amd64 + arm64)
-        shell: bash
-        working-directory: cicy-code
-        run: |
-          SKIP_TTYD_ASSET=1 SKIP_SKILLS_EMBED=1 bash build.sh all
-          ls -lh dist/
-
+      # cicy-code is NOT built-from-source here anymore (主人 2026-06): bundled
+      # sidecar = the per-platform optionalDependency, seeded by localbin at runtime.
+      # The .cicy-code-ref source-build → vendor/cicy-code path was stale + never
+      # packaged, so it's removed. Sync just pins optionalDeps to latest.
       - name: Sync runtime deps to latest (cicy-code + cicy-mihomo; drop msys2)
         run: node scripts/sync-runtime-deps.cjs
 
@@ -62,6 +36,17 @@ jobs:
       - name: Install Electron build dependencies
         run: npm install --save-dev --no-audit electron@41.0.2 electron-builder@26.7.0
 
+      # 主人(2026-06 关键修复): runner 是 x64,npm 只装 linux-x64 的 cicy-code/mihomo →
+      # linux-arm64 用户的包里塞的是 x64 二进制。强制把两个 linux 架构都装进 node_modules,
+      # electron-builder 两架构都打包,localbin 按用户机器选。必须在所有 npm install 之后。
+      - name: Bundle BOTH linux arches of cicy-code/mihomo (runner is single-arch)
+        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
+          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
+
       # NOTE: the homepage SPA is rebuilt automatically by the prebuild:linux npm
       # hook (scripts/build-homepage.cjs) right before `npm run build:linux` below,
       # so the AppImage can never ship a stale homepage. No explicit step needed.
@@ -69,7 +54,6 @@ jobs:
       - name: Build Linux app (deb + AppImage)
         shell: bash
         env:
-          CICY_CODE_DIST_DIR: ${{ github.workspace }}/cicy-code/dist
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           set -euo pipefail

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

@@ -23,44 +23,12 @@ jobs:
           node-version: "20"
           cache: "npm"
 
-      - name: Setup Go (for cicy-code sidecar build)
-        uses: actions/setup-go@v5
-        with:
-          go-version: '1.25'
-
-      - name: Read cicy-code ref pin
-        id: cicy_code_ref
-        shell: bash
-        run: |
-          ref="$(cat .cicy-code-ref | tr -d '[:space:]')"
-          echo "ref=${ref}" >> "$GITHUB_OUTPUT"
-          # Enforce: ref must be a tagged release (vX.Y.Z), not a branch.
-          # This guarantees a deterministic build and lets the homepage
-          # display the same version it shipped with.
-          if ! [[ "$ref" =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then
-            echo "::error::.cicy-code-ref must be a release tag (vX.Y.Z), got: $ref"
-            exit 1
-          fi
-
-      - name: Checkout cicy-code as sibling
-        uses: actions/checkout@v4
-        with:
-          repository: cicy-ai/cicy-code
-          ref: ${{ steps.cicy_code_ref.outputs.ref }}
-          path: cicy-code
-
-      - name: Build cicy-code sidecar binaries (darwin amd64 + arm64)
-        # `bash build.sh all` runs prepare_embed (cicy-skills tarball, frontend,
-        # ttyd assets) and cross-compiles all four darwin/linux targets.
-        # We only need the two darwin slots for the Mac .app, but building
-        # the linux ones here is cheap (~20s) and keeps the prepare:sidecar
-        # script's "all targets at once" mode happy.
-        shell: bash
-        working-directory: cicy-code
-        run: |
-          bash build.sh all
-          ls -lh dist/
-
+      # cicy-code is NOT built-from-source here anymore. 主人(2026-06): the bundled
+      # sidecar = the per-platform optionalDependency (cicy-code-<plat>, prebuilt +
+      # arm64 linker-adhoc-signed), seeded at runtime by localbin.fromBundle. The old
+      # .cicy-code-ref source-build → vendor/cicy-code path was stale + never packaged
+      # (vendor/ not in package.json files), so it's removed. Sync just pins the
+      # optionalDeps to the latest published cicy-code/cicy-mihomo.
       - name: Sync runtime deps to latest (cicy-code + cicy-mihomo; drop msys2)
         run: node scripts/sync-runtime-deps.cjs
 
@@ -70,6 +38,20 @@ jobs:
       - name: Install Electron build dependencies in project directory
         run: npm install --save-dev --no-audit electron@41.0.2 electron-builder@26.7.0
 
+      # 主人(2026-06 关键修复): macos-latest runner 是 arm64,`npm install` 的 os/cpu
+      # 过滤只装 arm64 的 cicy-code/mihomo 子包 → x64(Intel)的 .pkg 里塞的也是 arm64
+      # 二进制 → Intel fresh 装没 :8008(实测 josephs)。这里强制把 BOTH darwin 架构都
+      # 装进 node_modules(--force 绕过 EBADPLATFORM),让 electron-builder 两架构都打包,
+      # localbin 按用户机器选对应那份。必须在所有 npm install 之后(否则被剪枝)。
+      - name: Bundle BOTH macOS arches of cicy-code/mihomo (runner is single-arch)
+        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
+
       # NOTE: the homepage SPA is rebuilt automatically by the prebuild:mac npm
       # hook (scripts/build-homepage.cjs) right before `npm run build:mac` below,
       # so the dmg can never ship a stale homepage. No explicit step needed.
@@ -100,16 +82,13 @@ jobs:
           iconutil -c icns build/icon.iconset -o build/logo.icns || { echo "::warning::iconutil failed"; exit 0; }
 
       - name: Build macOS app (dmg + zip, unsigned)
-        # prebuild:mac (declared in package.json) chains npm run prepare:sidecar
-        # which reads CICY_CODE_DIST_DIR and populates vendor/cicy-code/.
-        # CSC_IDENTITY_AUTO_DISCOVERY=false stops electron-builder from probing
-        # the runner keychain for a cert it does not have; combined with
-        # build.mac.identity=null in package.json this produces a clean
-        # unsigned build (with the cicy-code sidecar ad-hoc signed by
-        # prepare-cicy-code-sidecar.js so Apple Silicon will exec it).
+        # CSC_IDENTITY_AUTO_DISCOVERY=false stops electron-builder from probing the
+        # runner keychain for a cert it does not have; combined with
+        # build.mac.identity=null in package.json this produces a clean unsigned
+        # build. The cicy-code sidecar arrives via the optionalDependency
+        # (arm64 is linker-adhoc-signed already), seeded by localbin at runtime.
         shell: bash
         env:
-          CICY_CODE_DIST_DIR: ${{ github.workspace }}/cicy-code/dist
           CSC_IDENTITY_AUTO_DISCOVERY: "false"
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
@@ -161,7 +140,6 @@ jobs:
         shell: bash
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CICY_CODE_DIST_DIR: ${{ github.workspace }}/cicy-code/dist
           CSC_IDENTITY_AUTO_DISCOVERY: "false"
         run: |
           gh release upload "${{ steps.meta.outputs.tag }}" dist/*.dmg dist/*.zip \

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.182",
+  "version": "2.1.184",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -140,11 +140,11 @@
   "//optionalDependencies": "主人(2026-06 回调): mac/linux 改回 native cicy-code(:8008,colima 在 16G mac 上压垮内存)→ 重新内置 cicy-code-<plat> / cicy-mihomo-<plat>,localbin.fromBundle 零网络 seed(npm 仅作更新通道,带 npmmirror→npmjs 回退)。这些由 scripts/sync-runtime-deps.cjs 在 tag-push 时同步到最新版。npm 的 os/cpu 字段保证每个平台只装自己那份。Windows 仍走 docker(WSL :8009),它那份 cicy-code-windows 用不到但 bundle 着无害。",
   "optionalDependencies": {
     "electron": "41.0.3",
-    "cicy-code-darwin-x64": "2.3.22",
-    "cicy-code-darwin-arm64": "2.3.22",
-    "cicy-code-linux-x64": "2.3.22",
-    "cicy-code-linux-arm64": "2.3.22",
-    "cicy-code-windows-x64": "2.3.22",
+    "cicy-code-darwin-x64": "2.3.23",
+    "cicy-code-darwin-arm64": "2.3.23",
+    "cicy-code-linux-x64": "2.3.23",
+    "cicy-code-linux-arm64": "2.3.23",
+    "cicy-code-windows-x64": "2.3.23",
     "cicy-mihomo-darwin-x64": "1.10.4",
     "cicy-mihomo-darwin-arm64": "1.10.4",
     "cicy-mihomo-linux-x64": "1.10.4",

package/src/backends/ipc.js

@@ -174,18 +174,20 @@ function register(opts = {}) {
   ipcMain.handle("app:check-update",    async () => { await appUpdater.check(); return appUpdater.getState(); });
   ipcMain.handle("app:install-update",  () => { appUpdater.installNow(); return true; });
 
-  // Static version info: cicy-desktop's own version + the cicy-code tag
-  // we shipped with (`.cicy-code-ref` content from build time). Used by the
-  // homepage footer to show "CiCy Desktop vX.Y · cicy-code vA.B".
+  // Static version info: cicy-desktop's own version + the cicy-code version we
+  // actually ship. 主人(2026-06): the real bundled cicy-code = the per-platform
+  // optionalDependency (localbin.bundledVersion), not the retired `.cicy-code-ref`
+  // source-build pin (which was stale + never packaged). Used by the homepage
+  // footer to show "CiCy Desktop vX.Y · cicy-code vA.B".
   ipcMain.handle("app:get-version", () => {
     let cicyCodeRef = "";
     try {
-      const refPath = path.join(app.getAppPath(), ".cicy-code-ref");
-      cicyCodeRef = require("fs").readFileSync(refPath, "utf8").trim();
+      const bv = require("../sidecar/localbin").bundledVersion("cicy-code");
+      if (bv) cicyCodeRef = `v${bv}`;
     } catch {}
     return {
       desktop: app.getVersion(),
-      cicyCodeRef,                            // e.g. "v2.0.11" — what we *intended* to ship
+      cicyCodeRef,                            // e.g. "v2.3.22" — the bundled cicy-code
       electron: process.versions.electron,
       node:     process.versions.node,
       chrome:   process.versions.chrome,

package/src/sidecar/localbin.js

@@ -35,11 +35,36 @@ const path = require("path");
 const { execFile, execFileSync } = require("child_process");
 
 const IS_WIN = process.platform === "win32";
-const REGISTRY = process.env.CICY_NPM_REGISTRY || "https://registry.npmmirror.com";
-// 多 registry 回退(主人): npmmirror(CN 快)优先,失败回退 npmjs.org(官方)。新发布的
-// cicy-code-<plat> 子包/新版本先到 npmjs,npmmirror 同步有延迟 —— 只查 npmmirror 会
-// "package not found" 把 seed/更新 整死(实测 mac:npm view cicy-code-darwin-x64 失败)。
-const REGISTRIES = [REGISTRY, "https://registry.npmjs.org"].filter((r, i, a) => a.indexOf(r) === i);
+const NPMMIRROR = "https://registry.npmmirror.com"; // CN-fast
+const NPMJS = "https://registry.npmjs.org";         // 官方,新版本/新子包先到这
+
+// 主人(2026-06): 按网络环境选 registry 顺序,两边都用各自最快的源(对方做回退)。
+//   CN(GFW 内):npmmirror 优先 → npmjs 兜底
+//   非CN:        npmjs 优先     → npmmirror 兜底(npmmirror 海外慢,别让它当首选)
+// 判断:探 generate_204 —— 能 204(够到 Google/有代理)= 非CN;超时/失败 = CN。探一次缓存。
+// CICY_NPM_REGISTRY 覆盖时强制该源优先(测试/私有源用)。
+let _cnProbe = null;
+function probeIsCN() {
+  if (_cnProbe) return _cnProbe;
+  _cnProbe = new Promise((resolve) => {
+    let done = false;
+    const fin = (cn) => { if (!done) { done = true; resolve(cn); } };
+    try {
+      const req = require("https").get("https://www.gstatic.com/generate_204", { timeout: 2000 }, (res) => {
+        const ok = res.statusCode === 204; res.destroy(); fin(!ok); // 204 够到 = 非CN
+      });
+      req.on("timeout", () => { req.destroy(); fin(true); }); // 超时 = GFW = CN
+      req.on("error", () => fin(true));                        // 连不上 = CN
+    } catch { fin(true); }
+  });
+  return _cnProbe;
+}
+async function registries() {
+  const override = process.env.CICY_NPM_REGISTRY;
+  if (override) return [override, NPMJS, NPMMIRROR].filter((r, i, a) => a.indexOf(r) === i);
+  const cn = await probeIsCN();
+  return cn ? [NPMMIRROR, NPMJS] : [NPMJS, NPMMIRROR];
+}
 const LOCAL_BIN = path.join(os.homedir(), ".local", "bin");
 const MANIFEST = path.join(LOCAL_BIN, ".cicy-localbin.json");
 
@@ -126,11 +151,12 @@ function npmExec(args, timeout = 600000) {
   });
 }
 
-// Latest published version of the per-platform subpackage. Tries npmmirror then
-// npmjs.org (REGISTRIES) so a not-yet-mirrored package/version still resolves.
+// Latest published version of the per-platform subpackage. Tries the env-ordered
+// registries (CN→npmmirror first, 非CN→npmjs first) so a not-yet-mirrored
+// package/version still resolves and 非CN 不被慢镜像拖住。
 async function latestVersion(name = DEFAULT) {
   let lastErr;
-  for (const reg of REGISTRIES) {
+  for (const reg of await registries()) {
     try { return (await npmExec(["view", pkgFor(name), "version", `--registry=${reg}`], 30000)).trim(); }
     catch (e) { lastErr = e; }
   }
@@ -221,7 +247,7 @@ async function fetchToLocalBin(ver, { emit, name = DEFAULT } = {}) {
   try {
     e({ phase: "download", status: "running", message: `下载 ${label} ${ver}…` });
     let out, lastErr;
-    for (const reg of REGISTRIES) {
+    for (const reg of await registries()) {
       try { out = await npmExec(["pack", `${pkgFor(name)}@${ver}`, `--registry=${reg}`, "--pack-destination", tmp]); break; }
       catch (e2) { lastErr = e2; }
     }

package/.cicy-code-ref

@@ -1 +0,0 @@
-v2.2.5

package/scripts/prepare-cicy-code-sidecar.js

@@ -1,116 +0,0 @@
-#!/usr/bin/env node
-// Populates vendor/cicy-code/<platform>-<arch>/cicy-code so electron-builder
-// can include the cicy-code daemon as an extraResources sidecar.
-//
-// Source resolution (first hit wins):
-//   1. CICY_CODE_BIN_PATH  — single binary file, copied to the current host's
-//      platform/arch slot only. Dev shortcut on the maintainer's own box.
-//   2. CICY_CODE_DIST_DIR  — directory containing all four
-//      cicy-code-{darwin,linux}-{amd64,arm64} files as produced by
-//      `bash build.sh all` in the cicy-code repo. Used by CI.
-//   3. ../cicy-code/dist   — sibling checkout fallback.
-//
-// Output layout (the ${arch} macro in electron-builder uses x64/arm64 naming,
-// not Go's amd64/arm64, so we rename at copy time):
-//   vendor/cicy-code/darwin-x64/cicy-code
-//   vendor/cicy-code/darwin-arm64/cicy-code
-//   vendor/cicy-code/linux-x64/cicy-code
-//   vendor/cicy-code/linux-arm64/cicy-code
-//
-// On macOS hosts the copied binary is ad-hoc signed (`codesign --sign -`) so
-// it loads on Apple Silicon (which refuses to exec any unsigned mach-o).
-// When a real Apple Developer ID is configured, electron-builder's signing
-// pass during build:mac will overwrite this ad-hoc sig.
-
-const fs = require("fs");
-const path = require("path");
-const { spawnSync } = require("child_process");
-
-const REPO_ROOT = path.resolve(__dirname, "..");
-const VENDOR_ROOT = path.join(REPO_ROOT, "vendor", "cicy-code");
-
-const TARGETS = [
-  { platform: "darwin", goArch: "amd64", electronArch: "x64" },
-  { platform: "darwin", goArch: "arm64", electronArch: "arm64" },
-  { platform: "linux",  goArch: "amd64", electronArch: "x64" },
-  { platform: "linux",  goArch: "arm64", electronArch: "arm64" },
-];
-
-function nodePlatformToGo(p) {
-  if (p === "darwin") return "darwin";
-  if (p === "linux") return "linux";
-  return null;
-}
-function nodeArchToGo(a) {
-  if (a === "x64") return "amd64";
-  if (a === "arm64") return "arm64";
-  return null;
-}
-
-function adhocSignIfDarwin(destPath, target) {
-  if (process.platform !== "darwin" || target.platform !== "darwin") return;
-  const r = spawnSync("codesign", ["--force", "--sign", "-", destPath], { stdio: "pipe", encoding: "utf8" });
-  if (r.status === 0) {
-    console.log(`[cicy-code-sidecar]   ad-hoc signed ${path.basename(destPath)}`);
-  } else {
-    console.warn(`[cicy-code-sidecar]   codesign failed (rc=${r.status}); arm64 may refuse to launch this binary: ${r.stderr.trim()}`);
-  }
-}
-
-function copyOne(srcPath, target) {
-  if (!fs.existsSync(srcPath)) return false;
-  const destDir = path.join(VENDOR_ROOT, `${target.platform}-${target.electronArch}`);
-  fs.mkdirSync(destDir, { recursive: true });
-  const destPath = path.join(destDir, "cicy-code");
-  fs.copyFileSync(srcPath, destPath);
-  fs.chmodSync(destPath, 0o755);
-  const sizeMB = (fs.statSync(destPath).size / (1024 * 1024)).toFixed(1);
-  console.log(`[cicy-code-sidecar] ${target.platform}/${target.electronArch}  ${sizeMB} MB  <- ${srcPath}`);
-  adhocSignIfDarwin(destPath, target);
-  return true;
-}
-
-function main() {
-  fs.mkdirSync(VENDOR_ROOT, { recursive: true });
-
-  const binPath = process.env.CICY_CODE_BIN_PATH;
-  if (binPath) {
-    const goPlat = nodePlatformToGo(process.platform);
-    const goArch = nodeArchToGo(process.arch);
-    if (!goPlat || !goArch) {
-      console.error(`[cicy-code-sidecar] CICY_CODE_BIN_PATH set but current host ${process.platform}/${process.arch} is not a supported sidecar target`);
-      process.exit(1);
-    }
-    const t = TARGETS.find(x => x.platform === goPlat && x.goArch === goArch);
-    if (!copyOne(binPath, t)) {
-      console.error(`[cicy-code-sidecar] CICY_CODE_BIN_PATH=${binPath} does not exist`);
-      process.exit(1);
-    }
-    return;
-  }
-
-  const sibling = path.resolve(REPO_ROOT, "..", "cicy-code", "dist");
-  const distDir = process.env.CICY_CODE_DIST_DIR
-    || (fs.existsSync(sibling) ? sibling : null);
-  if (!distDir) {
-    console.error("[cicy-code-sidecar] no source found.");
-    console.error("  Set one of:");
-    console.error("    CICY_CODE_BIN_PATH=/path/to/cicy-code");
-    console.error("    CICY_CODE_DIST_DIR=/path/to/cicy-code/dist");
-    console.error("  …or check out cicy-code as a sibling at ../cicy-code and run `bash build.sh all` there.");
-    process.exit(1);
-  }
-
-  let copied = 0;
-  for (const t of TARGETS) {
-    const srcPath = path.join(distDir, `cicy-code-${t.platform}-${t.goArch}`);
-    if (copyOne(srcPath, t)) copied++;
-  }
-  if (copied === 0) {
-    console.error(`[cicy-code-sidecar] no expected binaries found under ${distDir}`);
-    console.error("  Expected: cicy-code-{darwin,linux}-{amd64,arm64}");
-    process.exit(1);
-  }
-}
-
-main();