cicy-desktop 2.1.301 → 2.1.302

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.301",
+  "version": "2.1.302",
   "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.568",
-    "cicy-code-darwin-arm64": "2.3.568",
-    "cicy-code-linux-x64": "2.3.568",
-    "cicy-code-linux-arm64": "2.3.568",
+    "cicy-code-darwin-x64": "2.3.570",
+    "cicy-code-darwin-arm64": "2.3.570",
+    "cicy-code-linux-x64": "2.3.570",
+    "cicy-code-linux-arm64": "2.3.570",
     "cicy-code-windows-x64": "2.3.193",
     "cicy-mihomo-darwin-x64": "1.10.4",
     "cicy-mihomo-darwin-arm64": "1.10.4",

package/src/main.js

@@ -298,11 +298,13 @@ electronApp.on("second-instance", (_e, argv) => {
     const { openHomepage } = require("./backends/homepage-window");
     openHomepage({ activate: false }); // 再次启动 exe 只把窗口带到前台,不抢走用户正在看的团队 tab
   } catch {}
+  // 绝不抢焦点:second-instance 大多不是用户点的(登录自启重复拉起、deeplink、安装器/自动更新
+  // 重开)。只有当一个可见窗口都没有时才把最近的窗口静默显示出来(showInactive),用户正在
+  // 别的 app 里时不会被莫名跳到前台;想看 app 的用户点托盘/任务栏即可。
   const { BrowserWindow } = require("electron");
-  for (const w of BrowserWindow.getAllWindows()) {
-    if (w.isMinimized()) w.restore();
-    w.show();
-    w.focus();
+  const wins = BrowserWindow.getAllWindows();
+  if (!wins.some((w) => { try { return w.isVisible() && !w.isMinimized(); } catch { return false; } })) {
+    for (const w of wins) { try { if (w.isMinimized()) w.restore(); if (!w.isVisible()) w.showInactive(); } catch {} }
   }
 });
 

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

@@ -1022,12 +1022,10 @@ function registerTabBrowserTools(registerTool) {
         if (!m) throw new Error(`tab ${webContentsId} not found`);
         const success = m.activate(webContentsId);
         if (success) {
-          try {
-            if (process.platform === "darwin") app.focus({ steal: true });
-            if (m.win.isMinimized()) m.win.restore();
-            m.win.show();
-            m.win.focus();
-          } catch (e) {}
+          // agent 驱动的切标签:只切视图、静默保证窗口可见,绝不从用户当前 app 抢焦点
+          // (之前这里 show()+focus() + mac app.focus({steal:true}) 会让 cicy-desktop 突然跳到前台)。
+          try { if (m.win.isMinimized()) m.win.restore(); } catch (e) {}
+          m.surfaceQuiet();
         }
         return ok({ success, webContentsId });
       } catch (e) { return ok({ error: e.message }, true); }

package/test/no-focus-steal.test.js

@@ -0,0 +1,20 @@
+const test = require("node:test");
+const assert = require("node:assert/strict");
+const fs = require("node:fs");
+const path = require("node:path");
+const read = (p) => fs.readFileSync(path.join(__dirname, "..", p), "utf8");
+
+test("second-instance never steals focus: only surfaces a window when none is visible", () => {
+  const main = read("src/main.js");
+  const block = main.slice(main.indexOf('electronApp.on("second-instance"'), main.indexOf('electronApp.on("second-instance"') + 1500);
+  assert.doesNotMatch(block, /w\.focus\(\)/);
+  assert.match(block, /showInactive\(\)/);
+});
+
+test("agent-driven tab activate does not bring the window to front", () => {
+  const src = read("src/tools/tab-browser-tools.js");
+  const i = src.indexOf("const success = m.activate(webContentsId);");
+  const block = src.slice(i, i + 600);
+  assert.doesNotMatch(block, /m\.win\.focus\(\)|app\.focus\(\{ steal: true \}\)/);
+  assert.match(block, /m\.surfaceQuiet\(\)/);
+});