diff --git a/src/agents/model-auth.ts b/src/agents/model-auth.ts
index f7bb54fcc4a..b50c4c7bb7e 100644
--- a/src/agents/model-auth.ts
+++ b/src/agents/model-auth.ts
@@ -175,6 +175,7 @@ export function resolveUsableCustomProviderApiKey(params: {
   if (
     customProviderConfig &&
     isCustomLocalProviderConfig(customProviderConfig) &&
+    customProviderConfig.api === "openai-completions" &&
     customProviderConfig.baseUrl &&
     isLocalBaseUrl(customProviderConfig.baseUrl)
   ) {
diff --git a/src/plugin-activation-boundary.test.ts b/src/plugin-activation-boundary.test.ts
index 675aa6fa2df..0f7e0e793de 100644
--- a/src/plugin-activation-boundary.test.ts
+++ b/src/plugin-activation-boundary.test.ts
@@ -132,11 +132,11 @@ describe("plugin activation boundary", () => {
     const staticNormalize = { allowPluginNormalization: false };
     expect(normalizeModelRef("google", "gemini-3.1-pro", staticNormalize)).toEqual({
       provider: "google",
-      model: "gemini-3.1-pro",
+      model: "gemini-3.1-pro-preview",
     });
     expect(normalizeModelRef("xai", "grok-4-fast-reasoning", staticNormalize)).toEqual({
       provider: "xai",
-      model: "grok-4-fast-reasoning",
+      model: "grok-4-fast",
     });
     expect(loadBundledPluginPublicSurfaceModuleSync).not.toHaveBeenCalled();