cicy-desktop 2.1.256 → 2.1.258

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

@@ -9,6 +9,10 @@ on:
 permissions:
   contents: write
 
+concurrency:
+  group: cicy-desktop-release-linux
+  cancel-in-progress: true
+
 jobs:
   build-linux-app:
     runs-on: ubuntu-latest
@@ -60,23 +64,14 @@ jobs:
       # hook (scripts/build-homepage.cjs) right before `npm run build:linux` below,
       # so the AppImage can never ship a stale homepage. No explicit step needed.
 
-      - name: Build Linux app (deb + AppImage)
+      - name: Build Linux AppImage
         shell: bash
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CICY_OBFUSCATE: "1"   # 发版混淆 JS(prebuild 主进程 + Vite 渲染层),仅 release CI
         run: |
           set -euo pipefail
-          npm run build:linux -- --publish always
-
-      - name: Upload Linux artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: cicy-desktop-linux
-          path: |
-            dist/*.deb
-            dist/*.AppImage
-            dist/latest-linux.yml
+          npm run build:linux -- --x64 --config.linux.target=AppImage --publish always
 
       # AppImage + 版本指针传到 OSS —— app-updater 现已全走 OSS(不碰 GitHub),linux 也要在
       # OSS 上有 versioned AppImage(CiCy-Desktop-<ver>.AppImage)和自己的指针 linux-latest-version.txt。

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

@@ -9,6 +9,10 @@ on:
 permissions:
   contents: write
 
+concurrency:
+  group: cicy-desktop-release-macos
+  cancel-in-progress: true
+
 jobs:
   build-mac-app:
     runs-on: macos-latest
@@ -97,7 +101,7 @@ jobs:
           done
           iconutil -c icns build/icon.iconset -o build/logo.icns || { echo "::warning::iconutil failed"; exit 0; }
 
-      - name: Build macOS app (dmg + zip, unsigned)
+      - name: Build macOS app directories (unsigned)
         # CSC_IDENTITY_AUTO_DISCOVERY=false stops electron-builder from probing the
         # runner keychain for a cert it does not have; combined with
         # build.mac.identity=null in package.json this produces a clean unsigned
@@ -111,27 +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.
+          # Build BOTH native app directories, then package only the PKGs consumed by
+          # the updater/download page. Avoiding dmg/zip saves macOS runner time and
+          # duplicate release storage.
           if [ -f build/logo.icns ]; then
-            npm run build:mac -- --arm64 --x64 --config.mac.icon=build/logo.icns --publish always
+            npm run build:mac -- --dir --arm64 --x64 --config.mac.icon=build/logo.icns --publish never
           else
             echo "::warning::build/logo.icns missing — using default Electron icon"
-            npm run build:mac -- --arm64 --x64 --publish always
+            npm run build:mac -- --dir --arm64 --x64 --publish never
           fi
 
-      - name: Upload macOS artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: cicy-desktop-mac
-          path: |
-            dist/*.dmg
-            dist/*.zip
-          if-no-files-found: error
-
       - name: Resolve release version
         id: meta
         shell: bash
@@ -140,7 +133,7 @@ jobs:
           echo "version=${version}" >> "$GITHUB_OUTPUT"
           echo "tag=v${version}" >> "$GITHUB_OUTPUT"
 
-      - name: Create GitHub release (idempotent)
+      - name: Ensure draft GitHub release exists
         shell: bash
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -150,30 +143,10 @@ jobs:
             --title "CiCy Desktop v${{ steps.meta.outputs.version }}" \
             --target "$GITHUB_SHA" \
             --generate-notes \
-            --latest \
+            --draft \
             2>/dev/null || echo "release already exists, continuing"
 
-      - name: Publish macOS assets (dmg + zip + latest-mac.yml)
-        shell: bash
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CSC_IDENTITY_AUTO_DISCOVERY: "false"
-        run: |
-          gh release upload "${{ steps.meta.outputs.tag }}" dist/*.dmg dist/*.zip \
-            --repo "$GITHUB_REPOSITORY" --clobber
-          # Also upload latest-mac.yml generated by --publish always into dist/
-          if ls dist/latest-mac.yml 2>/dev/null; then
-            gh release upload "${{ steps.meta.outputs.tag }}" dist/latest-mac.yml \
-              --repo "$GITHUB_REPOSITORY" --clobber
-          fi
-
-      # 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
+      - name: Build and publish PKG installers
         shell: bash
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -189,15 +162,8 @@ jobs:
               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 scripts/mac-allinone/install.command "$B/"; chmod +x "$B/install.command"
-            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))"
+            [ -n "$APP" ] || { echo "::error::no $ARCH .app found"; exit 1; }
+            echo "pkg $ARCH ← $APP"
 
             # Native .pkg installer (right-click Open once; the postinstall ad-hoc-signs
             # + de-quarantines the installed app so it opens with no Apple cert).
@@ -215,13 +181,11 @@ jobs:
             pkgbuild --analyze --root "$ROOT" "$PLIST"
             /usr/libexec/PlistBuddy -c "Set :0:BundleIsRelocatable false" "$PLIST" 2>/dev/null \
               || plutil -replace 0.BundleIsRelocatable -bool NO "$PLIST" || true
-            if pkgbuild --root "$ROOT" --component-plist "$PLIST" --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
+            pkgbuild --root "$ROOT" --component-plist "$PLIST" --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
 
       # Publish the .pkg installers to OSS (CN-fast). GitHub release downloads stall from

package/.github/workflows/npm-publish.yml

@@ -10,6 +10,10 @@ on:
       - 'v*'
   workflow_dispatch: {}
 
+concurrency:
+  group: cicy-desktop-release-npm
+  cancel-in-progress: true
+
 jobs:
   publish:
     runs-on: ubuntu-latest

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

@@ -9,6 +9,10 @@ on:
 permissions:
   contents: write
 
+concurrency:
+  group: cicy-desktop-release-windows
+  cancel-in-progress: true
+
 jobs:
   build-windows-exe:
     runs-on: windows-latest
@@ -93,13 +97,6 @@ jobs:
             npm run build:win -- --publish always
           }
 
-      - name: Upload EXE artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: cicy-desktop-windows-exe
-          path: dist/*.exe
-          if-no-files-found: error
-
       # 推 exe 到 OSS。三件事(不再是"永远一个版本"):
       #   1) 带版本号的永久副本 releases/cicy-desktop-<version>.exe — 历史 / 指定版本 / 回滚
       #   2) latest 指针 releases/cicy-desktop-latest.exe — 只前进:本次版本 < 已发布版本(更旧的

package/package.json

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

package/src/main.js

@@ -1317,17 +1317,17 @@ electronApp.whenReady().then(async () => {
   }
 
   const profileStore = require("./profiles/profile-store");
-  const electronProfiles = (() => {
+  const electronProfiles = () => {
     let rows = [];
     try { rows = profileStore.listProfiles("electron"); } catch {}
     // Profile 0 is the resident CiCy system window and must not be exposed in
     // the macOS title/top-bar launcher. Profile 9 is Chrome's source template.
     rows = rows.filter((p) => ![0, 9].includes(Number(p.accountIdx)));
     return rows;
-  })();
-  const chromeProfiles = (() => {
+  };
+  const chromeProfiles = () => {
     try { return profileStore.listProfiles("chrome"); } catch { return []; }
-  })();
+  };
   const showProfileError = (kind, e) => {
     dialog.showMessageBox({
       type: "error",
@@ -1336,16 +1336,17 @@ electronApp.whenReady().then(async () => {
       buttons: ["OK"],
     });
   };
-  const openElectronProfile = async (accountIdx) => {
+  const openElectronProfile = async (accountIdx, url) => {
     try {
       const tabs = require("./tools/tab-browser-tools");
-      await tabs.openTab(accountIdx, undefined, { activate: true });
+      await tabs.openTab(accountIdx, url, { activate: true });
       const m = tabs.ensureManager(accountIdx);
       if (m.win.isMinimized()) m.win.restore();
       m.win.show();
       m.win.focus();
     } catch (e) { showProfileError("Electron", e); }
   };
+  const openCicyAi = () => openElectronProfile(1, "https://cicy-ai.com");
   const openChromeProfile = async (accountIdx) => {
     try {
       await require("./tools/chrome-tools").launchOrActivateProfile({
@@ -1359,8 +1360,49 @@ electronApp.whenReady().then(async () => {
     catch (e) { showProfileError("Chrome", e); }
   };
 
-  const menuTemplate = [
-    ...(process.platform === "darwin" ? [{ role: "appMenu" }] : []),
+  let installApplicationMenu = () => {};
+  const addProfileFromMenu = async (kind) => {
+    try {
+      const result = await executeTool(kind === "Electron" ? "electron_add_profile" : "chrome_add_profile", {});
+      const text = result && result.content && result.content[0] && result.content[0].text;
+      let data = {};
+      try { data = JSON.parse(text || "{}"); } catch {}
+      if (result && result.isError) throw new Error(data.error || text || "unknown error");
+      const accountIdx = Number(data.accountIdx ?? (data.created && data.created.accountIdx));
+      installApplicationMenu(); // the new profile appears immediately in the native menu
+      if (Number.isFinite(accountIdx)) {
+        if (kind === "Electron") await openElectronProfile(accountIdx);
+        else await openChromeProfile(accountIdx);
+      }
+    } catch (e) {
+      dialog.showMessageBox({
+        type: "error",
+        message: `新增 ${kind} Profile 失败`,
+        detail: String((e && e.message) || e),
+        buttons: ["OK"],
+      });
+    }
+  };
+
+  installApplicationMenu = () => {
+    const electronRows = electronProfiles();
+    const chromeRows = chromeProfiles();
+    const menuTemplate = [
+    ...(process.platform === "darwin" ? [{
+      label: electronApp.name,
+      submenu: [
+        { role: "about" },
+        { label: "打开 cicy-ai.com", click: openCicyAi },
+        { type: "separator" },
+        { role: "services" },
+        { type: "separator" },
+        { role: "hide" },
+        { role: "hideOthers" },
+        { role: "unhide" },
+        { type: "separator" },
+        { role: "quit" },
+      ],
+    }] : []),
     {
       label: i18n.t("menu.file"),
       submenu: [
@@ -1398,17 +1440,22 @@ electronApp.whenReady().then(async () => {
     },
     {
       label: "Electron",
-      submenu: electronProfiles.map((p) => ({
-        label: `Profile ${p.accountIdx}${p.name ? ` · ${p.name}` : ""}`,
-        click: () => openElectronProfile(Number(p.accountIdx)),
-      })),
+      submenu: [
+        { label: "新增 Profile", click: () => addProfileFromMenu("Electron") },
+        ...(electronRows.length ? [{ type: "separator" }] : []),
+        ...electronRows.map((p) => ({
+          label: `Profile ${p.accountIdx}${p.name ? ` · ${p.name}` : ""}`,
+          click: () => openElectronProfile(Number(p.accountIdx)),
+        })),
+      ],
     },
     {
       label: "Chrome",
       submenu: [
+        { label: "新增 Profile", click: () => addProfileFromMenu("Chrome") },
         { label: "原生 Chrome", click: openNativeChrome },
-        { type: "separator" },
-        ...chromeProfiles.map((p) => ({
+        ...(chromeRows.length ? [{ type: "separator" }] : []),
+        ...chromeRows.map((p) => ({
           label: `Profile ${p.accountIdx}${p.gmail ? ` · ${p.gmail}` : p.note ? ` · ${p.note}` : ""}`,
           click: () => openChromeProfile(Number(p.accountIdx)),
         })),
@@ -1423,8 +1470,16 @@ electronApp.whenReady().then(async () => {
           : [{ label: i18n.t("menu.close"), role: "close" }]),
       ],
     },
-  ];
-  Menu.setApplicationMenu(Menu.buildFromTemplate(menuTemplate));
+    ...(process.platform !== "darwin" ? [{
+      label: i18n.t("menu.help"),
+      submenu: [
+        { label: "打开 cicy-ai.com", click: openCicyAi },
+      ],
+    }] : []),
+    ];
+    Menu.setApplicationMenu(Menu.buildFromTemplate(menuTemplate));
+  };
+  installApplicationMenu();
 
   // Always open the homepage unless launched at login with --hidden.
   const hidden = process.argv.includes("--hidden");