perf(test): eliminate resetModules via injectable seams

src/agents/bash-tools.exec.pty-fallback.e2e.test.ts

@@ -1,14 +1,15 @@
 import { afterEach, expect, test, vi } from "vitest";
 import { resetProcessRegistryForTests } from "./bash-process-registry";
+import { createExecTool, setPtyModuleLoaderForTests } from "./bash-tools.exec";
 
 afterEach(() => {
   resetProcessRegistryForTests();
-  vi.resetModules();
+  setPtyModuleLoaderForTests();
   vi.clearAllMocks();
 });
 
 test("exec falls back when PTY spawn fails", async () => {
-  vi.doMock("@lydell/node-pty", () => ({
+  setPtyModuleLoaderForTests(async () => ({
     spawn: () => {
       const err = new Error("spawn EBADF");
       (err as NodeJS.ErrnoException).code = "EBADF";
@@ -16,7 +17,6 @@ test("exec falls back when PTY spawn fails", async () => {
     },
   }));
 
-  const { createExecTool } = await import("./bash-tools.exec");
   const tool = createExecTool({ allowBackground: false });
   const result = await tool.execute("toolcall", {
     command: "printf ok",

src/agents/bash-tools.exec.ts

@@ -144,6 +144,19 @@ type PtySpawn = (
     env?: Record<string, string>;
   },
 ) => PtyHandle;
+type PtyModule = {
+  spawn?: PtySpawn;
+  default?: { spawn?: PtySpawn };
+};
+type PtyModuleLoader = () => Promise<PtyModule>;
+
+const loadPtyModuleDefault: PtyModuleLoader = async () =>
+  (await import("@lydell/node-pty")) as unknown as PtyModule;
+let loadPtyModule: PtyModuleLoader = loadPtyModuleDefault;
+
+export function setPtyModuleLoaderForTests(loader?: PtyModuleLoader): void {
+  loadPtyModule = loader ?? loadPtyModuleDefault;
+}
 
 type ExecProcessOutcome = {
   status: "completed" | "failed";
@@ -477,10 +490,7 @@ async function runExecProcess(opts: {
   } else if (opts.usePty) {
     const { shell, args: shellArgs } = getShellConfig();
     try {
-      const ptyModule = (await import("@lydell/node-pty")) as unknown as {
-        spawn?: PtySpawn;
-        default?: { spawn?: PtySpawn };
-      };
+      const ptyModule = await loadPtyModule();
       const spawnPty = ptyModule.spawn ?? ptyModule.default?.spawn;
       if (!spawnPty) {
         throw new Error("PTY support is unavailable (node-pty spawn not found).");

src/agents/cli-credentials.e2e.test.ts

@@ -7,7 +7,6 @@ const execSyncMock = vi.fn();
 
 describe("cli credentials", () => {
   beforeEach(() => {
-    vi.resetModules();
     vi.useFakeTimers();
   });
 

src/agents/models-config.normalizes-gemini-3-ids-preview-google-providers.e2e.test.ts

@@ -1,6 +1,6 @@
 import fs from "node:fs/promises";
 import path from "node:path";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
 import type { OpenClawConfig } from "../config/config.js";
 import { withTempHome as withTempHomeBase } from "../../test/helpers/temp-home.js";
 
@@ -45,7 +45,6 @@ describe("models-config", () => {
 
   it("normalizes gemini 3 ids to preview for google providers", async () => {
     await withTempHome(async () => {
-      vi.resetModules();
       const { ensureOpenClawModelsJson } = await import("./models-config.js");
       const { resolveOpenClawAgentDir } = await import("./agent-paths.js");
 

src/agents/pi-embedded-runner.sanitize-session-history.e2e.test.ts

@@ -31,7 +31,6 @@ describe("sanitizeSessionHistory", () => {
   beforeEach(async () => {
     vi.resetAllMocks();
     vi.mocked(helpers.sanitizeSessionMessagesImages).mockImplementation(async (msgs) => msgs);
-    vi.resetModules();
     ({ sanitizeSessionHistory } = await import("./pi-embedded-runner/google.js"));
   });
 
@@ -94,7 +93,7 @@ describe("sanitizeSessionHistory", () => {
     );
   });
 
-  it("does not sanitize tool call ids for openai-responses", async () => {
+  it("sanitizes tool call ids for openai-responses", async () => {
     vi.mocked(helpers.isGoogleModelApi).mockReturnValue(false);
 
     await sanitizeSessionHistory({
@@ -108,7 +107,11 @@ describe("sanitizeSessionHistory", () => {
     expect(helpers.sanitizeSessionMessagesImages).toHaveBeenCalledWith(
       mockMessages,
       "session:history",
-      expect.objectContaining({ sanitizeMode: "images-only", sanitizeToolCallIds: false }),
+      expect.objectContaining({
+        sanitizeMode: "images-only",
+        sanitizeToolCallIds: true,
+        toolCallIdMode: "strict",
+      }),
     );
   });
 

src/agents/pi-embedded-runner.sanitize-session-history.test.ts

@@ -31,7 +31,6 @@ describe("sanitizeSessionHistory", () => {
   beforeEach(async () => {
     vi.resetAllMocks();
     vi.mocked(helpers.sanitizeSessionMessagesImages).mockImplementation(async (msgs) => msgs);
-    vi.resetModules();
     ({ sanitizeSessionHistory } = await import("./pi-embedded-runner/google.js"));
   });
 

src/agents/sandbox-agent-config.agent-specific-sandbox-config.e2e.test.ts

@@ -51,7 +51,6 @@ vi.mock("../skills.js", async (importOriginal) => {
 describe("Agent-specific sandbox config", () => {
   beforeEach(() => {
     spawnCalls.length = 0;
-    vi.resetModules();
   });
 
   it("should use agent-specific workspaceRoot", async () => {

src/agents/tools/sessions-announce-target.e2e.test.ts

@@ -58,7 +58,6 @@ const installRegistry = async () => {
 describe("resolveAnnounceTarget", () => {
   beforeEach(async () => {
     callGatewayMock.mockReset();
-    vi.resetModules();
     await installRegistry();
   });