cicy-desktop 2.1.147 → 2.1.149

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

@@ -172,38 +172,47 @@ jobs:
               --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)
+      # Lightweight app installer (~150MB): prebuilt ad-hoc-signed .app + install.command.
+      # No Apple cert (installer strips quarantine + re-ad-hoc-signs locally). Docker is
+      # NOT bundled — the app downloads + reuses it at runtime (keeps this small). For a
+      # fully-offline install, drop the docker base disk + cicy-code image next to
+      # install.command in a docker/ subdir and it'll stage them instead.
+      - name: Build app installer bundles (.app + installer, no docker)
         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*/)
+            WANT="$([ "$ARCH" = x64 ] && echo x86_64 || echo arm64)"
             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"
+            # NUL-delimited: the .app dir name has a space ("CiCy Desktop.app"), so a
+            # `for d in $(find …)` word-splits the path and breaks. read -d '' is safe.
+            while IFS= read -r -d '' d; do
+              bin="$(find "$d/Contents/MacOS" -maxdepth 1 -type f | head -1)"
+              if lipo -archs "$bin" 2>/dev/null | grep -qw "$WANT"; then APP="$d"; break; fi
+            done < <(find dist -maxdepth 2 -type d -name "*.app" -print0)
+            [ -n "$APP" ] || { echo "::warning::no $ARCH .app found, skipping"; continue; }
+            echo "app installer $ARCH ← $APP"
+            B="appbundle-$ARCH"; rm -rf "$B"; mkdir -p "$B"
             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"
+            OUT="cicy-desktop-app-$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))"
+
+            # Native .pkg installer (right-click Open once; the postinstall ad-hoc-signs
+            # + de-quarantines the installed app so it opens with no Apple cert).
+            ROOT="pkgroot-$ARCH"; rm -rf "$ROOT"; mkdir -p "$ROOT/Applications"
+            cp -R "$APP" "$ROOT/Applications/CiCy Desktop.app"
+            SCR="pkgscripts-$ARCH"; rm -rf "$SCR"; mkdir -p "$SCR"
+            cp scripts/mac-allinone/postinstall "$SCR/postinstall"; chmod +x "$SCR/postinstall"
+            PKG="cicy-desktop-$VER-$ARCH.pkg"
+            pkgbuild --root "$ROOT" --scripts "$SCR" --identifier com.cicy.desktop \
+              --version "$VER" --install-location / "$PKG"
+            gh release upload "${{ steps.meta.outputs.tag }}" "$PKG" --repo "$GITHUB_REPOSITORY" --clobber
+            echo "uploaded $PKG ($(du -h "$PKG" | cut -f1))"
           done

package/package.json

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

package/scripts/mac-allinone/install.command

@@ -45,15 +45,23 @@ xattr -cr "$DEST_APP" 2>/dev/null || true
 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"
+# ── 3) (可选)预暂存 docker 包 —— 仅当 bundle 里带了 docker/ 时(全离线包)。
+#      app-only 包没有这个目录:跳过,docker 由 app 运行时联网装(一次,之后复用)。
 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 镜像已就位"
+STAGED=0
+if [ -f "$DISK_SRC" ] || [ -f "$IMG_SRC" ]; then
+  echo "==> 检测到离线 docker 包,预暂存以便零下载 …"
+  mkdir -p "$HOME/cicy-ai/colima" "$HOME/Downloads"
+  [ -f "$DISK_SRC" ] && ditto "$DISK_SRC" "$HOME/cicy-ai/colima/ubuntu-2404-$DTAG-docker.raw.gz" && echo "    基础盘已就位($DTAG)" && STAGED=1
+  [ -f "$IMG_SRC" ]  && ditto "$IMG_SRC"  "$HOME/Downloads/cicy-code-latest.tar.gz" && echo "    cicy-code 镜像已就位" && STAGED=1
+fi
 
 echo ""
 echo "✅ 安装完成 —— 打开「启动台」或 /Applications 里的「$APP_NAME」。"
-echo "   docker 运行环境已预置,首次点安装直接复用、不下载。"
+if [ "$STAGED" = 1 ]; then
+  echo "   docker 运行环境已预置,首次点安装直接复用、不下载。"
+else
+  echo "   docker 首次点安装会联网下载运行环境(之后复用,不再重下)。"
+fi
 open "$DEST_APP" || true

package/scripts/mac-allinone/postinstall

@@ -0,0 +1,11 @@
+#!/bin/bash
+# Runs as root right after the .pkg lays down /Applications/CiCy Desktop.app.
+# The app is unsigned-but-ad-hoc (no Apple cert). pkg-installed files normally
+# aren't quarantined, but strip any quarantine + re-ad-hoc-sign to be safe so the
+# app opens without "已损坏 / unidentified developer". Best-effort — never fail install.
+APP="/Applications/CiCy Desktop.app"
+[ -d "$APP" ] || exit 0
+/usr/bin/xattr -dr com.apple.quarantine "$APP" 2>/dev/null || true
+/usr/bin/xattr -cr "$APP" 2>/dev/null || true
+/usr/bin/codesign --force --deep --sign - "$APP" 2>/dev/null || true
+exit 0