cicy-desktop 2.1.324 → 2.1.326

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.324",
+  "version": "2.1.326",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -144,10 +144,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.593",
-    "cicy-code-darwin-arm64": "2.3.593",
-    "cicy-code-linux-x64": "2.3.593",
-    "cicy-code-linux-arm64": "2.3.593",
+    "cicy-code-darwin-x64": "2.3.594",
+    "cicy-code-darwin-arm64": "2.3.594",
+    "cicy-code-linux-x64": "2.3.594",
+    "cicy-code-linux-arm64": "2.3.594",
     "cicy-code-windows-x64": "2.3.193",
     "cicy-mihomo-darwin-x64": "1.10.4",
     "cicy-mihomo-darwin-arm64": "1.10.4",

package/scripts/r2.mjs

@@ -23,6 +23,7 @@
 // list has no wrangler equivalent, so it goes through the REST API.
 
 import { spawnSync } from "node:child_process";
+import { pathToFileURL } from "node:url";
 import { existsSync, statSync } from "node:fs";
 
 const BUCKET = process.env.R2_BUCKET || "cicy-assets-poc";
@@ -42,12 +43,23 @@ function needCreds() {
   if (!ACCOUNT || !TOKEN) die("R2_ACCOUNT_ID and R2_API_TOKEN must be set");
 }
 
+// Windows: npx is npx.cmd, which Node only spawns with shell:true — and then
+// cmd.exe re-parses the argv, so anything with a space ("CiCy Desktop Setup
+// 2.1.324.exe") must be quoted or it arrives as several arguments.
+export function shellQuote(arg, platform = process.platform) {
+  const s = String(arg);
+  if (platform !== "win32" || !/[\s"&|<>^()]/.test(s)) return s;
+  return `"${s.replace(/"/g, '\\"')}"`;
+}
+
 function wrangler(args) {
   needCreds();
-  const npx = process.platform === "win32" ? "npx.cmd" : "npx";
-  const r = spawnSync(npx, ["--yes", WRANGLER, ...args, "--remote"], {
+  const isWin = process.platform === "win32";
+  const npx = isWin ? "npx.cmd" : "npx";
+  const argv = ["--yes", WRANGLER, ...args, "--remote"].map((a) => shellQuote(a));
+  const r = spawnSync(npx, argv, {
     stdio: "inherit",
-    shell: process.platform === "win32",
+    shell: isWin,
     env: { ...process.env, CLOUDFLARE_ACCOUNT_ID: ACCOUNT, CLOUDFLARE_API_TOKEN: TOKEN },
   });
   return r.status == null ? 1 : r.status;
@@ -122,4 +134,5 @@ async function main() {
   }
 }
 
-main();
+// Only run when executed directly (tests import shellQuote).
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) main();

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

@@ -43,12 +43,19 @@ function readDaemonB64() {
 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 }) => {
+    "返回整屏桌面截图（base64 JPEG）。默认读 desktop-snapshot daemon 写的 desktop.b64（600px/q60，秒回、不弹 consent / 屏幕录制）；请求更高 maxWidth/quality 时 mac/linux 即时抓屏。",
+    z.object({
+      maxWidth: z.number().optional().describe("最大宽度(px)，默认 600"),
+      quality: z.number().optional().describe("JPEG 质量 20-95，默认 60"),
+    }),
+    async ({ maxWidth, quality }) => {
       try {
         const fresh = readDaemonB64();
-        if (fresh && fresh.ageMs <= FRESH_MS) {
+        // The daemon file is ALWAYS the cheap 600px/q60 preset. Serving it for a
+        // request that asked for 高清/超清 would silently ignore the user's 画质
+        // choice, so only take the fast path when the cached preset is enough.
+        const cacheOk = snap.matchesDaemonPreset(maxWidth, quality);
+        if (cacheOk && fresh && fresh.ageMs <= FRESH_MS) {
           return { content: [{ type: "text", text: fresh.b64 }] };
         }
 
@@ -60,10 +67,10 @@ module.exports = (registerTool) => {
         // mac/linux:进程内即时抓屏(honor snapshotEnabled — mac 默认关避免授权弹窗)。
         if (process.platform !== "win32" && snap.snapshotEnabled()) {
           try {
-            const r = await snap.captureB64(maxWidth);
+            const r = await snap.captureB64(maxWidth, quality);
             return { content: [{ type: "text", text: r.b64 }] };
           } catch (e) {
-            if (fresh) return { content: [{ type: "text", text: fresh.b64 }] }; // stale but real
+            if (fresh && cacheOk) return { content: [{ type: "text", text: fresh.b64 }] }; // stale but real
             throw e;
           }
         }

package/src/utils/desktop-snapshot.js

@@ -116,16 +116,37 @@ async function captureOnce() {
 // 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) {
+//
+// maxWidth/quality are the cloud UI's 画质 picker (流畅 480/q45 → 超清 1920/q92).
+// The daemon file is always the cheap 600px/q60 preset, so a caller asking for
+// anything else MUST come through here to actually get it.
+async function captureB64(maxWidth, quality) {
   const mw = maxWidth > 0 ? maxWidth : MAX_W;
+  const q = clampQuality(quality);
   let img = await grabScreenImage();
   const o = img.getSize();
   if (o.width > mw) img = img.resize({ width: mw, quality: "good" });
-  const jpeg = img.toJPEG(QUALITY);
+  const jpeg = img.toJPEG(q);
   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 };
 }
 
+// electron's toJPEG rejects anything outside 0-100; keep a sane floor so a bad
+// caller can't ask for an unreadable 1-quality frame.
+function clampQuality(q) {
+  const n = Number(q);
+  if (!Number.isFinite(n) || n <= 0) return QUALITY;
+  return Math.min(95, Math.max(20, Math.round(n)));
+}
+
+// Does this request match what the daemon file already holds? If so the cached
+// frame is good enough and we skip a live grab; if not (the user picked 高清),
+// the caller must capture live or it would silently serve the coarse preset.
+function matchesDaemonPreset(maxWidth, quality) {
+  const mw = maxWidth > 0 ? maxWidth : MAX_W;
+  return mw <= MAX_W && clampQuality(quality) <= QUALITY;
+}
+
 // ── parent (started from main.js) ─────────────────────────────────────────────
 let child = null;
 let timer = null;
@@ -235,4 +256,4 @@ if (process.env.CICY_SNAP_DAEMON === "1") {
   app.on("render-process-gone", () => app.quit());
 }
 
-module.exports = { startDesktopSnapshots, stopDesktopSnapshots, snapDir, captureOnce, captureOnceWin, captureB64, snapshotEnabled, MAX_W };
+module.exports = { startDesktopSnapshots, stopDesktopSnapshots, snapDir, captureOnce, captureOnceWin, captureB64, snapshotEnabled, matchesDaemonPreset, MAX_W, QUALITY };

package/test/r2-shell-quote.test.js

@@ -0,0 +1,13 @@
+const test = require("node:test");
+const assert = require("node:assert");
+
+// scripts/r2.mjs is ESM and runs main() on load; pull just the exported helper.
+async function load() { const m = await import("../scripts/r2.mjs"); return m.shellQuote; }
+
+test("shellQuote: Windows paths with spaces are quoted for cmd.exe re-parsing", async () => {
+  const q = await load();
+  assert.strictEqual(q("CiCy Desktop Setup 2.1.324.exe", "win32"), '"CiCy Desktop Setup 2.1.324.exe"');
+  assert.strictEqual(q("releases/win/CiCy-Desktop-Setup-2.1.324.exe", "win32"), "releases/win/CiCy-Desktop-Setup-2.1.324.exe");
+  assert.strictEqual(q('a "b" c', "win32"), '"a \\"b\\" c"');
+  assert.strictEqual(q("CiCy Desktop Setup 2.1.324.exe", "linux"), "CiCy Desktop Setup 2.1.324.exe");
+});