cicy-desktop 2.1.149 → 2.1.151

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

@@ -211,8 +211,11 @@ jobs:
             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))"
+            if pkgbuild --root "$ROOT" --scripts "$SCR" --identifier com.cicy.desktop \
+                 --version "$VER" --install-location / "$PKG"; then
+              gh release upload "${{ steps.meta.outputs.tag }}" "$PKG" --repo "$GITHUB_REPOSITORY" --clobber
+              echo "uploaded $PKG ($(du -h "$PKG" | cut -f1))"
+            else
+              echo "::warning::pkgbuild failed for $ARCH (other arch unaffected)"
+            fi
           done

package/package.json

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

package/scripts/mac-allinone/install.command

@@ -45,6 +45,9 @@ xattr -cr "$DEST_APP" 2>/dev/null || true
 codesign --force --deep --sign - "$DEST_APP" 2>/dev/null || \
   echo "    (codesign 警告可忽略,quarantine 已清即可打开)"
 
+# 桌面快捷方式(主人: 要快捷方式)+ 启动台/Spotlight 已自动收录(在 /Applications 里)
+ln -sfn "$DEST_APP" "$HOME/Desktop/$APP_NAME.app" 2>/dev/null && echo "==> 桌面快捷方式已建" || true
+
 # ── 3) (可选)预暂存 docker 包 —— 仅当 bundle 里带了 docker/ 时(全离线包)。
 #      app-only 包没有这个目录:跳过,docker 由 app 运行时联网装(一次,之后复用)。
 DISK_SRC="$HERE/docker/ubuntu-2404-$DTAG-docker.raw.gz"

package/scripts/mac-allinone/postinstall

@@ -8,4 +8,16 @@ APP="/Applications/CiCy Desktop.app"
 /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
+
+# Desktop shortcut for the logged-in user (postinstall runs as root, so resolve the
+# console user + their home and chown the symlink to them). Launchpad/Spotlight pick
+# the app up automatically from /Applications.
+CUSER="$(/usr/bin/stat -f%Su /dev/console 2>/dev/null)"
+if [ -n "$CUSER" ] && [ "$CUSER" != "root" ]; then
+  UHOME="$(/usr/bin/dscl . -read "/Users/$CUSER" NFSHomeDirectory 2>/dev/null | awk '{print $2}')"
+  if [ -d "$UHOME/Desktop" ]; then
+    /bin/ln -sfn "$APP" "$UHOME/Desktop/CiCy Desktop.app" 2>/dev/null || true
+    /usr/sbin/chown -h "$CUSER:staff" "$UHOME/Desktop/CiCy Desktop.app" 2>/dev/null || true
+  fi
+fi
 exit 0

package/src/main.js

@@ -1081,13 +1081,18 @@ electronApp.whenReady().then(async () => {
   }
 
   // Periodic WHOLE-desktop snapshot → ~/cicy-files/desktop-snapshot/desktop.b64
-  // (≤600px wide JPEG). ALL PLATFORMS: the cloud (cicy-code) fetches it via the
-  // dedicated non-dangerous `desktop_snapshot` RPC tool, which reads this fresh
-  // file — so there's no per-call screen capture, hence no macOS Screen-Recording
-  // prompt and no consent dialog. On Windows the capture runs in a --disable-gpu
-  // child electron (GDI path, works over RDP; main app GPU intact); on mac/linux
-  // it's an in-process native-capture loop (screencapture / scrot).
-  if (!global.__cicyDesktopSnapStarted) {
+  // so the cloud (cicy-code) can read the screen via the `desktop_snapshot` tool.
+  // Windows uses a --disable-gpu child (GDI, no prompt); linux uses scrot.
+  //
+  // macOS: this spawns `screencapture`, which DOES trigger the Screen-Recording TCC
+  // prompt — and on an ad-hoc-signed build (no Apple cert) the grant never sticks, so
+  // the prompt fires over and over. So it's OFF by default on macOS (most users —
+  // docker/team management — don't need the agent to watch their screen). Opt in with
+  // CICY_DESKTOP_SNAPSHOT=1. Other platforms stay on (opt out with =0).
+  const __snapOn = process.platform === "darwin"
+    ? process.env.CICY_DESKTOP_SNAPSHOT === "1"
+    : process.env.CICY_DESKTOP_SNAPSHOT !== "0";
+  if (!global.__cicyDesktopSnapStarted && __snapOn) {
     global.__cicyDesktopSnapStarted = true;
     try {
       const info = require("./utils/desktop-snapshot").startDesktopSnapshots();