cicy-desktop 2.1.310 → 2.1.313

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.310",
+  "version": "2.1.313",
   "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.580",
-    "cicy-code-darwin-arm64": "2.3.580",
-    "cicy-code-linux-x64": "2.3.580",
-    "cicy-code-linux-arm64": "2.3.580",
+    "cicy-code-darwin-x64": "2.3.581",
+    "cicy-code-darwin-arm64": "2.3.581",
+    "cicy-code-linux-x64": "2.3.581",
+    "cicy-code-linux-arm64": "2.3.581",
     "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

@@ -358,6 +358,24 @@ if (oneWindow) {
 // Setup logging
 setupLogging(config);
 wrapLogger();
+// ── focus audit ──────────────────────────────────────────────────────────────
+// 「cicy-desktop 莫名其妙跳到前台」修了多次都没根治,因为事后无法知道是谁调的 show/focus。
+// 这里给 BrowserWindow 的抢前台方法打点:每次调用记一行 [focus-audit] + 调用栈前几帧。
+// 只记日志,不改行为。排查时 grep 主日志里的 focus-audit 即可。
+try {
+  const { BrowserWindow: _BW } = require("electron");
+  for (const method of ["show", "focus", "restore", "moveTop"]) {
+    const orig = _BW.prototype[method];
+    if (typeof orig !== "function") continue;
+    _BW.prototype[method] = function (...args) {
+      try {
+        const frames = String(new Error().stack || "").split("\n").slice(2, 6).map((l) => l.trim().replace(/^at /, "")).join(" ← ");
+        log.info(`[focus-audit] ${method}() win=${this.id} title="${(this.getTitle && this.getTitle()) || ""}" visible=${this.isVisible && this.isVisible()} focused=${this.isFocused && this.isFocused()} ← ${frames}`);
+      } catch (e) {}
+      return orig.apply(this, args);
+    };
+  }
+} catch (e) {}
 
 log.info("[MCP] Server starting at", new Date().toISOString());
 
@@ -1579,7 +1597,7 @@ electronApp.whenReady().then(async () => {
         if (!e.url) continue;
         if (liveSet.has(`${e.accountIdx || 0}::${registry.normalizeUrl(e.url)}`)) continue;
         log.info(`[WindowRegistry] Reopening ${e.url} (account ${e.accountIdx || 0})`);
-        const opts = { url: e.url };
+        const opts = { url: e.url, background: true }; // 启动时自动重开:后台,不抢焦点
         if (e.bounds && typeof e.bounds === "object") Object.assign(opts, e.bounds);
         createWindow(opts, e.accountIdx || 0, true);
       }

package/src/tabbrowser/telegram-matrix.html

@@ -39,11 +39,7 @@
     .line2 .tg { flex: none; max-width: 55%; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; color: #b4b4bb; }
     .line2 .tg b { color: var(--fg); font-weight: 600; }
     .line2 .tg.none { color: #6b6b72; }
-    .line2 .note { flex: 1; min-width: 0; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; color: #9a9aa2; cursor: text; outline: 0; border-radius: 4px; padding: 0 4px; margin: 0 -4px; }
-    .line2 .note.empty { color: #55555c; font-style: italic; }
-    .line2 .note:hover { color: #fff; }
     /* 编辑态就地变成可输入,尺寸/位置与只读态完全一致,不发生位移 */
-    .line2 .note.editing { color: var(--fg); font-style: normal; background: #111113; box-shadow: 0 0 0 1px var(--accent); text-overflow: clip; }
     .line2 .ip { flex: none; max-width: 45%; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; padding: 0 6px; border-radius: 999px; background: var(--head); color: #b4b4bb; font: 11px ui-monospace, monospace; line-height: 16px; cursor: pointer; }
     .line2 .ip.none { color: #6b6b72; font-family: inherit; }
     .line2 .ip.busy { color: #f0b429; }
@@ -229,7 +225,7 @@
       row.className = 'row'; row.dataset.id = String(p.accountIdx); row.title = `persist:sandbox-${p.accountIdx}`;
       row.innerHTML = `
         <div class="line1"><span class="dot"></span><span class="name">${esc(p.name)}</span><span class="chip">#${p.accountIdx}</span><span class="st"></span><button class="icon gear" title="代理设置">⚙</button><button class="icon reload" title="重新加载">⟳</button></div>
-        <div class="line2"><span class="tg none">—</span><span class="note" data-role="note" title="点击编辑备注，Enter 保存 / Esc 取消" spellcheck="false"></span><span class="ip none" title="经该 Profile 的代理探测出口 IP / 地区">测 IP</span></div>
+        <div class="line2"><span class="tg none">—</span><span class="ip none" title="经该 Profile 的代理探测出口 IP / 地区">测 IP</span></div>
         <div class="cfg">
           <div class="f"><label>代理</label><input data-role="proxy" placeholder="留空 = 直连，例如 http://127.0.0.1:20001" spellcheck="false"><button class="sm save">保存</button><button class="sm ghost test">测 IP</button></div>
           <div class="hint">保存后已打开的会话会重新加载；<b>测 IP</b> 经该代理访问 IP 服务，结果显示在上方。</div>
@@ -238,35 +234,7 @@
         </div>
         <div class="row-err"></div>`;
       const errEl = row.querySelector('.row-err');
-      const noteEl = row.querySelector('.note');
-      const showNote = () => { noteEl.textContent = p.note || '添加备注'; noteEl.classList.toggle('empty', !p.note); };
-      showNote();
-      let editing = false;
-      const startEdit = (e) => {
-        e && e.stopPropagation();
-        if (editing) return;
-        editing = true;
-        noteEl.classList.add('editing'); noteEl.classList.remove('empty');
-        noteEl.textContent = p.note || '';
-        noteEl.contentEditable = 'plaintext-only';
-        noteEl.focus();
-        const range = document.createRange(); range.selectNodeContents(noteEl);
-        const sel = getSelection(); sel.removeAllRanges(); sel.addRange(range);
-      };
-      const stopEdit = () => { editing = false; noteEl.contentEditable = 'false'; noteEl.classList.remove('editing'); showNote(); };
-      const saveNote = async () => {
-        if (!editing) return;
-        const value = noteEl.textContent.replace(/\s+/g, ' ').trim().slice(0, 500);
-        stopEdit();
-        if (value === (p.note || '')) return;
-        try {
-          const updated = await window.panelAPI.setProfileNote(p.accountIdx, value);
-          p.note = updated.note; showNote();
-        } catch (e) { errEl.textContent = e.message || String(e); errEl.classList.add('on'); }
-      };
-      noteEl.onclick = (e) => { e.stopPropagation(); startEdit(e); };
-      noteEl.onkeydown = (e) => { e.stopPropagation(); if (e.key === 'Enter') { e.preventDefault(); saveNote(); } if (e.key === 'Escape') { e.preventDefault(); stopEdit(); } };
-      noteEl.onblur = () => saveNote();
+      // 备注功能已按需求移除(列表只保留 名称 / @用户名 / 状态 / IP)
       // 代理设置抽屉(⚙):不常用,默认收起,列表保持干净。
       const proxyInput = row.querySelector('[data-role="proxy"]');
       const saveBtn = row.querySelector('.cfg .save');

package/src/tools/ipc-bridge.js

@@ -14,7 +14,7 @@ if (!global._cicyIpcBridge) {
     const { url, title } = data || {};
     if (!url) return;
     log.info(`[IPC Bridge] open-window: ${url} ${title || ""}`);
-    const win = createWindow({ url }, 0, true);
+    const win = createWindow({ url, background: true }, 0, true); // 渲染进程请求:后台开,不抢焦点
     if (title) win.setTitle(title);
   });
 

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

@@ -268,6 +268,9 @@ class TabManager {
     const winOpts = {
       width: 1180,
       height: 820,
+      // 先不显示:由 openTab 决定 show+focus(用户明确要求)还是 showInactive(程序/页面触发)。
+      // 默认 show:true 会在新建 profile 窗口的瞬间把 app 抢到前台。
+      show: false,
       backgroundColor: STRIP_BG,
       title: accountIdx === 0 ? "CiCy Desktop" : `CiCy Browser · sandbox-${accountIdx}`,
       // Drop the native title-bar row — the tab strip becomes the top of the window
@@ -305,6 +308,8 @@ class TabManager {
       } catch (e) {}
     }
     this.win = new BrowserWindow(winOpts);
+    // 兜底:无论谁建的窗口,3s 内没人 show/showInactive 就静默显示,窗口绝不会永远隐身。
+    setTimeout(() => { try { if (!this.win.isDestroyed() && !this.win.isVisible()) this.win.showInactive(); } catch (e) {} }, 3000);
     try {
       this.win.cicyAccountIdx = accountIdx;
       this.win.webContents.cicyAccountIdx = accountIdx;
@@ -490,7 +495,9 @@ class TabManager {
     // 沙箱 profile(accountIdx ≥ 1)自身的 window.open 本就没有桥,仍开成本 profile 的 tab。
     try { wc.setWindowOpenHandler(({ url: u }) => {
       try {
-        if (this.accountIdx === 0) openTab(1, u); // 特权 profile 的链接 → 沙箱 profile 1
+        // activate:false —— 这是页面自己(window.open/重定向)触发的,不是用户在看 cicy-desktop;
+        // 不能因此把窗口抢到前台(用户报的「莫名其妙跳到前台」主因之一)。
+        if (this.accountIdx === 0) openTab(1, u, { activate: false }); // 特权 profile 的链接 → 沙箱 profile 1
         else this.addTab(u);                      // 沙箱 profile → 本 profile 内开 tab
       } catch (e) {}
       return { action: "deny" };
@@ -508,7 +515,7 @@ class TabManager {
           let curOrigin = ""; try { curOrigin = new URL(wc.getURL()).origin; } catch {}
           if (tgt.origin !== curOrigin && !(tab.team && isInstanceAuthNavigation(wc.getURL(), u))) {
             e.preventDefault();
-            openTab(1, u);
+            openTab(1, u, { activate: false }); // 页面驱动,不抢焦点
           }
         } catch (err) {}
       });
@@ -1024,7 +1031,7 @@ function registerTabBrowserTools(registerTool) {
         if (success) {
           // agent 驱动的切标签:只切视图、静默保证窗口可见,绝不从用户当前 app 抢焦点
           // (之前这里 show()+focus() + mac app.focus({steal:true}) 会让 cicy-desktop 突然跳到前台)。
-          try { if (m.win.isMinimized()) m.win.restore(); } catch (e) {}
+          // 不 restore():Windows 上 restore() 会激活窗口(=抢前台)。最小化就保持最小化。
           m.surfaceQuiet();
         }
         return ok({ success, webContentsId });

package/src/tools/window-tools.js

@@ -206,7 +206,7 @@ function registerTools(registerTool) {
         const registry = require("../utils/window-registry");
         const entry = registry.getByKey(window_key);
         if (!entry) throw new Error(`windowKey ${window_key} not found in registry`);
-        const opts = { url: entry.url };
+        const opts = { url: entry.url, background: true }; // agent 驱动:后台开,不抢焦点
         if (entry.bounds && typeof entry.bounds === "object") Object.assign(opts, entry.bounds);
         const win = createWindow(opts, entry.accountIdx || 0, true);
         return {

package/src/utils/window-utils.js

@@ -83,7 +83,7 @@ function windowOpenDecision(url, { wc } = {}) {
   // its own profile N. Never in-session for profile 0.
   const openerIdx = accountIdxOfWebContents(wc);
   const target = openerIdx === 0 ? 1 : openerIdx;
-  try { createWindow({ url }, target, true); }
+  try { createWindow({ url, background: true }, target, true); } // 页面驱动:后台开,不抢焦点
   catch (e) { log.warn(`[WindowOpen] open external in profile ${target} failed: ${e && e.message}`); }
   return { action: "deny" };
 }

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

@@ -18,3 +18,30 @@ test("agent-driven tab activate does not bring the window to front", () => {
   assert.doesNotMatch(block, /m\.win\.focus\(\)|app\.focus\(\{ steal: true \}\)/);
   assert.match(block, /m\.surfaceQuiet\(\)/);
 });
+
+test("page-driven opens (window.open / cross-origin navigate) never activate the window", () => {
+  const src = read("src/tools/tab-browser-tools.js");
+  assert.match(src, /if \(this\.accountIdx === 0\) openTab\(1, u, \{ activate: false \}\)/);
+  assert.match(src, /e\.preventDefault\(\);\s*openTab\(1, u, \{ activate: false \}\)/);
+});
+
+test("tab windows are created hidden and only surfaced by openTab / a quiet fallback", () => {
+  const src = read("src/tools/tab-browser-tools.js");
+  const i = src.indexOf("const winOpts = {");
+  assert.match(src.slice(i, i + 600), /show: false,/);
+  const j = src.indexOf("this.win = new BrowserWindow(winOpts);");
+  assert.match(src.slice(j, j + 400), /showInactive\(\)/);
+});
+
+test("non-click createWindow paths open in the background", () => {
+  assert.match(read("src/utils/window-utils.js"), /createWindow\(\{ url, background: true \}, target, true\)/);
+  assert.match(read("src/tools/ipc-bridge.js"), /createWindow\(\{ url, background: true \}, 0, true\)/);
+  assert.match(read("src/tools/window-tools.js"), /const opts = \{ url: entry\.url, background: true \}/);
+  assert.match(read("src/main.js"), /const opts = \{ url: e\.url, background: true \}/);
+});
+
+test("focus audit hooks show/focus/restore/moveTop", () => {
+  const main = read("src/main.js");
+  assert.match(main, /\[focus-audit\]/);
+  assert.match(main, /\["show", "focus", "restore", "moveTop"\]/);
+});

package/test/telegram-matrix.test.js

@@ -80,7 +80,7 @@ test("reloading an unopened profile creates its cell instead of a bare reload",
   assert.match(reload, /if \(!fresh\)[^]*panelAPI\.reload/);
 });
 
-test("matrix page exposes profile table, phone preview, note, proxy drawer and ip probe", () => {
+test("matrix page exposes profile table, phone preview, proxy drawer and ip probe", () => {
   const html = fs.readFileSync(path.join(__dirname, "..", "src", "tabbrowser", "telegram-matrix.html"), "utf8");
   assert.match(html, /id="rows"/);
   assert.match(html, /id="ov-error"/);
@@ -95,8 +95,6 @@ test("matrix page exposes profile table, phone preview, note, proxy drawer and i
   assert.match(html, /id="add-profile"/);
   assert.match(html, /class="cfg"[^]*data-role="proxy"/);
   assert.match(html, /\.row\.cfg-open \.cfg \{ display: block; \}/);
-  assert.match(html, /panelAPI\.setProfileNote/);
-  assert.match(html, /data-role="note"/);
   assert.match(html, /class="tg none"/);
   assert.match(html, /id="phone-preview"/);
   assert.match(html, /https:\/\/web\.telegram\.org\/k\//);