cicy-desktop 2.1.83 → 2.1.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.83",
+  "version": "2.1.85",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -133,11 +133,11 @@
   },
   "//optionalDependencies": "Runtime Bundle v1 (主人指令): platform binaries delivered by `npm i -g cicy-desktop` itself — npm installs only the current-platform subpackage (os/cpu pinned in each), so first start seeds the runtime store with ZERO network, ZERO npx. Windows packages are named *-windows-* (npm spam filter 403s new names containing win32). cicy-msys2 added once published.",
   "optionalDependencies": {
-    "cicy-code-darwin-x64": "2.3.2",
-    "cicy-code-darwin-arm64": "2.3.2",
-    "cicy-code-linux-x64": "2.3.2",
-    "cicy-code-linux-arm64": "2.3.2",
-    "cicy-code-windows-x64": "2.3.2",
+    "cicy-code-darwin-x64": "2.3.4",
+    "cicy-code-darwin-arm64": "2.3.4",
+    "cicy-code-linux-x64": "2.3.4",
+    "cicy-code-linux-arm64": "2.3.4",
+    "cicy-code-windows-x64": "2.3.4",
     "cicy-mihomo-darwin-x64": "1.10.4",
     "cicy-mihomo-darwin-arm64": "1.10.4",
     "cicy-mihomo-linux-x64": "1.10.4",

package/src/main.js

@@ -1049,15 +1049,17 @@ electronApp.whenReady().then(async () => {
   }
 
   // Periodic WHOLE-desktop snapshot → ~/cicy-files/desktop-snapshot/desktop.b64
-  // (≤600px wide JPEG). WINDOWS ONLY: the cloud (cicy-code) live-captures mac/
-  // linux via the OS grabber, but on Windows live PowerShell capture fails under
-  // 360/AppLocker/RDP, so there it reads this file instead. The capture runs in a
-  // --disable-gpu child electron (GDI path, works over RDP; main app GPU intact).
-  if (process.platform === "win32" && !global.__cicyDesktopSnapStarted) {
+  // (≤600px wide JPEG). ALL PLATFORMS: the cloud (cicy-code) fetches it via the
+  // dedicated non-dangerous `desktop_snapshot` RPC tool, which reads this fresh
+  // file — so there's no per-call screen capture, hence no macOS Screen-Recording
+  // prompt and no consent dialog. On Windows the capture runs in a --disable-gpu
+  // child electron (GDI path, works over RDP; main app GPU intact); on mac/linux
+  // it's an in-process native-capture loop (screencapture / scrot).
+  if (!global.__cicyDesktopSnapStarted) {
     global.__cicyDesktopSnapStarted = true;
     try {
       const info = require("./utils/desktop-snapshot").startDesktopSnapshots();
-      log.info(`[desktop-snap] desktop snapshots → ${info.dir} (every ${info.intervalMs}ms, maxW ${info.maxWidth})`);
+      log.info(`[desktop-snap] desktop snapshots → ${info.dir} (every ${info.intervalMs}ms, maxW ${info.maxWidth}, mode ${info.mode})`);
     } catch (e) { log.warn(`[desktop-snap] start failed: ${e.message}`); }
   }
 

package/src/tabbrowser/tab-shell.html

@@ -62,6 +62,15 @@
   .tab.active::before,.tab.active::after{content:"";position:absolute;bottom:0;width:5px;height:5px}
   .tab.active::before{left:-5px;background:radial-gradient(circle at top left,var(--strip) 4.5px,var(--toolbar) 5px)}
   .tab.active::after{right:-5px;background:radial-gradient(circle at top right,var(--strip) 4.5px,var(--toolbar) 5px)}
+  /* Chrome-style hairline separator between adjacent INACTIVE tabs: a faint 1px
+     vertical line sitting in the gap to the LEFT of each tab. Suppressed for the
+     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}
+  #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}

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

@@ -0,0 +1,72 @@
+const { z } = require("zod");
+const fs = require("fs");
+const path = require("path");
+
+// desktop_snapshot — DEDICATED, NON-dangerous full-desktop screenshot tool for the
+// cloud (cicy-code). It returns a base64 JPEG of the whole screen so cicy-code can
+// preview a device's desktop WITHOUT going through exec_shell / file_read.
+//
+// Why a dedicated tool (主人令 + w-10135):
+//   exec_*/file_* are in rpc-guard's DANGEROUS_TOOLS, so each call pops the
+//   "敏感操作请求" consent dialog, and on macOS the live `screencapture` shell also
+//   trips the OS Screen-Recording prompt. This tool is NOT dangerous (deliberately
+//   absent from DANGEROUS_TOOLS), and it reuses cicy-desktop's own native capturer
+//   (which already holds the OS grant) — so: no shell, no consent dialog, no
+//   per-call permission prompt.
+//
+// Source of the image (preferred → fallback):
+//   1) ~/cicy-files/desktop-snapshot/desktop.b64 — written every few seconds by the
+//      desktop-snapshot daemon (src/utils/desktop-snapshot.js, started in main.js).
+//      On Windows this is the ONLY valid source (in-process desktopCapturer fails
+//      over RDP without --disable-gpu; the daemon is a --disable-gpu child).
+//   2) live in-process capture (mac/linux only) when the file is stale/missing.
+const snap = require("../utils/desktop-snapshot");
+
+// Treat the daemon file as good if written within this window. The daemon ticks
+// every ~8s, so 30s tolerates a couple of missed/slow ticks before we live-capture.
+const FRESH_MS = 30_000;
+
+function readDaemonB64() {
+  try {
+    const p = path.join(snap.snapDir(), "desktop.b64");
+    const st = fs.statSync(p);
+    const ageMs = Date.now() - st.mtimeMs;
+    const b64 = fs.readFileSync(p, "utf8").trim();
+    if (b64.length > 256) return { b64, ageMs };
+  } catch (_) {}
+  return null;
+}
+
+module.exports = (registerTool) => {
+  registerTool(
+    "desktop_snapshot",
+    "返回整屏桌面截图（base64 JPEG，≤600px 宽）。优先读 desktop-snapshot daemon 写的 desktop.b64（秒回、不弹 consent / 屏幕录制），过期或缺失时 mac/linux 即时抓屏。",
+    z.object({ maxWidth: z.number().optional().describe("最大宽度(px)，默认 600") }),
+    async ({ maxWidth }) => {
+      try {
+        const fresh = readDaemonB64();
+        if (fresh && fresh.ageMs <= FRESH_MS) {
+          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.
+        if (process.platform !== "win32") {
+          try {
+            const r = await snap.captureB64(maxWidth);
+            return { content: [{ type: "text", text: r.b64 }] };
+          } catch (e) {
+            if (fresh) return { content: [{ type: "text", text: fresh.b64 }] }; // stale but real
+            throw e;
+          }
+        }
+
+        if (fresh) return { content: [{ type: "text", text: fresh.b64 }] }; // win32: stale is better than nothing
+        throw new Error("no desktop snapshot yet (daemon warming up?)");
+      } catch (error) {
+        return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };
+      }
+    },
+    { tag: "Desktop" }
+  );
+};

package/src/tools/index.js

@@ -14,6 +14,7 @@ module.exports = [
   require("./automation-tools"),
   require("./account-tools"),
   require("./device-tools"),
+  require("./desktop-snapshot-tools"),
   require("./download-tools"),
   require("./ipc-bridge"),
   require("./hook-gemini"),

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

@@ -104,9 +104,14 @@ class TabManager {
     managerByHost.set(this.win.webContents.id, this);
     // Fullscreen hides the OS window controls (mac traffic lights / win caption
     // buttons) → tell the shell so it reclaims the reserved gutter (CSS
-    // body.is-fullscreen). Fires on both mac and Windows.
-    this.win.on("enter-full-screen", () => { try { this.win.webContents.send("window:fullscreen", true); } catch (e) {} });
-    this.win.on("leave-full-screen", () => { try { this.win.webContents.send("window:fullscreen", false); } catch (e) {} });
+    // body.is-fullscreen). Fires on both mac and Windows. MUST also reach every
+    // TAB's renderer: the homepage SPA (homepage-preload) toggles its own
+    // data-fullscreen attr to drop the 34px traffic-light gutter — and the
+    // homepage now runs as a resident BrowserView TAB, not this.win.webContents.
+    // Without forwarding to the tab, the gutter stays in fullscreen = a blank
+    // strip across the top of 我的团队 (reported on mac fullscreen).
+    this.win.on("enter-full-screen", () => this.sendFullscreen(true));
+    this.win.on("leave-full-screen", () => this.sendFullscreen(false));
     this.win.on("resize", () => this.layout());
     this.win.on("closed", () => {
       managers.delete(accountIdx);
@@ -114,6 +119,16 @@ class TabManager {
     });
   }
 
+  // Broadcast the window's fullscreen state to the shell chrome AND every tab's
+  // renderer. The homepage tab's SPA needs it to collapse the mac traffic-light
+  // gutter; other tabs simply ignore the message.
+  sendFullscreen(isFs) {
+    try { this.win.webContents.send("window:fullscreen", isFs); } catch (e) {}
+    for (const t of this.tabs) {
+      try { t.view.webContents.send("window:fullscreen", isFs); } catch (e) {}
+    }
+  }
+
   pushState() {
     const active = this.tabs.find((t) => t.id === this.activeId);
     let wc = null;
@@ -177,6 +192,10 @@ class TabManager {
     wc.on("page-favicon-updated", (_e, favs) => { tab.favicon = (favs && favs[0]) || ""; this.pushState(); });
     wc.on("did-start-loading", () => { tab.loading = true; this.pushState(); });
     wc.on("did-stop-loading", () => { tab.loading = false; this.pushState(); });
+    // Re-sync fullscreen state after each (re)load: the SPA resets data-fullscreen
+    // to "0" on mount, so a homepage reload while the window is fullscreen would
+    // otherwise re-show the 34px traffic-light gutter (blank top strip).
+    wc.on("did-finish-load", () => { try { wc.send("window:fullscreen", !!this.win.isFullScreen()); } catch (e) {} });
     wc.on("did-navigate", (_e, u) => { tab.url = u; tab.favicon = ""; this.pushState(); });
     wc.on("did-navigate-in-page", (_e, u) => { tab.url = u; this.pushState(); });
     // popups / window.open → open as a new tab. In profile 0 the new tab carries
@@ -247,13 +266,10 @@ function findManagerByTab(webContentsId) {
 }
 
 // ── programmatic API (team-open reroute / homepage) ──────────────────────────
-// profile 0 is the system tab window: tabs may ONLY be added by the homepage
-// (team open passes systemOpen:true). The "+" button, the electron_tab_open
-// tool and the panel can't add tabs to it.
+// profile 0 is the system tab window. It used to accept tabs ONLY from the
+// homepage (team open, systemOpen:true); that restriction is lifted so the "+"
+// button / electron_tab_open / the panel can add tabs to profile 0 too.
 async function openTab(accountIdx, url, opts = {}) {
-  if (accountIdx === 0 && !opts.systemOpen) {
-    throw new Error("profile 0 的标签只能从首页点开 team");
-  }
   const m = ensureManager(accountIdx);
   const id = m.addTab(url, { trusted: !!opts.trusted, home: !!opts.home, title: opts.title || "" });
   try { m.win.show(); m.win.focus(); } catch (e) {}
@@ -280,7 +296,7 @@ function installIpc() {
   ipcInstalled = true;
   const mgr = (e) => managerByHost.get(e.sender.id);
   ipcMain.on("tabwin:ready", (e) => { const m = mgr(e); if (m) m.pushState(); });
-  ipcMain.on("tabwin:new", (e, { url }) => { const m = mgr(e); if (m && m.accountIdx !== 0) m.addTab(url || ""); });
+  ipcMain.on("tabwin:new", (e, { url }) => { const m = mgr(e); if (m) m.addTab(url || ""); });
   ipcMain.on("tabwin:activate", (e, { id }) => { const m = mgr(e); if (m) m.activate(id); });
   ipcMain.on("tabwin:close", (e, { id }) => { const m = mgr(e); if (m) m.close(id); });
   ipcMain.on("tabwin:navigate", (e, { url }) => { const m = mgr(e); const wc = m && m.activeWc(); if (wc && url) wc.loadURL(String(url)); });

package/src/utils/desktop-snapshot.js

@@ -92,6 +92,21 @@ async function captureOnce() {
   return { dir, w: o.width, h: o.height, bytes: jpeg.length };
 }
 
+// One-shot in-process capture that RETURNS the base64 JPEG (does not touch disk).
+// Used by the `desktop_snapshot` RPC tool as the live fallback when the daemon's
+// desktop.b64 file is missing/stale. NOT valid on win32 in the main process —
+// desktopCapturer needs the --disable-gpu daemon there (see grabScreenImage);
+// the tool guards that and reads the daemon file instead.
+async function captureB64(maxWidth) {
+  const mw = maxWidth > 0 ? maxWidth : MAX_W;
+  let img = await grabScreenImage();
+  const o = img.getSize();
+  if (o.width > mw) img = img.resize({ width: mw, quality: "good" });
+  const jpeg = img.toJPEG(QUALITY);
+  if (!jpeg || jpeg.length < 256) throw new Error("encoded jpeg too small");
+  return { b64: jpeg.toString("base64"), w: o.width, h: o.height, bytes: jpeg.length };
+}
+
 // ── parent (started from main.js) ─────────────────────────────────────────────
 let child = null;
 let timer = null;
@@ -172,4 +187,4 @@ if (process.env.CICY_SNAP_DAEMON === "1") {
   app.on("render-process-gone", () => app.quit());
 }
 
-module.exports = { startDesktopSnapshots, stopDesktopSnapshots, snapDir, captureOnce };
+module.exports = { startDesktopSnapshots, stopDesktopSnapshots, snapDir, captureOnce, captureB64, MAX_W };