From 457835148869c8f84ebe533f1f4ffab382aa84cc Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Fri, 3 Apr 2026 20:04:43 +0100
Subject: [PATCH] test: trim agent and discord harness partial mocks

---
 .../discord/src/outbound-adapter.test-harness.ts     | 12 ++++++------
 .../pi-embedded-runner/extra-params.ollama.test.ts   |  5 +++--
 .../extra-params.xai-tool-payload.test.ts            |  6 ++++--
 .../extra-params.zai-tool-stream.test.ts             |  6 ++++--
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/extensions/discord/src/outbound-adapter.test-harness.ts b/extensions/discord/src/outbound-adapter.test-harness.ts
index 623dae0058c..b6022f48bcb 100644
--- a/extensions/discord/src/outbound-adapter.test-harness.ts
+++ b/extensions/discord/src/outbound-adapter.test-harness.ts
@@ -45,9 +45,9 @@ export const DEFAULT_DISCORD_SEND_RESULT = {
 
 export async function createDiscordSendModuleMock(
   hoisted: DiscordOutboundHoisted,
-  importOriginal: () => Promise<DiscordSendModule>,
+  loadActual: () => Promise<DiscordSendModule>,
 ): Promise<DiscordSendModule> {
-  const actual = await importOriginal();
+  const actual = await loadActual();
   return {
     ...actual,
     sendMessageDiscord: (...args: Parameters<DiscordSendModule["sendMessageDiscord"]>) =>
@@ -72,9 +72,9 @@ export async function createDiscordSendModuleMock(
 
 export async function createDiscordSendComponentsModuleMock(
   hoisted: DiscordOutboundHoisted,
-  importOriginal: () => Promise<DiscordSendComponentsModule>,
+  loadActual: () => Promise<DiscordSendComponentsModule>,
 ): Promise<DiscordSendComponentsModule> {
-  const actual = await importOriginal();
+  const actual = await loadActual();
   return {
     ...actual,
     sendDiscordComponentMessage: (
@@ -89,9 +89,9 @@ export async function createDiscordSendComponentsModuleMock(
 
 export async function createDiscordThreadBindingsModuleMock(
   hoisted: DiscordOutboundHoisted,
-  importOriginal: () => Promise<DiscordThreadBindingsModule>,
+  loadActual: () => Promise<DiscordThreadBindingsModule>,
 ): Promise<DiscordThreadBindingsModule> {
-  const actual = await importOriginal();
+  const actual = await loadActual();
   return {
     ...actual,
     getThreadBindingManager: (
diff --git a/src/agents/pi-embedded-runner/extra-params.ollama.test.ts b/src/agents/pi-embedded-runner/extra-params.ollama.test.ts
index 5742b3fd706..7a29bc62e4e 100644
--- a/src/agents/pi-embedded-runner/extra-params.ollama.test.ts
+++ b/src/agents/pi-embedded-runner/extra-params.ollama.test.ts
@@ -3,8 +3,9 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { __testing as extraParamsTesting } from "./extra-params.js";
 import { runExtraParamsCase } from "./extra-params.test-support.js";
 
-vi.mock("@mariozechner/pi-ai", async (importOriginal) => {
-  const original = await importOriginal<typeof import("@mariozechner/pi-ai")>();
+vi.mock("@mariozechner/pi-ai", async () => {
+  const original =
+    await vi.importActual<typeof import("@mariozechner/pi-ai")>("@mariozechner/pi-ai");
   return {
     ...original,
     streamSimple: vi.fn(() => ({
diff --git a/src/agents/pi-embedded-runner/extra-params.xai-tool-payload.test.ts b/src/agents/pi-embedded-runner/extra-params.xai-tool-payload.test.ts
index f402256c3e2..bed568b9703 100644
--- a/src/agents/pi-embedded-runner/extra-params.xai-tool-payload.test.ts
+++ b/src/agents/pi-embedded-runner/extra-params.xai-tool-payload.test.ts
@@ -3,8 +3,10 @@ import { describe, expect, it, vi } from "vitest";
 import { createPiAiStreamSimpleMock } from "./extra-params.pi-ai-mock.js";
 import { runExtraParamsCase } from "./extra-params.test-support.js";
 
-vi.mock("@mariozechner/pi-ai", async (importOriginal) =>
-  createPiAiStreamSimpleMock(() => importOriginal<typeof import("@mariozechner/pi-ai")>()),
+vi.mock("@mariozechner/pi-ai", async () =>
+  createPiAiStreamSimpleMock(() =>
+    vi.importActual<typeof import("@mariozechner/pi-ai")>("@mariozechner/pi-ai"),
+  ),
 );
 
 function runToolPayloadCase(provider: "openai" | "xai", modelId: string) {
diff --git a/src/agents/pi-embedded-runner/extra-params.zai-tool-stream.test.ts b/src/agents/pi-embedded-runner/extra-params.zai-tool-stream.test.ts
index 6c0fb327f34..b372a7ca1bd 100644
--- a/src/agents/pi-embedded-runner/extra-params.zai-tool-stream.test.ts
+++ b/src/agents/pi-embedded-runner/extra-params.zai-tool-stream.test.ts
@@ -4,8 +4,10 @@ import type { OpenClawConfig } from "../../config/config.js";
 import { createPiAiStreamSimpleMock } from "./extra-params.pi-ai-mock.js";
 import { runExtraParamsCase } from "./extra-params.test-support.js";
 
-vi.mock("@mariozechner/pi-ai", async (importOriginal) =>
-  createPiAiStreamSimpleMock(() => importOriginal<typeof import("@mariozechner/pi-ai")>()),
+vi.mock("@mariozechner/pi-ai", async () =>
+  createPiAiStreamSimpleMock(() =>
+    vi.importActual<typeof import("@mariozechner/pi-ai")>("@mariozechner/pi-ai"),
+  ),
 );
 
 type ToolStreamCase = {