test: trim more core importOriginal usage

packages/memory-host-sdk/src/host/qmd-process.test.ts

@@ -6,8 +6,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 const spawnMock = vi.hoisted(() => vi.fn());
 
-vi.mock("node:child_process", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("node:child_process")>();
+vi.mock("node:child_process", async () => {
+  const actual = await vi.importActual<typeof import("node:child_process")>("node:child_process");
   return {
     ...actual,
     spawn: spawnMock,

src/acp/control-plane/manager.test.ts

@@ -25,8 +25,9 @@ vi.mock("../runtime/session-meta.js", () => ({
   upsertAcpSessionMeta: (params: unknown) => hoisted.upsertAcpSessionMetaMock(params),
 }));
 
-vi.mock("../runtime/registry.js", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("../runtime/registry.js")>();
+vi.mock("../runtime/registry.js", async () => {
+  const actual =
+    await vi.importActual<typeof import("../runtime/registry.js")>("../runtime/registry.js");
   return {
     ...actual,
     requireAcpRuntimeBackend: (backendId?: string) =>

src/channels/plugins/session-conversation.bundled-fallback.test.ts

@@ -21,8 +21,10 @@ vi.mock("../../plugin-sdk/facade-runtime.js", () => ({
       : null,
 }));
 
-vi.mock("../../plugins/bundled-plugin-metadata.js", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("../../plugins/bundled-plugin-metadata.js")>();
+vi.mock("../../plugins/bundled-plugin-metadata.js", async () => {
+  const actual = await vi.importActual<typeof import("../../plugins/bundled-plugin-metadata.js")>(
+    "../../plugins/bundled-plugin-metadata.js",
+  );
   return {
     ...actual,
     resolveBundledPluginPublicSurfacePath: ({ dirName }: { dirName: string }) =>

src/cli/config-cli.test.ts

@@ -42,8 +42,11 @@ const mockLog = defaultRuntime.log;
 const mockError = defaultRuntime.error;
 const mockExit = defaultRuntime.exit;
 
-vi.mock("../runtime.js", async (importOriginal) => {
-  return mockRuntimeModule(importOriginal<typeof import("../runtime.js")>, defaultRuntime);
+vi.mock("../runtime.js", async () => {
+  return mockRuntimeModule(
+    () => vi.importActual<typeof import("../runtime.js")>("../runtime.js"),
+    defaultRuntime,
+  );
 });
 
 function buildSnapshot(params: {

src/infra/path-env.test.ts

@@ -11,8 +11,8 @@ const abs = (p: string) => path.resolve(p);
 const setDir = (p: string) => state.dirs.add(abs(p));
 const setExe = (p: string) => state.executables.add(abs(p));
 
-vi.mock("node:fs", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("node:fs")>();
+vi.mock("node:fs", async () => {
+  const actual = await vi.importActual<typeof import("node:fs")>("node:fs");
   const pathMod = await import("node:path");
   const absInMock = (p: string) => pathMod.resolve(p);
 

src/logging/config.test.ts

@@ -3,8 +3,8 @@ import { readLoggingConfig } from "./config.js";
 
 const loadConfigMock = vi.hoisted(() => vi.fn());
 
-vi.mock("../config/config.js", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("../config/config.js")>();
+vi.mock("../config/config.js", async () => {
+  const actual = await vi.importActual<typeof import("../config/config.js")>("../config/config.js");
   return {
     ...actual,
     loadConfig: () => loadConfigMock(),

src/media-understanding/apply.test.ts

@@ -263,8 +263,9 @@ describe("applyMediaUnderstanding", () => {
     vi.doMock("../process/exec.js", () => ({
       runExec: runExecMock,
     }));
-    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,

src/media-understanding/shared.test.ts

@@ -4,8 +4,10 @@ const { fetchWithSsrFGuardMock } = vi.hoisted(() => ({
   fetchWithSsrFGuardMock: vi.fn(),
 }));
 
-vi.mock("../infra/net/fetch-guard.js", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("../infra/net/fetch-guard.js")>();
+vi.mock("../infra/net/fetch-guard.js", async () => {
+  const actual = await vi.importActual<typeof import("../infra/net/fetch-guard.js")>(
+    "../infra/net/fetch-guard.js",
+  );
   return {
     ...actual,
     fetchWithSsrFGuard: fetchWithSsrFGuardMock,

src/plugin-activation-boundary.test.ts

@@ -2,8 +2,10 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 
 const loadBundledPluginPublicSurfaceModuleSync = vi.hoisted(() => vi.fn());
 
-vi.mock("./plugin-sdk/facade-runtime.js", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("./plugin-sdk/facade-runtime.js")>();
+vi.mock("./plugin-sdk/facade-runtime.js", async () => {
+  const actual = await vi.importActual<typeof import("./plugin-sdk/facade-runtime.js")>(
+    "./plugin-sdk/facade-runtime.js",
+  );
   return {
     ...actual,
     loadBundledPluginPublicSurfaceModuleSync,

src/plugins/conversation-binding.test.ts

@@ -379,8 +379,9 @@ async function expectResolutionDoesNotWait(params: {
 describe("plugin conversation binding approvals", () => {
   beforeEach(async () => {
     vi.resetModules();
-    vi.doMock("../infra/home-dir.js", async (importOriginal) => {
-      const actual = await importOriginal<typeof import("../infra/home-dir.js")>();
+    vi.doMock("../infra/home-dir.js", async () => {
+      const actual =
+        await vi.importActual<typeof import("../infra/home-dir.js")>("../infra/home-dir.js");
       return {
         ...actual,
         expandHomePrefix: (value: string) => {

src/process/exec.windows.test.ts

@@ -6,12 +6,15 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 const spawnMock = vi.hoisted(() => vi.fn());
 const execFileMock = vi.hoisted(() => vi.fn());
 
-vi.mock("node:child_process", async (importOriginal) => {
+vi.mock("node:child_process", async () => {
   const { mockNodeBuiltinModule } = await import("../../test/helpers/node-builtin-mocks.js");
-  return mockNodeBuiltinModule(importOriginal, {
-    spawn: spawnMock,
-    execFile: execFileMock,
-  });
+  return mockNodeBuiltinModule(
+    () => vi.importActual<typeof import("node:child_process")>("node:child_process"),
+    {
+      spawn: spawnMock,
+      execFile: execFileMock,
+    },
+  );
 });
 
 let runCommandWithTimeout: typeof import("./exec.js").runCommandWithTimeout;

src/process/kill-tree.test.ts

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

src/security/windows-acl.test.ts

@@ -3,10 +3,10 @@ import type { WindowsAclEntry, WindowsAclSummary } from "./windows-acl.js";
 
 const MOCK_USERNAME = "MockUser";
 
-vi.mock("node:os", async (importOriginal) => {
+vi.mock("node:os", async () => {
   const { mockNodeBuiltinModule } = await import("../../test/helpers/node-builtin-mocks.js");
   return mockNodeBuiltinModule(
-    importOriginal,
+    () => vi.importActual<typeof import("node:os")>("node:os"),
     { userInfo: () => ({ username: MOCK_USERNAME }) },
     { mirrorToDefault: true },
   );

src/tts/tts.test.ts

@@ -3,8 +3,10 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 const loadBundledPluginPublicSurfaceModuleSync = vi.hoisted(() => vi.fn());
 const loadActivatedBundledPluginPublicSurfaceModuleSync = vi.hoisted(() => vi.fn());
 
-vi.mock("../plugin-sdk/facade-runtime.js", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("../plugin-sdk/facade-runtime.js")>();
+vi.mock("../plugin-sdk/facade-runtime.js", async () => {
+  const actual = await vi.importActual<typeof import("../plugin-sdk/facade-runtime.js")>(
+    "../plugin-sdk/facade-runtime.js",
+  );
   return {
     ...actual,
     loadActivatedBundledPluginPublicSurfaceModuleSync,