cicy-desktop 2.1.250 → 2.1.251

package/.github/workflows/build-wsl-package.yml

@@ -36,6 +36,7 @@ jobs:
           default = root
           [automount]
           enabled = true
+          options = "metadata"
           EOS
           cat > ctx/Dockerfile <<'EOF'
           FROM ubuntu:22.04

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.250",
+  "version": "2.1.251",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -139,10 +139,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.205",
-    "cicy-code-darwin-arm64": "2.3.205",
-    "cicy-code-linux-x64": "2.3.205",
-    "cicy-code-linux-arm64": "2.3.205",
+    "cicy-code-darwin-x64": "2.3.234",
+    "cicy-code-darwin-arm64": "2.3.234",
+    "cicy-code-linux-x64": "2.3.234",
+    "cicy-code-linux-arm64": "2.3.234",
     "cicy-code-windows-x64": "2.3.193",
     "cicy-mihomo-darwin-x64": "1.10.4",
     "cicy-mihomo-darwin-arm64": "1.10.4",

package/src/tools/hook-gemini.js

@@ -15,7 +15,7 @@ async function ensureGeminiWindow(win_id, accountIdx = 0) {
     if (win_id) {
       throw new Error(`Window ${win_id} not found`);
     }
-    win = createWindow({ url: GEMINI_URL }, accountIdx, false);
+    win = createWindow({ url: GEMINI_URL, background: true }, accountIdx, false); // agent 驱动:后台开,不抢用户焦点
     await new Promise((r) => setTimeout(r, 3000));
     return win;
   }

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

@@ -208,7 +208,10 @@ class TabManager {
         if (opts.navigate && ex.url !== target) {
           try { ex.view.webContents.loadURL(target); ex.url = target; } catch (e) {}
         }
-        this.activate(ex.id); return ex.id;
+        // activate:false(agent 后台开 tab)→ 命中已有 tab 也不切视图,绝不打断用户正看的 tab。
+        if (opts.activate !== false || this.activeId == null) this.activate(ex.id);
+        else this.pushState(); // 列表里仍要出现/更新这个 tab
+        return ex.id;
       }
     }
     // Privilege gate: only the system profile (accountIdx 0) may get a Node-capable
@@ -282,7 +285,10 @@ class TabManager {
       });
     }
     wc.loadURL(target);
-    this.activate(id);
+    // activate:false(agent/程序化后台开 tab)→ 新 tab 在后台加载,**不切走用户当前 tab**
+    // (BrowserView 不挂上也照常加载)。没有任何 active tab 时仍激活,否则窗口空白。
+    if (opts.activate !== false || this.activeId == null) this.activate(id);
+    else this.pushState(); // tab 条上要出现新 tab(非激活态)
     return id;
   }
 
@@ -384,7 +390,7 @@ function findManagerByTab(webContentsId) {
 // button / electron_tab_open / the panel can add tabs to profile 0 too.
 async function openTab(accountIdx, url, opts = {}) {
   const m = ensureManager(accountIdx);
-  const id = m.addTab(url, { trusted: !!opts.trusted, home: !!opts.home, title: opts.title || "", navigate: !!opts.navigate, avatar: opts.avatar || "", team: !!opts.team, colorKey: opts.colorKey || "" });
+  const id = m.addTab(url, { trusted: !!opts.trusted, home: !!opts.home, title: opts.title || "", navigate: !!opts.navigate, avatar: opts.avatar || "", team: !!opts.team, colorKey: opts.colorKey || "", activate: opts.activate });
   try { m.surfaceQuiet(); } catch (e) {}
   // 记下这个团队 tab 的 webContentsId(打开 → set;关闭/销毁 → delete)。
   try {
@@ -486,15 +492,16 @@ function registerTabBrowserTools(registerTool) {
 
   registerTool(
     "electron_tab_open",
-    "在某 profile 的标签窗口新开一个标签（窗口不在则先建）。打开=开 tab,不弹新窗口。trusted=true 给 cicy-code 等受信任页注入 electronRPC 桥。",
+    "在某 profile 的标签窗口新开一个标签（窗口不在则先建）。打开=开 tab,不弹新窗口。**默认后台打开**:不切走用户正在看的 tab、不抢焦点(agent 干活不打扰用户);要立即展示给用户传 activate:true。trusted=true 给 cicy-code 等受信任页注入 electronRPC 桥。",
     z.object({
       accountIdx: z.number().describe("账户索引（profile）"),
       url: z.string().optional().describe("网址；省略则起始页"),
       trusted: z.boolean().optional().describe("受信任页面才注入桥；默认 false"),
+      activate: z.boolean().optional().describe("true=切到该标签并置前;默认 false(后台开,不打扰用户)"),
     }),
-    async ({ accountIdx, url, trusted }) => {
+    async ({ accountIdx, url, trusted, activate }) => {
       try {
-        const r = await openTab(accountIdx, url, { trusted: !!trusted });
+        const r = await openTab(accountIdx, url, { trusted: !!trusted, activate: activate === true });
         return ok({ success: true, accountIdx, winId: r.winId, tabId: r.tabId, tabs: ensureManager(accountIdx).list() });
       } catch (e) { return ok({ error: e.message }, true); }
     },

package/src/tools/window-tools.js

@@ -134,17 +134,22 @@ function registerTools(registerTool) {
         .optional()
         .default(true)
         .describe("是否复用现有窗口。true=复用(默认)，false=创建新窗口"),
+      background: z
+        .boolean()
+        .optional()
+        .default(true)
+        .describe("后台打开(默认 true):窗口不夺焦点、不把 cicy-desktop 激活到用户当前应用之前 —— agent 干活不打扰用户。要弹到前台给用户看传 false。"),
       options: z.object({}).optional().describe("Electron BrowserWindow options"),
     }),
-    async ({ url, accountIdx, reuseWindow, options }) => {
+    async ({ url, accountIdx, reuseWindow, background, options }) => {
       // Determine if we should create a new window
       const forceNew = reuseWindow === false;
 
       // Get existing windows count before creating
       const existingCount = BrowserWindow.getAllWindows().length;
 
-      // Create or reuse window
-      const win = createWindow({ url, ...options }, accountIdx, forceNew);
+      // Create or reuse window (agent 默认后台开,不抢用户焦点)
+      const win = createWindow({ url, background: background !== false, ...options }, accountIdx, forceNew);
 
       // Check if window was reused (count didn't change)
       const newCount = BrowserWindow.getAllWindows().length;

package/src/utils/window-utils.js

@@ -250,8 +250,10 @@ function isTrustedUrl(url) {
 // platform's own/system windows; callers that want the system slot pass 0
 // explicitly (e.g. local-teams). Agents opening windows should use >0.
 function createWindow(options = {}, accountIdx = 1, forceNew = false) {
-  const { width = 1200, height = 800, url, webPreferences = {}, x, y } = options;
-  console.log("[createWindow] url:", url, "isTrusted:", isTrustedUrl(url));
+  // background:true(agent/程序化开窗)→ 窗口后台出现:不抢焦点、mac 上不激活 app、不把
+  // cicy-desktop 拉到用户正用的应用前面。用户主动点开的路径不传 → 行为不变(照常置前)。
+  const { width = 1200, height = 800, url, webPreferences = {}, x, y, background = false } = options;
+  console.log("[createWindow] url:", url, "isTrusted:", isTrustedUrl(url), "background:", background);
 
   // Check if oneWindow mode is enabled - execute before coordinate logic
   if (config.oneWindow && !forceNew) {
@@ -262,8 +264,10 @@ function createWindow(options = {}, accountIdx = 1, forceNew = false) {
         `[WindowUtils] Single window mode enabled. Reusing existing window ${existingWin.id}`
       );
 
-      if (existingWin.isMinimized()) existingWin.restore();
-      existingWin.focus();
+      if (!background) {
+        if (existingWin.isMinimized()) existingWin.restore();
+        existingWin.focus();
+      }
 
       if (url) {
         const currentUrl = existingWin.webContents.getURL();
@@ -311,6 +315,8 @@ function createWindow(options = {}, accountIdx = 1, forceNew = false) {
     height: winHeight,
     x: posX,
     y: posY,
+    // 后台开窗:先不显示,渲染好后 showInactive(可见但不夺焦点、不激活 app)。
+    show: !background,
     icon: require("./app-icon").appIconPath(), // npx/unpackaged → set our own icon
     // (Windows has no built .exe to embed it; default electron icon otherwise).
     // Native menu bar collapses by default on win/linux; press Alt to
@@ -349,6 +355,15 @@ function createWindow(options = {}, accountIdx = 1, forceNew = false) {
   // reliably readable back.
   try { win.cicyAccountIdx = accountIdx; win.webContents.cicyAccountIdx = accountIdx; } catch (e) {}
 
+  // 后台开窗:渲染好再 showInactive(不夺焦点/不激活 app)。ready-to-show 偶发不触发
+  // (页面挂了等)→ 3s 兜底照样 showInactive,窗口绝不会永远隐身。
+  if (background) {
+    let shown = false;
+    const quiet = () => { if (shown || win.isDestroyed()) return; shown = true; try { win.showInactive(); } catch (e) {} };
+    try { win.once("ready-to-show", quiet); } catch (e) {}
+    setTimeout(quiet, 3000);
+  }
+
   // 监听窗口状态变化并自动保存（基于URL）
   watchWindowState(win, accountIdx);