cicy-desktop 2.1.144 → 2.1.146

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

@@ -115,11 +115,16 @@ jobs:
         run: |
           set -euo pipefail
           rm -rf dist
+          # Build BOTH arches: --arm64 (Apple Silicon) AND --x64 (Intel). The runner
+          # is arm64 and electron-builder cross-builds x64, so Intel Macs get a NATIVE
+          # dmg instead of being forced onto the slow `npx` electron path (the repo had
+          # only arm64 dmgs, so x86_64 Macs had no installer). cicy-code sidecar is
+          # already built for darwin amd64 + arm64 above.
           if [ -f build/logo.icns ]; then
-            npm run build:mac -- --config.mac.icon=build/logo.icns --publish always
+            npm run build:mac -- --arm64 --x64 --config.mac.icon=build/logo.icns --publish always
           else
             echo "::warning::build/logo.icns missing — using default Electron icon"
-            npm run build:mac -- --publish always
+            npm run build:mac -- --arm64 --x64 --publish always
           fi
 
       - name: Upload macOS artifacts

package/package.json

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

package/src/sidecar/docker.js

@@ -360,6 +360,18 @@ function curlDownload(url, dest, { emit, phase = "image", label = "下载镜像"
 // (much faster here); falls back to the node downloader if curl is unavailable.
 async function downloadImageTarball({ emit } = {}) {
   const dest = imageTarballPath();
+  // REUSE a complete tarball already on disk (staged into ~/Downloads, or a prior
+  // run) BEFORE curlDownload touches it — curlDownload doesn't skip a complete file
+  // (and a failed curl truncates it). headSize uses node http so it works even when
+  // curl can't resolve the host. Skips the ~500MB re-download per new user.
+  try {
+    const expected = await headSize(R2_TARBALL);
+    const have = fs.statSync(dest).size;
+    if (expected > 0 && have === expected) {
+      emit && emit({ phase: "image", status: "skip", message: "镜像:已有完整包,跳过下载", progress: 100, received: have, total: expected });
+      return dest;
+    }
+  } catch {}
   try { await curlDownload(R2_TARBALL, dest, { emit, phase: "image", label: "下载镜像" }); }
   catch (e) {
     emit && emit({ phase: "image", status: "running", message: `curl 下载失败(${e.message}),改用内置下载…` });