cicy-desktop 2.1.233 → 2.1.235

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cicy-desktop",
-  "version": "2.1.233",
+  "version": "2.1.235",
   "description": "CiCy - AI-powered operating system browser",
   "main": "src/main.js",
   "bin": {
@@ -144,11 +144,11 @@
   "//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.189",
-    "cicy-code-darwin-arm64": "2.3.189",
-    "cicy-code-linux-x64": "2.3.189",
-    "cicy-code-linux-arm64": "2.3.189",
-    "cicy-code-windows-x64": "2.3.189",
+    "cicy-code-darwin-x64": "2.3.190",
+    "cicy-code-darwin-arm64": "2.3.190",
+    "cicy-code-linux-x64": "2.3.190",
+    "cicy-code-linux-arm64": "2.3.190",
+    "cicy-code-windows-x64": "2.3.190",
     "cicy-mihomo-darwin-x64": "1.10.4",
     "cicy-mihomo-darwin-arm64": "1.10.4",
     "cicy-mihomo-linux-x64": "1.10.4",

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

@@ -238,13 +238,17 @@ class TabManager {
     wc.on("page-title-updated", (_e, title) => { if (!tab.fixedTitle) { tab.title = title; this.pushState(); } });
     wc.on("page-favicon-updated", (_e, favs) => { tab.favicon = (favs && favs[0]) || ""; this.pushState(); });
     wc.on("did-start-loading", () => { tab.loading = true; this.pushState(); });
-    wc.on("did-stop-loading", () => { tab.loading = false; this.pushState(); });
+    wc.on("did-stop-loading", () => { tab.loading = false; try { const cu = wc.getURL(); if (cu && !cu.startsWith("about:blank")) tab.url = cu; } catch (e) {} this.pushState(); });
     // Re-sync fullscreen state after each (re)load: the SPA resets data-fullscreen
     // to "0" on mount, so a homepage reload while the window is fullscreen would
     // otherwise re-show the 34px traffic-light gutter (blank top strip).
     wc.on("did-finish-load", () => { try { wc.send("window:fullscreen", !!this.win.isFullScreen()); } catch (e) {} });
-    wc.on("did-navigate", (_e, u) => { tab.url = u; tab.favicon = ""; this.pushState(); });
-    wc.on("did-navigate-in-page", (_e, u) => { tab.url = u; this.pushState(); });
+    // **绝不把 about:blank 记进 tab.url**。这些 tab 从不真的停在 about:blank —— 但新建时会先
+    // 短暂经过 about:blank,导航事件的 u 偶尔就是 about:blank(或 about:blank#hash,SPA 在空白页
+    // 上先改了 hash)。若写进去,地址栏/tab 就显示 about:blank#teams,且任何「按 tab.url 重新导航」
+    // 的 reload(reloadTabByUrl)会真把页面导到 about:blank#teams。忽略它,保留上一个真实 URL。
+    wc.on("did-navigate", (_e, u) => { if (u && !u.startsWith("about:blank")) tab.url = u; tab.favicon = ""; this.pushState(); });
+    wc.on("did-navigate-in-page", (_e, u) => { if (u && !u.startsWith("about:blank")) tab.url = u; this.pushState(); });
     // popups / window.open → open as a tab. 安全(防"点链接 = 静默 RCE"):在 profile 0
     // (系统/特权 profile,tab 带 electronRPC 桥)里被点开的链接 —— 典型是 agent gotty
     // 打印的网址 —— 一律改到 profile 1 打开。profile 1 是硬沙箱(contextIsolation on /