cicy-desktop 2.1.230 → 2.1.231

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.230",
+  "version": "2.1.231",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {

package/src/backends/homepage-window.js

@@ -28,10 +28,12 @@ let homeTabWc = null;   // the homepage's resident-tab webContents (primary path
 // browser window (homepage = profile 0 的起始页). Clicking a team there
 // opens the team as another tab in the same window. Falls back to a standalone
 // window only if the tab engine throws, so the homepage is never unreachable.
-async function openHomepage() {
+async function openHomepage(opts = {}) {
   try {
     const tabBrowser = require("../tools/tab-browser-tools");
-    const { win, wc } = tabBrowser.openHomeWindow(0, pickHomepageURL());
+    // opts.activate=false(deeplink / second-instance 顺带调用)→ 不抢用户当前 tab,只保证
+    // 首页存在 + 窗口在前台;不传(tray「打开首页」/ 启动)→ 默认切到首页 tab。
+    const { win, wc } = tabBrowser.openHomeWindow(0, pickHomepageURL(), opts);
     if (wc) {
       homeTabWc = wc;
       try { wc.once("destroyed", () => { if (homeTabWc === wc) homeTabWc = null; }); } catch {}

package/src/main.js

@@ -248,7 +248,7 @@ async function handleDeepLink(url) {
       if (electronApp.isReady()) {
         try {
           const { openHomepage } = require("./backends/homepage-window");
-          openHomepage();
+          openHomepage({ activate: false }); // deeplink 顺带唤起,不抢用户当前 tab(团队列表已由 broadcast 刷新)
         } catch {}
       }
     }
@@ -276,7 +276,7 @@ electronApp.on("second-instance", (_e, argv) => {
 
   try {
     const { openHomepage } = require("./backends/homepage-window");
-    openHomepage();
+    openHomepage({ activate: false }); // 再次启动 exe 只把窗口带到前台,不抢走用户正在看的团队 tab
   } catch {}
   const { BrowserWindow } = require("electron");
   for (const w of BrowserWindow.getAllWindows()) {

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

@@ -389,11 +389,18 @@ async function openTab(accountIdx, url, opts = {}) {
 // { win, wc } so the homepage module can track the tab's webContents for the
 // main→renderer pushes (auth:complete, update-state) that used to target the
 // standalone homepage window.
-function openHomeWindow(accountIdx, homeUrl) {
+function openHomeWindow(accountIdx, homeUrl, opts = {}) {
   const m = ensureManager(accountIdx);
   let tab = m.tabs.find((t) => t.home);
-  if (tab) { m.activate(tab.id); }
-  else { const id = m.addTab(homeUrl, { home: true }); tab = m.tabs.find((t) => t.id === id); }
+  if (tab) {
+    // 只在明确要求(用户点「打开首页」/ 启动)时才切到首页 tab。deeplink / second-instance 等
+    // **顺带**触发 openHomepage 的路径传 activate:false —— 绝不抢走用户正在看的团队 tab,否则
+    // 对话着对话着窗口就莫名切到「我的团队」(用户报的 bug)。当前本来就是首页 tab、或还没有任何
+    // active tab 时,activate 无副作用,照常执行。
+    if (opts.activate !== false || m.activeId == null || m.activeId === tab.id) m.activate(tab.id);
+  } else {
+    const id = m.addTab(homeUrl, { home: true }); tab = m.tabs.find((t) => t.id === id);
+  }
   try { m.win.show(); m.win.focus(); } catch (e) {}
   let wc = null; try { wc = tab ? tab.view.webContents : null; } catch (e) {}
   return { win: m.win, wc };