From 8ab762c005f11f05fa51dcc7dfeab2e43cb4fbd4 Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Sun, 8 Mar 2026 17:17:51 +0000 Subject: [PATCH] test: standardize hermetic provider env snapshots --- src/agents/models-config.e2e-harness.ts | 26 +++++++++++++++++++ ...s-config.providers.auth-provenance.test.ts | 8 +++--- ...ig.providers.cloudflare-ai-gateway.test.ts | 6 ++--- ...ls-config.providers.discovery-auth.test.ts | 8 +++--- .../models-config.providers.kilocode.test.ts | 7 ++--- ...odels-config.providers.kimi-coding.test.ts | 7 ++--- .../models-config.providers.minimax.test.ts | 4 +-- .../models-config.providers.nvidia.test.ts | 15 ++++++----- ...fig.providers.ollama-autodiscovery.test.ts | 8 +++--- .../models-config.providers.ollama.test.ts | 15 ++++++----- ...dels-config.providers.openai-codex.test.ts | 4 +-- .../models-config.providers.qianfan.test.ts | 4 +-- ...config.providers.vercel-ai-gateway.test.ts | 8 +++--- ...nfig.providers.volcengine-byteplus.test.ts | 8 +++--- 14 files changed, 79 insertions(+), 49 deletions(-) diff --git a/src/agents/models-config.e2e-harness.ts b/src/agents/models-config.e2e-harness.ts index 4bd6d47960c..71577b27e69 100644 --- a/src/agents/models-config.e2e-harness.ts +++ b/src/agents/models-config.e2e-harness.ts @@ -2,6 +2,7 @@ import { afterEach, beforeEach, vi } from "vitest"; import { withTempHome as withTempHomeBase } from "../../test/helpers/temp-home.js"; import type { OpenClawConfig } from "../config/config.js"; import type { MockFn } from "../test-utils/vitest-mock-fn.js"; +import { resolveImplicitProviders } from "./models-config.providers.js"; export async function withModelsTempHome(fn: (home: string) => Promise): Promise { return withTempHomeBase(fn, { prefix: "openclaw-models-" }); @@ -106,6 +107,8 @@ export const MODELS_CONFIG_IMPLICIT_ENV_VARS = [ "TOGETHER_API_KEY", "VOLCANO_ENGINE_API_KEY", "BYTEPLUS_API_KEY", + "KILOCODE_API_KEY", + "KIMI_API_KEY", "KIMICODE_API_KEY", "GEMINI_API_KEY", "VENICE_API_KEY", @@ -123,6 +126,29 @@ export const MODELS_CONFIG_IMPLICIT_ENV_VARS = [ "AWS_SHARED_CREDENTIALS_FILE", ]; +export function snapshotImplicitProviderEnv(env?: NodeJS.ProcessEnv): NodeJS.ProcessEnv { + const source = env ?? process.env; + const snapshot: NodeJS.ProcessEnv = {}; + + for (const envVar of MODELS_CONFIG_IMPLICIT_ENV_VARS) { + const value = source[envVar]; + if (value !== undefined) { + snapshot[envVar] = value; + } + } + + return snapshot; +} + +export async function resolveImplicitProvidersForTest( + params: Parameters[0], +) { + return await resolveImplicitProviders({ + ...params, + env: snapshotImplicitProviderEnv(params.env), + }); +} + export const CUSTOM_PROXY_MODELS_CONFIG: OpenClawConfig = { models: { providers: { diff --git a/src/agents/models-config.providers.auth-provenance.test.ts b/src/agents/models-config.providers.auth-provenance.test.ts index c06653973f3..987f825932b 100644 --- a/src/agents/models-config.providers.auth-provenance.test.ts +++ b/src/agents/models-config.providers.auth-provenance.test.ts @@ -9,7 +9,7 @@ import { NON_ENV_SECRETREF_MARKER, QWEN_OAUTH_MARKER, } from "./model-auth-markers.js"; -import { resolveImplicitProviders } from "./models-config.providers.js"; +import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js"; describe("models-config provider auth provenance", () => { it("persists env keyRef and tokenRef auth profiles as env var markers", async () => { @@ -41,7 +41,7 @@ describe("models-config provider auth provenance", () => { "utf8", ); try { - const providers = await resolveImplicitProviders({ agentDir, env: {} }); + const providers = await resolveImplicitProvidersForTest({ agentDir, env: {} }); expect(providers?.volcengine?.apiKey).toBe("VOLCANO_ENGINE_API_KEY"); expect(providers?.["volcengine-plan"]?.apiKey).toBe("VOLCANO_ENGINE_API_KEY"); expect(providers?.together?.apiKey).toBe("TOGETHER_API_KEY"); @@ -78,7 +78,7 @@ describe("models-config provider auth provenance", () => { "utf8", ); - const providers = await resolveImplicitProviders({ agentDir, env: {} }); + const providers = await resolveImplicitProvidersForTest({ agentDir, env: {} }); expect(providers?.byteplus?.apiKey).toBe(NON_ENV_SECRETREF_MARKER); expect(providers?.["byteplus-plan"]?.apiKey).toBe(NON_ENV_SECRETREF_MARKER); expect(providers?.together?.apiKey).toBe(NON_ENV_SECRETREF_MARKER); @@ -114,7 +114,7 @@ describe("models-config provider auth provenance", () => { "utf8", ); - const providers = await resolveImplicitProviders({ agentDir, env: {} }); + const providers = await resolveImplicitProvidersForTest({ agentDir, env: {} }); expect(providers?.["minimax-portal"]?.apiKey).toBe(MINIMAX_OAUTH_MARKER); expect(providers?.["qwen-portal"]?.apiKey).toBe(QWEN_OAUTH_MARKER); }); diff --git a/src/agents/models-config.providers.cloudflare-ai-gateway.test.ts b/src/agents/models-config.providers.cloudflare-ai-gateway.test.ts index 82a16dbcbee..dad90c740d2 100644 --- a/src/agents/models-config.providers.cloudflare-ai-gateway.test.ts +++ b/src/agents/models-config.providers.cloudflare-ai-gateway.test.ts @@ -5,7 +5,7 @@ import { join } from "node:path"; import { describe, expect, it } from "vitest"; import { captureEnv } from "../test-utils/env.js"; import { NON_ENV_SECRETREF_MARKER } from "./model-auth-markers.js"; -import { resolveImplicitProviders } from "./models-config.providers.js"; +import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js"; describe("cloudflare-ai-gateway profile provenance", () => { it("prefers env keyRef marker over runtime plaintext for persistence", async () => { @@ -37,7 +37,7 @@ describe("cloudflare-ai-gateway profile provenance", () => { "utf8", ); try { - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.["cloudflare-ai-gateway"]?.apiKey).toBe("CLOUDFLARE_AI_GATEWAY_API_KEY"); } finally { envSnapshot.restore(); @@ -70,7 +70,7 @@ describe("cloudflare-ai-gateway profile provenance", () => { "utf8", ); - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.["cloudflare-ai-gateway"]?.apiKey).toBe(NON_ENV_SECRETREF_MARKER); }); }); diff --git a/src/agents/models-config.providers.discovery-auth.test.ts b/src/agents/models-config.providers.discovery-auth.test.ts index c5c79b2fb95..e6aebc0d7cb 100644 --- a/src/agents/models-config.providers.discovery-auth.test.ts +++ b/src/agents/models-config.providers.discovery-auth.test.ts @@ -4,7 +4,7 @@ import { tmpdir } from "node:os"; import { join } from "node:path"; import { afterEach, describe, expect, it, vi } from "vitest"; import { NON_ENV_SECRETREF_MARKER } from "./model-auth-markers.js"; -import { resolveImplicitProviders } from "./models-config.providers.js"; +import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js"; describe("provider discovery auth marker guardrails", () => { let originalVitest: string | undefined; @@ -63,7 +63,7 @@ describe("provider discovery auth marker guardrails", () => { "utf8", ); - const providers = await resolveImplicitProviders({ agentDir, env: {} }); + const providers = await resolveImplicitProvidersForTest({ agentDir, env: {} }); expect(providers?.vllm?.apiKey).toBe(NON_ENV_SECRETREF_MARKER); const request = fetchMock.mock.calls[0]?.[1] as | { headers?: Record } @@ -96,7 +96,7 @@ describe("provider discovery auth marker guardrails", () => { "utf8", ); - const providers = await resolveImplicitProviders({ agentDir, env: {} }); + const providers = await resolveImplicitProvidersForTest({ agentDir, env: {} }); expect(providers?.huggingface?.apiKey).toBe(NON_ENV_SECRETREF_MARKER); const huggingfaceCalls = fetchMock.mock.calls.filter(([url]) => String(url).includes("router.huggingface.co"), @@ -132,7 +132,7 @@ describe("provider discovery auth marker guardrails", () => { "utf8", ); - await resolveImplicitProviders({ agentDir, env: {} }); + await resolveImplicitProvidersForTest({ agentDir, env: {} }); const vllmCall = fetchMock.mock.calls.find(([url]) => String(url).includes(":8000")); const request = vllmCall?.[1] as { headers?: Record } | undefined; expect(request?.headers?.Authorization).toBe("Bearer ALLCAPS_SAMPLE"); diff --git a/src/agents/models-config.providers.kilocode.test.ts b/src/agents/models-config.providers.kilocode.test.ts index ce57ab561be..18edb78b2a6 100644 --- a/src/agents/models-config.providers.kilocode.test.ts +++ b/src/agents/models-config.providers.kilocode.test.ts @@ -3,7 +3,8 @@ import { tmpdir } from "node:os"; import { join } from "node:path"; import { describe, expect, it } from "vitest"; import { captureEnv } from "../test-utils/env.js"; -import { buildKilocodeProvider, resolveImplicitProviders } from "./models-config.providers.js"; +import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js"; +import { buildKilocodeProvider } from "./models-config.providers.js"; const KILOCODE_MODEL_IDS = ["kilo/auto"]; @@ -14,7 +15,7 @@ describe("Kilo Gateway implicit provider", () => { process.env.KILOCODE_API_KEY = "test-key"; // pragma: allowlist secret try { - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.kilocode).toBeDefined(); expect(providers?.kilocode?.models?.length).toBeGreaterThan(0); } finally { @@ -28,7 +29,7 @@ describe("Kilo Gateway implicit provider", () => { delete process.env.KILOCODE_API_KEY; try { - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.kilocode).toBeUndefined(); } finally { envSnapshot.restore(); diff --git a/src/agents/models-config.providers.kimi-coding.test.ts b/src/agents/models-config.providers.kimi-coding.test.ts index bc49115cb40..33e94a2f1c3 100644 --- a/src/agents/models-config.providers.kimi-coding.test.ts +++ b/src/agents/models-config.providers.kimi-coding.test.ts @@ -3,7 +3,8 @@ import { tmpdir } from "node:os"; import { join } from "node:path"; import { describe, expect, it } from "vitest"; import { captureEnv } from "../test-utils/env.js"; -import { buildKimiCodingProvider, resolveImplicitProviders } from "./models-config.providers.js"; +import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js"; +import { buildKimiCodingProvider } from "./models-config.providers.js"; describe("kimi-coding implicit provider (#22409)", () => { it("should include kimi-coding when KIMI_API_KEY is configured", async () => { @@ -12,7 +13,7 @@ describe("kimi-coding implicit provider (#22409)", () => { process.env.KIMI_API_KEY = "test-key"; // pragma: allowlist secret try { - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.["kimi-coding"]).toBeDefined(); expect(providers?.["kimi-coding"]?.api).toBe("anthropic-messages"); expect(providers?.["kimi-coding"]?.baseUrl).toBe("https://api.kimi.com/coding/"); @@ -36,7 +37,7 @@ describe("kimi-coding implicit provider (#22409)", () => { delete process.env.KIMI_API_KEY; try { - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.["kimi-coding"]).toBeUndefined(); } finally { envSnapshot.restore(); diff --git a/src/agents/models-config.providers.minimax.test.ts b/src/agents/models-config.providers.minimax.test.ts index 687020f7568..80718d28fbe 100644 --- a/src/agents/models-config.providers.minimax.test.ts +++ b/src/agents/models-config.providers.minimax.test.ts @@ -3,7 +3,7 @@ import { writeFile } from "node:fs/promises"; import { tmpdir } from "node:os"; import { join } from "node:path"; import { describe, expect, it } from "vitest"; -import { resolveImplicitProviders } from "./models-config.providers.js"; +import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js"; describe("minimax provider catalog", () => { it("does not advertise the removed lightning model for api-key or oauth providers", async () => { @@ -34,7 +34,7 @@ describe("minimax provider catalog", () => { "utf8", ); - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.minimax?.models?.map((model) => model.id)).toEqual([ "MiniMax-VL-01", "MiniMax-M2.5", diff --git a/src/agents/models-config.providers.nvidia.test.ts b/src/agents/models-config.providers.nvidia.test.ts index fe61b343369..11a291bf69f 100644 --- a/src/agents/models-config.providers.nvidia.test.ts +++ b/src/agents/models-config.providers.nvidia.test.ts @@ -5,13 +5,14 @@ import { join } from "node:path"; import { describe, expect, it } from "vitest"; import { withEnvAsync } from "../test-utils/env.js"; import { resolveApiKeyForProvider } from "./model-auth.js"; -import { buildNvidiaProvider, resolveImplicitProviders } from "./models-config.providers.js"; +import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js"; +import { buildNvidiaProvider } from "./models-config.providers.js"; describe("NVIDIA provider", () => { it("should include nvidia when NVIDIA_API_KEY is configured", async () => { const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-")); await withEnvAsync({ NVIDIA_API_KEY: "test-key" }, async () => { - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.nvidia).toBeDefined(); expect(providers?.nvidia?.models?.length).toBeGreaterThan(0); }); @@ -52,7 +53,7 @@ describe("MiniMax implicit provider (#15275)", () => { it("should use anthropic-messages API for API-key provider", async () => { const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-")); await withEnvAsync({ MINIMAX_API_KEY: "test-key" }, async () => { - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.minimax).toBeDefined(); expect(providers?.minimax?.api).toBe("anthropic-messages"); expect(providers?.minimax?.authHeader).toBe(true); @@ -83,14 +84,14 @@ describe("MiniMax implicit provider (#15275)", () => { "utf8", ); - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.["minimax-portal"]?.authHeader).toBe(true); }); it("should include minimax portal provider when MINIMAX_OAUTH_TOKEN is configured", async () => { const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-")); await withEnvAsync({ MINIMAX_OAUTH_TOKEN: "portal-token" }, async () => { - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.["minimax-portal"]).toBeDefined(); expect(providers?.["minimax-portal"]?.authHeader).toBe(true); expect(providers?.["minimax-portal"]?.models?.some((m) => m.id === "MiniMax-VL-01")).toBe( @@ -104,7 +105,7 @@ describe("vLLM provider", () => { it("should not include vllm when no API key is configured", async () => { const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-")); await withEnvAsync({ VLLM_API_KEY: undefined }, async () => { - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.vllm).toBeUndefined(); }); }); @@ -112,7 +113,7 @@ describe("vLLM provider", () => { it("should include vllm when VLLM_API_KEY is set", async () => { const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-")); await withEnvAsync({ VLLM_API_KEY: "test-key" }, async () => { - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.vllm).toBeDefined(); expect(providers?.vllm?.apiKey).toBe("VLLM_API_KEY"); diff --git a/src/agents/models-config.providers.ollama-autodiscovery.test.ts b/src/agents/models-config.providers.ollama-autodiscovery.test.ts index b878607edea..b550e19d40c 100644 --- a/src/agents/models-config.providers.ollama-autodiscovery.test.ts +++ b/src/agents/models-config.providers.ollama-autodiscovery.test.ts @@ -2,7 +2,7 @@ import { mkdtempSync } from "node:fs"; import { tmpdir } from "node:os"; import { join } from "node:path"; import { afterEach, describe, expect, it, vi } from "vitest"; -import { resolveImplicitProviders } from "./models-config.providers.js"; +import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js"; describe("Ollama auto-discovery", () => { let originalVitest: string | undefined; @@ -55,7 +55,7 @@ describe("Ollama auto-discovery", () => { }) as unknown as typeof fetch; const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-")); - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.ollama).toBeDefined(); expect(providers?.ollama?.apiKey).toBe("ollama-local"); @@ -73,7 +73,7 @@ describe("Ollama auto-discovery", () => { mockOllamaUnreachable(); const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-")); - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.ollama).toBeUndefined(); const ollamaWarnings = warnSpy.mock.calls.filter( @@ -89,7 +89,7 @@ describe("Ollama auto-discovery", () => { mockOllamaUnreachable(); const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-")); - await resolveImplicitProviders({ + await resolveImplicitProvidersForTest({ agentDir, explicitProviders: { ollama: { diff --git a/src/agents/models-config.providers.ollama.test.ts b/src/agents/models-config.providers.ollama.test.ts index 661c95c1c8e..49e4deae551 100644 --- a/src/agents/models-config.providers.ollama.test.ts +++ b/src/agents/models-config.providers.ollama.test.ts @@ -3,7 +3,8 @@ import { tmpdir } from "node:os"; import { join } from "node:path"; import { afterEach, describe, expect, it, vi } from "vitest"; import type { ModelDefinitionConfig } from "../config/types.models.js"; -import { resolveImplicitProviders, resolveOllamaApiBase } from "./models-config.providers.js"; +import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js"; +import { resolveOllamaApiBase } from "./models-config.providers.js"; afterEach(() => { vi.unstubAllEnvs(); @@ -60,7 +61,7 @@ describe("Ollama provider", () => { } async function resolveProvidersWithOllamaKey(agentDir: string) { - return await withOllamaApiKey(async () => await resolveImplicitProviders({ agentDir })); + return await withOllamaApiKey(async () => await resolveImplicitProvidersForTest({ agentDir })); } const createTagModel = (name: string) => ({ name, modified_at: "", size: 1, digest: "" }); @@ -78,7 +79,7 @@ describe("Ollama provider", () => { it("should not include ollama when no API key is configured", async () => { const agentDir = createAgentDir(); - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.ollama).toBeUndefined(); }); @@ -86,7 +87,7 @@ describe("Ollama provider", () => { it("should use native ollama api type", async () => { const agentDir = createAgentDir(); await withOllamaApiKey(async () => { - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.ollama).toBeDefined(); expect(providers?.ollama?.apiKey).toBe("OLLAMA_API_KEY"); @@ -98,7 +99,7 @@ describe("Ollama provider", () => { it("should preserve explicit ollama baseUrl on implicit provider injection", async () => { const agentDir = createAgentDir(); await withOllamaApiKey(async () => { - const providers = await resolveImplicitProviders({ + const providers = await resolveImplicitProvidersForTest({ agentDir, explicitProviders: { ollama: { @@ -239,7 +240,7 @@ describe("Ollama provider", () => { }, ]; - const providers = await resolveImplicitProviders({ + const providers = await resolveImplicitProvidersForTest({ agentDir, explicitProviders: { ollama: { @@ -264,7 +265,7 @@ describe("Ollama provider", () => { it("should preserve explicit apiKey when discovery path has no models and no env key", async () => { const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-")); - const providers = await resolveImplicitProviders({ + const providers = await resolveImplicitProvidersForTest({ agentDir, explicitProviders: { ollama: { diff --git a/src/agents/models-config.providers.openai-codex.test.ts b/src/agents/models-config.providers.openai-codex.test.ts index 98051eb05da..89add15433a 100644 --- a/src/agents/models-config.providers.openai-codex.test.ts +++ b/src/agents/models-config.providers.openai-codex.test.ts @@ -5,12 +5,12 @@ import { resolveOpenClawAgentDir } from "./agent-paths.js"; import { installModelsConfigTestHooks, MODELS_CONFIG_IMPLICIT_ENV_VARS, + resolveImplicitProvidersForTest, unsetEnv, withModelsTempHome, withTempEnv, } from "./models-config.e2e-harness.js"; import { ensureOpenClawModelsJson } from "./models-config.js"; -import { resolveImplicitProviders } from "./models-config.providers.js"; import { readGeneratedModelsJson } from "./models-config.test-utils.js"; installModelsConfigTestHooks(); @@ -50,7 +50,7 @@ describe("openai-codex implicit provider", () => { const agentDir = resolveOpenClawAgentDir(); await writeCodexOauthProfile(agentDir); - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.["openai-codex"]).toMatchObject({ baseUrl: "https://chatgpt.com/backend-api", api: "openai-codex-responses", diff --git a/src/agents/models-config.providers.qianfan.test.ts b/src/agents/models-config.providers.qianfan.test.ts index 97c093d7c47..da55cd44206 100644 --- a/src/agents/models-config.providers.qianfan.test.ts +++ b/src/agents/models-config.providers.qianfan.test.ts @@ -3,7 +3,7 @@ import { tmpdir } from "node:os"; import { join } from "node:path"; import { describe, expect, it } from "vitest"; import { withEnvAsync } from "../test-utils/env.js"; -import { resolveImplicitProviders } from "./models-config.providers.js"; +import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js"; const qianfanApiKeyEnv = ["QIANFAN_API", "KEY"].join("_"); @@ -13,7 +13,7 @@ describe("Qianfan provider", () => { const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-")); const qianfanApiKey = "test-key"; // pragma: allowlist secret await withEnvAsync({ [qianfanApiKeyEnv]: qianfanApiKey }, async () => { - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.qianfan).toBeDefined(); expect(providers?.qianfan?.apiKey).toBe("QIANFAN_API_KEY"); }); diff --git a/src/agents/models-config.providers.vercel-ai-gateway.test.ts b/src/agents/models-config.providers.vercel-ai-gateway.test.ts index c4caf98ce11..d53e2f85435 100644 --- a/src/agents/models-config.providers.vercel-ai-gateway.test.ts +++ b/src/agents/models-config.providers.vercel-ai-gateway.test.ts @@ -5,7 +5,7 @@ import { join } from "node:path"; import { describe, expect, it } from "vitest"; import { captureEnv } from "../test-utils/env.js"; import { NON_ENV_SECRETREF_MARKER } from "./model-auth-markers.js"; -import { resolveImplicitProviders } from "./models-config.providers.js"; +import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js"; import { VERCEL_AI_GATEWAY_BASE_URL } from "./vercel-ai-gateway.js"; describe("vercel-ai-gateway provider resolution", () => { @@ -14,7 +14,7 @@ describe("vercel-ai-gateway provider resolution", () => { process.env.AI_GATEWAY_API_KEY = "vercel-gateway-test-key"; // pragma: allowlist secret try { const agentDir = mkdtempSync(join(tmpdir(), "openclaw-test-")); - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); const provider = providers?.["vercel-ai-gateway"]; expect(provider?.apiKey).toBe("AI_GATEWAY_API_KEY"); expect(provider?.api).toBe("anthropic-messages"); @@ -52,7 +52,7 @@ describe("vercel-ai-gateway provider resolution", () => { ); try { - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.["vercel-ai-gateway"]?.apiKey).toBe("AI_GATEWAY_API_KEY"); } finally { envSnapshot.restore(); @@ -81,7 +81,7 @@ describe("vercel-ai-gateway provider resolution", () => { "utf8", ); - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.["vercel-ai-gateway"]?.apiKey).toBe(NON_ENV_SECRETREF_MARKER); }); }); diff --git a/src/agents/models-config.providers.volcengine-byteplus.test.ts b/src/agents/models-config.providers.volcengine-byteplus.test.ts index cba28521040..16a0d8d259a 100644 --- a/src/agents/models-config.providers.volcengine-byteplus.test.ts +++ b/src/agents/models-config.providers.volcengine-byteplus.test.ts @@ -4,7 +4,7 @@ import { join } from "node:path"; import { describe, expect, it } from "vitest"; import { captureEnv } from "../test-utils/env.js"; import { upsertAuthProfile } from "./auth-profiles.js"; -import { resolveImplicitProviders } from "./models-config.providers.js"; +import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js"; describe("Volcengine and BytePlus providers", () => { it("includes volcengine and volcengine-plan when VOLCANO_ENGINE_API_KEY is configured", async () => { @@ -13,7 +13,7 @@ describe("Volcengine and BytePlus providers", () => { process.env.VOLCANO_ENGINE_API_KEY = "test-key"; // pragma: allowlist secret try { - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.volcengine).toBeDefined(); expect(providers?.["volcengine-plan"]).toBeDefined(); expect(providers?.volcengine?.apiKey).toBe("VOLCANO_ENGINE_API_KEY"); @@ -29,7 +29,7 @@ describe("Volcengine and BytePlus providers", () => { process.env.BYTEPLUS_API_KEY = "test-key"; // pragma: allowlist secret try { - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.byteplus).toBeDefined(); expect(providers?.["byteplus-plan"]).toBeDefined(); expect(providers?.byteplus?.apiKey).toBe("BYTEPLUS_API_KEY"); @@ -65,7 +65,7 @@ describe("Volcengine and BytePlus providers", () => { }); try { - const providers = await resolveImplicitProviders({ agentDir }); + const providers = await resolveImplicitProvidersForTest({ agentDir }); expect(providers?.volcengine?.apiKey).toBe("VOLCANO_ENGINE_API_KEY"); expect(providers?.["volcengine-plan"]?.apiKey).toBe("VOLCANO_ENGINE_API_KEY"); expect(providers?.byteplus?.apiKey).toBe("BYTEPLUS_API_KEY");