cicy-desktop 2.1.129 → 2.1.131

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

@@ -95,15 +95,18 @@ jobs:
           path: dist/*.exe
           if-no-files-found: error
 
-      # 把最新的安装 exe 推到 OSS 的**单一固定 key**(主人:latest 只发一个)。
-      # 每次发版覆盖同一个文件,永远只有一个 latest，URL 不变:
-      #   https://cicy-1372193042-cn.oss-cn-shanghai.aliyuncs.com/releases/cicy-desktop-latest.exe
-      - name: Upload latest EXE to OSS (single 'latest' file, overwritten)
+      # 推 exe 到 OSS。三件事(不再是"永远一个版本"):
+      #   1) 带版本号的永久副本 releases/cicy-desktop-<version>.exe — 历史 / 指定版本 / 回滚
+      #   2) latest 指针 releases/cicy-desktop-latest.exe — 只前进:本次版本 < 已发布版本(更旧的
+      #      构建后完成)则不覆盖,避免并发构建竞态把 latest 退回旧版
+      #   3) releases/latest-version.txt — 记录 latest 当前是哪个版本,curl 一下即可核对,无需猜 exe
+      - name: Upload EXE to OSS (versioned + forward-only latest pointer)
         shell: pwsh
         env:
           OSS_AK: ${{ secrets.OSS_ACCESS_KEY_ID }}
           OSS_SK: ${{ secrets.OSS_ACCESS_KEY_SECRET }}
         run: |
+          $version = "${{ steps.meta.outputs.version }}"
           Invoke-WebRequest -Uri "https://gosspublic.alicdn.com/ossutil/1.7.18/ossutil-v1.7.18-windows-amd64.zip" -OutFile ossutil.zip
           Expand-Archive -LiteralPath ossutil.zip -DestinationPath ossutil-dir -Force
           $oss = "ossutil-dir\ossutil-v1.7.18-windows-amd64\ossutil.exe"
@@ -111,10 +114,50 @@ jobs:
           $exe = Get-ChildItem dist\*.exe | Where-Object { $_.Name -match 'Setup' } | Select-Object -First 1
           if (-not $exe) { $exe = Get-ChildItem dist\*.exe | Select-Object -First 1 }
           if (-not $exe) { Write-Error "no exe found in dist"; exit 1 }
-          Write-Host "Uploading $($exe.Name) -> oss://cicy-1372193042-cn/releases/cicy-desktop-latest.exe"
-          & $oss cp "$($exe.FullName)" "oss://cicy-1372193042-cn/releases/cicy-desktop-latest.exe" -f --acl public-read
-          if ($LASTEXITCODE -ne 0) { Write-Error "ossutil upload failed"; exit 1 }
-          Write-Host "Latest EXE: https://cicy-1372193042-cn.oss-cn-shanghai.aliyuncs.com/releases/cicy-desktop-latest.exe"
+          $base = "oss://cicy-1372193042-cn/releases"
+
+          # 1) 永久版本化副本(unique key — 不会被后续发版覆盖)
+          $verKey = "$base/cicy-desktop-$version.exe"
+          Write-Host "Uploading versioned -> $verKey"
+          & $oss cp "$($exe.FullName)" "$verKey" -f --acl public-read
+          if ($LASTEXITCODE -ne 0) { Write-Error "versioned upload failed"; exit 1 }
+
+          # 2) latest 指针 — 只在本次版本 >= 已发布版本时前进
+          & $oss cp "$base/latest-version.txt" "current-latest.txt" -f 2>$null
+          $cur = if (Test-Path "current-latest.txt") { (Get-Content "current-latest.txt" -Raw).Trim() } else { "0.0.0" }
+          $advance = $true
+          try { $advance = ([version]$version -ge [version]$cur) } catch { $advance = $true }
+          if ($advance) {
+            Write-Host "Advancing latest: $cur -> $version"
+            & $oss cp "$($exe.FullName)" "$base/cicy-desktop-latest.exe" -f --acl public-read
+            if ($LASTEXITCODE -ne 0) { Write-Error "latest upload failed"; exit 1 }
+            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 }
+          } else {
+            Write-Host "Skip latest: building $version < published $cur (older build — not clobbering newer latest)"
+          }
+
+          # 3) 保留策略 — 只留最近 $KEEP 个版本化 exe(~130MB/个),旧的删掉,避免 OSS 无限膨胀。
+          #    latest.exe / latest-version.txt 不在此列(名字不匹配 X.Y.Z),永远保留。
+          $KEEP = 2
+          $versions = @()
+          foreach ($l in (& $oss ls "$base/" 2>$null)) {
+            if ($l -match 'releases/cicy-desktop-(\d+\.\d+\.\d+)\.exe\s*$') { $versions += $matches[1] }
+          }
+          $sorted = @($versions | Sort-Object { [version]$_ } -Descending)
+          if ($sorted.Count -gt $KEEP) {
+            foreach ($v in ($sorted | Select-Object -Skip $KEEP)) {
+              Write-Host "Pruning old versioned exe: cicy-desktop-$v.exe"
+              & $oss rm "$base/cicy-desktop-$v.exe" -f 2>$null
+            }
+          } else {
+            Write-Host "Retention: $($sorted.Count) versioned exe(s) <= keep $KEEP, nothing to prune"
+          }
+
+          Write-Host "Versioned : https://cicy-1372193042-cn.oss-cn-shanghai.aliyuncs.com/releases/cicy-desktop-$version.exe"
+          Write-Host "Latest    : https://cicy-1372193042-cn.oss-cn-shanghai.aliyuncs.com/releases/cicy-desktop-latest.exe"
+          Write-Host "Version-of: https://cicy-1372193042-cn.oss-cn-shanghai.aliyuncs.com/releases/latest-version.txt"
 
       - name: Publish release (drop draft, mark latest)
         # Only promote AFTER all assets uploaded successfully. autoUpdater on

package/bin/cicy-desktop

@@ -7,6 +7,14 @@ const isWindows = process.platform === "win32";
 const { MasterTokenManager } = require("../src/master/master-main");
 const { version: CLI_VERSION } = require("../package.json");
 
+// Windows consoles default to a legacy OEM codepage (936/GBK on zh-CN), which
+// renders our UTF-8 output (emoji + 中文) as 乱码. Flip the active console to
+// UTF-8 (65001) before anything prints. Best-effort: harmless if redirected,
+// unsupported, or already UTF-8.
+if (isWindows) {
+  try { execSync("chcp 65001", { stdio: "ignore" }); } catch {}
+}
+
 const HOME = os.homedir();
 const DESKTOP_DIR = path.join(HOME, "Desktop");
 const GLOBAL_CONFIG_FILE = path.join(HOME, "global.json");
@@ -170,19 +178,42 @@ function provisionElectronFromMirror(bundledDir) {
 // into the bundled npx copy straight from the R2 mirror — NO `npm i -g`, NO
 // GitHub, NO @electron/get. This is what lets a single `npx cicy-desktop`
 // self-provision electron and start first-try. Runs once per process.
+// The electron dir we provision into: the real electron npm package if it's
+// installed, otherwise a self-managed dir under our own node_modules. `npx
+// cicy-desktop` does NOT pull electron (it's not a runtime dep), so on a fresh
+// machine require.resolve('electron') fails — we must NOT give up there.
+function bundledElectronDir() {
+  try { return path.dirname(require.resolve("electron/package.json", { paths: [PACKAGE_ROOT] })); } catch {}
+  return path.join(PACKAGE_ROOT, "node_modules", "electron");
+}
+// Make `dir` a resolvable electron package (package.json + index.js that reads
+// path.txt) so provisionElectronFromMirror's layout + a spawned require('electron')
+// both work — WITHOUT ever running electron's own installer. Only fills in missing
+// files, so a real electron package is left untouched.
+function ensureMinimalElectronPkg(dir) {
+  fs.mkdirSync(dir, { recursive: true });
+  const pj = path.join(dir, "package.json");
+  if (!fs.existsSync(pj)) fs.writeFileSync(pj, JSON.stringify({ name: "electron", version: ELECTRON_VERSION, main: "index.js" }));
+  const ij = path.join(dir, "index.js");
+  if (!fs.existsSync(ij)) fs.writeFileSync(ij,
+    "const fs=require('fs'),path=require('path');const p=path.join(__dirname,'path.txt');" +
+    "module.exports=fs.existsSync(p)?path.join(__dirname,'dist',fs.readFileSync(p,'utf8').trim()):null;\n");
+}
+
 let _electronEnsured = false;
 function ensureElectron() {
   if (_electronEnsured) return;
   _electronEnsured = true;
-  // Already usable (a shared global, or the resolvable bundled/npx copy)? done.
+  // Already usable (a shared global, or an already-provisioned bundled copy)? done.
   if (electronBinaryHealthy(globalElectronDir())) return;
-  let bundledDir = null;
-  try { bundledDir = path.dirname(require.resolve("electron/package.json", { paths: [PACKAGE_ROOT] })); } catch {}
+  const bundledDir = bundledElectronDir();
   if (electronBinaryHealthy(bundledDir)) return;
-  if (!bundledDir) {
-    console.warn(`⚠️  electron package not resolvable under ${PACKAGE_ROOT}; cannot self-provision.`);
-    return;
-  }
+  // Set up the dir (create minimal pkg if electron isn't installed) then download
+  // the binary straight from the mirror — bypassing electron's own installer,
+  // which is broken on win32 + node 24 (@electron-internal extract-zip native
+  // binding "intentionally not published" → "Cannot find native binding").
+  try { ensureMinimalElectronPkg(bundledDir); }
+  catch (e) { console.warn(`⚠️  could not set up electron dir ${bundledDir}: ${e.message}`); return; }
   console.log(`⚙️  Fetching Electron ${ELECTRON_VERSION} from mirror (one-time)…`);
   try {
     provisionElectronFromMirror(bundledDir);
@@ -200,9 +231,17 @@ function resolveElectronSpawn() {
   ensureElectron();
   const g = globalElectronBin();
   if (g) return { cmd: g, prefixArgs: [] };
-  if (isWindows) return { cmd: "npx.cmd", prefixArgs: ["electron"] };
+  // Spawn the self-provisioned binary DIRECTLY (mirror download → <dir>/dist/<exe>).
+  // Critically: prefer this over `npx electron` — electron's own installer is
+  // broken on win32 + node 24, so the npx fallback below just crashes there.
+  try {
+    const { exe } = electronArtifact();
+    const bin = path.join(bundledElectronDir(), "dist", exe);
+    if (fs.existsSync(bin)) return { cmd: bin, prefixArgs: [] };
+  } catch {}
   const local = path.join(PACKAGE_ROOT, "node_modules", ".bin", "electron");
   if (fs.existsSync(local)) return { cmd: local, prefixArgs: [] };
+  if (isWindows) return { cmd: "npx.cmd", prefixArgs: ["electron"] };
   return { cmd: "npx", prefixArgs: ["electron"] };
 }
 const PROJECT_COMMAND_FILE = path.join(PACKAGE_ROOT, "cicy-dektop.command");

package/package.json

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

package/cicy-dektop.command

@@ -1,51 +0,0 @@
-#!/bin/zsh
-set -e
-
-PROJECT_DIR="/Users/ton/projects/cicy-desktop"
-
-exec 2>&1
-
-echo "========================================="
-echo "  🚀 CiCy Desktop Master + Worker"
-echo "  📅 $(date '+%Y-%m-%d %H:%M:%S')"
-echo "========================================="
-
-if [ ! -d "$PROJECT_DIR" ]; then
-  echo "❌ Project directory not found: $PROJECT_DIR"
-  echo "按回车键退出..."
-  read
-  exit 1
-fi
-
-cd "$PROJECT_DIR" || {
-  echo "❌ Failed to cd into project directory"
-  echo "按回车键退出..."
-  read
-  exit 1
-}
-
-echo "📁 Project: $PROJECT_DIR"
-
-# Dev override: if .env.dev exists in the project root, source it before
-# npm start. Useful for CICY_HOMEPAGE_URL=http://localhost:8173 to load
-# the workers/render vite dev server (HMR) into the BrowserWindow instead
-# of the production CF Worker / bundled file://.
-if [ -f "$PROJECT_DIR/.env.dev" ]; then
-  echo "🧪 .env.dev detected — loading dev overrides"
-  set -a
-  . "$PROJECT_DIR/.env.dev"
-  set +a
-fi
-
-echo "🚀 Running: npm start"
-echo "⚠️  关闭此窗口将停止 Master 和 Worker"
-echo "========================================="
-echo ""
-
-npm start
-
-echo ""
-echo "========================================="
-echo "Master + Worker 已停止"
-echo "按回车键关闭窗口..."
-read