cicy-desktop 2.1.132 → 2.1.134

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

@@ -62,19 +62,9 @@ jobs:
       - name: Install Electron build dependencies
         run: npm install --save-dev --no-audit electron@41.0.2 electron-builder@26.7.0
 
-      # Installer builds bundle the prebuilt SPA at src/backends/homepage-react.
-      # vite outputs to workers/render/dist, so rebuild + copy here — otherwise the
-      # AppImage ships a STALE homepage (e.g. missing the version badge). Mirrors npm-publish.yml.
-      - name: Build homepage SPA → src/backends/homepage-react
-        shell: bash
-        run: |
-          cd workers/render
-          npm install --no-audit --no-fund
-          npm run build
-          cd ../..
-          rm -rf src/backends/homepage-react/assets src/backends/homepage-react/index.html
-          cp -r workers/render/dist/. src/backends/homepage-react/
-          echo "homepage bundle: $(grep -o 'assets/index-[A-Za-z0-9_-]*\.js' src/backends/homepage-react/index.html)"
+      # NOTE: the homepage SPA is rebuilt automatically by the prebuild:linux npm
+      # 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)
         shell: bash

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

@@ -70,19 +70,9 @@ jobs:
       - name: Install Electron build dependencies in project directory
         run: npm install --save-dev --no-audit electron@41.0.2 electron-builder@26.7.0
 
-      # Installer builds bundle the prebuilt SPA at src/backends/homepage-react.
-      # vite outputs to workers/render/dist, so rebuild + copy here — otherwise the
-      # dmg ships a STALE homepage (e.g. missing the version badge). Mirrors npm-publish.yml.
-      - name: Build homepage SPA → src/backends/homepage-react
-        shell: bash
-        run: |
-          cd workers/render
-          npm install --no-audit --no-fund
-          npm run build
-          cd ../..
-          rm -rf src/backends/homepage-react/assets src/backends/homepage-react/index.html
-          cp -r workers/render/dist/. src/backends/homepage-react/
-          echo "homepage bundle: $(grep -o 'assets/index-[A-Za-z0-9_-]*\.js' src/backends/homepage-react/index.html)"
+      # NOTE: the homepage SPA is rebuilt automatically by the prebuild:mac npm
+      # hook (scripts/build-homepage.cjs) right before `npm run build:mac` below,
+      # so the dmg can never ship a stale homepage. No explicit step needed.
 
       - name: Prepare macOS icon
         shell: bash

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

@@ -26,20 +26,11 @@ jobs:
       - name: Sync runtime deps to latest (cicy-code + cicy-mihomo; drop msys2)
         run: node scripts/sync-runtime-deps.cjs
 
-      # The shipped homepage is the prebuilt SPA at src/backends/homepage-react.
-      # vite outputs to workers/render/dist, so rebuild + copy it here — otherwise
-      # the package ships a STALE homepage (this is exactly how the Docker card
-      # lingered after it was removed in source). Always build from source on publish.
-      - name: Build homepage SPA → src/backends/homepage-react
-        run: |
-          cd workers/render
-          npm install --no-audit --no-fund
-          npm run build
-          cd ../..
-          rm -rf src/backends/homepage-react/assets src/backends/homepage-react/index.html
-          cp -r workers/render/dist/. src/backends/homepage-react/
-          echo "homepage bundle: $(grep -o 'assets/index-[A-Za-z0-9_-]*\.js' src/backends/homepage-react/index.html)"
-
+      # NOTE: the homepage SPA is rebuilt from source automatically by the
+      # prepublishOnly npm hook (scripts/build-homepage.cjs) during `npm publish`
+      # below, so the package can never ship a stale homepage (this is how the
+      # Docker card lingered, and how the version badge went missing). No explicit
+      # step needed — one mechanism (npm lifecycle) covers npm + all installers.
       - name: Publish cicy-desktop to npm
         run: npm publish --access public
         env:

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

@@ -32,19 +32,9 @@ jobs:
       - name: Install Electron build dependencies in project directory
         run: npm install --save-dev --no-audit electron@41.0.2 electron-builder@26.7.0
 
-      # Installer builds bundle the prebuilt SPA at src/backends/homepage-react.
-      # vite outputs to workers/render/dist, so rebuild + copy here — otherwise the
-      # exe ships a STALE homepage (e.g. missing the version badge). Mirrors npm-publish.yml.
-      - name: Build homepage SPA → src/backends/homepage-react
-        shell: bash
-        run: |
-          cd workers/render
-          npm install --no-audit --no-fund
-          npm run build
-          cd ../..
-          rm -rf src/backends/homepage-react/assets src/backends/homepage-react/index.html
-          cp -r workers/render/dist/. src/backends/homepage-react/
-          echo "homepage bundle: $(grep -o 'assets/index-[A-Za-z0-9_-]*\.js' src/backends/homepage-react/index.html)"
+      # NOTE: the homepage SPA is rebuilt automatically by the prebuild:win npm
+      # hook (scripts/build-homepage.cjs) right before `npm run build:win` below,
+      # so the exe can never ship a stale homepage. No explicit step needed.
 
       - name: Prepare Windows icon
         shell: powershell

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.132",
+  "version": "2.1.134",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -17,6 +17,11 @@
     "test:ls": "node tests/test-ls.js",
     "build": "electron-builder --publish never",
     "build:ui": "cd packages/ui-react && npm install && npm run build",
+    "build:homepage": "node scripts/build-homepage.cjs",
+    "prebuild:win": "node scripts/build-homepage.cjs",
+    "prebuild:mac": "node scripts/build-homepage.cjs",
+    "prebuild:linux": "node scripts/build-homepage.cjs",
+    "prepublishOnly": "node scripts/build-homepage.cjs",
     "build:win": "electron-builder --win",
     "build:mac": "electron-builder --mac",
     "build:linux": "electron-builder --linux"

package/scripts/build-homepage.cjs

@@ -0,0 +1,44 @@
+#!/usr/bin/env node
+// Single source of truth for producing the SHIPPED homepage.
+//
+// The app loads src/backends/homepage-react/ (a prebuilt SPA snapshot). The
+// SOURCE lives in workers/render/. These are two different things and WILL
+// drift apart unless the snapshot is rebuilt from source — which is exactly
+// how a stale homepage (missing the version badge) shipped before.
+//
+// This script rebuilds the snapshot from source. It is wired into every
+// release path via npm lifecycle hooks (prebuild:win/mac/linux + prepublishOnly),
+// so the shipped homepage can NEVER lag behind workers/render — locally or in CI.
+// Cross-platform (pure node fs/cp): runs on the maintainer's Windows box too.
+
+const { execSync } = require("child_process");
+const fs = require("fs");
+const path = require("path");
+
+const ROOT = path.join(__dirname, "..");
+const RENDER = path.join(ROOT, "workers", "render");
+const DIST = path.join(RENDER, "dist");
+const DEST = path.join(ROOT, "src", "backends", "homepage-react");
+
+function run(cmd, cwd) {
+  console.log(`[build-homepage] $ ${cmd}  (in ${path.relative(ROOT, cwd) || "."})`);
+  execSync(cmd, { cwd, stdio: "inherit" });
+}
+
+// 1) build the SPA from source (install deps on a cold runner)
+if (!fs.existsSync(path.join(RENDER, "node_modules"))) {
+  run("npm install --no-audit --no-fund", RENDER);
+}
+run("npm run build", RENDER);
+
+// 2) replace the shipped snapshot with the fresh build (clean, not merge —
+//    so old hashed assets don't pile up)
+fs.rmSync(path.join(DEST, "assets"), { recursive: true, force: true });
+fs.rmSync(path.join(DEST, "index.html"), { force: true });
+fs.mkdirSync(DEST, { recursive: true });
+fs.cpSync(DIST, DEST, { recursive: true });
+
+// 3) report which bundle shipped (visible in CI logs)
+const html = fs.readFileSync(path.join(DEST, "index.html"), "utf8");
+const m = html.match(/assets\/index-[A-Za-z0-9_-]*\.js/);
+console.log(`[build-homepage] shipped bundle: ${m ? m[0] : "(hash not found!)"}`);

package/src/backends/auth-loopback.js

@@ -137,7 +137,7 @@ async function startLogin({ onResult } = {}) {
       // browser, locked-down shell) openExternal silently fails and the user is
       // left stuck "等回调" with no recourse — so we ALSO return the url to the
       // renderer (below) to show a manual "open / copy this link" fallback.
-      shell.openExternal(url).catch((e) => log.warn(`[auth-loopback] openExternal failed: ${e.message}`));
+      require("./open-external").openExternalRobust(url).catch((e) => log.warn(`[auth-loopback] open failed: ${e.message}`));
 
       _timeoutHandle = setTimeout(() => {
         try { onResult && onResult({ error: "timeout" }); } catch {}

package/src/backends/ipc.js

@@ -199,10 +199,12 @@ function register(opts = {}) {
   });
 
   // --- shell / app / tos / logs (last rebuild!) ---
-  ipcMain.handle("shell:open-external", (_e, url) => {
+  ipcMain.handle("shell:open-external", async (_e, url) => {
     if (!url) return false;
-    shell.openExternal(String(url));
-    return true;
+    // Robust open: shell.openExternal silently fails on some Windows profiles;
+    // fall back to rundll32/explorer/start (the "手动打开" button uses this too).
+    const { openExternalRobust } = require("./open-external");
+    return await openExternalRobust(url);
   });
   ipcMain.handle("app:quit", () => {
     setTimeout(() => app.quit(), 100);

package/src/backends/open-external.js

@@ -0,0 +1,50 @@
+// Robust "open this URL in the system browser".
+//
+// electron's shell.openExternal silently fails on some Windows setups — a fresh
+// user profile, a locked-down shell, or console-launched (npx) electron — leaving
+// browser-login stuck ("点了没反应"). When it fails we fall back to the OS URL
+// openers directly. Order matters: rundll32 / explorer / open / xdg-open take the
+// URL as a SINGLE argv (no shell parsing), so the login URL's `&`/`?` query params
+// survive. `cmd start` is last because cmd treats `&` as a command separator.
+
+const { shell } = require("electron");
+const { spawn } = require("child_process");
+const log = require("electron-log");
+
+function trySpawn(cmd, args) {
+  try {
+    const child = spawn(cmd, args, { detached: true, stdio: "ignore", windowsHide: true });
+    child.on("error", (err) => log.warn(`[open-external] ${cmd} error: ${err.message}`));
+    child.unref();
+    return true;
+  } catch (e) {
+    log.warn(`[open-external] spawn ${cmd} threw: ${e.message}`);
+    return false;
+  }
+}
+
+// Returns true if SOME mechanism was dispatched (best-effort — the OS may still
+// have no default browser, which no opener can fix; the renderer always also
+// shows a copy-link fallback).
+async function openExternalRobust(rawUrl) {
+  const url = String(rawUrl || "");
+  if (!url) return false;
+
+  try {
+    await shell.openExternal(url);
+    return true;
+  } catch (e) {
+    log.warn(`[open-external] shell.openExternal failed, falling back: ${e && e.message}`);
+  }
+
+  if (process.platform === "win32") {
+    // FileProtocolHandler + explorer pass the URL untouched (good for query strings).
+    if (trySpawn("rundll32", ["url.dll,FileProtocolHandler", url])) return true;
+    if (trySpawn("explorer.exe", [url])) return true;
+    return trySpawn("cmd", ["/c", "start", "", url]);
+  }
+  if (process.platform === "darwin") return trySpawn("open", [url]);
+  return trySpawn("xdg-open", [url]);
+}
+
+module.exports = { openExternalRobust };