test: expand builtin mock helper usage

extensions/voice-call/src/webhook/tailscale.test.ts

@@ -6,11 +6,10 @@ const { spawnMock } = vi.hoisted(() => ({
 }));
 
 vi.mock("node:child_process", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("node:child_process")>();
+  const { mockNodeBuiltinModule } = await import("../../../../test/helpers/node-builtin-mocks.js");
-  return {
+  return mockNodeBuiltinModule(importOriginal, {
-    ...actual,
     spawn: spawnMock,
-  };
+  });
 });
 
 import {

src/cli/update-cli/restart-helper.test.ts

@@ -4,11 +4,10 @@ import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
 import { prepareRestartScript, runRestartScript } from "./restart-helper.js";
 
 vi.mock("node:child_process", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("node:child_process")>();
+  const { mockNodeBuiltinModule } = await import("../../../test/helpers/node-builtin-mocks.js");
-  return {
+  return mockNodeBuiltinModule(importOriginal, {
-    ...actual,
     spawn: vi.fn(),
-  };
+  });
 });
 
 describe("restart-helper", () => {

src/daemon/systemd.test.ts

@@ -5,11 +5,10 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 const execFileMock = vi.hoisted(() => vi.fn());
 
 vi.mock("node:child_process", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("node:child_process")>();
+  const { mockNodeBuiltinModule } = await import("../../test/helpers/node-builtin-mocks.js");
-  return {
+  return mockNodeBuiltinModule(importOriginal, {
-    ...actual,
     execFile: execFileMock,
-  };
+  });
 });
 
 import { splitArgsPreservingQuotes } from "./arg-split.js";

src/gateway/server-methods/config.test.ts

@@ -4,11 +4,10 @@ import { configHandlers, resolveConfigOpenCommand } from "./config.js";
 import { createConfigHandlerHarness } from "./config.test-helpers.js";
 
 vi.mock("node:child_process", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("node:child_process")>();
+  const { mockNodeBuiltinModule } = await import("../../../test/helpers/node-builtin-mocks.js");
-  return {
+  return mockNodeBuiltinModule(importOriginal, {
-    ...actual,
     execFile: vi.fn(),
-  };
+  });
 });
 
 function invokeExecFileCallback(args: unknown[], error: Error | null) {

src/infra/machine-name.test.ts

@@ -5,11 +5,10 @@ import { importFreshModule } from "../../test/helpers/import-fresh.js";
 const execFileMock = vi.hoisted(() => vi.fn());
 
 vi.mock("node:child_process", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("node:child_process")>();
+  const { mockNodeBuiltinModule } = await import("../../test/helpers/node-builtin-mocks.js");
-  return {
+  return mockNodeBuiltinModule(importOriginal, {
-    ...actual,
     execFile: (...args: unknown[]) => execFileMock(...args),
-  };
+  });
 });
 
 const originalVitest = process.env.VITEST;

src/infra/os-summary.test.ts

@@ -4,11 +4,10 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 const spawnSyncMock = vi.hoisted(() => vi.fn());
 
 vi.mock("node:child_process", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("node:child_process")>();
+  const { mockNodeBuiltinModule } = await import("../../test/helpers/node-builtin-mocks.js");
-  return {
+  return mockNodeBuiltinModule(importOriginal, {
-    ...actual,
     spawnSync: (...args: unknown[]) => spawnSyncMock(...args),
-  };
+  });
 });
 
 import { resolveOsSummary } from "./os-summary.js";

src/infra/process-respawn.test.ts

@@ -7,11 +7,10 @@ const triggerOpenClawRestartMock = vi.hoisted(() => vi.fn());
 const scheduleDetachedLaunchdRestartHandoffMock = vi.hoisted(() => vi.fn());
 
 vi.mock("node:child_process", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("node:child_process")>();
+  const { mockNodeBuiltinModule } = await import("../../test/helpers/node-builtin-mocks.js");
-  return {
+  return mockNodeBuiltinModule(importOriginal, {
-    ...actual,
     spawn: (...args: unknown[]) => spawnMock(...args),
-  };
+  });
 });
 vi.mock("./restart.js", () => ({
   triggerOpenClawRestart: (...args: unknown[]) => triggerOpenClawRestartMock(...args),

src/infra/restart-stale-pids.test.ts

@@ -11,12 +11,11 @@ const mockResolveGatewayPort = vi.hoisted(() => vi.fn(() => 18789));
 const mockRestartWarn = vi.hoisted(() => vi.fn());
 
 vi.mock("node:child_process", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("node:child_process")>();
+  const { mockNodeBuiltinModule } = await import("../../test/helpers/node-builtin-mocks.js");
-  return {
+  return mockNodeBuiltinModule(importOriginal, {
-    ...actual,
     spawnSync: (...args: unknown[]) => mockSpawnSync(...args),
     execFileSync: vi.fn(),
-  };
+  });
 });
 
 vi.mock("../config/paths.js", () => ({

src/infra/restart.test.ts

@@ -5,11 +5,10 @@ const resolveLsofCommandSyncMock = vi.hoisted(() => vi.fn());
 const resolveGatewayPortMock = vi.hoisted(() => vi.fn());
 
 vi.mock("node:child_process", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("node:child_process")>();
+  const { mockNodeBuiltinModule } = await import("../../test/helpers/node-builtin-mocks.js");
-  return {
+  return mockNodeBuiltinModule(importOriginal, {
-    ...actual,
+    spawnSync: (...args: unknown[]) => spawnSyncMock(...args),
-    spawnSync: (...args: Parameters<typeof actual.spawnSync>) => spawnSyncMock(...args),
+  });
-  };
 });
 
 vi.mock("./ports-lsof.js", () => ({

src/process/kill-tree.test.ts

@@ -5,11 +5,10 @@ const { spawnMock } = vi.hoisted(() => ({
 }));
 
 vi.mock("node:child_process", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("node:child_process")>();
+  const { mockNodeBuiltinModule } = await import("../../test/helpers/node-builtin-mocks.js");
-  return {
+  return mockNodeBuiltinModule(importOriginal, {
-    ...actual,
     spawn: (...args: unknown[]) => spawnMock(...args),
-  };
+  });
 });
 
 let killProcessTree: typeof import("./kill-tree.js").killProcessTree;