Tests: fix green check typing regressions

src/cron/isolated-agent.delivers-response-has-heartbeat-ok-but-includes.test.ts

@@ -73,7 +73,7 @@ async function runTelegramAnnounceTurn(params: {
 
 describe("runCronIsolatedAgentTurn", () => {
   beforeEach(() => {
-    vi.spyOn(modelSelection, "resolveThinkingDefault").mockReturnValue(undefined);
+    vi.spyOn(modelSelection, "resolveThinkingDefault").mockReturnValue("off");
     setupIsolatedAgentTurnMocks({ fast: true });
   });
 

src/cron/isolated-agent.model-formatting.test.ts

@@ -126,7 +126,7 @@ async function expectInvalidModel(home: string, model: string) {
 
 describe("cron model formatting and precedence edge cases", () => {
   beforeEach(() => {
-    vi.spyOn(modelSelection, "resolveThinkingDefault").mockReturnValue(undefined);
+    vi.spyOn(modelSelection, "resolveThinkingDefault").mockReturnValue("off");
     vi.mocked(runEmbeddedPiAgent).mockClear();
     vi.mocked(loadModelCatalog).mockResolvedValue([]);
   });

src/cron/isolated-agent.skips-delivery-without-whatsapp-recipient-besteffortdeliver-true.test.ts

@@ -262,7 +262,7 @@ async function assertExplicitTelegramTargetDelivery(params: {
 
 describe("runCronIsolatedAgentTurn", () => {
   beforeEach(() => {
-    vi.spyOn(modelSelection, "resolveThinkingDefault").mockReturnValue(undefined);
+    vi.spyOn(modelSelection, "resolveThinkingDefault").mockReturnValue("off");
     setupIsolatedAgentTurnMocks();
   });
 

src/cron/isolated-agent.uses-last-non-empty-agent-text-as.test.ts

@@ -16,10 +16,6 @@ import {
 } from "./isolated-agent.test-harness.js";
 import type { CronJob } from "./types.js";
 
-let resolveThinkingDefaultSpy: ReturnType<
-  typeof vi.spyOn<typeof modelSelection, "resolveThinkingDefault">
->;
-
 function makeDeps(): CliDeps {
   return {
     sendMessageSlack: vi.fn(),
@@ -168,9 +164,7 @@ async function runStoredOverrideAndExpectModel(params: {
 
 describe("runCronIsolatedAgentTurn", () => {
   beforeEach(() => {
-    resolveThinkingDefaultSpy = vi
-      .spyOn(modelSelection, "resolveThinkingDefault")
-      .mockReturnValue(undefined);
+    vi.spyOn(modelSelection, "resolveThinkingDefault").mockReturnValue("off");
     vi.mocked(runEmbeddedPiAgent).mockClear();
     vi.mocked(loadModelCatalog).mockResolvedValue([]);
   });
@@ -513,7 +507,7 @@ describe("runCronIsolatedAgentTurn", () => {
 
   it("passes through the resolved default thinking level", async () => {
     await withTempHome(async (home) => {
-      resolveThinkingDefaultSpy.mockReturnValueOnce("low");
+      vi.mocked(modelSelection.resolveThinkingDefault).mockReturnValueOnce("low");
 
       await runCronTurn(home, {
         jobPayload: DEFAULT_AGENT_TURN_PAYLOAD,

src/cron/isolated-agent/run.test-harness.ts

@@ -363,7 +363,7 @@ export function resetRunCronIsolatedAgentTurnHarness(): void {
   resolveConfiguredModelRefMock.mockReturnValue({ provider: "openai", model: "gpt-4" });
   resolveAllowedModelRefMock.mockReturnValue({ ref: { provider: "openai", model: "gpt-4" } });
   resolveHooksGmailModelMock.mockReturnValue(null);
-  resolveThinkingDefaultMock.mockReturnValue(undefined);
+  resolveThinkingDefaultMock.mockReturnValue("off");
   getModelRefStatusMock.mockReturnValue({ allowed: false });
   isCliProviderMock.mockReturnValue(false);
 

src/media-understanding/apply.test.ts

@@ -13,14 +13,14 @@ import { clearMediaUnderstandingBinaryCacheForTests } from "./runner.js";
 import { createSafeAudioFixtureBuffer } from "./runner.test-utils.js";
 
 const resolveApiKeyForProviderMock = vi.hoisted(() =>
-  vi.fn(async () => ({
+  vi.fn<typeof resolveApiKeyForProvider>(async () => ({
     apiKey: "test-key", // pragma: allowlist secret
     source: "test",
     mode: "api-key",
   })),
 );
 const hasAvailableAuthForProviderMock = vi.hoisted(() =>
-  vi.fn(async (...args: unknown[]) => {
+  vi.fn(async (...args: Parameters<typeof resolveApiKeyForProvider>) => {
     const resolved = await resolveApiKeyForProviderMock(...args);
     return Boolean(resolved?.apiKey);
   }),

src/plugin-sdk/sandbox.ts

@@ -19,6 +19,7 @@ export type {
   SshSandboxSession,
   SshSandboxSettings,
 } from "../agents/sandbox.js";
+export type { OpenClawConfig } from "../config/config.js";
 
 export {
   buildExecRemoteCommand,

src/plugins/provider-runtime.test.ts

@@ -1,9 +1,13 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import type { ProviderPlugin, ProviderRuntimeModel } from "./types.js";
 
-const resolvePluginProvidersMock = vi.fn((_: unknown) => [] as ProviderPlugin[]);
-const resolveOwningPluginIdsForProviderMock = vi.fn(
-  (_: unknown) => undefined as string[] | undefined,
+type ResolvePluginProviders = typeof import("./providers.js").resolvePluginProviders;
+type ResolveOwningPluginIdsForProvider =
+  typeof import("./providers.js").resolveOwningPluginIdsForProvider;
+
+const resolvePluginProvidersMock = vi.fn<ResolvePluginProviders>((_) => [] as ProviderPlugin[]);
+const resolveOwningPluginIdsForProviderMock = vi.fn<ResolveOwningPluginIdsForProvider>(
+  (_) => undefined as string[] | undefined,
 );
 
 vi.mock("./providers.js", () => ({
@@ -98,7 +102,7 @@ describe("provider-runtime", () => {
   });
 
   it("dispatches runtime hooks for the matched provider", async () => {
-    resolveOwningPluginIdsForProviderMock.mockImplementation((params: { provider?: string }) => {
+    resolveOwningPluginIdsForProviderMock.mockImplementation((params) => {
       if (params.provider === "demo") {
         return ["demo"];
       }

src/plugins/types.ts

@@ -849,6 +849,10 @@ export type WebSearchProviderPlugin = {
   createTool: (ctx: WebSearchProviderContext) => WebSearchProviderToolDefinition | null;
 };
 
+export type PluginWebSearchProviderEntry = WebSearchProviderPlugin & {
+  pluginId: string;
+};
+
 export type OpenClawPluginGatewayMethod = {
   method: string;
   handler: GatewayRequestHandler;

src/plugins/web-search-providers.ts

@@ -12,7 +12,7 @@ import {
 } from "./bundled-compat.js";
 import { normalizePluginsConfig, resolveEffectiveEnableState } from "./config-state.js";
 import type { PluginLoadOptions } from "./loader.js";
-import type { WebSearchProviderPlugin } from "./types.js";
+import type { PluginWebSearchProviderEntry } from "./types.js";
 
 const BUNDLED_WEB_SEARCH_ALLOWLIST_COMPAT_PLUGIN_IDS = [
   "brave",
@@ -114,7 +114,7 @@ export function resolvePluginWebSearchProviders(params: {
   workspaceDir?: string;
   env?: PluginLoadOptions["env"];
   bundledAllowlistCompat?: boolean;
-}): WebSearchProviderPlugin[] {
+}): PluginWebSearchProviderEntry[] {
   const allowlistCompat = params.bundledAllowlistCompat
     ? withBundledPluginAllowlistCompat({
         config: params.config,