test: preserve equivalent Ollama live credentials

steipete · steipete · commit 919413c3a09b · 2026-06-01T02:13:53.000+01:00
diff --git a/src/agents/models.profiles.live.test.ts b/src/agents/models.profiles.live.test.ts
@@ -299,7 +299,12 @@ function applyLiveOllamaProviderEnvCompat(params: {
   const liveBaseUrl = params.env?.OPENCLAW_LIVE_OLLAMA_BASE_URL?.trim();
   const baseUrl = liveBaseUrl || configuredBaseUrl || OLLAMA_DEFAULT_BASE_URL;
   const shouldPreserveConfiguredApiKey =
-    !liveBaseUrl || Boolean(configuredBaseUrl && configuredBaseUrl === baseUrl);
+    !liveBaseUrl ||
+    Boolean(
+      configuredBaseUrl &&
+      canonicalOllamaCredentialBaseUrl(configuredBaseUrl) ===
+        canonicalOllamaCredentialBaseUrl(baseUrl),
+    );
   const apiKey = resolveLiveOllamaProviderApiKey({
     baseUrl,
     existingApiKey: existingProvider?.apiKey,
@@ -1069,6 +1074,39 @@ describe("explicit live model discovery scope", () => {
     });
   });
 
+  it("preserves configured Ollama auth for equivalent live env base URLs", () => {
+    const cfg = {
+      plugins: {
+        bundledDiscovery: "compat",
+      },
+      models: {
+        providers: {
+          ollama: {
+            api: "ollama",
+            baseUrl: "http://127.0.0.1:11434/v1",
+            apiKey: { source: "env", provider: "default", id: "LOCAL_OLLAMA_API_KEY" },
+            models: [],
+          },
+        },
+      },
+    } satisfies OpenClawConfig;
+
+    const result = applyLiveProviderDiscoveryPluginCompat({
+      config: cfg,
+      providers: ["ollama"],
+      env: {
+        OPENCLAW_LIVE_OLLAMA_BASE_URL: "http://127.0.0.1:11434",
+      },
+    });
+
+    expect(result.models?.providers?.ollama).toEqual({
+      api: "ollama",
+      baseUrl: "http://127.0.0.1:11434",
+      apiKey: { source: "env", provider: "default", id: "LOCAL_OLLAMA_API_KEY" },
+      models: [],
+    });
+  });
+
   it("keeps local Ollama live auth on the non-secret marker", async () => {
     const cfg = applyLiveProviderDiscoveryPluginCompat({
       config: {
