From 301b3ff9123d5a39c4ff8603f4cc232d0bb3becf Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sun, 15 Feb 2026 01:29:38 +0100
Subject: [PATCH] fix(ci): avoid TS2742 vitest mock export types

---
 .../openclaw-tools.subagents.sessions-spawn.mocks.ts   |  5 ++---
 src/cron/service.test-harness.ts                       | 10 +++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/agents/openclaw-tools.subagents.sessions-spawn.mocks.ts b/src/agents/openclaw-tools.subagents.sessions-spawn.mocks.ts
index 7a9ad5919..be10cdbda 100644
--- a/src/agents/openclaw-tools.subagents.sessions-spawn.mocks.ts
+++ b/src/agents/openclaw-tools.subagents.sessions-spawn.mocks.ts
@@ -1,8 +1,7 @@
 import { vi } from "vitest";
+import type { MockFn } from "../test-utils/vitest-mock-fn.js";
 
-// Avoid exporting inferred vitest mock types (TS2742 under pnpm + d.ts emit).
-export type CallGatewayMock = ((opts: unknown) => unknown) & ReturnType<typeof vi.fn>;
-export const callGatewayMock: CallGatewayMock = vi.fn() as unknown as CallGatewayMock;
+export const callGatewayMock: MockFn<(opts: unknown) => unknown> = vi.fn();
 vi.mock("../gateway/call.js", () => ({
   callGateway: (opts: unknown) => callGatewayMock(opts),
 }));
diff --git a/src/cron/service.test-harness.ts b/src/cron/service.test-harness.ts
index 99c717e3c..8fd8618a2 100644
--- a/src/cron/service.test-harness.ts
+++ b/src/cron/service.test-harness.ts
@@ -2,13 +2,13 @@ import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { afterAll, afterEach, beforeAll, beforeEach, vi } from "vitest";
+import type { MockFn } from "../test-utils/vitest-mock-fn.js";
 
-// Avoid exporting inferred vitest mock types (TS2742 under pnpm + d.ts emit).
 export type NoopLogger = {
-  debug: ReturnType<typeof vi.fn>;
-  info: ReturnType<typeof vi.fn>;
-  warn: ReturnType<typeof vi.fn>;
-  error: ReturnType<typeof vi.fn>;
+  debug: MockFn;
+  info: MockFn;
+  warn: MockFn;
+  error: MockFn;
 };
 
 export function createNoopLogger(): NoopLogger {