cicy-desktop 2.1.255 → 2.1.257

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.255",
+  "version": "2.1.257",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -139,10 +139,10 @@
   "//optionalDependencies": "(2026-06 回调): mac/linux 改回 native cicy-code(:8008,colima 在 16G mac 上压垮内存)→ 重新内置 cicy-code-<plat> / cicy-mihomo-<plat>,localbin.fromBundle 零网络 seed(npm 仅作更新通道,带 npmmirror→npmjs 回退)。这些由 scripts/sync-runtime-deps.cjs 在 tag-push 时同步到最新版。npm 的 os/cpu 字段保证每个平台只装自己那份。Windows 仍走 docker(WSL :8009),它那份 cicy-code-windows 用不到但 bundle 着无害。",
   "optionalDependencies": {
     "electron": "41.0.3",
-    "cicy-code-darwin-x64": "2.3.313",
-    "cicy-code-darwin-arm64": "2.3.313",
-    "cicy-code-linux-x64": "2.3.313",
-    "cicy-code-linux-arm64": "2.3.313",
+    "cicy-code-darwin-x64": "2.3.315",
+    "cicy-code-darwin-arm64": "2.3.315",
+    "cicy-code-linux-x64": "2.3.315",
+    "cicy-code-linux-arm64": "2.3.315",
     "cicy-code-windows-x64": "2.3.193",
     "cicy-mihomo-darwin-x64": "1.10.4",
     "cicy-mihomo-darwin-arm64": "1.10.4",

package/src/tabbrowser/panel-cells.js

@@ -136,10 +136,16 @@ class PanelCells {
     const push = () => {
       let url = "", title = "";
       try { url = wc.getURL(); title = wc.getTitle(); } catch (e) {}
-      this.sendState({ id: cellId, url, title, loading: false, wcId: wc.id });
+      // did-navigate / page-title-updated commonly fire while the document is
+      // still loading. Hard-coding false here hid the spinner immediately after
+      // did-start-loading; report the BrowserView's actual state instead.
+      let loading = false;
+      try { loading = wc.isLoading(); } catch (e) {}
+      this.sendState({ id: cellId, url, title, loading, wcId: wc.id });
     };
     wc.on("did-start-loading", () => this.sendState({ id: cellId, loading: true, wcId: wc.id }));
     wc.on("did-stop-loading", push);
+    wc.on("did-fail-load", push);
     wc.on("did-navigate", push);
     wc.on("did-navigate-in-page", push);
     wc.on("page-title-updated", push);

package/src/tabbrowser/split-panel.html

@@ -26,8 +26,12 @@
   .native-cells .cell,.native-cells .divider{transition:none}
   .cell.dragging-layout{transition:none}
   .cell__head{flex:0 0 34px;display:flex;align-items:center;gap:6px;padding:0 6px 0 10px;background:var(--head);border-bottom:1px solid var(--line);-webkit-user-select:none;user-select:none}
-  .cell__spin{flex:0 0 12px;width:12px;height:12px;border:2px solid rgba(255,255,255,.18);border-top-color:var(--accent);border-radius:50%;animation:sp .7s linear infinite;display:none}
-  .cell.loading .cell__spin{display:block}
+  /* Reload and loading share one fixed button slot: loading swaps the glyph in
+     place, so no toolbar element moves and no extra padding is needed. */
+  .reload-btn{position:relative}
+  .reload-btn .cell__spin{position:absolute;width:12px;height:12px;border:2px solid rgba(255,255,255,.18);border-top-color:var(--accent);border-radius:50%;animation:sp .7s linear infinite;visibility:hidden}
+  .cell.loading .reload-btn>svg{visibility:hidden}
+  .cell.loading .reload-btn .cell__spin{visibility:visible}
   @keyframes sp{to{transform:rotate(360deg)}}
   .cell__url{flex:1;min-width:0;height:24px;padding:0 10px;background:#101012;border:1px solid var(--line);border-radius:12px;color:var(--fg);font-size:12px;outline:none;-webkit-user-select:text;user-select:text}
   .cell__url:focus{border-color:var(--accent);background:#0d0d10}
@@ -639,18 +643,25 @@
     url.value = leaf.url || '';
     url.addEventListener('keydown', (e) => {
       if (e.key !== 'Enter') return;
+      // Enter during an IME composition commits the composing text; navigating
+      // and blurring in that same event makes Chromium commit it a second time
+      // (e.g. "chatgpt" → "chatgptchatgpt"). Let the IME finish first; the
+      // following Enter performs navigation, matching a normal browser omnibox.
+      if (e.isComposing || e.keyCode === 229) return;
+      e.preventDefault();
       const u = normalizeUrl(url.value);
       if (u) { setCellUrl(leaf.id, u); url.blur(); }
     });
     url.addEventListener('focus', () => url.select());
-    head.appendChild(spin);
     head.appendChild(service);
     head.appendChild(profile);
     head.appendChild(url);
-    head.appendChild(btn(I.reload, '刷新', '', () => {
+    const reload = btn(I.reload, '刷新', 'reload-btn', () => {
       if (NATIVE) { try { window.panelAPI.reload(leaf.id); } catch (e) {} return; }
       const c = cells.get(leaf.id); try { c && c.wv && c.wv.reload(); } catch (e) {}
-    }));
+    });
+    reload.appendChild(spin);
+    head.appendChild(reload);
     head.appendChild(btn(I.splitR, '右分屏', '', () => splitLeaf(leaf.id, 'row')));
     head.appendChild(btn(I.splitD, '下分屏', '', () => splitLeaf(leaf.id, 'col')));
     head.appendChild(btn(I.close, '关闭', 'close', () => closeLeaf(leaf.id)));