@glittering0717/ai-browser 2.1.15 → 2.1.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glittering0717/ai-browser",
-  "version": "2.1.15",
+  "version": "2.1.17",
   "description": "AI-native browser — renders pixels for humans, structured semantic-tree API for agents. No screenshots, no OCR, no coordinate guessing.",
   "main": "src/main/index.js",
   "bin": {

package/src/main/index.js

@@ -257,14 +257,44 @@ app.on('child-process-gone', (_event, details) => {
     exit_code: details && details.exitCode,
     service: details && details.serviceName,
   });
+  // GPU 崩溃自动降级（见下面 disableHardwareAcceleration 的说明）。
+  // 只在"开着硬件加速"时计数；已经降级过就不再折腾。
+  const type = details && details.type;
+  const reason = details && details.reason;
+  if (!gpuDisabled && type === 'GPU' && reason && reason !== 'clean-exit') {
+    const now = Date.now();
+    gpuCrashes = gpuCrashes.filter((t) => now - t < 120000).concat(now);
+    if (gpuCrashes.length >= 2) {
+      try { fs.writeFileSync(gpuOffMarker, new Date().toISOString() + ' gpu crash fallback\n'); } catch (e) {}
+      recordError('gpu_fallback', { crashes: gpuCrashes.length, reason });
+      try { app.relaunch(); } catch (e) {}
+      try { app.exit(0); } catch (e) {}
+    }
+  }
 });
+let gpuCrashes = [];
 
-// Disable GPU compositing to avoid a whole class of GPU driver crashes
-// (exit_code=6) that take down the whole app on some systems. This only turns
-// off hardware acceleration — the window itself stays a real, visible window
-// and a human can drive it with mouse/keyboard at any time (login, QR scan,
-// captcha, correcting the agent).
-app.disableHardwareAcceleration();
+// === 硬件加速：默认开，GPU 连续崩溃自动退回软件合成 ===
+//
+// 历史：2026-10 为了让某些机器上的 GPU 崩溃（exit_code=6）别把整个 app 拖死，
+// 这里无条件 disableHardwareAcceleration()。代价是**所有页面都走软件合成**，
+// 而"整窗内容被缩放一帧""刷新时先缩成一小块再恢复""内容缩在左上角"这类绘制异常
+// 几乎都长在软件合成上 —— 合成器手里的 surface 尺寸和图层几何脱节时，软件路径会
+// 把那张图**缩放**着贴出来，GPU 路径则按图层几何重新栅格化。
+//
+// 现在的策略：
+//   - 默认开硬件加速（Apple Silicon 上更快，也不出这类缩放异常）
+//   - 连续两次 GPU 进程崩溃（2 分钟内）→ 写标记 + 自动重启到软件合成，
+//     之后一直用软的（删掉 ~/.ai-browser/.gpu-off 可恢复）。绝不因为一次偶发崩溃
+//     就把所有人降级到软件渲染。
+//   - AI_BROWSER_GPU=on|off 可强制；off 等价于旧行为。
+const gpuOffMarker = path.join(config.userDataDir, '.gpu-off');
+const gpuPref = String(process.env.AI_BROWSER_GPU || 'auto').toLowerCase();
+let gpuDisabled = gpuPref === 'off';
+if (!gpuDisabled && gpuPref !== 'on') {
+  try { gpuDisabled = fs.existsSync(gpuOffMarker); } catch (e) { gpuDisabled = false; }
+}
+if (gpuDisabled) app.disableHardwareAcceleration();
 
 // Disable Chromium sandbox — required when launched from restricted
 // environments (e.g. TRAE IDE shell) where the sandbox helper cannot
@@ -398,6 +428,10 @@ function createWindow() {
 
   // Init PageManager
   pageManager = PageManager.getInstance(mainWindow);
+  // 渲染路径是"硬件合成"还是"软件合成"，直接决定绘制异常的面貌（见
+  // disableHardwareAcceleration 一段）。让外部能查到这一位：ui.server_info 会带出来，
+  // 否则"页面上这一帧的问题"和"这条路的问题"永远分不开。
+  pageManager.renderPath = { gpu: !gpuDisabled, reason: gpuPref === 'off' ? 'env' : (gpuDisabled ? 'fallback' : 'default') };
   pageManager._preloadPath = path.join(__dirname, '../preload/bridge.cjs');
 
   // Create first tab.

package/src/main/page_manager.js

@@ -707,7 +707,10 @@ class PageManager {
     } catch (e) {
       return this._navigateFailure(e, view, tid, waitUntil);
     }
-    this.repaint(tid);
+    // 这里**不做**重绘（2026-10-25 修）。以前每次 navigate 结束都调 repaint()，
+    // 而 repaint() 走 webContents.invalidate() —— 在新页面刚出现的那一刻强制整页
+    // 重栅格化，合成器会先把画面按初始尺寸画一遍再缩放，用户看到的就是
+    // "先缩成一小块、闪一下、然后正常"。导航本身会正常出帧，不需要我们推。
     if (waitUntil === 'load') return { ok: true, waited_for: 'load' };
     // load 还没来是**正常**的（SPA 本来就不 fire load）。如实说明，并给出
     // 下一步：调用方需要等某个具体内容时该用 ui.wait，而不是等 load。
@@ -3434,19 +3437,20 @@ return {ok:true,name:file.name,size:file.size,via:via,host_sel:hostSel,clicked:c
     //     so did-finish-load has already fired and repainted an empty shell.
     //   did-navigate — any cross-document navigation, including programmatic
     //     location.href assignment the app does on its own.
-    if (url) {
-      const repaint = () => { self._scheduleRepaint(tabId); };
-      view.webContents.on('dom-ready', repaint);
-      view.webContents.on('did-finish-load', repaint);
-      view.webContents.on('did-navigate', repaint);
-      view.webContents.on('did-navigate-in-page', repaint);
-      view.webContents.on('did-frame-finish-load', repaint);
-    } else {
-      // No URL at construction time (new_tab with no url, then navigate):
-      // register the same hooks now, or the later navigate() would never
-      // repaint — which was one of the paths that showed a stale view.
-      this._attachRepaintHooks(tabId, view);
-    }
+    // ⚠️ 导航事件**不挂任何重绘**（2026-10-25 修）。
+    //
+    // 历史：这条钩子是为了对付"页面已导航但窗口还显示旧画面"，手段是
+    // removeBrowserView + addBrowserView（后来换成 invalidate）。但两者都有代价：
+    // remove/add 会闪一帧白；invalidate() 更麻烦 —— 它强制整页重新栅格化，
+    // 而在导航刚开始的那一刻，图层的尺寸还是初始值，于是合成器会先把新页面画进
+    // 一个小尺寸 surface 再缩放显示：用户看到的就是"先缩成左上角一小块，闪一下，
+    // 然后正常"（2026-10-25 用户报"刷新 baidu 总是一闪一闪"）。
+    //
+    // 现代 Chromium 在正常情况下不会留旧画面；真留住了也有兜底：
+    //   - 白屏/缩放自检（_auditPaint）会判 scale-mismatch 并**定向**重绘
+    //   - ui.repaint 显式重绘
+    //   - 几何变化由 afterGeometryChange 负责收敛
+    // 所以这里什么都不挂。回归：npm run layout 的 G5 断言"一次导航不引发任何重绘"。
 
     this._attachLoadFailureHooks(tabId, view);
     // "画出来了没有"只能主动看（没有对应事件），"渲染进程崩了"要自己救
@@ -3536,27 +3540,12 @@ return {ok:true,name:file.name,size:file.size,via:via,host_sel:hostSel,clicked:c
    * Idempotent per tab: re-registering would schedule redundant remove/add
    * cycles, so a WeakSet of hooked views guards it.
    */
-  _attachRepaintHooks(tabId, view) {
-    if (!view || !view.webContents || view.webContents.isDestroyed()) return;
-    if (!this._repaintHooked) this._repaintHooked = new WeakSet();
-    if (this._repaintHooked.has(view)) return;
-    this._repaintHooked.add(view);
-    const repaint = () => { this._scheduleRepaint(tabId); };
-    view.webContents.on('dom-ready', repaint);
-    view.webContents.on('did-finish-load', repaint);
-    view.webContents.on('did-navigate', repaint);
-    view.webContents.on('did-navigate-in-page', repaint);
-    view.webContents.on('did-frame-finish-load', repaint);
-  }
-
   /**
-   * Coalesce repaint requests. A single page load fires dom-ready +
-   * did-navigate + did-navigate-in-page + did-frame-finish-load within a few
-   * hundred ms; a load like ComfyUI's fires dozens of did-frame-finish-load.
-   * Without coalescing that is dozens of remove/add cycles — visible flicker
-   * and wasted compositing work. Debounce ~120ms: late enough to collapse the
-   * burst, early enough that the user sees the new view essentially at once.
+   * 已废弃：以前用来给"后来才导航的 tab"补挂重绘钩子。现在导航事件一律不重绘
+   * （原因见 newTab 里的长注释），这里只留一个空实现，避免调用点报错。
    */
+  _attachRepaintHooks() {}
+
   _scheduleRepaint(tabId, delay = 120) {
     const prev = this._repaintTimers.get(tabId);
     if (prev) clearTimeout(prev);

package/src/main/ws_server.js

@@ -317,6 +317,9 @@ export function startWSServer(pageManager, port = config.wsPort, onQuit = null)
                 started_at: serverStartedAt,
                 ws_port: port,
                 platform: process.platform,
+                // 渲染路径：{gpu:true|false, reason:'default'|'env'|'fallback'}。
+                // 白屏/缩放类缺陷的复现与"这条路有没有关系"都要靠它。
+                ...(pageManager.renderPath ? { render_path: pageManager.renderPath } : {}),
               },
             });
             break;

package/src/shared/version.js

@@ -2,4 +2,4 @@
 // Kept in JS (not imported from package.json) to avoid Node import-attribute
 // (JSON module) compatibility issues inside Electron. package.json "version"
 // is manually synced to this value; tests assert they match.
-export const VERSION = '2.1.15';
+export const VERSION = '2.1.17';