cicy-desktop 2.1.232 → 2.1.234

package/package.json

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

package/src/sidecar/wsl-docker.js

@@ -543,6 +543,20 @@ function projectsMountArg() {
   } catch (e) { log.warn(`[wsl-docker] projects mount setup failed: ${e.message}`); return ""; }
 }
 
+// 把 Windows 的每个盘都挂进容器 —— **动态枚举,不写死盘符**:`ls /mnt` 拿 WSL 已自动挂载的
+// 单字母目录(c/d/e…,有几个挂几个),逐盘 `-v /mnt/<x>:/mnt/<x>`。逐盘而非整挂 /mnt,是为了
+// 避开 /mnt/wsl 等非盘目录。USB/可移动盘 WSL 默认不自动挂进 /mnt,天然不在此列(主人:不用管 usb)。
+async function allDrivesMountArg() {
+  try {
+    const { stdout } = await wslRun("ls -1 /mnt 2>/dev/null", { timeout: 10000 });
+    const drives = String(stdout || "")
+      .split(/\r?\n/)
+      .map((s) => s.trim())
+      .filter((s) => /^[a-z]$/i.test(s)); // 只取单字母盘符,排除 wsl 等
+    return drives.map((d) => `-v /mnt/${d}:/mnt/${d}`).join(" ");
+  } catch (e) { log.warn(`[wsl-docker] enumerate drives failed: ${e.message}`); return ""; }
+}
+
 // extraPorts → additional `-p 127.0.0.1:<p>:<p>` mappings (host=container, loopback
 // only). For container-internal agent services the user wants reachable from
 // Windows. Each adds one docker-proxy, so keep the list small. 8008/主端口自动排除。
@@ -581,7 +595,8 @@ async function runContainer({ port = 8008, container = "cicy-code-docker", volum
   // 只发布 :8008(单端口,1 个 docker-proxy)。EXTRA_PORTS 那段 18000-19999(2000 个端口)
   // 已删——docker 默认每端口起一个 userland-proxy 进程 → 2000 进程,docker run 卡死/吃内存/
   // 偶发失败(实测)。容器内 agent 服务需要从 Windows 直达时再按需单独暴露。
-  const cmd = `docker run -d --name ${container} --restart unless-stopped --dns 223.5.5.5 --dns 8.8.8.8 ${publishArgs(port, extraPorts)} -e CICY_PUBLIC=1 -v ${volume}:/home/cicy ${projectsMountArg()} ${envArgs} ${IMAGE}`;
+  const drivesArg = await allDrivesMountArg(); // 动态:有几个盘挂几个
+  const cmd = `docker run -d --name ${container} --restart unless-stopped --dns 223.5.5.5 --dns 8.8.8.8 ${publishArgs(port, extraPorts)} -e CICY_PUBLIC=1 -v ${volume}:/home/cicy ${projectsMountArg()} ${drivesArg} ${envArgs} ${IMAGE}`;
   emit && emit({ phase: "container", status: "running", message: `$ ${cmd.length > 220 ? cmd.slice(0, 220) + " …" : cmd}` });
   await wslRun(cmd, { timeout: 60000 }); // 失败时 err.stderr 带 docker 真错误 → _bootstrap 的 errTail 显示
   ensureDesktopShortcut(volume, port).catch(() => {});

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

@@ -293,6 +293,12 @@ class TabManager {
     return true;
   }
 
+  // 让窗口「可见但不抢前台」:已显示 → 什么都不做;隐藏 → showInactive(绝不 focus)。
+  // 程序化/agent 驱动的开 tab、reload、activate 都用它 —— win.focus() 只有在 cicy-desktop 不
+  // 在前台时才有效(= 从用户当前 app 抢焦点),用户在 cicy-desktop 内操作时它本就是 no-op。
+  // 所以这些非「用户明确要打开 app」的路径一律不抢焦点,避免用户在微信等窗口时被莫名跳到前台。
+  surfaceQuiet() { try { if (!this.win.isVisible()) this.win.showInactive(); } catch (e) {} }
+
   close(id) {
     const i = this.tabs.findIndex((x) => x.id === id);
     if (i < 0) return false;
@@ -341,7 +347,7 @@ class TabManager {
       if (ignoreCache) tab.view.webContents.reloadIgnoringCache();
       else tab.view.webContents.reload();
     } catch (e) {}
-    try { this.activate(tab.id); this.win.show(); this.win.focus(); } catch (e) {}
+    try { this.activate(tab.id); this.surfaceQuiet(); } catch (e) {}
     return true;
   }
 
@@ -372,7 +378,7 @@ function findManagerByTab(webContentsId) {
 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 || "" });
-  try { m.win.show(); m.win.focus(); } catch (e) {}
+  try { m.surfaceQuiet(); } catch (e) {}
   // 记下这个团队 tab 的 webContentsId(打开 → set;关闭/销毁 → delete)。
   try {
     const tab = m.tabs.find((t) => t.id === id);
@@ -401,7 +407,9 @@ function openHomeWindow(accountIdx, homeUrl, opts = {}) {
   } 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) {}
+  // 只有明确要求(tray「打开首页」/ 启动,activate!==false)才把窗口抢到前台;deeplink /
+  // second-instance 顺带触发(activate:false)只静默显示,绝不从用户当前 app 抢焦点。
+  if (opts.activate !== false) { try { m.win.show(); m.win.focus(); } catch (e) {} } else m.surfaceQuiet();
   let wc = null; try { wc = tab ? tab.view.webContents : null; } catch (e) {}
   return { win: m.win, wc };
 }
@@ -462,7 +470,7 @@ function registerTabBrowserTools(registerTool) {
       try {
         const m = ensureManager(accountIdx);
         if (m.tabs.length === 0 && accountIdx !== 0) m.addTab();
-        try { m.win.show(); m.win.focus(); } catch (e) {}
+        try { m.surfaceQuiet(); } catch (e) {}
         return ok({ success: true, accountIdx, winId: m.win.id });
       } catch (e) { return ok({ error: e.message }, true); }
     },
@@ -610,7 +618,7 @@ async function reloadTabByUrl(accountIdx, url, opts = {}) {
     const tab = m.tabs.find((t) => stripVol(t.url) === key);
     if (tab) {
       try { tab.view.webContents.reload(); } catch (e) {}
-      try { m.activate(tab.id); m.win.show(); m.win.focus(); } catch (e) {}
+      try { m.activate(tab.id); m.surfaceQuiet(); } catch (e) {}
       return { ok: true, winId: m.win.id, reloaded: true };
     }
   }
@@ -633,7 +641,7 @@ function reloadTabIfOpen(accountIdx, url, opts = {}) {
       if (mm && !mm.win.isDestroyed()) {
         try {
           const tab = mm.tabs.find((t) => { try { return t.view.webContents.id === wcId; } catch (e) { return false; } });
-          if (tab) { mm.activate(tab.id); mm.win.show(); mm.win.focus(); }
+          if (tab) { mm.activate(tab.id); mm.surfaceQuiet(); }
         } catch (e) {}
       }
       return { ok: true, winId: mm ? mm.win.id : undefined, reloaded: true, byWcId: true };
@@ -660,7 +668,7 @@ function activateTabIfOpen(accountIdx, url) {
       if (mm && !mm.win.isDestroyed()) {
         try {
           const tab = mm.tabs.find((t) => { try { return t.view.webContents.id === wcId; } catch (e) { return false; } });
-          if (tab) { mm.activate(tab.id); mm.win.show(); mm.win.focus(); return { ok: true, active: true }; }
+          if (tab) { mm.activate(tab.id); mm.surfaceQuiet(); return { ok: true, active: true }; }
         } catch (e) {}
       }
     }