From 3a99b8b9e14d956978e1bb50bdd2846b1b37db87 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 20 Apr 2026 15:22:19 +0100
Subject: [PATCH] perf(test): preload browser server harness

---
 .../server.control-server.test-harness.ts     | 23 +++----------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/extensions/browser/src/browser/server.control-server.test-harness.ts b/extensions/browser/src/browser/server.control-server.test-harness.ts
index a0b7c29af38..e327a677709 100644
--- a/extensions/browser/src/browser/server.control-server.test-harness.ts
+++ b/extensions/browser/src/browser/server.control-server.test-harness.ts
@@ -1,5 +1,6 @@
 import { afterEach, beforeEach, vi } from "vitest";
 import { deriveDefaultBrowserCdpPortRange } from "../config/port-defaults.js";
+import * as browserServerModule from "../server.js";
 import type { MockFn } from "../test-utils/vitest-mock-fn.js";
 import { installChromeUserDataDirHooks } from "./chrome-user-data-dir.test-harness.js";
 import { getFreePort } from "./test-port.js";
@@ -341,17 +342,6 @@ export function getChromeMcpMocks(): Record<string, MockFn> {
 const chromeUserDataDir = vi.hoisted(() => ({ dir: "/tmp/openclaw" }));
 installChromeUserDataDirHooks(chromeUserDataDir);
 
-type BrowserServerModule = typeof import("../server.js");
-let browserServerModule: BrowserServerModule | null = null;
-
-async function loadBrowserServerModule(): Promise<BrowserServerModule> {
-  if (browserServerModule) {
-    return browserServerModule;
-  }
-  browserServerModule = await import("../server.js");
-  return browserServerModule;
-}
-
 function makeProc(pid = 123) {
   const handlers = new Map<string, Array<(...args: unknown[]) => void>>();
   return {
@@ -477,16 +467,11 @@ vi.mock("./screenshot.js", () => ({
 }));
 
 export async function startBrowserControlServerFromConfig() {
-  const server = await loadBrowserServerModule();
-  return await server.startBrowserControlServerFromConfig();
+  return await browserServerModule.startBrowserControlServerFromConfig();
 }
 
 export async function stopBrowserControlServer(): Promise<void> {
-  const server = browserServerModule;
-  if (!server) {
-    return;
-  }
-  await server.stopBrowserControlServer();
+  await browserServerModule.stopBrowserControlServer();
 }
 
 export function makeResponse(
@@ -571,8 +556,6 @@ export function installBrowserControlServerHooks() {
     });
 
     await resetBrowserControlServerTestContext();
-    await loadBrowserServerModule();
-
     // Minimal CDP JSON endpoints used by the server.
     let putNewCalls = 0;
     vi.stubGlobal(