fix(diffs): ignore blank Windows browser roots

LZY3538 · LZY3538 · commit 81245059e84b · 2026-07-19T14:51:02.000+08:00
diff --git a/extensions/diffs/src/browser.test.ts b/extensions/diffs/src/browser.test.ts
@@ -61,9 +61,53 @@ describe("PlaywrightDiffScreenshotter", () => {
   afterEach(async () => {
     await vi.runAllTimersAsync();
     vi.useRealTimers();
+    vi.unstubAllEnvs();
+    vi.restoreAllMocks();
     await cleanupRootDir();
   });
 
+  it("uses standard Windows install roots when ProgramFiles overrides are blank", async () => {
+    const originalPlatform = Object.getOwnPropertyDescriptor(process, "platform");
+    Object.defineProperty(process, "platform", { value: "win32", configurable: true });
+    vi.stubEnv("LOCALAPPDATA", "   ");
+    vi.stubEnv("ProgramFiles", "   ");
+    vi.stubEnv("ProgramFiles(x86)", "");
+    const chromePath = "C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe";
+    vi.spyOn(fs, "access").mockImplementation(async (candidate) => {
+      if (String(candidate) !== chromePath) {
+        throw new Error("ENOENT");
+      }
+    });
+    launchMock.mockResolvedValue(createMockBrowser([]));
+
+    try {
+      const screenshotter = new PlaywrightDiffScreenshotter({ config: {}, browserIdleMs: 1_000 });
+      await screenshotter.screenshotHtml({
+        html: '<html><head></head><body><main class="oc-frame"></main></body></html>',
+        outputPath,
+        theme: "dark",
+        image: {
+          format: "png",
+          qualityPreset: "standard",
+          scale: 1,
+          maxWidth: 960,
+          maxPixels: 8_000_000,
+        },
+      });
+      expect(launchMock).toHaveBeenCalledWith(
+        expect.objectContaining({ executablePath: chromePath }),
+      );
+      expect(fs.access).not.toHaveBeenCalledWith(
+        path.win32.join("Google", "Chrome", "Application", "chrome.exe"),
+        expect.anything(),
+      );
+    } finally {
+      if (originalPlatform) {
+        Object.defineProperty(process, "platform", originalPlatform);
+      }
+    }
+  });
+
   it("reuses the same browser across renders and closes it after the idle window", async () => {
     const { pages, browser, screenshotter } = await createScreenshotterHarness();
 
diff --git a/extensions/diffs/src/browser.ts b/extensions/diffs/src/browser.ts
@@ -4,6 +4,7 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { writeExternalFileWithinRoot } from "openclaw/plugin-sdk/security-runtime";
+import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { chromium } from "playwright-core";
 import type { OpenClawConfig } from "../api.js";
 import type { DiffRenderOptions, DiffTheme } from "./types.js";
@@ -520,17 +521,27 @@ function commonExecutablePathsForPlatform(): string[] {
   }
 
   if (process.platform === "win32") {
-    const localAppData = process.env.LOCALAPPDATA ?? "";
-    const programFiles = process.env.ProgramFiles ?? "C:\\Program Files";
-    const programFilesX86 = process.env["ProgramFiles(x86)"] ?? "C:\\Program Files (x86)";
+    const joinWindowsPath = path.win32.join;
+    const localAppData = normalizeOptionalString(process.env.LOCALAPPDATA) ?? "";
+    const programFiles = normalizeOptionalString(process.env.ProgramFiles) ?? "C:\\Program Files";
+    const programFilesX86 =
+      normalizeOptionalString(process.env["ProgramFiles(x86)"]) ?? "C:\\Program Files (x86)";
     return [
-      path.join(localAppData, "Google", "Chrome", "Application", "chrome.exe"),
-      path.join(programFiles, "Google", "Chrome", "Application", "chrome.exe"),
-      path.join(programFilesX86, "Google", "Chrome", "Application", "chrome.exe"),
-      path.join(programFiles, "Microsoft", "Edge", "Application", "msedge.exe"),
-      path.join(programFilesX86, "Microsoft", "Edge", "Application", "msedge.exe"),
-      path.join(programFiles, "BraveSoftware", "Brave-Browser", "Application", "brave.exe"),
-      path.join(programFilesX86, "BraveSoftware", "Brave-Browser", "Application", "brave.exe"),
+      ...(localAppData
+        ? [joinWindowsPath(localAppData, "Google", "Chrome", "Application", "chrome.exe")]
+        : []),
+      joinWindowsPath(programFiles, "Google", "Chrome", "Application", "chrome.exe"),
+      joinWindowsPath(programFilesX86, "Google", "Chrome", "Application", "chrome.exe"),
+      joinWindowsPath(programFiles, "Microsoft", "Edge", "Application", "msedge.exe"),
+      joinWindowsPath(programFilesX86, "Microsoft", "Edge", "Application", "msedge.exe"),
+      joinWindowsPath(programFiles, "BraveSoftware", "Brave-Browser", "Application", "brave.exe"),
+      joinWindowsPath(
+        programFilesX86,
+        "BraveSoftware",
+        "Brave-Browser",
+        "Application",
+        "brave.exe",
+      ),
     ];
   }
 
