diff --git a/extensions/discord/src/monitor/acp-bind-here.integration.test.ts b/extensions/discord/src/monitor/acp-bind-here.integration.test.ts index 87952d2a530..697c0057d70 100644 --- a/extensions/discord/src/monitor/acp-bind-here.integration.test.ts +++ b/extensions/discord/src/monitor/acp-bind-here.integration.test.ts @@ -3,8 +3,10 @@ import { beforeEach, describe, expect, it, vi } from "vitest"; const loadConfigMock = vi.hoisted(() => vi.fn()); -vi.mock("openclaw/plugin-sdk/config-runtime", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("openclaw/plugin-sdk/config-runtime", async () => { + const actual = await vi.importActual( + "openclaw/plugin-sdk/config-runtime", + ); return { ...actual, loadConfig: () => loadConfigMock(), diff --git a/extensions/discord/src/monitor/message-handler.preflight.acp-bindings.test.ts b/extensions/discord/src/monitor/message-handler.preflight.acp-bindings.test.ts index 5a9ec0f37e8..4cbc37e004c 100644 --- a/extensions/discord/src/monitor/message-handler.preflight.acp-bindings.test.ts +++ b/extensions/discord/src/monitor/message-handler.preflight.acp-bindings.test.ts @@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it, vi } from "vitest"; const ensureConfiguredBindingRouteReadyMock = vi.hoisted(() => vi.fn()); const resolveConfiguredBindingRouteMock = vi.hoisted(() => vi.fn()); -vi.mock("../../../../src/channels/plugins/binding-routing.js", async (importOriginal) => { +vi.mock("../../../../src/channels/plugins/binding-routing.js", async () => { const { createConfiguredBindingConversationRuntimeModuleMock } = await import("../test-support/configured-binding-runtime.js"); return await createConfiguredBindingConversationRuntimeModuleMock( @@ -12,7 +12,10 @@ vi.mock("../../../../src/channels/plugins/binding-routing.js", async (importOrig ensureConfiguredBindingRouteReadyMock, resolveConfiguredBindingRouteMock, }, - importOriginal, + () => + vi.importActual( + "../../../../src/channels/plugins/binding-routing.js", + ), ); }); diff --git a/extensions/discord/src/monitor/thread-bindings.lifecycle.test.ts b/extensions/discord/src/monitor/thread-bindings.lifecycle.test.ts index 16d9dcd367f..e6bd42223d2 100644 --- a/extensions/discord/src/monitor/thread-bindings.lifecycle.test.ts +++ b/extensions/discord/src/monitor/thread-bindings.lifecycle.test.ts @@ -41,8 +41,8 @@ const hoisted = vi.hoisted(() => { }; }); -vi.mock("../send.js", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("../send.js", async () => { + const actual = await vi.importActual("../send.js"); return { ...actual, addRoleDiscord: vi.fn(), diff --git a/extensions/discord/src/monitor/thread-session-close.test.ts b/extensions/discord/src/monitor/thread-session-close.test.ts index 713bbd1690f..b119ec4b1e4 100644 --- a/extensions/discord/src/monitor/thread-session-close.test.ts +++ b/extensions/discord/src/monitor/thread-session-close.test.ts @@ -6,8 +6,10 @@ const hoisted = vi.hoisted(() => { return { updateSessionStore, resolveStorePath }; }); -vi.mock("openclaw/plugin-sdk/config-runtime", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("openclaw/plugin-sdk/config-runtime", async () => { + const actual = await vi.importActual( + "openclaw/plugin-sdk/config-runtime", + ); return { ...actual, updateSessionStore: hoisted.updateSessionStore, diff --git a/extensions/memory-core/src/memory/manager.mistral-provider.test.ts b/extensions/memory-core/src/memory/manager.mistral-provider.test.ts index 972092f8c7b..7c0b07b8076 100644 --- a/extensions/memory-core/src/memory/manager.mistral-provider.test.ts +++ b/extensions/memory-core/src/memory/manager.mistral-provider.test.ts @@ -16,8 +16,8 @@ const { createEmbeddingProviderMock } = vi.hoisted(() => ({ createEmbeddingProviderMock: vi.fn(), })); -vi.mock("./embeddings.js", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("./embeddings.js", async () => { + const actual = await vi.importActual("./embeddings.js"); return { ...actual, createEmbeddingProvider: createEmbeddingProviderMock, diff --git a/extensions/memory-core/src/memory/qmd-manager.slugified-paths.test.ts b/extensions/memory-core/src/memory/qmd-manager.slugified-paths.test.ts index c728ddb602e..b3e728e165e 100644 --- a/extensions/memory-core/src/memory/qmd-manager.slugified-paths.test.ts +++ b/extensions/memory-core/src/memory/qmd-manager.slugified-paths.test.ts @@ -66,8 +66,8 @@ vi.mock("openclaw/plugin-sdk/memory-core-host-engine-foundation", async () => { }; }); -vi.mock("node:child_process", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("node:child_process", async () => { + const actual = await vi.importActual("node:child_process"); return { ...actual, spawn: vi.fn(), diff --git a/extensions/slack/src/monitor/events/pins.test.ts b/extensions/slack/src/monitor/events/pins.test.ts index 8a5b6ca884c..cd690d57bc6 100644 --- a/extensions/slack/src/monitor/events/pins.test.ts +++ b/extensions/slack/src/monitor/events/pins.test.ts @@ -5,10 +5,10 @@ let registerSlackPinEvents: typeof import("./pins.js").registerSlackPinEvents; let buildPinHarness: typeof import("./system-event-test-harness.js").createSlackSystemEventTestHarness; type PinOverrides = import("./system-event-test-harness.js").SlackSystemEventTestOverrides; -async function createChannelRuntimeMock( - importOriginal: () => Promise, -) { - const actual = await importOriginal(); +async function createChannelRuntimeMock() { + const actual = await vi.importActual( + "openclaw/plugin-sdk/infra-runtime", + ); return { ...actual, enqueueSystemEvent: pinEnqueueMock }; } diff --git a/extensions/slack/src/monitor/events/reactions.test.ts b/extensions/slack/src/monitor/events/reactions.test.ts index c4f6bdde025..cfe0c6dcbe6 100644 --- a/extensions/slack/src/monitor/events/reactions.test.ts +++ b/extensions/slack/src/monitor/events/reactions.test.ts @@ -6,10 +6,10 @@ let createSlackSystemEventTestHarness: typeof import("./system-event-test-harnes type SlackSystemEventTestOverrides = import("./system-event-test-harness.js").SlackSystemEventTestOverrides; -async function createChannelRuntimeMock( - importOriginal: () => Promise, -) { - const actual = await importOriginal(); +async function createChannelRuntimeMock() { + const actual = await vi.importActual( + "openclaw/plugin-sdk/infra-runtime", + ); return { ...actual, enqueueSystemEvent: (...args: unknown[]) => reactionQueueMock(...args), diff --git a/extensions/slack/src/monitor/message-handler.test.ts b/extensions/slack/src/monitor/message-handler.test.ts index 1c241e8b6bf..585ed026b18 100644 --- a/extensions/slack/src/monitor/message-handler.test.ts +++ b/extensions/slack/src/monitor/message-handler.test.ts @@ -7,8 +7,10 @@ const resolveThreadTsMock = vi.fn(async ({ message }: { message: Record { - const actual = await importOriginal(); +vi.mock("openclaw/plugin-sdk/channel-inbound", async () => { + const actual = await vi.importActual( + "openclaw/plugin-sdk/channel-inbound", + ); return { ...actual, createChannelInboundDebouncer: () => ({ diff --git a/extensions/slack/src/send.upload.test.ts b/extensions/slack/src/send.upload.test.ts index 7b7d9f8362d..4cfa8ee682f 100644 --- a/extensions/slack/src/send.upload.test.ts +++ b/extensions/slack/src/send.upload.test.ts @@ -30,8 +30,8 @@ vi.mock("../../../src/infra/net/fetch-guard.js", () => ({ }), })); -vi.mock("./runtime-api.js", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("./runtime-api.js", async () => { + const actual = await vi.importActual("./runtime-api.js"); const mockedLoadOutboundMediaFromUrl = loadOutboundMediaFromUrlMock as unknown as typeof actual.loadOutboundMediaFromUrl; return { diff --git a/extensions/telegram/src/bot-message-context.silent-ingest.test.ts b/extensions/telegram/src/bot-message-context.silent-ingest.test.ts index 4012e100928..66d6f79db9b 100644 --- a/extensions/telegram/src/bot-message-context.silent-ingest.test.ts +++ b/extensions/telegram/src/bot-message-context.silent-ingest.test.ts @@ -15,8 +15,10 @@ const internalHookMocks = vi.hoisted(() => ({ triggerInternalHook: vi.fn(async () => undefined), })); -vi.mock("openclaw/plugin-sdk/hook-runtime", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("openclaw/plugin-sdk/hook-runtime", async () => { + const actual = await vi.importActual( + "openclaw/plugin-sdk/hook-runtime", + ); return { ...actual, createInternalHookEvent: internalHookMocks.createInternalHookEvent, diff --git a/extensions/telegram/src/bot-message-context.topic-agentid.test.ts b/extensions/telegram/src/bot-message-context.topic-agentid.test.ts index 6a278b4c1a8..023552b2972 100644 --- a/extensions/telegram/src/bot-message-context.topic-agentid.test.ts +++ b/extensions/telegram/src/bot-message-context.topic-agentid.test.ts @@ -11,8 +11,10 @@ const { defaultRouteConfig } = vi.hoisted(() => ({ }, })); -vi.mock("openclaw/plugin-sdk/config-runtime", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("openclaw/plugin-sdk/config-runtime", async () => { + const actual = await vi.importActual( + "openclaw/plugin-sdk/config-runtime", + ); return { ...actual, loadConfig: vi.fn(() => defaultRouteConfig), diff --git a/extensions/whatsapp/src/auto-reply.web-auto-reply.last-route.test.ts b/extensions/whatsapp/src/auto-reply.web-auto-reply.last-route.test.ts index cc46fa1d993..201a213a1d2 100644 --- a/extensions/whatsapp/src/auto-reply.web-auto-reply.last-route.test.ts +++ b/extensions/whatsapp/src/auto-reply.web-auto-reply.last-route.test.ts @@ -9,8 +9,10 @@ let buildMentionConfig: typeof import("./auto-reply/mentions.js").buildMentionCo let createEchoTracker: typeof import("./auto-reply/monitor/echo.js").createEchoTracker; let createWebOnMessageHandler: typeof import("./auto-reply/monitor/on-message.js").createWebOnMessageHandler; -vi.mock("./auto-reply/monitor/last-route.js", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("./auto-reply/monitor/last-route.js", async () => { + const actual = await vi.importActual( + "./auto-reply/monitor/last-route.js", + ); return { ...actual, updateLastRouteInBackground: (...args: unknown[]) => updateLastRouteInBackgroundMock(...args), diff --git a/extensions/whatsapp/src/inbound.media.test.ts b/extensions/whatsapp/src/inbound.media.test.ts index 392551e9703..e89243ebcb7 100644 --- a/extensions/whatsapp/src/inbound.media.test.ts +++ b/extensions/whatsapp/src/inbound.media.test.ts @@ -63,8 +63,9 @@ vi.mock("openclaw/plugin-sdk/media-runtime", async () => { const HOME = path.join(os.tmpdir(), `openclaw-inbound-media-${crypto.randomUUID()}`); process.env.HOME = HOME; -vi.mock("@whiskeysockets/baileys", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("@whiskeysockets/baileys", async () => { + const actual = + await vi.importActual("@whiskeysockets/baileys"); const jpegBuffer = Buffer.from([ 0xff, 0xd8, 0xff, 0xdb, 0x00, 0x43, 0x00, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x06, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x06, 0x06, 0x05, diff --git a/extensions/whatsapp/src/inbound/media.node.test.ts b/extensions/whatsapp/src/inbound/media.node.test.ts index 829e69d2f7a..e5f5ce2c280 100644 --- a/extensions/whatsapp/src/inbound/media.node.test.ts +++ b/extensions/whatsapp/src/inbound/media.node.test.ts @@ -13,8 +13,9 @@ const { normalizeMessageContent, downloadMediaMessage } = vi.hoisted(() => ({ downloadMediaMessage: vi.fn().mockResolvedValue(Buffer.from("fake-media-data")), })); -vi.mock("@whiskeysockets/baileys", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("@whiskeysockets/baileys", async () => { + const actual = + await vi.importActual("@whiskeysockets/baileys"); return { ...actual, DisconnectReason: actual.DisconnectReason ?? { loggedOut: 401 }, diff --git a/extensions/whatsapp/src/inbound/send-api.test.ts b/extensions/whatsapp/src/inbound/send-api.test.ts index 756ea8e9a66..794eccdc829 100644 --- a/extensions/whatsapp/src/inbound/send-api.test.ts +++ b/extensions/whatsapp/src/inbound/send-api.test.ts @@ -3,8 +3,10 @@ import { beforeEach, describe, expect, it, vi } from "vitest"; const recordChannelActivity = vi.hoisted(() => vi.fn()); let createWebSendApi: typeof import("./send-api.js").createWebSendApi; -vi.mock("openclaw/plugin-sdk/infra-runtime", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("openclaw/plugin-sdk/infra-runtime", async () => { + const actual = await vi.importActual( + "openclaw/plugin-sdk/infra-runtime", + ); return { ...actual, recordChannelActivity: (...args: unknown[]) => recordChannelActivity(...args), diff --git a/extensions/whatsapp/src/monitor-inbox.captures-media-path-image-messages.test.ts b/extensions/whatsapp/src/monitor-inbox.captures-media-path-image-messages.test.ts index c3d6c8fa608..81368081c5c 100644 --- a/extensions/whatsapp/src/monitor-inbox.captures-media-path-image-messages.test.ts +++ b/extensions/whatsapp/src/monitor-inbox.captures-media-path-image-messages.test.ts @@ -11,8 +11,10 @@ import { let monitorWebInbox: typeof import("./inbound.js").monitorWebInbox; const inboundLoggerInfoMock = vi.hoisted(() => vi.fn()); -vi.mock("openclaw/plugin-sdk/text-runtime", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("openclaw/plugin-sdk/text-runtime", async () => { + const actual = await vi.importActual( + "openclaw/plugin-sdk/text-runtime", + ); return { ...actual, getChildLogger: () => ({ diff --git a/extensions/whatsapp/src/send.test.ts b/extensions/whatsapp/src/send.test.ts index 3db1629fbe1..fb1fb613498 100644 --- a/extensions/whatsapp/src/send.test.ts +++ b/extensions/whatsapp/src/send.test.ts @@ -17,8 +17,8 @@ let setActiveWebListener: typeof import("./active-listener.js").setActiveWebList let resetLogger: typeof import("openclaw/plugin-sdk/runtime-env").resetLogger; let setLoggerOverride: typeof import("openclaw/plugin-sdk/runtime-env").setLoggerOverride; -vi.mock("./runtime-api.js", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("./runtime-api.js", async () => { + const actual = await vi.importActual("./runtime-api.js"); return { ...actual, loadOutboundMediaFromUrl: hoisted.loadOutboundMediaFromUrl, diff --git a/extensions/zalo/src/monitor.lifecycle.test.ts b/extensions/zalo/src/monitor.lifecycle.test.ts index f0022228718..367e24895e4 100644 --- a/extensions/zalo/src/monitor.lifecycle.test.ts +++ b/extensions/zalo/src/monitor.lifecycle.test.ts @@ -10,8 +10,8 @@ const deleteWebhookMock = vi.fn(async () => ({ ok: true, result: { url: "" } })) const getUpdatesMock = vi.fn(() => new Promise(() => {})); const setWebhookMock = vi.fn(async () => ({ ok: true, result: { url: "" } })); -vi.mock("./api.js", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("./api.js", async () => { + const actual = await vi.importActual("./api.js"); return { ...actual, deleteWebhook: deleteWebhookMock,