cicy-desktop 2.1.208 → 2.1.209

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.208",
+  "version": "2.1.209",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -140,11 +140,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.53",
-    "cicy-code-darwin-arm64": "2.3.53",
-    "cicy-code-linux-x64": "2.3.53",
-    "cicy-code-linux-arm64": "2.3.53",
-    "cicy-code-windows-x64": "2.3.53",
+    "cicy-code-darwin-x64": "2.3.54",
+    "cicy-code-darwin-arm64": "2.3.54",
+    "cicy-code-linux-x64": "2.3.54",
+    "cicy-code-linux-arm64": "2.3.54",
+    "cicy-code-windows-x64": "2.3.54",
     "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

@@ -1095,34 +1095,26 @@ electronApp.whenReady().then(async () => {
     if (global.__cicyTitleSyncTimer.unref) global.__cicyTitleSyncTimer.unref();
   }
 
-  // Periodic per-window thumbnails → ~/cicy-files/window-thumbs (chrome-style
-  // small previews on disk; override dir via CICY_THUMB_DIR). Best-effort.
-  if (!global.__cicyThumbStarted) {
+  // 窗口缩略图 & 桌面快照:默认**不再周期截图**(资源占用大头;消费端 cicy-code 已改
+  // 用 live RPC /ui/snapshot 与按需 desktop_snapshot,见各文件)。改成「手动触发→按需截」:
+  //   - 窗口截图:cicy-code 走 electron_tab_screenshot / Page.captureScreenshot(live)
+  //   - 桌面截图:desktop_snapshot 工具按需截(win=一次性 --disable-gpu 子进程,mac/linux=live)
+  // 想恢复后台常驻连续截图(给一直盯屏幕的 agent)再用 CICY_DESKTOP_SNAPSHOT=1 显式开。
+  if (process.env.CICY_DESKTOP_SNAPSHOT === "1" && !global.__cicyDesktopSnapStarted) {
+    global.__cicyDesktopSnapStarted = true;
+    try {
+      const info = require("./utils/desktop-snapshot").startDesktopSnapshots();
+      log.info(`[desktop-snap] continuous desktop snapshots → ${info.dir} (every ${info.intervalMs}ms, mode ${info.mode})`);
+    } catch (e) { log.warn(`[desktop-snap] start failed: ${e.message}`); }
+  }
+  if (process.env.CICY_WINDOW_THUMBS === "1" && !global.__cicyThumbStarted) {
     global.__cicyThumbStarted = true;
     try {
       const info = require("./utils/window-thumbnails").startWindowThumbnails();
-      log.info(`[thumbs] window thumbnails → ${info.dir} (every ${info.intervalMs}ms, maxW ${info.maxWidth})`);
+      log.info(`[thumbs] window thumbnails → ${info.dir} (every ${info.intervalMs}ms)`);
     } catch (e) { log.warn(`[thumbs] start failed: ${e.message}`); }
   }
 
-  // Periodic WHOLE-desktop snapshot → ~/cicy-files/desktop-snapshot/desktop.b64
-  // so the cloud (cicy-code) can read the screen via the `desktop_snapshot` tool.
-  // Windows uses a --disable-gpu child (GDI, no prompt); linux uses scrot.
-  //
-  // macOS: this spawns `screencapture`, which DOES trigger the Screen-Recording TCC
-  // prompt — and on an ad-hoc-signed build (no Apple cert) the grant never sticks, so
-  // the prompt fires over and over. So it's OFF by default on macOS (most users —
-  // docker/team management — don't need the agent to watch their screen). Opt in with
-  // CICY_DESKTOP_SNAPSHOT=1. Other platforms stay on (opt out with =0).
-  const __snap = require("./utils/desktop-snapshot");
-  if (!global.__cicyDesktopSnapStarted && __snap.snapshotEnabled()) {
-    global.__cicyDesktopSnapStarted = true;
-    try {
-      const info = __snap.startDesktopSnapshots();
-      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}`); }
-  }
-
   // Local-team discovery — reads ~/cicy-ai/global.json's cicyDesktopNodes
   // and probes each via /api/health. Pure local, never talks to the cloud
   // and never runs docker shells.

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

@@ -54,6 +54,7 @@ module.exports = (registerTool) => {
         // 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()) {
           try {
             const r = await snap.captureB64(maxWidth);
@@ -63,12 +64,25 @@ module.exports = (registerTool) => {
             throw e;
           }
         }
+        // win32:进程内截不了(需 --disable-gpu)。按需起一个一次性 --disable-gpu 子进程
+        // 截一张、写盘,再读回来 —— 这样没有常驻 daemon 也能手动截图(手动触发→写盘→拉图)。
+        if (process.platform === "win32") {
+          try {
+            await snap.captureOnceWin();
+            const after = readDaemonB64();
+            if (after) return { content: [{ type: "text", text: after.b64 }] };
+          } catch (e) {
+            if (fresh) return { content: [{ type: "text", text: fresh.b64 }] };
+            throw e;
+          }
+        }
 
         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("桌面截图在 macOS 默认关闭(避免反复弹屏幕录制授权)。需要 agent 看屏幕时,启动 app 前设环境变量 CICY_DESKTOP_SNAPSHOT=1。");
         }
-        throw new Error("no desktop snapshot yet (daemon warming up?)");
+        throw new Error("no desktop snapshot yet");
       } catch (error) {
         return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };
       }

package/src/utils/desktop-snapshot.js

@@ -26,7 +26,7 @@ const electron = require("electron");
 
 const MAX_W = 600; // 压到 600 以下宽度
 const QUALITY = 60;
-const DEFAULT_INTERVAL_MS = 8000;
+const DEFAULT_INTERVAL_MS = 30000; // 8s→30s:降全屏截图频率(资源占用)
 
 function snapDir() {
   const fromEnv = (process.env.CICY_DESKTOP_SNAP_DIR || "").trim();
@@ -35,13 +35,16 @@ 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.
-// OFF by default on macOS: any capture trips the Screen-Recording prompt, and macOS 15
-// won't persist the grant for a non-Apple-Team-ID signature (ad-hoc AND a self-signed
-// cert both re-prompt — verified). So unless you ship an Apple Developer-ID + notarized
-// build, the only way to "no prompts" is to not capture. Opt in with CICY_DESKTOP_SNAPSHOT=1.
-// win/linux are ON by default (no such prompt); opt out with =0.
+// 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.
+// linux stays ON by default (no prompt, cheap scrot); opt out with =0.
 function snapshotEnabled() {
-  return process.platform === "darwin"
+  return (process.platform === "darwin" || process.platform === "win32")
     ? process.env.CICY_DESKTOP_SNAPSHOT === "1"
     : process.env.CICY_DESKTOP_SNAPSHOT !== "0";
 }
@@ -169,6 +172,29 @@ function stopDesktopSnapshots() {
   if (child) { try { child.kill(); } catch (_) {} child = null; }
 }
 
+// On-demand ONE-SHOT capture (no persistent daemon). win32: spawn a --disable-gpu
+// child that captures once, writes desktop.b64, and exits — so manual「立即截图」
+// works without the periodic daemon running. mac/linux: capture in-process once.
+// Resolves after the file is written; rejects on timeout/error.
+function captureOnceWin(timeoutMs = 20000) {
+  if (process.platform !== "win32") return captureOnce();
+  return new Promise((resolve, reject) => {
+    const dir = snapDir();
+    try { fs.mkdirSync(dir, { recursive: true }); } catch (_) {}
+    let c;
+    try {
+      c = spawn(process.execPath, ["--disable-gpu", "--disable-logging", __filename], {
+        env: { ...process.env, CICY_SNAP_DAEMON: "1", CICY_SNAP_ONESHOT: "1" },
+        stdio: "ignore",
+        windowsHide: true,
+      });
+    } catch (e) { return reject(e); }
+    const timer = setTimeout(() => { try { c.kill(); } catch (_) {} reject(new Error("oneshot capture timeout")); }, timeoutMs);
+    c.on("exit", (code) => { clearTimeout(timer); resolve({ dir, code }); });
+    c.on("error", (e) => { clearTimeout(timer); reject(e); });
+  });
+}
+
 // ── daemon mode ───────────────────────────────────────────────────────────────
 // Entered when this file is the entry of `electron --disable-gpu
 // desktop-snapshot.js` (Windows capture child). Detected purely via the env flag
@@ -190,7 +216,13 @@ if (process.env.CICY_SNAP_DAEMON === "1") {
     }
   };
   console.error("[snap-daemon] booting, dir=" + snapDir());
-  app.whenReady().then(() => {
+  app.whenReady().then(async () => {
+    // ONESHOT:截一张、写盘、退出(给 captureOnceWin 的按需手动截图用,不常驻)。
+    if (process.env.CICY_SNAP_ONESHOT === "1") {
+      await once();
+      try { app.quit(); } catch (_) {}
+      return;
+    }
     once();
     const t = setInterval(once, intervalMs());
     if (t.unref) t.unref();
@@ -200,4 +232,4 @@ if (process.env.CICY_SNAP_DAEMON === "1") {
   app.on("render-process-gone", () => app.quit());
 }
 
-module.exports = { startDesktopSnapshots, stopDesktopSnapshots, snapDir, captureOnce, captureB64, snapshotEnabled, MAX_W };
+module.exports = { startDesktopSnapshots, stopDesktopSnapshots, snapDir, captureOnce, captureOnceWin, captureB64, snapshotEnabled, MAX_W };

package/src/utils/window-thumbnails.js

@@ -88,6 +88,10 @@ async function tick(opts) {
     const manifest = [];
     for (const win of wins) {
       try {
+        // 跳过最小化/隐藏的窗口:capturePage 即使对不可见窗口也强制离屏重绘+GPU 回读
+        // (高占用主因)。看不见的没必要刷预览,留用上次的缩略图即可。
+        if (win.isMinimized && win.isMinimized()) continue;
+        if (win.isVisible && !win.isVisible()) continue;
         const entry = await captureOne(win, dir, opts);
         if (entry) manifest.push(entry);
       } catch (_) {
@@ -104,7 +108,7 @@ async function tick(opts) {
 
 function startWindowThumbnails(options = {}) {
   const opts = {
-    intervalMs: options.intervalMs || 4000,
+    intervalMs: options.intervalMs || 20000,  // 4s→20s:降 capturePage 频率(资源占用大头)
     maxWidth: options.maxWidth || 320, // small rect, chrome-ish
     quality: options.quality || 60,
   };