cicy-desktop 2.1.359 → 2.1.361

package/package.json

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

package/src/backends/sidecar-ipc.js

@@ -392,29 +392,53 @@ function register({ sidecarLogPath } = {}) {
     setInterval(() => { reconcileDocker().catch(() => {}); }, 60000);   // keep fresh + self-heal
   }
 
-  // 宿主 Chrome 代理(始终开启):从容器 cp 出 mihomo 配置 → host-mihomo 在宿主起/续。
-  // 已在跑也同步一次配置(容器侧节点可能被云端更新),变了才重启。幂等。二进制不在会自动下。
+  // 宿主 Chrome / Electron profile 代理(始终开启,且**不依赖 WSL 或容器**)。
+  //
+  // 每个 profile 的会话被指向 127.0.0.1:(20000+idx),所以这个 mihomo 必须存在,
+  // 否则那些 webview 一律 ERR_PROXY_CONNECTION_FAILED 白板。以前这里要先从
+  // cicy-code 容器里 cp 出 mihomo.yaml,没有容器(没装 WSL / WSL 坏了)就什么都不做 ——
+  // xs-master 就是这样:没有 WSL、没有容器,mihomo 从来没被装过,profile 1 的
+  // Telegram webview 一直白板(2026-09-13 实测)。
+  //
+  // 现在的语义:**默认装、默认起**。容器配置能读到就用它(云端下发的真实节点),
+  // 读不到就用宿主已有的 mihomo-host.yaml;都没有就按本机实际 profile 生成一份
+  // DIRECT 兜底配置先跑起来。等容器/云端配置到位,下一轮 reconcile 会覆盖它。
+  function hostProfileIdxs() {
+    try {
+      const store = require("../profiles/profile-store");
+      const ids = [];
+      for (const b of ["chrome", "electron"]) {
+        for (const p of store.listProfiles(b) || []) {
+          const n = Number(p && (p.accountIdx ?? p.idx));
+          if (Number.isInteger(n) && n >= 1) ids.push(n);
+        }
+      }
+      return [...new Set(ids)];
+    } catch (e) { return []; }
+  }
+
   async function maybeStartChromeProxy() {
     if (!APP_DOCKER_SUPPORTED) return;
     // 「独立管理」开关:标记文件在 → 不从容器同步覆盖宿主配置,host mihomo
     // 用宿主自己的 mihomo-host.yaml 独立跑(没跑就用现有宿主配置起来)。幂等。
     if (hostMihomo.standalonePinned()) {
-      if (!hostMihomo.running() && hostMihomo.binPresent()) {
-        try { await hostMihomo.enable({ containerYaml: null }); }
+      if (!hostMihomo.running()) {
+        try { await hostMihomo.enable({ containerYaml: null, profileIdxs: hostProfileIdxs() }); }
         catch (e) { log.warn(`[chrome-proxy] standalone start failed: ${e.message}`); }
       }
       return;
     }
+    // 容器读不到不再是致命的 —— catch 成 null,继续往独立模式走。
     const [yaml, selections] = await Promise.all([
-      appDocker.readMihomoConfig(APP_CONTAINER),
-      appDocker.readMihomoSelections(APP_CONTAINER),
+      appDocker.readMihomoConfig(APP_CONTAINER).catch(() => null),
+      appDocker.readMihomoSelections(APP_CONTAINER).catch(() => ({})),
     ]);
     if (hostMihomo.binPresent() && hostMihomo.running()) {
-      if (hostMihomo.writeConfig(yaml)) hostMihomo.start({ force: true });
-      await hostMihomo.syncSelections(selections);
+      if (yaml) { if (hostMihomo.writeConfig(yaml)) hostMihomo.start({ force: true }); await hostMihomo.syncSelections(selections); }
       return;
     }
-    await hostMihomo.enable({ containerYaml: yaml, selections });
+    try { await hostMihomo.enable({ containerYaml: yaml, selections, profileIdxs: hostProfileIdxs() }); }
+    catch (e) { log.warn(`[chrome-proxy] enable failed: ${e.message}`); }
   }
 
   ipcMain.handle("sidecar:status", async () => {

package/src/main.js

@@ -44,15 +44,23 @@ electronApp.on("web-contents-created", (_e, wc) => {
   // attachContextMenu). Wire copy directly on the guest. COPY-ONLY and WITHOUT
   // preventDefault, so the gotty terminal's Ctrl+C=SIGINT and any web app's own
   // copy handler still fire; wc.copy() is a no-op when there's no selection.
+  // 域名注入的**唯一统一入口**:凡是承载站点页面的 webContents 都走 domain-inject。
+  //   · webview     —— <webview> guest(如搜群后台里内嵌的 Telegram)
+  //   · browserView —— 浏览器标签页 和 矩阵面板的格子(panel-cells.js 建的)
+  // BrowserWindow 自己的主 webContents 由 window-utils.js 挂,这里不重复。
+  //
+  // 以前这里只判 webview,于是 **标签页和面板格子一个都没注入**(都是 BrowserView):
+  // 实测 xs-master 的 desktop.cicy-ai.com / hub / 矩阵面板格子,__cicyInjected 全是 false,
+  // electronRPC 未定义 —— 放进 inject 目录的脚本在这些页面里从来不生效(2026-09-13)。
+  try {
+    const _t = wc.getType && wc.getType();
+    if (_t === "webview" || _t === "browserView") {
+      const { applyDomainInject } = require("./utils/domain-inject");
+      wc.on("dom-ready", () => applyDomainInject(wc));
+    }
+  } catch (_) {}
   try {
     if (wc.getType && wc.getType() === "webview") {
-      // 所有 <webview> guest 都走 domain-inject：inject 文件读取逻辑原本只挂在
-      // BrowserWindow 的主 webContents 上（window-utils.js），tab 里嵌套的 webview 拿不到。
-      // 这里在 app 级 web-contents-created 上统一给每个 webview 挂 dom-ready 注入。
-      try {
-        const { applyDomainInject } = require("./utils/domain-inject");
-        wc.on("dom-ready", () => applyDomainInject(wc));
-      } catch (_) {}
       wc.on("before-input-event", (_ev, input) => {
         if (
           input.type === "keyDown" &&

package/src/sidecar/host-mihomo.js

@@ -290,12 +290,47 @@ function start({ force = false } = {}) {
 // without WSL at all. Only "no container config AND no host config" leaves us
 // nothing to start. Standalone has no authoritative selection source, so the
 // selection sync is skipped rather than overriding whatever the host holds.
-async function enable({ containerYaml, selections = {}, emit } = {}) {
+// 没有任何配置可用时的兜底:按机器上实际存在的 profile 生成 listener
+// (约定 端口 = 20000 + accountIdx,免鉴权、只绑 127.0.0.1),规则 MATCH,DIRECT。
+//
+// 为什么要有它:没有 WSL / 没有 cicy-code 容器的机器(xs-master 就是)拿不到云端
+// 下发的 mihomo.yaml,原来这里直接抛 noContainerConfig —— 于是 mihomo 连装都不装,
+// 那些 profile 的会话指向 127.0.0.1:2000N 却无人监听,webview 全部
+// ERR_PROXY_CONNECTION_FAILED 白板(2026-09-13 在 xs-master 实测)。
+// 先 DIRECT 让它通,之后容器/云端真配置一到,reconcile 循环会覆盖掉这份兜底。
+function defaultHostConfig(idxs) {
+  const list = (Array.isArray(idxs) && idxs.length ? idxs : [1])
+    .map((n) => Number(n)).filter((n) => Number.isInteger(n) && n >= 1 && n <= 999);
+  const host = {
+    "mixed-port": HOST_MIXED,
+    "allow-lan": false,
+    "log-level": "warning",
+    "external-controller": `127.0.0.1:${HOST_CTRL}`,
+    secret: "",
+    dns: { enable: false },
+    listeners: [...new Set(list)].sort((a, b) => a - b).map((n) => ({
+      name: `chrome-profile-${n}`, type: "mixed", port: 20000 + n, listen: "127.0.0.1",
+    })),
+    proxies: [],
+    "proxy-groups": [],
+    rules: ["MATCH,DIRECT"],
+  };
+  return yaml.dump(host, { lineWidth: -1 });
+}
+
+function writeDefaultConfig(idxs) {
+  const next = defaultHostConfig(idxs);
+  fs.mkdirSync(path.dirname(HOST_CONFIG), { recursive: true });
+  fs.writeFileSync(HOST_CONFIG, next);
+  return true;
+}
+
+async function enable({ containerYaml, selections = {}, emit, profileIdxs } = {}) {
   await ensureBinary({ emit });
   let changed = false, standalone = false;
   if (containerYaml) changed = writeConfig(containerYaml);
   else if (fs.existsSync(HOST_CONFIG)) standalone = true;
-  else throw new Error(tt("noContainerConfig"));
+  else { changed = writeDefaultConfig(profileIdxs); standalone = true; }   // 完全独立:自己造一份能跑的
   const res = start({ force: changed });
   const synced = standalone ? { updated: [] } : await syncSelections(selections);
   emit && emit({ phase: "chrome-proxy", status: "running", message: tt("ready") });
@@ -303,6 +338,8 @@ async function enable({ containerYaml, selections = {}, emit } = {}) {
 }
 
 module.exports = {
+  defaultHostConfig,
+  writeDefaultConfig,
   VER, assetUrl, binPath, binPresent, ensureBinary,
   buildHostConfig, writeConfig, planSelectionUpdates, syncSelections,
   start, stop, running, enable, standalonePinned,

package/src/tabbrowser/panel-cells.js

@@ -385,9 +385,23 @@ class PanelCells {
   }
 }
 
+// 面板页里的 <webview partition="persist:sandbox-N"> 用的是同一批 partition,但它不走
+// PanelCells,没人给它设代理 —— 不设就是直连,账号的真实出口 IP 直接暴露。
+// 面板一打开就把所有 electron profile 的 partition 代理都绑上,webview 和 BrowserView
+// 两种格子都覆盖到。ensureCellSessionProxy 自带去重,重复调用无副作用。
+function ensureAllProfileProxies() {
+  try {
+    const profileStore = require("../profiles/profile-store");
+    for (const p of profileStore.listProfiles("electron") || []) {
+      const idx = Number(p && p.accountIdx);
+      if (Number.isInteger(idx) && idx > 0) ensureCellSessionProxy(idx);
+    }
+  } catch (e) {}
+}
+
 function cellsForTab(manager, tab) {
   let pc = registry.get(tab.id);
-  if (!pc) { pc = new PanelCells(manager, tab); registry.set(tab.id, pc); }
+  if (!pc) { pc = new PanelCells(manager, tab); registry.set(tab.id, pc); ensureAllProfileProxies(); }
   return pc;
 }
 
@@ -414,6 +428,10 @@ function installIpc(findTab) {
   ipcMain.handle("panelcells:states", (e) => { const pc = ctx(e); return pc ? pc.states() : []; });
   ipcMain.handle("panelcells:profiles", (e) => {
     if (!ctx(e)) return [];
+    // 面板页开局必调这个接口。借它把所有 profile 的 partition 代理绑一遍 ——
+    // 页面里的 <webview partition="persist:sandbox-N"> 不走 PanelCells,没人给它设代理,
+    // 不设就是直连,账号真实出口 IP 直接暴露。ensureCellSessionProxy 自带去重。
+    ensureAllProfileProxies();
     try {
       return require("../profiles/profile-store").listProfiles("electron")
         .filter((p) => Number.isInteger(Number(p.accountIdx)) && Number(p.accountIdx) > 0 && Number(p.accountIdx) !== 9)

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

@@ -160,10 +160,18 @@ function buildTabWebPreferences(accountIdx, partition, target, opts = {}) {
   // home is system-driven (openHomeWindow), never caller-URL-reachable, so it
   // keeps its privileges without a URL check.
   if (opts.home) { wp.preload = HOMEPAGE_PRELOAD; wp.webviewTag = true; wp.allowRunningInsecureContent = true; wp.sandbox = false; }
-  // split panel page: its cells are main-managed BrowserViews (panel-cells.js),
-  // driven over panelAPI IPC. No webviewTag needed (that path is the file://-dev
-  // fallback below). Sandbox stays ON — the preload only uses contextBridge/ipc.
-  else if (typeof target === "string" && (target.startsWith(PANEL_URL_BASE) || target.startsWith("cicyui://panel"))) { wp.preload = PANEL_PRELOAD; }
+  // split panel page: cells may be main-managed BrowserViews (panel-cells.js, over
+  // panelAPI IPC) OR in-page <webview>. BrowserViews are painted by the main process
+  // at viewport coordinates, so they do not scroll with the page and are not clipped
+  // by the grid's overflow — with more than a screenful of cells that is unusable.
+  // <webview> lives in the DOM and scrolls/clips for free, so the panel needs
+  // webviewTag on. sandbox must go off for the tag to be usable; the preload still
+  // only exposes contextBridge/ipcRenderer, and the panel page is our own origin.
+  else if (typeof target === "string" && (target.startsWith(PANEL_URL_BASE) || target.startsWith("cicyui://panel"))) {
+    wp.preload = PANEL_PRELOAD;
+    wp.webviewTag = true;
+    wp.sandbox = false;
+  }
   // Every other profile-0 tab carries the electronRPC bridge (WEBVIEW_PRELOAD),
   // but the bridge is INERT until the page's origin is authorized: the first
   // rpc:guarded call from a non-allowlisted origin pops a consent modal