cicy-desktop 2.1.152 → 2.1.153

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

@@ -228,3 +228,35 @@ jobs:
               echo "::warning::pkgbuild failed for $ARCH (other arch unaffected)"
             fi
           done
+
+      # Publish the .pkg installers to OSS (CN-fast). GitHub release downloads stall from
+      # mainland China, so users in CN pull from OSS instead. Each arch gets a versioned key
+      # plus a stable cicy-desktop-mac-<arch>-latest.pkg alias a download page can hard-link.
+      # Same bucket/creds as the Windows latest.exe step.
+      - name: Upload .pkg to OSS (versioned + per-arch latest alias)
+        continue-on-error: true   # OSS is a convenience mirror — never fail the release
+        shell: bash
+        env:
+          OSS_AK: ${{ secrets.OSS_ACCESS_KEY_ID }}
+          OSS_SK: ${{ secrets.OSS_ACCESS_KEY_SECRET }}
+        run: |
+          set -uo pipefail
+          VER="${{ steps.meta.outputs.version }}"
+          if [ -z "${OSS_AK:-}" ] || [ -z "${OSS_SK:-}" ]; then
+            echo "::warning::OSS creds missing — skipping OSS mirror"; exit 0
+          fi
+          curl -fsSL -o ossutil.zip "https://gosspublic.alicdn.com/ossutil/1.7.18/ossutil-v1.7.18-mac-arm64.zip"
+          unzip -oq ossutil.zip
+          OSS="./ossutil-v1.7.18-mac-arm64/ossutil"; chmod +x "$OSS"
+          "$OSS" config -e oss-cn-shanghai.aliyuncs.com -i "$OSS_AK" -k "$OSS_SK"
+          BASE="oss://cicy-1372193042-cn/releases"
+          HOST="https://cicy-1372193042-cn.oss-cn-shanghai.aliyuncs.com/releases"
+          for ARCH in x64 arm64; do
+            PKG="cicy-desktop-$VER-$ARCH.pkg"
+            [ -f "$PKG" ] || { echo "::warning::$PKG not built — skipping OSS for $ARCH"; continue; }
+            "$OSS" cp "$PKG" "$BASE/$PKG" -f --acl public-read || { echo "::warning::OSS versioned upload failed $ARCH"; continue; }
+            "$OSS" cp "$PKG" "$BASE/cicy-desktop-mac-$ARCH-latest.pkg" -f --acl public-read || echo "::warning::OSS latest upload failed $ARCH"
+            echo "OSS $ARCH: $HOST/cicy-desktop-mac-$ARCH-latest.pkg"
+          done
+          printf '%s' "$VER" > mac-latest-version.txt
+          "$OSS" cp mac-latest-version.txt "$BASE/mac-latest-version.txt" -f --acl public-read || true

package/.github/workflows/windows-exe-release.yml

@@ -138,6 +138,11 @@ jobs:
             Set-Content -NoNewline -Path "current-latest.txt" -Value $version
             & $oss cp "current-latest.txt" "$base/latest-version.txt" -f --acl public-read
             if ($LASTEXITCODE -ne 0) { Write-Error "latest-version.txt upload failed"; exit 1 }
+            # Unified per-platform naming: cicy-desktop-<platform>-latest.<ext> so every OS
+            # shares one URL shape (win + mac-x64 + mac-arm64). The bare cicy-desktop-latest.exe
+            # / latest-version.txt above are kept as backward-compat aliases for old links.
+            & $oss cp "$($exe.FullName)" "$base/cicy-desktop-win-latest.exe" -f --acl public-read
+            & $oss cp "current-latest.txt" "$base/win-latest-version.txt" -f --acl public-read
           } else {
             Write-Host "Skip latest: building $version < published $cur (older build — not clobbering newer latest)"
           }

package/package.json

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

package/scripts/mac-allinone/postinstall

@@ -7,7 +7,47 @@ 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
+
+# ── Stable LOCAL code-signing identity (主人令: 用自签证书) ────────────────────
+# ad-hoc has no stable identity, so macOS never persists the Screen-Recording TCC
+# grant → it re-prompts forever. A self-signed cert gives the app a STABLE designated
+# requirement, so the grant sticks after the user allows it once. We run as root here,
+# so we can write the System keychain + trust the cert with NO password prompt.
+SIGN_CN="CiCy Desktop Local Signing"
+SYS_KC="/Library/Keychains/System.keychain"
+if ! /usr/bin/security find-identity -p codesigning "$SYS_KC" 2>/dev/null | grep -qF "$SIGN_CN"; then
+  TMPD="$(/usr/bin/mktemp -d)"
+  # Config file (portable across the LibreSSL that ships in /usr/bin/openssl, which
+  # lacks `-addext`). codeSigning EKU is what makes it a valid signing identity.
+  cat > "$TMPD/c.cnf" <<CNF
+[req]
+distinguished_name = dn
+x509_extensions = v3
+prompt = no
+[dn]
+CN = $SIGN_CN
+[v3]
+basicConstraints = critical,CA:false
+keyUsage = critical,digitalSignature
+extendedKeyUsage = critical,codeSigning
+CNF
+  /usr/bin/openssl req -x509 -newkey rsa:2048 -keyout "$TMPD/k.pem" -out "$TMPD/c.pem" \
+    -days 3650 -nodes -config "$TMPD/c.cnf" >/dev/null 2>&1
+  /usr/bin/openssl pkcs12 -export -inkey "$TMPD/k.pem" -in "$TMPD/c.pem" \
+    -out "$TMPD/id.p12" -passout pass:cicy -name "$SIGN_CN" >/dev/null 2>&1
+  # -A = no ACL on the key → codesign can use it without a partition-list/password dance.
+  /usr/bin/security import "$TMPD/id.p12" -k "$SYS_KC" -P cicy -A >/dev/null 2>&1 || true
+  /usr/bin/security add-trusted-cert -d -r trustRoot -p codeSign -k "$SYS_KC" "$TMPD/c.pem" >/dev/null 2>&1 || true
+  /bin/rm -rf "$TMPD"
+fi
+if /usr/bin/security find-identity -p codesigning "$SYS_KC" 2>/dev/null | grep -qF "$SIGN_CN"; then
+  /usr/bin/codesign --force --deep --sign "$SIGN_CN" --keychain "$SYS_KC" "$APP" 2>/dev/null \
+    && echo "signed with local identity: $SIGN_CN" \
+    || /usr/bin/codesign --force --deep --sign - "$APP" 2>/dev/null || true
+else
+  echo "local identity unavailable — falling back to ad-hoc"
+  /usr/bin/codesign --force --deep --sign - "$APP" 2>/dev/null || true
+fi
 
 # 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

package/src/main.js

@@ -1089,13 +1089,11 @@ electronApp.whenReady().then(async () => {
   // 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) {
+  const __snap = require("./utils/desktop-snapshot");
+  if (!global.__cicyDesktopSnapStarted && __snap.snapshotEnabled()) {
     global.__cicyDesktopSnapStarted = true;
     try {
-      const info = require("./utils/desktop-snapshot").startDesktopSnapshots();
+      const info = __snap.startDesktopSnapshots();
       log.info(`[desktop-snap] desktop snapshots → ${info.dir} (every ${info.intervalMs}ms, maxW ${info.maxWidth}, mode ${info.mode})`);
     } catch (e) { log.warn(`[desktop-snap] start failed: ${e.message}`); }
   }

package/src/tools/desktop-snapshot-tools.js

@@ -51,7 +51,10 @@ module.exports = (registerTool) => {
 
         // Stale/missing. mac/linux can capture live in-process; win32 cannot (needs
         // the --disable-gpu daemon), so there we fall back to whatever file exists.
-        if (process.platform !== "win32") {
+        // BUT honor snapshotEnabled(): on macOS capture is off by default, and a live
+        // `screencapture` here is exactly what pops the Screen-Recording prompt (just
+        // less often than the daemon did) — so when disabled we must NOT live-capture.
+        if (process.platform !== "win32" && snap.snapshotEnabled()) {
           try {
             const r = await snap.captureB64(maxWidth);
             return { content: [{ type: "text", text: r.b64 }] };
@@ -61,7 +64,10 @@ module.exports = (registerTool) => {
           }
         }
 
-        if (fresh) return { content: [{ type: "text", text: fresh.b64 }] }; // win32: stale is better than nothing
+        if (fresh) return { content: [{ type: "text", text: fresh.b64 }] }; // stale is better than nothing
+        if (process.platform === "darwin" && !snap.snapshotEnabled()) {
+          throw new Error("桌面截图在 macOS 默认关闭(避免反复弹屏幕录制授权)。需要 agent 看屏幕时,启动 app 前设 CICY_DESKTOP_SNAPSHOT=1。");
+        }
         throw new Error("no desktop snapshot yet (daemon warming up?)");
       } catch (error) {
         return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };

package/src/utils/desktop-snapshot.js

@@ -33,6 +33,16 @@ function snapDir() {
   return fromEnv || path.join(os.homedir(), "cicy-files", "desktop-snapshot");
 }
 
+// Is desktop screen capture allowed here? Single source of truth shared by the
+// periodic daemon (main.js) AND the on-demand `desktop_snapshot` tool's live fallback.
+// ON by default on every platform (主人令: 不能关周期截图 — the agent needs to watch the
+// screen). The macOS repeated Screen-Recording prompt is NOT fixed by disabling capture
+// but by giving the app a STABLE signing identity (see scripts/mac-allinone codesign), so
+// the TCC grant sticks. Opt out entirely with CICY_DESKTOP_SNAPSHOT=0.
+function snapshotEnabled() {
+  return process.env.CICY_DESKTOP_SNAPSHOT !== "0";
+}
+
 function intervalMs(opt) {
   const fromEnv = parseInt(process.env.CICY_DESKTOP_SNAP_INTERVAL_MS || "", 10);
   return (opt && opt.intervalMs) || (fromEnv > 0 ? fromEnv : DEFAULT_INTERVAL_MS);
@@ -187,4 +197,4 @@ if (process.env.CICY_SNAP_DAEMON === "1") {
   app.on("render-process-gone", () => app.quit());
 }
 
-module.exports = { startDesktopSnapshots, stopDesktopSnapshots, snapDir, captureOnce, captureB64, MAX_W };
+module.exports = { startDesktopSnapshots, stopDesktopSnapshots, snapDir, captureOnce, captureB64, snapshotEnabled, MAX_W };