cicy-desktop 2.1.228 → 2.1.230

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

@@ -254,3 +254,15 @@ jobs:
           done
           printf '%s' "$VER" > mac-latest-version.txt
           "$OSS" cp mac-latest-version.txt "$BASE/mac-latest-version.txt" -f --acl public-read || true
+
+          # Prune —— 版本化 pkg 只保留最新 2 个版本(每版含 x64+arm64),更旧的删掉(省 OSS)。
+          # 只匹配 cicy-desktop-<semver>-<arch>.pkg;mac-<arch>-latest.pkg 指针不含 semver、永远保留。非致命。
+          allvers=$("$OSS" ls "$BASE/cicy-desktop-" -s 2>/dev/null | grep -oE 'cicy-desktop-[0-9]+\.[0-9]+\.[0-9]+-(x64|arm64)\.pkg' | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | sort -uV || true)
+          keep=$(echo "$allvers" | tail -2)
+          for v in $allvers; do
+            echo "$keep" | grep -qx "$v" && continue
+            for ARCH in x64 arm64; do
+              "$OSS" rm "$BASE/cicy-desktop-$v-$ARCH.pkg" -f 2>/dev/null || true
+            done
+            echo "Pruned old mac pkg version: $v"
+          done

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.228",
+  "version": "2.1.230",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -144,11 +144,11 @@
   "//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.180",
-    "cicy-code-darwin-arm64": "2.3.180",
-    "cicy-code-linux-x64": "2.3.180",
-    "cicy-code-linux-arm64": "2.3.180",
-    "cicy-code-windows-x64": "2.3.180",
+    "cicy-code-darwin-x64": "2.3.189",
+    "cicy-code-darwin-arm64": "2.3.189",
+    "cicy-code-linux-x64": "2.3.189",
+    "cicy-code-linux-arm64": "2.3.189",
+    "cicy-code-windows-x64": "2.3.189",
     "cicy-mihomo-darwin-x64": "1.10.4",
     "cicy-mihomo-darwin-arm64": "1.10.4",
     "cicy-mihomo-linux-x64": "1.10.4",

package/src/app-updater.js

@@ -6,7 +6,7 @@
 // → 下完「ready」→ 用户点安装 → 拉起原生安装器并退出 app。
 //
 // 源(分网络 + 分平台):
-//   版本清单  CN → OSS releases/latest-version.txt;非 CN → GitHub releases/latest
+//   版本清单  CN → OSS releases/{win,mac}-latest-version.txt(按平台);非 CN → GitHub releases/latest
 //   Windows  → OSS  cicy-desktop-<ver>.exe          (GitHub 不发 win 包)
 //   macOS    → GitHub cicy-desktop-<ver>-<arch>.pkg (CN 经 ghproxy 兜底)
 //   Linux    → GitHub CiCy-Desktop-<ver>.AppImage   (CN 经 ghproxy 兜底)
@@ -88,8 +88,14 @@ function headOk(url, redirects = 0) {
 // ── 最新版本号 ────────────────────────────────────────────────────────────────
 async function fetchLatestVersion(network) {
   if (network === "cn") {
-    // CN:OSS 版本清单(纯文本 "2.1.200")。
-    return (await getText(`${OSS_RELEASES_BASE}/latest-version.txt`)).trim().replace(/^v/, "");
+    // CN:OSS 版本清单(纯文本 "2.1.200")。**按平台读各自的指针** —— win 和 mac 是两条独立
+    // CI、分别构建上传、版本可能不同步;都读裸名 latest-version.txt(只由 Windows CI 写)会让
+    // mac 客户端拿到 Windows 的版本号 → 去下不存在的 mac 包 → 404。win→win-、mac→mac-,
+    // linux 没有独立 OSS 指针、沿用裸名(与 win 同 tag 同步发布,且 linux 实际走 GitHub 下载)。
+    const file = process.platform === "win32" ? "win-latest-version.txt"
+               : process.platform === "darwin" ? "mac-latest-version.txt"
+               : "latest-version.txt";
+    return (await getText(`${OSS_RELEASES_BASE}/${file}`)).trim().replace(/^v/, "");
   }
   // 非 CN:GitHub releases/latest 的 tag_name。
   const j = JSON.parse(await getText(`https://api.github.com/repos/${REPO}/releases/latest`));

package/src/tabbrowser/newtab-protocol.js

@@ -1,6 +1,13 @@
-// cicy://newtab — the tab browser's start page, served via a custom scheme so a
-// new tab's URL is a clean "cicy://newtab" instead of a giant inline data: URL
+// cicyui://newtab — the tab browser's start page, served via a custom scheme so a
+// new tab's URL is a clean "cicyui://newtab" instead of a giant inline data: URL
 // (url 不要那串 data: 天书). Chrome's chrome://newtab analog.
+//
+// SINGLE SOURCE: the page itself is served by cicy-code at http://127.0.0.1:PORT/
+// newtab?profile=N — this handler just FETCHES that and returns it, so the logo /
+// layout / profile pill live in exactly ONE place (cicy-code's /newtab handler)
+// and both the Electron tab browser and Chrome's start tab render the same thing.
+// If cicy-code is momentarily unreachable we fall back to a minimal inline page so
+// a fresh tab is never blank.
 const { protocol, session } = require("electron");
 const _handled = new WeakSet(); // sessions that already have the cicyui handler
 
@@ -9,10 +16,24 @@ const _handled = new WeakSet(); // sessions that already have the cicyui handler
 // cicy://… gets dispatched externally (open-url) and the page never renders.
 // A dedicated scheme avoids that collision.
 const NEWTAB_URL = "cicyui://newtab";
+const CICY_PORT = Number(process.env.CICY_CODE_PORT || 8008);
 
-function startPageHtml() {
-  // <title> → document.title = 起始页 (so the tab isn't titled by its URL).
-  return `<!doctype html><meta charset=utf-8><title>起始页</title><style>html,body{height:100%;margin:0;display:flex;align-items:center;justify-content:center;background:#202124;color:#e8eaed;font-family:-apple-system,sans-serif}.w{text-align:center}.l{width:54px;height:54px;border-radius:16px;margin:0 auto 16px;background:linear-gradient(135deg,#3b82f6,#8b5cf6);display:flex;align-items:center;justify-content:center;color:#fff;font-size:26px}h1{font-size:16px;margin-bottom:6px}p{color:#9aa0a6;font-size:13px}</style><div class=w><div class=l>&#10022;</div><h1>CiCy Browser</h1><p>新标签页</p></div>`;
+// accountIdxFromPartition pulls N out of "persist:sandbox-N" (default session /
+// system profile → "").
+function accountIdxFromPartition(partition) {
+  const m = /sandbox-(\d+)/.exec(partition || "");
+  return m ? m[1] : "";
+}
+
+// startPageHtml is the OFFLINE FALLBACK only — a minimal, self-contained page for
+// when cicy-code (:CICY_PORT) can't be reached. The real page comes from
+// cicy-code /newtab (see handlerFor). Kept exported for tab-browser.html's inline
+// start page.
+function startPageHtml(profile) {
+  const pill = profile
+    ? `<div style="display:inline-block;margin:14px 0 0;padding:4px 12px;border-radius:999px;background:rgba(139,92,246,.18);border:1px solid rgba(139,92,246,.35);color:#c4b5fd;font-size:13px;font-weight:600;font-family:ui-monospace,Menlo,Consolas,monospace">Profile #${profile}</div>`
+    : "";
+  return `<!doctype html><meta charset=utf-8><title>起始页</title><style>html,body{height:100%;margin:0;display:flex;align-items:center;justify-content:center;background:#202124;color:#e8eaed;font-family:-apple-system,sans-serif}.w{text-align:center}.l{width:56px;height:56px;margin:0 auto 16px}.l svg{width:100%;height:100%;display:block}h1{font-size:16px;margin:0 0 6px}p{color:#9aa0a6;font-size:13px;margin:0}</style><div class=w><div class=l><svg viewBox="0 0 96 96" fill="#fff"><path d="M48 11L39.5 33.3L16 29.5L31 48L16 66.5L39.5 62.7L48 85L56.5 62.7L80 66.5L65 48L80 29.5L56.5 33.3Z"/></svg></div><h1>CiCy Browser</h1><p>新标签页</p>${pill}</div>`;
 }
 
 // MUST be called BEFORE app 'ready' (registerSchemesAsPrivileged requirement).
@@ -26,29 +47,37 @@ function registerScheme() {
 
 // Register the cicyui handler on a given session. protocol.handle on the global
 // (default) session does NOT cover persist:sandbox-N partition sessions — the
-// tab BrowserViews run in those — so each partition session needs its own.
-function handlerFor(ses) {
+// tab BrowserViews run in those — so each partition session needs its own. The
+// partition string lets us tell cicy-code which profile this is (Profile #N).
+function handlerFor(ses, partition) {
   if (!ses || _handled.has(ses)) return;
+  const profile = accountIdxFromPartition(partition);
   try {
-    ses.protocol.handle("cicyui", (request) => {
+    ses.protocol.handle("cicyui", async (request) => {
       let host = "";
       try { host = new URL(request.url).hostname; } catch (e) {}
-      if (host === "newtab") {
-        return new Response(startPageHtml(), { headers: { "content-type": "text/html; charset=utf-8" } });
-      }
-      return new Response("not found", { status: 404 });
+      if (host !== "newtab") return new Response("not found", { status: 404 });
+      // Fetch the single-source page from cicy-code; fall back to the inline page.
+      try {
+        const up = await fetch(`http://127.0.0.1:${CICY_PORT}/newtab?profile=${encodeURIComponent(profile)}`);
+        if (up.ok) {
+          const body = await up.text();
+          return new Response(body, { headers: { "content-type": "text/html; charset=utf-8" } });
+        }
+      } catch (e) {}
+      return new Response(startPageHtml(profile), { headers: { "content-type": "text/html; charset=utf-8" } });
     });
     _handled.add(ses);
   } catch (e) {}
 }
 
 // MUST be called AFTER app 'ready' — default session (homepage etc.).
-function installHandler() { handlerFor(session.defaultSession); }
+function installHandler() { handlerFor(session.defaultSession, ""); }
 
 // Per-partition session for the tab-browser sandboxes — call before a tab in
 // that partition loads cicyui://newtab.
 function ensureForPartition(partition) {
-  try { handlerFor(session.fromPartition(partition)); } catch (e) {}
+  try { handlerFor(session.fromPartition(partition), partition); } catch (e) {}
 }
 
 module.exports = { NEWTAB_URL, registerScheme, installHandler, ensureForPartition, startPageHtml };

package/src/tabbrowser/tab-browser.html

@@ -49,7 +49,7 @@
   const HOME = Q.get('home') || '';
   // Built-in start page (a real page, not about:blank) for new tabs.
   const START = 'data:text/html;charset=utf-8,' + encodeURIComponent(
-    `<!doctype html><meta charset=utf-8><style>html,body{height:100%;margin:0;display:flex;align-items:center;justify-content:center;background:#202124;color:#e8eaed;font-family:-apple-system,sans-serif}.w{text-align:center}.l{width:54px;height:54px;border-radius:16px;margin:0 auto 16px;background:linear-gradient(135deg,#3b82f6,#8b5cf6);display:flex;align-items:center;justify-content:center;color:#fff;font-size:26px}h1{font-size:16px;margin-bottom:6px}p{color:#9aa0a6;font-size:13px}</style><div class=w><div class=l>&#10022;</div><h1>CiCy Browser</h1><p>profile sandbox-${ACCT}</p></div>`);
+    `<!doctype html><meta charset=utf-8><style>html,body{height:100%;margin:0;display:flex;align-items:center;justify-content:center;background:#202124;color:#e8eaed;font-family:-apple-system,sans-serif}.w{text-align:center}.l{width:54px;height:54px;border-radius:16px;margin:0 auto 16px;background:linear-gradient(135deg,#3b82f6,#8b5cf6);display:flex;align-items:center;justify-content:center;color:#fff}h1{font-size:16px;margin-bottom:6px}p{color:#9aa0a6;font-size:13px}</style><div class=w><div class=l><svg viewBox="0 0 96 96" width="34" height="34" fill="#fff"><path d="M48 11L39.5 33.3L16 29.5L31 48L16 66.5L39.5 62.7L48 85L56.5 62.7L80 66.5L65 48L80 29.5L56.5 33.3Z"/></svg></div><h1>CiCy Browser</h1><p>profile sandbox-${ACCT}</p></div>`);
 
   const tabsEl = document.getElementById('tabs');
   const viewsEl = document.getElementById('views');