cicy-desktop 2.1.271 → 2.1.273

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

@@ -67,7 +67,7 @@ jobs:
       - name: Build Linux AppImage
         shell: bash
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.CICY_RELEASE_GH_TOKEN }}
           CICY_OBFUSCATE: "1"   # 发版混淆 JS(prebuild 主进程 + Vite 渲染层),仅 release CI
         run: |
           set -euo pipefail

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

@@ -110,7 +110,7 @@ jobs:
         shell: bash
         env:
           CSC_IDENTITY_AUTO_DISCOVERY: "false"
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.CICY_RELEASE_GH_TOKEN }}
           CICY_OBFUSCATE: "1"   # 发版混淆 JS(prebuild 主进程 + Vite 渲染层),仅 release CI
         run: |
           set -euo pipefail
@@ -136,12 +136,11 @@ jobs:
       - name: Ensure draft GitHub release exists
         shell: bash
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.CICY_RELEASE_GH_TOKEN }}
         run: |
           gh release create "${{ steps.meta.outputs.tag }}" \
-            --repo "$GITHUB_REPOSITORY" \
+            --repo "cicy-ai/cicy-desktop" \
             --title "CiCy Desktop v${{ steps.meta.outputs.version }}" \
-            --target "$GITHUB_SHA" \
             --generate-notes \
             --draft \
             2>/dev/null || echo "release already exists, continuing"
@@ -149,7 +148,7 @@ jobs:
       - name: Build and publish PKG installers
         shell: bash
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.CICY_RELEASE_GH_TOKEN }}
         run: |
           set -euo pipefail
           VER="${{ steps.meta.outputs.version }}"
@@ -184,7 +183,7 @@ jobs:
             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
+              --repo "cicy-ai/cicy-desktop" --clobber
             echo "uploaded $PKG ($(du -h "$PKG" | cut -f1))"
           done
 

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

@@ -72,12 +72,11 @@ jobs:
         # uploaded. Promoted to non-draft + latest in the final step.
         shell: bash
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.CICY_RELEASE_GH_TOKEN }}
         run: |
           gh release create "${{ steps.meta.outputs.tag }}" \
-            --repo "$GITHUB_REPOSITORY" \
+            --repo "cicy-ai/cicy-desktop" \
             --title "CiCy Desktop v${{ steps.meta.outputs.version }}" \
-            --target "$GITHUB_SHA" \
             --generate-notes \
             --draft \
             2>/dev/null || echo "release already exists, continuing"
@@ -86,7 +85,7 @@ jobs:
         # --publish always uploads .exe + latest.yml to the release created above.
         shell: powershell
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.CICY_RELEASE_GH_TOKEN }}
           CICY_OBFUSCATE: "1"   # 发版混淆 JS(prebuild 主进程 + Vite 渲染层),仅 release CI
         run: |
           if (Test-Path dist) { Remove-Item -Recurse -Force dist }
@@ -177,9 +176,9 @@ jobs:
         # existing clients will pick up the new version on its next poll.
         shell: bash
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.CICY_RELEASE_GH_TOKEN }}
         run: |
           gh release edit "${{ steps.meta.outputs.tag }}" \
-            --repo "$GITHUB_REPOSITORY" \
+            --repo "cicy-ai/cicy-desktop" \
             --draft=false \
             --latest

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.271",
+  "version": "2.1.273",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -143,10 +143,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.546",
-    "cicy-code-darwin-arm64": "2.3.546",
-    "cicy-code-linux-x64": "2.3.546",
-    "cicy-code-linux-arm64": "2.3.546",
+    "cicy-code-darwin-x64": "2.3.556",
+    "cicy-code-darwin-arm64": "2.3.556",
+    "cicy-code-linux-x64": "2.3.556",
+    "cicy-code-linux-arm64": "2.3.556",
     "cicy-code-windows-x64": "2.3.193",
     "cicy-mihomo-darwin-x64": "1.10.4",
     "cicy-mihomo-darwin-arm64": "1.10.4",

package/src/backends/webview-preload.js

@@ -24,6 +24,48 @@
 //   webview gets the awaited promise
 
 const { contextBridge, ipcRenderer } = require("electron");
+const { resolveReportedCicyTheme } = require("../tabbrowser/tab-theme");
+
+// cicy-code owns the theme preference (`cicy_theme`) and publishes the applied
+// value on <html data-theme>. Report that contract to the owning tab window so
+// its native tab strip can use the same light/dark palette. The main process
+// accepts this signal only from a registered team tab, so other pages carrying
+// this preload cannot recolor Desktop chrome.
+let lastReportedTheme = "";
+function reportCicyTheme() {
+  let documentTheme = "";
+  let savedTheme = "";
+  try { documentTheme = document.documentElement?.dataset?.theme || ""; } catch (_) {}
+  try { savedTheme = localStorage.getItem("cicy_theme") || ""; } catch (_) {}
+  const theme = resolveReportedCicyTheme(documentTheme, savedTheme);
+  if (theme === lastReportedTheme) return;
+  lastReportedTheme = theme;
+  try { ipcRenderer.send("tab-content:cicy-theme", { theme }); } catch (_) {}
+}
+
+function watchCicyTheme() {
+  reportCicyTheme();
+  try {
+    const root = document.documentElement;
+    if (root) {
+      new MutationObserver(reportCicyTheme).observe(root, {
+        attributes: true,
+        attributeFilter: ["data-theme"],
+      });
+    }
+  } catch (_) {}
+  try { window.addEventListener("cicy-theme-change", reportCicyTheme); } catch (_) {}
+}
+
+// The saved preference is already available at preload time, which prevents a
+// dark-strip flash while a light cicy-code page mounts. DOMContentLoaded then
+// installs the live observer for changes made from Settings.
+reportCicyTheme();
+if (document.readyState === "loading") {
+  window.addEventListener("DOMContentLoaded", watchCicyTheme, { once: true });
+} else {
+  watchCicyTheme();
+}
 
 const relay = (type, payload) =>
   ipcRenderer.invoke("webview:relay", { type, ...(payload || {}) });

package/src/chrome/chrome-launcher.js

@@ -160,7 +160,14 @@ function resolveChromeBinary(binaryPath) {
   );
 }
 
-function buildChromeArgs({ userDataDirRoot, profileDirectory, debuggerPort, proxy, url }) {
+function buildChromeArgs({
+  userDataDirRoot,
+  profileDirectory,
+  debuggerPort,
+  proxy,
+  url,
+  restoreLastSession = false,
+}) {
   const args = [
     `--user-data-dir=${userDataDirRoot}`,
     `--profile-directory=${profileDirectory}`,
@@ -170,6 +177,10 @@ function buildChromeArgs({ userDataDirRoot, profileDirectory, debuggerPort, prox
     "--no-default-browser-check",
   ];
 
+  if (restoreLastSession) {
+    args.push("--restore-last-session");
+  }
+
   if (proxy) {
     args.push(`--proxy-server=${proxy}`);
   }
@@ -181,6 +192,18 @@ function buildChromeArgs({ userDataDirRoot, profileDirectory, debuggerPort, prox
   return args;
 }
 
+function resolveLiveProfileAction({
+  platform = process.platform,
+  liveStatus,
+  runtime,
+  windowless = false,
+}) {
+  if (!liveStatus?.isRunning) return "launch";
+  if (windowless) return "restart-windowless";
+  if (platform === "darwin" && !runtime?.pid) return "restart-unmanaged";
+  return "reuse";
+}
+
 async function ensurePortAvailable(debuggerPort) {
   const open = await isPortOpen(debuggerPort, "127.0.0.1", 500);
   if (open) {
@@ -206,6 +229,7 @@ async function launchChrome({
   url,
   userDataDirRoot,
   userDataBaseRoot = DEFAULT_USER_DATA_BASE_ROOT,
+  restoreLastSession = false,
 }) {
   const profileDirectory = getProfileDirectory(accountIdx);
   const effectiveUserDataDirRoot = userDataDirRoot || getDefaultUserDataDirRoot(accountIdx, userDataBaseRoot);
@@ -221,6 +245,7 @@ async function launchChrome({
     debuggerPort,
     proxy,
     url,
+    restoreLastSession,
   });
   const child = spawn(binaryPath, args, {
     detached: process.platform !== "win32",
@@ -231,7 +256,7 @@ async function launchChrome({
   child.unref();
 
   const version = await waitForDebugger(debuggerPort, "127.0.0.1", 15000);
-  bringChromeAppToForeground(binaryPath);
+  bringChromeAppToForeground(binaryPath, { pid: child.pid, debuggerPort });
 
   return {
     pid: child.pid,
@@ -256,12 +281,49 @@ function closeChromeProcess(pid) {
 // macOS / Windows focus-stealing prevention keeps the spawning Electron
 // app on top after we launch Chrome, so the user's keystrokes go into
 // Electron. Nudge the OS to bring Chrome forward without opening it again.
-function bringChromeAppToForeground(binaryPath) {
+function getListeningPid(port) {
+  if (!Number.isInteger(port) || port <= 0 || port >= 65536) return null;
+  const candidates = process.platform === "darwin" ? ["/usr/sbin/lsof", "lsof"] : ["lsof"];
+  for (const command of candidates) {
+    try {
+      const out = execFileSync(command, ["-nP", `-tiTCP:${port}`, "-sTCP:LISTEN"], {
+        encoding: "utf8",
+        timeout: 2000,
+      });
+      const pid = Number(
+        String(out || "")
+          .trim()
+          .split(/\s+/)[0]
+      );
+      if (Number.isInteger(pid) && pid > 0) return pid;
+    } catch (_) {}
+  }
+  return null;
+}
+
+function bringChromeAppToForeground(binaryPath, { pid, debuggerPort } = {}) {
   try {
     if (process.platform === "darwin") {
+      const targetPid = Number.isInteger(pid) && pid > 0 ? pid : getListeningPid(debuggerPort);
+      if (targetPid) {
+        const script =
+          "ObjC.import('AppKit'); " +
+          `const app = $.NSRunningApplication.runningApplicationWithProcessIdentifier(${targetPid}); ` +
+          "if (app) app.activateWithOptions($.NSApplicationActivateIgnoringOtherApps);";
+        spawn("/usr/bin/osascript", ["-l", "JavaScript", "-e", script], {
+          stdio: "ignore",
+          detached: true,
+        }).unref();
+        return;
+      }
+
       let resolved = binaryPath;
       if (!resolved || !fs.existsSync(resolved)) {
-        try { resolved = resolveChromeBinary(); } catch (_) { return; }
+        try {
+          resolved = resolveChromeBinary();
+        } catch (_) {
+          return;
+        }
       }
       const match = resolved && resolved.match(/^(.+\.app)\//);
       if (!match) return;
@@ -301,6 +363,7 @@ module.exports = {
   getDefaultDebuggerPort,
   resolveChromeBinary,
   buildChromeArgs,
+  resolveLiveProfileAction,
   launchChrome,
   closeChromeProcess,
   bringChromeAppToForeground,

package/src/tabbrowser/tab-shell.html

@@ -12,9 +12,21 @@
        the same color as the toolbar/content (#0A0A0A) so it merges into the
        page, carved out of the lighter strip with outward bottom curves.
        (content is near-black, so a darker strip would be invisible → go lighter.) */
+    color-scheme:dark;
     --bg:#0A0A0A; --strip:#1c1c20; --toolbar:#0A0A0A;
     --fg:#e6e6e9; --muted:#8b8b92; --line:rgba(255,255,255,.06);
     --accent:#3b82f6; --omni:#1a1a1c;
+    --hover:rgba(255,255,255,.06); --hover-strong:rgba(255,255,255,.16);
+    --active-fg:#fff; --separator:rgba(255,255,255,.12);
+    --edit-bg:#111113; --focus-bg:#111113; --spinner-track:rgba(255,255,255,.25);
+  }
+  html[data-theme="light"]{
+    color-scheme:light;
+    --bg:#f4f4f5; --strip:#e4e4e7; --toolbar:#f4f4f5;
+    --fg:#27272a; --muted:#71717a; --line:rgba(39,39,42,.14);
+    --omni:#fff; --hover:rgba(39,39,42,.07); --hover-strong:rgba(39,39,42,.13);
+    --active-fg:#18181b; --separator:rgba(39,39,42,.16);
+    --edit-bg:#fff; --focus-bg:#fff; --spinner-track:rgba(39,39,42,.22);
   }
   *{box-sizing:border-box;margin:0;padding:0}
   html,body{height:100%;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,sans-serif;background:var(--bg);color:var(--fg);overflow:hidden;-webkit-user-select:none;user-select:none}
@@ -39,7 +51,7 @@
   .tab,#newtab{-webkit-app-region:no-drag}
   #tabs::-webkit-scrollbar{height:0}
   .tab{position:relative;display:flex;align-items:center;gap:9px;height:32px;min-width:60px;max-width:240px;padding:0 16px;border-radius:10px 10px 0 0;font-size:12.5px;color:var(--muted);background:transparent;cursor:default;flex:1 1 0;transition:background .12s,color .12s}
-  .tab:hover{background:rgba(255,255,255,.06);color:var(--fg)}
+  .tab:hover{background:var(--hover);color:var(--fg)}
   /* home = the resident homepage tab: pinned first, fixed width, user icon, no
      title text, no close — like Chrome's profile/avatar button. */
   /* start-page tab: pinned, sizes to its "我的团队" label (not a flex-grow tab) */
@@ -52,7 +64,7 @@
      so drop the outward ears — they'd otherwise meet the homepage top with a seam. */
   .tab.home.active::before,.tab.home.active::after{display:none}
   /* active tab = toolbar/content color, merged into the page, with outward bottom curves */
-  .tab.active{background:var(--toolbar);color:#fff;z-index:1}
+  .tab.active{background:var(--toolbar);color:var(--active-fg);z-index:1}
   /* outward bottom "ears" carved from the strip into the toolbar. gradient goes
      strip→toolbar (NOT transparent→toolbar): a transparent→opaque ramp passes
      through semi-transparent black and leaves a dark fringe on the lighter strip;
@@ -67,21 +79,21 @@
      first tab and around the active/hovered tab (Chrome hides the seam that would
      touch an active or hovered tab on either side). Inactive tabs don't use
      ::before (that's the active tab's ear), so it's free here. */
-  .tab:not(.active)::before{content:"";position:absolute;left:-3.5px;top:50%;transform:translateY(-50%);width:1px;height:16px;background:rgba(255,255,255,.12);pointer-events:none}
+  .tab:not(.active)::before{content:"";position:absolute;left:-3.5px;top:50%;transform:translateY(-50%);width:1px;height:16px;background:var(--separator);pointer-events:none}
   #tabs>.tab:first-child::before{display:none}                    /* nothing left of the first tab */
   .tab:hover::before{display:none}                                /* no line on the hovered tab's left */
   .tab.active+.tab::before,.tab:hover+.tab::before{display:none}  /* none on the active/hovered tab's right */
   .fav{width:16px;height:16px;flex:0 0 16px;border-radius:4px;display:flex;align-items:center;justify-content:center;overflow:hidden}
   .fav img{width:16px;height:16px;object-fit:contain}
-  .spin{width:14px;height:14px;border:2px solid rgba(255,255,255,.25);border-top-color:var(--accent);border-radius:50%;animation:sp .7s linear infinite}
+  .spin{width:14px;height:14px;border:2px solid var(--spinner-track);border-top-color:var(--accent);border-radius:50%;animation:sp .7s linear infinite}
   @keyframes sp{to{transform:rotate(360deg)}}
   .ttl{flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
-  .ttl-edit{flex:1;min-width:0;height:22px;padding:0 5px;border:1px solid var(--accent);border-radius:5px;outline:none;background:#111113;color:#fff;font-size:12.5px;-webkit-user-select:text;user-select:text}
+  .ttl-edit{flex:1;min-width:0;height:22px;padding:0 5px;border:1px solid var(--accent);border-radius:5px;outline:none;background:var(--edit-bg);color:var(--fg);font-size:12.5px;-webkit-user-select:text;user-select:text}
   .cls{flex:0 0 16px;width:16px;height:16px;border-radius:50%;display:flex;align-items:center;justify-content:center;opacity:0;color:var(--muted);transition:opacity .1s,background .1s}
   .tab:hover .cls,.tab.active .cls{opacity:.85}
-  .cls:hover{background:rgba(255,255,255,.16);color:#fff;opacity:1}
+  .cls:hover{background:var(--hover-strong);color:var(--fg);opacity:1}
   #newtab{flex:0 0 30px;width:30px;height:30px;margin:2px 0 2px 2px;border-radius:50%;display:flex;align-items:center;justify-content:center;color:var(--muted);cursor:default}
-  #newtab:hover{background:rgba(255,255,255,.08);color:#fff}
+  #newtab:hover{background:var(--hover);color:var(--fg)}
   /* ── drag-to-reorder (Chrome-style) ── */
   .tab.dragging{opacity:.4}
   /* vertical insertion bar shown between tabs while dragging */
@@ -93,7 +105,7 @@
      button sits left of it (fullscreen hides the overlay → reclaim). */
   #panelbtn{position:fixed;top:5px;right:8px;z-index:30;width:30px;height:30px;border-radius:8px;display:none;align-items:center;justify-content:center;color:var(--muted);-webkit-app-region:no-drag;cursor:default}
   body.has-panel #panelbtn{display:flex}
-  #panelbtn:hover{background:rgba(255,255,255,.08);color:#fff}
+  #panelbtn:hover{background:var(--hover);color:var(--fg)}
   body.is-win #panelbtn{right:148px}
   body.is-win.is-fullscreen #panelbtn{right:8px}
   /* keep tabs from sliding under the pinned button */
@@ -107,10 +119,10 @@
      The main process also moves its BrowserView content up to STRIP_H. */
   body.profile-0 #bar{display:none}
   .nav{width:32px;height:32px;flex:0 0 32px;border-radius:50%;display:flex;align-items:center;justify-content:center;color:var(--fg);cursor:default}
-  .nav:hover{background:rgba(255,255,255,.10)}
+  .nav:hover{background:var(--hover)}
   .nav.off{color:var(--muted);opacity:.35;pointer-events:none}
   #omni{flex:1;height:30px;display:flex;align-items:center;gap:8px;margin-left:6px;padding:0 12px;background:var(--omni);border:1px solid var(--line);border-radius:16px;transition:border-color .12s,background .12s}
-  #omni.focus{background:#111113;border-color:var(--accent)}
+  #omni.focus{background:var(--focus-bg);border-color:var(--accent)}
   #lead{flex:0 0 16px;width:16px;height:16px;color:var(--muted);display:flex;align-items:center;justify-content:center}
   #url{flex:1;height:100%;background:transparent;border:none;outline:none;color:var(--fg);font-size:13px;-webkit-user-select:text;user-select:text}
   #url::placeholder{color:var(--muted)}
@@ -149,7 +161,7 @@
   window.addEventListener('contextmenu', (e) => {
     if (!(e.target instanceof HTMLInputElement && e.target.id === 'url')) e.preventDefault();
   });
-  const ICON_GLOBE ='<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="#9aa0a6" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><line x1="2" y1="12" x2="22" y2="12"/><path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z"/></svg>';
+  const ICON_GLOBE ='<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><line x1="2" y1="12" x2="22" y2="12"/><path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z"/></svg>';
   // 「我的团队」标签的品牌标识 = 与首页 brand-mark 同款 BrandGlyph(白色六芒星)在蓝→紫渐变方块上。
   const CICY_LOGO = '<span class="cicy-logo"><svg width="12" height="12" viewBox="0 0 96 96" fill="none"><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" fill="white" stroke="white" stroke-width="8" stroke-linejoin="round" stroke-linecap="round"/></svg></span>';
   const ICON_LOCK = '<svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0 1 10 0v4"/></svg>';
@@ -347,7 +359,7 @@
     const isHome = !!(activeTab && activeTab.home);
     const u = nav.url || '';
     const secure = /^https:\/\//i.test(u);
-    leadEl.style.color = secure ? '#81c995' : '#9aa0a6';
+    leadEl.style.color = secure ? '#3f8f5b' : 'var(--muted)';
     leadEl.innerHTML = secure ? ICON_LOCK : ICON_GLOBE;
     // homepage tab → empty omnibox (like Chrome's new-tab page), don't expose the file:// path
     if (!urlFocused) urlEl.value = isHome ? '' : displayUrl(u);
@@ -362,7 +374,12 @@
   // Skip re-render while a drag is in flight — rebuilding tabsEl.innerHTML mid-drag
   // would destroy the dragged element and abort the gesture. State is still stored;
   // dragend triggers a render to sync.
-  window.tabAPI.onState((s) => { state = s || { tabs: [], nav: {} }; if (dragId != null) return; render(); });
+  window.tabAPI.onState((s) => {
+    state = s || { tabs: [], nav: {} };
+    document.documentElement.dataset.theme = state.theme === 'light' ? 'light' : 'dark';
+    if (dragId != null) return;
+    render();
+  });
 
   function go() {
     let v = urlEl.value.trim(); if (!v) return;

package/src/tabbrowser/tab-theme.js

@@ -0,0 +1,18 @@
+// Copyright 2026 CiCy AI
+// SPDX-License-Identifier: Apache-2.0
+
+function normalizeCicyTheme(theme) {
+  return theme === "light" || theme === "dark" ? theme : null;
+}
+
+function resolveReportedCicyTheme(documentTheme, savedTheme) {
+  return normalizeCicyTheme(documentTheme) || normalizeCicyTheme(savedTheme) || "light";
+}
+
+function resolveTabChromeTheme(tabs) {
+  const active = Array.isArray(tabs) ? tabs.find((tab) => tab && tab.active) : null;
+  if (!active || !active.team) return "dark";
+  return normalizeCicyTheme(active.cicyTheme) || "dark";
+}
+
+module.exports = { normalizeCicyTheme, resolveReportedCicyTheme, resolveTabChromeTheme };

package/src/tools/chrome-tools.js

@@ -16,6 +16,7 @@ const {
   launchChrome,
   closeChromeProcess,
   bringChromeAppToForeground,
+  resolveLiveProfileAction,
 } = require("../chrome/chrome-launcher");
 const { isPortOpen } = require("../utils/process-utils");
 const { getVersion, getTargets, createTarget, activateTarget, callCdp } = require("../chrome/chrome-cdp-client");
@@ -404,6 +405,7 @@ async function launchOrActivateProfile({
 
   // Script parity: if /json/version reachable => activate first page target and return reused
   const liveStatus = await probeChromeDebugger(effectivePort);
+  let restoreLastSession = false;
   if (liveStatus.isRunning) {
     // Detect a windowless Chrome — debugger up but 0 page targets. It lingers on
     // macOS after its last window is closed; reusing it is unreliable because a
@@ -419,13 +421,19 @@ async function launchOrActivateProfile({
       windowless = false;
     }
 
-    if (!windowless) {
+    const liveAction = resolveLiveProfileAction({
+      liveStatus,
+      runtime: registry.get(accountIdx),
+      windowless,
+    });
+
+    if (liveAction === "reuse") {
       const { targets, activatedTargetId } = await ensurePageTargets({
         debuggerPort: effectivePort,
         url,
         activateIfRunning,
       });
-      if (activateIfRunning) bringChromeAppToForeground();
+      if (activateIfRunning) bringChromeAppToForeground(undefined, { debuggerPort: effectivePort });
 
       const nextRuntime = registry.upsert(accountIdx, {
         status: "running",
@@ -454,13 +462,8 @@ async function launchOrActivateProfile({
       };
     }
 
-    // Windowless: tear the lingering process down (release its SingletonLock on
-    // the user-data-dir) before falling through to the fresh-launch path, which
-    // spawns Chrome with a real, persistent window.
-    const lingering = registry.get(accountIdx);
-    if (lingering?.pid) {
-      closeChromeProcess(lingering.pid);
-    } else if (liveStatus.webSocketDebuggerUrl) {
+    if (liveAction === "restart-unmanaged") {
+      restoreLastSession = true;
       try {
         await callCdp({
           debuggerPort: effectivePort,
@@ -469,8 +472,28 @@ async function launchOrActivateProfile({
           params: {},
         });
       } catch (_) {}
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+    }
+
+    // Windowless: tear the lingering process down (release its SingletonLock on
+    // the user-data-dir) before falling through to the fresh-launch path, which
+    // spawns Chrome with a real, persistent window.
+    if (liveAction === "restart-windowless") {
+      const lingering = registry.get(accountIdx);
+      if (lingering?.pid) {
+        closeChromeProcess(lingering.pid);
+      } else if (liveStatus.webSocketDebuggerUrl) {
+        try {
+          await callCdp({
+            debuggerPort: effectivePort,
+            target: liveStatus.webSocketDebuggerUrl,
+            method: "Browser.close",
+            params: {},
+          });
+        } catch (_) {}
+      }
+      await new Promise((resolve) => setTimeout(resolve, 1000));
     }
-    await new Promise((resolve) => setTimeout(resolve, 1000));
   }
 
   ensureRpaProfileInitialized({
@@ -503,6 +526,7 @@ async function launchOrActivateProfile({
     chromeBinary: config.chromeBinary,
     url,
     userDataDirRoot: effectiveUserDataDirRoot,
+    restoreLastSession,
   });
 
   const nextRuntime = registry.upsert(accountIdx, {

package/src/tools/desktop-snapshot-tools.js

@@ -52,13 +52,11 @@ module.exports = (registerTool) => {
           return { content: [{ type: "text", text: fresh.b64 }] };
         }
 
-        // Stale/missing. mac/linux can capture live in-process; win32 cannot (needs
-        // the --disable-gpu daemon), so there we fall back to whatever file exists.
-        // BUT honor snapshotEnabled(): on macOS capture is off by default, and a live
-        // `screencapture` here is exactly what pops the Screen-Recording prompt (just
-        // less often than the daemon did) — so when disabled we must NOT live-capture.
-        // mac/linux:进程内即时抓屏(honor snapshotEnabled — mac 默认关避免授权弹窗)。
-        if (process.platform !== "win32" && snap.snapshotEnabled()) {
+        // Stale/missing. A desktop_snapshot RPC is an explicit one-shot request,
+        // so mac/linux capture immediately even when the periodic daemon is off.
+        // CICY_DESKTOP_SNAPSHOT only controls the background capture loop in
+        // main.js; it must not make the user's “立即截图” button unusable.
+        if (process.platform !== "win32") {
           try {
             const r = await snap.captureB64(maxWidth);
             return { content: [{ type: "text", text: r.b64 }] };
@@ -81,10 +79,6 @@ module.exports = (registerTool) => {
         }
 
         if (fresh) return { content: [{ type: "text", text: fresh.b64 }] }; // stale is better than nothing
-        // macOS 默认关(避免反复弹屏幕录制授权)。
-        if (process.platform === "darwin" && !snap.snapshotEnabled()) {
-          throw new Error("桌面截图在 macOS 默认关闭(避免反复弹屏幕录制授权)。需要 agent 看屏幕时,启动 app 前设环境变量 CICY_DESKTOP_SNAPSHOT=1。");
-        }
         throw new Error("no desktop snapshot yet");
       } catch (error) {
         return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };

package/src/tools/tab-browser-tools.js

@@ -27,13 +27,30 @@ const SHELL_HTML = path.join(__dirname, "..", "tabbrowser", "tab-shell.html");
 const SHELL_PRELOAD = path.join(__dirname, "..", "tabbrowser", "tab-shell-preload.js");
 const PANEL_PRELOAD = path.join(__dirname, "..", "tabbrowser", "panel-preload.js");
 const panelCells = require("../tabbrowser/panel-cells");
+const { normalizeCicyTheme, resolveTabChromeTheme } = require("../tabbrowser/tab-theme");
 const HOMEPAGE_PRELOAD = path.join(__dirname, "..", "backends", "homepage-preload.js");
 const WEBVIEW_PRELOAD = path.join(__dirname, "..", "backends", "webview-preload.js");
 const CHROME_H = 80;  // tab strip (40) + toolbar (40) — must match tab-shell.html
 const STRIP_H = 40;   // tab strip only; the homepage tab hides the toolbar (no address bar)
+const TAB_CHROME_COLORS = {
+  dark: { background: "#1c1c20", symbols: "#e8eaed" },
+  light: { background: "#e4e4e7", symbols: "#27272a" },
+};
 
-const managers = new Map();      // accountIdx -> TabManager
-const managerByHost = new Map(); // shell webContents.id -> TabManager
+// `r-reset` deliberately evicts tool modules from require.cache. BrowserWindows
+// and BrowserViews outlive that reload, so their manager registry must outlive
+// it too. A module-local Map made ensureManager(0) think no profile-0 window
+// existed after a tool refresh; the next homepage "Open" click then created a
+// second BrowserWindow instead of adding a tab to the current one.
+const sharedState = globalThis.__cicyTabBrowserState || (globalThis.__cicyTabBrowserState = {
+  managers: new Map(),
+  managerByHost: new Map(),
+  openedWc: new Map(),
+  ipcInstalled: false,
+  themeIpcInstalled: false,
+});
+const managers = sharedState.managers;           // accountIdx -> TabManager
+const managerByHost = sharedState.managerByHost; // shell webContents.id -> TabManager
 
 function stripVol(u) { try { const x = new URL(u); return x.origin + x.pathname; } catch (e) { return u || ""; } }
 
@@ -68,7 +85,7 @@ function isInstanceAuthNavigation(currentUrl, targetUrl) {
 // (打开/关闭都更新)。刷新窗口据此按 wcId 强制 reload(reloadIgnoringCache),避开
 // "tab 打开后 URL 漂移(登录跳转 / token / 重定向)→ 按 URL 匹配失败"的 bug。
 // 键 = stripVol(打开时传入的 url);open 与 reload 两端 stripVol 一致(token 被剥掉)。
-const openedWc = new Map(); // stripVol(url) -> webContentsId
+const openedWc = sharedState.openedWc; // stripVol(url) -> webContentsId
 
 const { NEWTAB_URL, PANEL_URL_BASE, ensureForPartition } = require("../tabbrowser/newtab-protocol");
 const PANEL_STATE_PATH = path.join(os.homedir(), "cicy-ai", "db", "last-panel.json");
@@ -206,7 +223,7 @@ class TabManager {
     this.activeId = null;
     // profile 0 is the primary window (its first tab is the resident homepage),
     // so give it the app title/icon; other profiles are sandbox browsers.
-    const STRIP_BG = "#1c1c20"; // matches tab-shell.html --strip so the titlebar merges in
+    const STRIP_BG = TAB_CHROME_COLORS.dark.background; // matches tab-shell.html --strip
     const winOpts = {
       width: 1180,
       height: 820,
@@ -285,21 +302,25 @@ class TabManager {
     const active = this.tabs.find((t) => t.id === this.activeId);
     let wc = null;
     try { wc = active ? active.view.webContents : null; } catch (e) {}
+    const tabs = this.tabs.map((t) => ({
+      id: t.id,
+      // fixedTitle (team title / homepage) wins over the page's own document.title
+      title: t.fixedTitle || t.title || "新标签页",
+      url: t.url || "",
+      active: t.id === this.activeId,
+      loading: !!t.loading,
+      favicon: t.favicon || "",
+      avatar: t.avatar || "",   // team 自定义头像 → tab icon 用它(优先于页面 favicon)
+      team: !!t.team,           // 团队 tab:icon 只用 avatar,禁用页面 favicon
+      colorKey: t.colorKey || "", // 无头像时首字母色块的底色种子 = teamId(和卡片一致)
+      home: !!t.home,
+      panel: typeof t.url === "string" && t.url.startsWith(PANEL_URL_BASE),
+      cicyTheme: t.cicyTheme || "",
+    }));
+    const chromeTheme = resolveTabChromeTheme(tabs);
     const s = {
-      tabs: this.tabs.map((t) => ({
-        id: t.id,
-        // fixedTitle (team title / homepage) wins over the page's own document.title
-        title: t.fixedTitle || t.title || "新标签页",
-        url: t.url || "",
-        active: t.id === this.activeId,
-        loading: !!t.loading,
-        favicon: t.favicon || "",
-        avatar: t.avatar || "",   // team 自定义头像 → tab icon 用它(优先于页面 favicon)
-        team: !!t.team,           // 团队 tab:icon 只用 avatar,禁用页面 favicon
-        colorKey: t.colorKey || "", // 无头像时首字母色块的底色种子 = teamId(和卡片一致)
-        home: !!t.home,
-        panel: typeof t.url === "string" && t.url.startsWith(PANEL_URL_BASE),
-      })),
+      tabs,
+      theme: chromeTheme,
       nav: {
         canBack: wc ? wc.canGoBack() : false,
         canFwd: wc ? wc.canGoForward() : false,
@@ -307,6 +328,20 @@ class TabManager {
         url: active ? active.url || "" : "",
       },
     };
+    if (this.chromeTheme !== chromeTheme) {
+      this.chromeTheme = chromeTheme;
+      const colors = TAB_CHROME_COLORS[chromeTheme];
+      try { this.win.setBackgroundColor(colors.background); } catch (e) {}
+      if (process.platform === "win32") {
+        try {
+          this.win.setTitleBarOverlay({
+            color: colors.background,
+            symbolColor: colors.symbols,
+            height: STRIP_H,
+          });
+        } catch (e) {}
+      }
+    }
     try { this.win.webContents.send("tabwin:state", s); } catch (e) {}
   }
 
@@ -387,7 +422,7 @@ class TabManager {
     // home = the resident homepage tab (pinned, first, user-icon, no close).
     // fixedTitle = a caller-supplied tab name (e.g. the team title) that the
     // page's own document.title must NOT override.
-    const tab = { id, view, title: "", url: target, home: !!opts.home, fixedTitle: opts.title || "", avatar: opts.avatar || "", team: !!opts.team, colorKey: opts.colorKey || "" };
+    const tab = { id, view, title: "", url: target, home: !!opts.home, fixedTitle: opts.title || "", avatar: opts.avatar || "", team: !!opts.team, colorKey: opts.colorKey || "", cicyTheme: "" };
     // team tab 用团队自定义头像做 icon:调用方没给就按 URL 反查 teams.json(覆盖所有打开路径)。
     if (!tab.avatar && !opts.home) { try { tab.avatar = require("../backends/local-teams").avatarForUrl(target) || ""; } catch (e) {} }
     if (opts.home) this.tabs.unshift(tab); else this.tabs.push(tab);
@@ -651,10 +686,9 @@ function openHomeWindow(accountIdx, homeUrl, opts = {}) {
 }
 
 // ── shell IPC (registered once) ──────────────────────────────────────────────
-let ipcInstalled = false;
 function installIpc() {
-  if (ipcInstalled) return;
-  ipcInstalled = true;
+  if (sharedState.ipcInstalled) return;
+  sharedState.ipcInstalled = true;
   const mgr = (e) => managerByHost.get(e.sender.id);
   ipcMain.on("tabwin:ready", (e) => {
     const m = mgr(e);
@@ -693,7 +727,25 @@ function installIpc() {
   ipcMain.on("tabwin:fwd", (e) => { const m = mgr(e); const wc = m && m.activeWc(); if (wc && wc.canGoForward()) wc.goForward(); });
   ipcMain.on("tabwin:reload", (e) => { const m = mgr(e); const wc = m && m.activeWc(); if (wc) wc.reload(); });
 }
+
+function installThemeIpc() {
+  if (sharedState.themeIpcInstalled) return;
+  sharedState.themeIpcInstalled = true;
+  ipcMain.on("tab-content:cicy-theme", (e, payload) => {
+    const theme = normalizeCicyTheme(payload && payload.theme);
+    if (!theme) return;
+    const m = findManagerByTab(e.sender.id);
+    if (!m) return;
+    const tab = m.tabs.find((candidate) => candidate.id === e.sender.id);
+    // Only cicy-code/team tabs own the Desktop chrome theme. A normal page can
+    // carry the guarded preload, but it must never be able to repaint the shell.
+    if (!tab || !tab.team || tab.cicyTheme === theme) return;
+    tab.cicyTheme = theme;
+    m.pushState();
+  });
+}
 installIpc();
+installThemeIpc();
 
 // CDP captureScreenshot — works for background tabs (capturePage blanks when the
 // BrowserView isn't the attached/visible one).

package/src/utils/desktop-snapshot.js

@@ -37,14 +37,15 @@ function snapDir() {
 }
 
 // Is desktop screen capture allowed here? Single source of truth shared by the
-// periodic daemon (main.js) AND the on-demand `desktop_snapshot` tool's live fallback.
+// periodic daemon (main.js). One-shot `desktop_snapshot` RPC requests bypass this
+// switch: clicking “立即截图” must work without enabling background capture.
 // OFF by default on macOS AND Windows (opt in with CICY_DESKTOP_SNAPSHOT=1):
 //  - macOS: any capture trips the Screen-Recording prompt that won't persist for a
 //    non-Apple-Team-ID signature (re-prompts forever).
 //  - Windows: the periodic whole-desktop capture spawns an always-on --disable-gpu
 //    child + writes every 30s — pure overhead for users who only manage docker/teams
 //    and aren't being driven by a screen-watching cloud agent (资源占用). The on-demand
-//    `desktop_snapshot` tool still has its own live fallback when actually requested.
+//    `desktop_snapshot` still captures once when explicitly requested.
 // linux stays ON by default (no prompt, cheap scrot); opt out with =0.
 function snapshotEnabled() {
   return (process.platform === "darwin" || process.platform === "win32")

package/test/chrome-launcher.test.js

@@ -0,0 +1,71 @@
+// Copyright 2026 CiCy AI
+// SPDX-License-Identifier: Apache-2.0
+
+const assert = require("node:assert/strict");
+const childProcess = require("node:child_process");
+const net = require("node:net");
+const test = require("node:test");
+
+test("macOS restarts a live Chrome profile not launched by the current desktop runtime", () => {
+  const { resolveLiveProfileAction } = require("../src/chrome/chrome-launcher");
+
+  assert.equal(
+    resolveLiveProfileAction({
+      platform: "darwin",
+      liveStatus: { isRunning: true },
+      runtime: null,
+      windowless: false,
+    }),
+    "restart-unmanaged"
+  );
+});
+
+test("an unmanaged Chrome restart restores the previous browser session", () => {
+  const { buildChromeArgs } = require("../src/chrome/chrome-launcher");
+  const args = buildChromeArgs({
+    userDataDirRoot: "/tmp/cicy-profile-1",
+    profileDirectory: "Default",
+    debuggerPort: 11001,
+    restoreLastSession: true,
+  });
+
+  assert.ok(args.includes("--restore-last-session"));
+});
+
+test("macOS activates a reused Chrome profile by the debugger listener PID", async (t) => {
+  if (process.platform !== "darwin") {
+    t.skip("macOS-specific foreground behavior");
+    return;
+  }
+
+  const server = net.createServer();
+  await new Promise((resolve, reject) => {
+    server.once("error", reject);
+    server.listen(0, "127.0.0.1", resolve);
+  });
+  t.after(() => new Promise((resolve) => server.close(resolve)));
+
+  const calls = [];
+  const originalSpawn = childProcess.spawn;
+  childProcess.spawn = (command, args, options) => {
+    calls.push({ command, args, options });
+    return { unref() {} };
+  };
+
+  const launcherPath = require.resolve("../src/chrome/chrome-launcher");
+  delete require.cache[launcherPath];
+  const { bringChromeAppToForeground } = require(launcherPath);
+  childProcess.spawn = originalSpawn;
+
+  bringChromeAppToForeground("/Applications/Google Chrome.app/Contents/MacOS/Google Chrome", {
+    debuggerPort: server.address().port,
+  });
+
+  assert.equal(calls.length, 1);
+  assert.equal(calls[0].command, "/usr/bin/osascript");
+  assert.deepEqual(calls[0].args.slice(0, 3), ["-l", "JavaScript", "-e"]);
+  assert.match(
+    calls[0].args[3],
+    new RegExp(`runningApplicationWithProcessIdentifier\\(${process.pid}\\)`)
+  );
+});

package/test/tab-theme.test.js

@@ -0,0 +1,44 @@
+// Copyright 2026 CiCy AI
+// SPDX-License-Identifier: Apache-2.0
+
+const assert = require("node:assert/strict");
+const test = require("node:test");
+
+let resolveReportedCicyTheme;
+let resolveTabChromeTheme;
+try {
+  ({ resolveReportedCicyTheme, resolveTabChromeTheme } = require("../src/tabbrowser/tab-theme"));
+} catch (_) {}
+
+test("the active cicy-code team tab controls the desktop tab chrome theme", () => {
+  assert.equal(typeof resolveTabChromeTheme, "function");
+  assert.equal(
+    resolveTabChromeTheme([
+      { id: 1, active: false, team: true, cicyTheme: "dark" },
+      { id: 2, active: true, team: true, cicyTheme: "light" },
+    ]),
+    "light"
+  );
+  assert.equal(
+    resolveTabChromeTheme([{ id: 2, active: true, team: true, cicyTheme: "dark" }]),
+    "dark"
+  );
+});
+
+test("inactive cicy-code tabs and ordinary pages cannot recolor the desktop chrome", () => {
+  assert.equal(
+    resolveTabChromeTheme([
+      { id: 1, active: false, team: true, cicyTheme: "light" },
+      { id: 2, active: true, team: false, cicyTheme: "light" },
+    ]),
+    "dark"
+  );
+  assert.equal(resolveTabChromeTheme([]), "dark");
+});
+
+test("cicy-code reports its document theme, then its saved preference, then light by default", () => {
+  assert.equal(typeof resolveReportedCicyTheme, "function");
+  assert.equal(resolveReportedCicyTheme("light", "dark"), "light");
+  assert.equal(resolveReportedCicyTheme("", "dark"), "dark");
+  assert.equal(resolveReportedCicyTheme("system", "sepia"), "light");
+});