cicy-desktop 2.1.145 → 2.1.147

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
@@ -166,3 +171,39 @@ jobs:
             gh release upload "${{ steps.meta.outputs.tag }}" dist/latest-mac.yml \
               --repo "$GITHUB_REPOSITORY" --clobber
           fi
+
+      # Offline all-in-one: prebuilt .app (ad-hoc signed) + docker base disk + cicy-code
+      # image + install.command. No Apple cert needed (the installer strips quarantine +
+      # re-ad-hoc-signs locally), no network at docker-install time (images pre-staged).
+      - name: Build offline all-in-one bundles (.app + docker + installer)
+        continue-on-error: true   # extra artifact — never fail the dmg/zip release
+        shell: bash
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          set -euo pipefail
+          OSS="https://cicy-1372193042-cn.oss-cn-shanghai.aliyuncs.com"
+          VER="${{ steps.meta.outputs.version }}"
+          mkdir -p payload
+          # cicy-code image is amd64 for both arches (runs via rosetta on arm64) → fetch once.
+          curl -fSL "$OSS/images/cicy-code-latest.tar.gz" -o payload/cicy-code-latest.tar.gz
+          for ARCH in x64 arm64; do
+            [ "$ARCH" = x64 ] && DTAG=amd64 || DTAG=arm64
+            # locate the .app for this arch (electron-builder leaves it under dist/mac*/)
+            APP=""
+            for d in $(find dist -maxdepth 2 -type d -name "*.app"); do
+              if lipo -archs "$d/Contents/MacOS/"* 2>/dev/null | grep -qw "$([ "$ARCH" = x64 ] && echo x86_64 || echo arm64)"; then APP="$d"; break; fi
+            done
+            [ -n "$APP" ] || { echo "::warning::no $ARCH .app found, skipping all-in-one"; continue; }
+            echo "all-in-one $ARCH ← $APP"
+            curl -fSL "$OSS/colima-base/ubuntu-2404-$DTAG-docker.raw.gz" -o "payload/ubuntu-2404-$DTAG-docker.raw.gz"
+            B="allinone-$ARCH"; rm -rf "$B"; mkdir -p "$B/docker"
+            cp -R "$APP" "$B/CiCy Desktop.app"
+            cp payload/cicy-code-latest.tar.gz "$B/docker/"
+            cp "payload/ubuntu-2404-$DTAG-docker.raw.gz" "$B/docker/"
+            cp scripts/mac-allinone/install.command "$B/"; chmod +x "$B/install.command"
+            OUT="cicy-desktop-allinone-$VER-$ARCH.tar.gz"
+            tar -czf "$OUT" -C "$B" .
+            gh release upload "${{ steps.meta.outputs.tag }}" "$OUT" --repo "$GITHUB_REPOSITORY" --clobber
+            echo "uploaded $OUT ($(du -h "$OUT" | cut -f1))"
+          done

package/package.json

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

package/scripts/mac-allinone/install.command

@@ -0,0 +1,59 @@
+#!/bin/bash
+# CiCy Desktop — offline all-in-one installer for macOS (NO Apple signing needed).
+#
+# Without an Apple Developer cert a DOWNLOADED .app/.dmg is Gatekeeper-quarantined
+# ("已损坏 / 无法打开", hard-blocked on arm64). electron-builder already produces a
+# working ad-hoc-signed CiCy Desktop.app (in the -mac.zip); the only thing stopping
+# it from opening is the download quarantine flag. So this installer:
+#   1. installs that prebuilt .app and strips the quarantine (xattr -cr) + re-ad-hoc-
+#      signs it locally (codesign --sign -, no cert) → opens normally, no signing.
+#   2. pre-stages the docker base disk + cicy-code image so the app's docker
+#      bootstrap REUSES them → zero download, fully offline.
+#
+# Bundle layout (this file sits at the bundle root):
+#   CiCy Desktop.app                          — prebuilt app (from electron-builder)
+#   docker/ubuntu-2404-<arch>-docker.raw.gz   — colima base disk (340MB)
+#   docker/cicy-code-latest.tar.gz            — cicy-code image (167MB)
+set -euo pipefail
+
+HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+APP_NAME="CiCy Desktop"
+DEST_APP="/Applications/$APP_NAME.app"
+ARCH="$(uname -m)"; [ "$ARCH" = "x86_64" ] && DTAG="amd64" || DTAG="arm64"
+
+echo "==> CiCy Desktop 离线安装(arch=$ARCH)"
+
+SRC_APP="$HERE/$APP_NAME.app"
+[ -d "$SRC_APP" ] || { echo "缺少 $APP_NAME.app(包损坏?)"; exit 1; }
+
+# ── 1) 安装到 /Applications ─────────────────────────────────────────────────
+echo "==> 安装到 $DEST_APP …"
+if [ -w "/Applications" ] || [ ! -e "$DEST_APP" ]; then
+  rm -rf "$DEST_APP" 2>/dev/null || true
+  ditto "$SRC_APP" "$DEST_APP"
+else
+  echo "    需要管理员权限覆盖旧版,请输入密码:"
+  sudo rm -rf "$DEST_APP"; sudo ditto "$SRC_APP" "$DEST_APP"
+  sudo chown -R "$(id -un)":staff "$DEST_APP" 2>/dev/null || true
+fi
+
+# ── 2) 清隔离 + 本地 ad-hoc 自签(免 Apple 证书的关键)──────────────────────
+echo "==> 清隔离属性 + 本地 ad-hoc 自签 …"
+xattr -dr com.apple.quarantine "$DEST_APP" 2>/dev/null || true
+xattr -cr "$DEST_APP" 2>/dev/null || true
+# 重新 ad-hoc 签整个 bundle(ditto 后保险起见;已签则等价覆盖)
+codesign --force --deep --sign - "$DEST_APP" 2>/dev/null || \
+  echo "    (codesign 警告可忽略,quarantine 已清即可打开)"
+
+# ── 3) 预暂存 docker 包(让 app 的 bootstrap reuse、零下载)──────────────────
+echo "==> 预暂存 docker 运行环境(基础盘 + 镜像)…"
+mkdir -p "$HOME/cicy-ai/colima" "$HOME/Downloads"
+DISK_SRC="$HERE/docker/ubuntu-2404-$DTAG-docker.raw.gz"
+IMG_SRC="$HERE/docker/cicy-code-latest.tar.gz"
+[ -f "$DISK_SRC" ] && ditto "$DISK_SRC" "$HOME/cicy-ai/colima/ubuntu-2404-$DTAG-docker.raw.gz" && echo "    基础盘已就位($DTAG)"
+[ -f "$IMG_SRC" ]  && ditto "$IMG_SRC"  "$HOME/Downloads/cicy-code-latest.tar.gz" && echo "    cicy-code 镜像已就位"
+
+echo ""
+echo "✅ 安装完成 —— 打开「启动台」或 /Applications 里的「$APP_NAME」。"
+echo "   docker 运行环境已预置,首次点安装直接复用、不下载。"
+open "$DEST_APP" || true