cicy-desktop 2.1.93 → 2.1.94

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.93",
+  "version": "2.1.94",
   "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": {
     "electron": "41.0.3",
-    "cicy-code-darwin-x64": "2.3.12",
-    "cicy-code-darwin-arm64": "2.3.12",
-    "cicy-code-linux-x64": "2.3.12",
-    "cicy-code-linux-arm64": "2.3.12",
-    "cicy-code-windows-x64": "2.3.12",
+    "cicy-code-darwin-x64": "2.3.13",
+    "cicy-code-darwin-arm64": "2.3.13",
+    "cicy-code-linux-x64": "2.3.13",
+    "cicy-code-linux-arm64": "2.3.13",
+    "cicy-code-windows-x64": "2.3.13",
     "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

@@ -20,7 +20,25 @@ const appUpdater = require("./app-updater");
 // and guests fell back to the OS-native menu; this unifies them and adds 重新加载
 // + 切换开发者工具 + 检查元素 everywhere (see utils/context-menu-options.js).
 const { attachContextMenu } = require("./utils/context-menu-options");
-electronApp.on("web-contents-created", (_e, wc) => attachContextMenu(wc));
+electronApp.on("web-contents-created", (_e, wc) => {
+  attachContextMenu(wc);
+  // Ctrl/Cmd+C inside a <webview> guest: on Windows the application menu's
+  // role:"copy" accelerator doesn't reach the focused guest, so a selection
+  // couldn't be copied with the keyboard (right-click 复制 is fixed separately via
+  // attachContextMenu). Wire copy directly on the guest. COPY-ONLY and WITHOUT
+  // preventDefault, so the gotty terminal's Ctrl+C=SIGINT and any web app's own
+  // copy handler still fire; wc.copy() is a no-op when there's no selection.
+  try {
+    if (wc.getType && wc.getType() === "webview") {
+      wc.on("before-input-event", (_ev, input) => {
+        if (input.type === "keyDown" && (input.control || input.meta) &&
+            !input.alt && !input.shift && (input.key === "c" || input.key === "C")) {
+          try { wc.copy(); } catch (_) {}
+        }
+      });
+    }
+  } catch (_) {}
+});
 
 // Setup Electron flags IMMEDIATELY after require
 electronApp.commandLine.appendSwitch("ignore-certificate-errors");

package/src/utils/context-menu-options.js

@@ -58,17 +58,19 @@ const OPTIONS = {
   },
 };
 
-// Attach the menu to the host window + BrowserView tabs only. <webview> guests
-// are EXCLUDED on purpose: they carry their OWN custom context menu (e.g.
-// cicy-code's WebFrame / the gotty terminal), and an ecm native menu would cover
-// it. Idempotent via __cicyCtxMenu so the web-contents-created hook + the
-// tab-browser's per-tab call never double-pop.
+// Attach the menu to the host window, BrowserView tabs AND <webview> guests, so
+// right-click → 复制/粘贴 works on EVERY surface. Webviews used to be excluded on
+// the assumption they carry their own copy menu, but on Windows that left
+// selections uncopyable: the app menu's Ctrl+C / role:"copy" doesn't reach the
+// focused <webview> guest, and no own-menu filled the gap. Giving guests the ecm
+// 复制/粘贴 menu fixes copy cross-platform. Idempotent via __cicyCtxMenu so the
+// web-contents-created hook + the tab-browser's per-tab call never double-pop.
 function attachContextMenu(wc) {
   try {
     if (!wc || (wc.isDestroyed && wc.isDestroyed())) return;
     if (wc.__cicyCtxMenu) return;
     const t = wc.getType && wc.getType();
-    if (t !== "window" && t !== "browserView") return; // skip <webview> + others
+    if (t !== "window" && t !== "browserView" && t !== "webview") return; // host + tabs + <webview>
     wc.__cicyCtxMenu = true;
     contextMenu({ ...OPTIONS, window: wc });
   } catch (e) {}