From a3144b6bfdf581f7c41fe27ef2fc835a41ee666b Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 27 Apr 2026 12:00:41 +0100
Subject: [PATCH] fix(agents): preserve explicit Ollama local auth marker

---
 src/agents/model-auth-markers.ts | 1 +
 src/agents/model-auth.test.ts    | 2 +-
 src/agents/model-auth.ts         | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/agents/model-auth-markers.ts b/src/agents/model-auth-markers.ts
index 3b89f084efe..d6bbaf8e3d4 100644
--- a/src/agents/model-auth-markers.ts
+++ b/src/agents/model-auth-markers.ts
@@ -17,6 +17,7 @@ const AWS_SDK_ENV_MARKERS = new Set([
 ]);
 const CORE_NON_SECRET_API_KEY_MARKERS = [
   CUSTOM_LOCAL_AUTH_MARKER,
+  OLLAMA_LOCAL_AUTH_MARKER,
   NON_ENV_SECRETREF_MARKER,
 ] as const;
 let knownEnvApiKeyMarkersCache: Set<string> | undefined;
diff --git a/src/agents/model-auth.test.ts b/src/agents/model-auth.test.ts
index 3d526c037cd..654067ee9c2 100644
--- a/src/agents/model-auth.test.ts
+++ b/src/agents/model-auth.test.ts
@@ -918,7 +918,7 @@ describe("resolveApiKeyForProvider – synthetic local auth for custom providers
 
     expect(auth).toMatchObject({
       apiKey: "ollama-local",
-      source: "models.providers.ollama-remote (synthetic local key)",
+      source: "models.json (local marker)",
       mode: "api-key",
     });
   });
diff --git a/src/agents/model-auth.ts b/src/agents/model-auth.ts
index 49944e29bab..65046974c9c 100644
--- a/src/agents/model-auth.ts
+++ b/src/agents/model-auth.ts
@@ -179,7 +179,10 @@ export function resolveUsableCustomProviderApiKey(params: {
     customProviderConfig.baseUrl &&
     isLocalBaseUrl(customProviderConfig.baseUrl)
   ) {
-    return { apiKey: CUSTOM_LOCAL_AUTH_MARKER, source: "models.json (local marker)" };
+    return {
+      apiKey: customProviderConfig.api === "ollama" ? customKey : CUSTOM_LOCAL_AUTH_MARKER,
+      source: "models.json (local marker)",
+    };
   }
   return null;
 }