diff --git a/src/agents/pi-tools.before-tool-call.e2e.test.ts b/src/agents/pi-tools.before-tool-call.e2e.test.ts
index 906b7c2ac9c..b06b4f22c84 100644
--- a/src/agents/pi-tools.before-tool-call.e2e.test.ts
+++ b/src/agents/pi-tools.before-tool-call.e2e.test.ts
@@ -14,8 +14,10 @@ import { CRITICAL_THRESHOLD, GLOBAL_CIRCUIT_BREAKER_THRESHOLD } from "./tool-loo
 import type { AnyAgentTool } from "./tools/common.js";
 import { callGatewayTool } from "./tools/gateway.js";
 
-vi.mock("../plugins/hook-runner-global.js", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("../plugins/hook-runner-global.js")>();
+vi.mock("../plugins/hook-runner-global.js", async () => {
+  const actual = await vi.importActual<typeof import("../plugins/hook-runner-global.js")>(
+    "../plugins/hook-runner-global.js",
+  );
   return {
     ...actual,
     getGlobalHookRunner: vi.fn(),
diff --git a/src/commands/models.set.e2e.test.ts b/src/commands/models.set.e2e.test.ts
index eca79666342..97de3c15630 100644
--- a/src/commands/models.set.e2e.test.ts
+++ b/src/commands/models.set.e2e.test.ts
@@ -5,8 +5,8 @@ const mocks = vi.hoisted(() => ({
   writtenConfig: undefined as Record<string, unknown> | undefined,
 }));
 
-vi.mock("./models/shared.js", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("./models/shared.js")>();
+vi.mock("./models/shared.js", async () => {
+  const actual = await vi.importActual<typeof import("./models/shared.js")>("./models/shared.js");
   return {
     ...actual,
     updateConfig: async (mutator: (cfg: Record<string, unknown>) => Record<string, unknown>) => {
diff --git a/src/commands/status.scan.test-helpers.ts b/src/commands/status.scan.test-helpers.ts
index 4e8795c0998..c59dbba24eb 100644
--- a/src/commands/status.scan.test-helpers.ts
+++ b/src/commands/status.scan.test-helpers.ts
@@ -198,8 +198,8 @@ export async function loadStatusScanModuleForTest(
     }));
   }
 
-  vi.doMock("../config/paths.js", async (importOriginal) => {
-    const actual = await importOriginal<typeof import("../config/paths.js")>();
+  vi.doMock("../config/paths.js", async () => {
+    const actual = await vi.importActual<typeof import("../config/paths.js")>("../config/paths.js");
     return {
       ...actual,
       resolveConfigPath: mocks.resolveConfigPath,
diff --git a/src/gateway/session-subagent-reactivation.test.ts b/src/gateway/session-subagent-reactivation.test.ts
index b4e81288ae8..ebaf326d392 100644
--- a/src/gateway/session-subagent-reactivation.test.ts
+++ b/src/gateway/session-subagent-reactivation.test.ts
@@ -3,8 +3,10 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 const getLatestSubagentRunByChildSessionKeyMock = vi.fn();
 const replaceSubagentRunAfterSteerMock = vi.fn();
 
-vi.mock("../agents/subagent-registry-read.js", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("../agents/subagent-registry-read.js")>();
+vi.mock("../agents/subagent-registry-read.js", async () => {
+  const actual = await vi.importActual<typeof import("../agents/subagent-registry-read.js")>(
+    "../agents/subagent-registry-read.js",
+  );
   return {
     ...actual,
     getLatestSubagentRunByChildSessionKey: (...args: unknown[]) =>
diff --git a/src/media-understanding/apply.echo-transcript.test.ts b/src/media-understanding/apply.echo-transcript.test.ts
index f14c3b6bf1f..3a3dfc2ad19 100644
--- a/src/media-understanding/apply.echo-transcript.test.ts
+++ b/src/media-understanding/apply.echo-transcript.test.ts
@@ -175,8 +175,9 @@ describe("applyMediaUnderstanding – echo transcript", () => {
     vi.doMock("../infra/outbound/deliver-runtime.js", () => ({
       deliverOutboundPayloads: (...args: unknown[]) => mockDeliverOutboundPayloads(...args),
     }));
-    vi.doMock("./provider-registry.js", async (importOriginal) => {
-      const actual = await importOriginal<typeof import("./provider-registry.js")>();
+    vi.doMock("./provider-registry.js", async () => {
+      const actual =
+        await vi.importActual<typeof import("./provider-registry.js")>("./provider-registry.js");
       const registryProviders = createRegistryMediaProviders();
       return {
         ...actual,