From 627ab39b6d22abd84028d9dfcfdd1c8401000eae Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sat, 11 Apr 2026 13:20:49 +0100
Subject: [PATCH] perf: stabilize agent lane hotspots

---
 src/agents/sandbox/manage.test.ts             | 28 +++---
 ...bagent-registry.persistence.resume.test.ts | 87 +++++++++----------
 2 files changed, 54 insertions(+), 61 deletions(-)

diff --git a/src/agents/sandbox/manage.test.ts b/src/agents/sandbox/manage.test.ts
index 749723b9a85..b1617661d60 100644
--- a/src/agents/sandbox/manage.test.ts
+++ b/src/agents/sandbox/manage.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
+import { beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 let listSandboxBrowsers: typeof import("./manage.js").listSandboxBrowsers;
 let removeSandboxBrowserContainer: typeof import("./manage.js").removeSandboxBrowserContainer;
@@ -19,14 +19,13 @@ const backendMocks = vi.hoisted(() => ({
   removeRuntime: vi.fn(),
 }));
 
-vi.mock("../../config/config.js", async () => {
-  const actual =
-    await vi.importActual<typeof import("../../config/config.js")>("../../config/config.js");
-  return {
-    ...actual,
-    loadConfig: configMocks.loadConfig,
-  };
-});
+vi.mock("../../config/config.js", () => ({
+  loadConfig: configMocks.loadConfig,
+}));
+
+vi.mock("../../plugin-sdk/browser-bridge.js", () => ({
+  stopBrowserBridgeServer: vi.fn(async () => undefined),
+}));
 
 vi.mock("./registry.js", () => ({
   readBrowserRegistry: registryMocks.readBrowserRegistry,
@@ -43,10 +42,13 @@ vi.mock("./docker-backend.js", () => ({
   },
 }));
 
-async function loadFreshModule() {
-  vi.resetModules();
+vi.mock("./browser-bridges.js", () => ({
+  BROWSER_BRIDGES: new Map(),
+}));
+
+beforeAll(async () => {
   ({ listSandboxBrowsers, removeSandboxBrowserContainer } = await import("./manage.js"));
-}
+});
 
 describe("listSandboxBrowsers", () => {
   beforeEach(async () => {
@@ -94,8 +96,6 @@ describe("listSandboxBrowsers", () => {
       actualConfigLabel: "openclaw-sandbox-browser:bookworm-slim",
       configLabelMatch: true,
     });
-
-    await loadFreshModule();
   });
 
   it("compares browser runtimes against sandbox.browser.image", async () => {
diff --git a/src/agents/subagent-registry.persistence.resume.test.ts b/src/agents/subagent-registry.persistence.resume.test.ts
index 80fbf23737a..f789c815a79 100644
--- a/src/agents/subagent-registry.persistence.resume.test.ts
+++ b/src/agents/subagent-registry.persistence.resume.test.ts
@@ -168,33 +168,30 @@ describe("subagent registry persistence resume", () => {
     process.env.OPENCLAW_STATE_DIR = tempStateDir;
     const registryPath = path.join(tempStateDir, "subagents", "runs.json");
     hoisted.registryPath = registryPath;
-    hoisted.allowedRunIds = new Set(["run-1"]);
-
-    let releaseInitialWait:
-      | ((value: { status: "ok"; startedAt: number; endedAt: number }) => void)
-      | undefined;
-    vi.mocked(callGatewayModule.callGateway)
-      .mockImplementationOnce(
-        async () =>
-          await new Promise((resolve) => {
-            releaseInitialWait = resolve as typeof releaseInitialWait;
-          }),
-      )
-      .mockResolvedValueOnce({
-        status: "ok",
-        startedAt: 111,
-        endedAt: 222,
-      });
-
-    mod.registerSubagentRun({
-      runId: "run-1",
-      childSessionKey: "agent:main:subagent:test",
-      requesterSessionKey: "agent:main:main",
-      requesterOrigin: { channel: " whatsapp ", accountId: " acct-main " },
-      requesterDisplayKey: "main",
-      task: "do the thing",
-      cleanup: "keep",
-    });
+    await fs.mkdir(path.dirname(registryPath), { recursive: true });
+    await fs.writeFile(
+      registryPath,
+      `${JSON.stringify(
+        {
+          version: 2,
+          runs: {
+            "run-1": {
+              runId: "run-1",
+              childSessionKey: "agent:main:subagent:test",
+              requesterSessionKey: "agent:main:main",
+              requesterOrigin: { channel: "whatsapp", accountId: "acct-main" },
+              requesterDisplayKey: "main",
+              task: "do the thing",
+              cleanup: "keep",
+              createdAt: Date.now(),
+            },
+          },
+        },
+        null,
+        2,
+      )}\n`,
+      "utf8",
+    );
     await writeChildSessionEntry({
       sessionKey: "agent:main:subagent:test",
       sessionId: "sess-test",
@@ -216,15 +213,13 @@ describe("subagent registry persistence resume", () => {
     expect(run?.requesterOrigin?.channel).toBe("whatsapp");
     expect(run?.requesterOrigin?.accountId).toBe("acct-main");
 
-    mod.resetSubagentRegistryForTests({ persist: false });
     mod.initSubagentRegistry();
-    releaseInitialWait?.({
-      status: "ok",
-      startedAt: 111,
-      endedAt: 222,
-    });
 
     await flushQueuedRegistryWork();
+    await vi.waitFor(() => expect(announceSpy).toHaveBeenCalled(), {
+      timeout: 1_000,
+      interval: 10,
+    });
 
     const announceCalls = announceSpy.mock.calls as unknown as Array<[unknown]>;
     const announce = (announceCalls.at(-1)?.[0] ?? undefined) as
@@ -238,20 +233,18 @@ describe("subagent registry persistence resume", () => {
           outcome?: { status?: string };
         }
       | undefined;
-    if (announce) {
-      expect(announce).toMatchObject({
-        childRunId: "run-1",
-        childSessionKey: "agent:main:subagent:test",
-        requesterSessionKey: "agent:main:main",
-        requesterOrigin: {
-          channel: "whatsapp",
-          accountId: "acct-main",
-        },
-        task: "do the thing",
-        cleanup: "keep",
-        outcome: { status: "ok" },
-      });
-    }
+    expect(announce).toMatchObject({
+      childRunId: "run-1",
+      childSessionKey: "agent:main:subagent:test",
+      requesterSessionKey: "agent:main:main",
+      requesterOrigin: {
+        channel: "whatsapp",
+        accountId: "acct-main",
+      },
+      task: "do the thing",
+      cleanup: "keep",
+      outcome: { status: "ok" },
+    });
 
     const restored = mod.listSubagentRunsForRequester("agent:main:main")[0];
     expect(restored?.childSessionKey).toBe("agent:main:subagent:test");