fix(agents): extend Gemini 3.1 forward-compat to google provider

SidQin-cyber · SidQin-cyber · commit 281eee1e1cf0 · 2026-03-05T20:57:39.000+08:00
The forward-compat path for gemini-3.1-pro-preview and gemini-3.1-flash-lite-preview only covered the google-gemini-cli provider. Users configuring these models with the google provider (Gemini API key auth) got "Unknown model" errors and silently fell back to Anthropic. Extend resolveGoogleGemini31ForwardCompatModel to accept both google-gemini-cli and google providers by using a provider set. Also add bare-ID normalization for gemini-3.1-pro, gemini-3.1-flash, and gemini-3.1-flash-lite in normalizeGoogleModelId(). Closes #36134 Closes #36111
diff --git a/src/agents/model-forward-compat.ts b/src/agents/model-forward-compat.ts
@@ -168,15 +168,19 @@ function resolveAnthropicSonnet46ForwardCompatModel(
   });
 }
 
+const GOOGLE_GEMINI_31_ELIGIBLE_PROVIDERS = new Set(["google-gemini-cli", "google"]);
+
 // gemini-3.1-pro-preview / gemini-3.1-flash-preview are not present in pi-ai's built-in
-// google-gemini-cli catalog yet. Clone the nearest gemini-3 template so users don't get
-// "Unknown model" errors when Google Gemini CLI gains new minor-version models.
-function resolveGoogleGeminiCli31ForwardCompatModel(
+// catalog yet.  Clone the nearest gemini-3 template so users don't get "Unknown model"
+// errors when Google releases a new minor version.  Applies to both the google-gemini-cli
+// provider (CLI tool-use key) and the google provider (Gemini API key).
+function resolveGoogleGemini31ForwardCompatModel(
   provider: string,
   modelId: string,
   modelRegistry: ModelRegistry,
 ): Model<Api> | undefined {
-  if (normalizeProviderId(provider) !== "google-gemini-cli") {
+  const normalizedProvider = normalizeProviderId(provider);
+  if (!GOOGLE_GEMINI_31_ELIGIBLE_PROVIDERS.has(normalizedProvider)) {
     return undefined;
   }
   const trimmed = modelId.trim();
@@ -192,7 +196,7 @@ function resolveGoogleGeminiCli31ForwardCompatModel(
   }
 
   return cloneFirstTemplateModel({
-    normalizedProvider: "google-gemini-cli",
+    normalizedProvider,
     trimmedModelId: trimmed,
     templateIds: [...templateIds],
     modelRegistry,
@@ -252,6 +256,6 @@ export function resolveForwardCompatModel(
     resolveAnthropicOpus46ForwardCompatModel(provider, modelId, modelRegistry) ??
     resolveAnthropicSonnet46ForwardCompatModel(provider, modelId, modelRegistry) ??
     resolveZaiGlm5ForwardCompatModel(provider, modelId, modelRegistry) ??
-    resolveGoogleGeminiCli31ForwardCompatModel(provider, modelId, modelRegistry)
+    resolveGoogleGemini31ForwardCompatModel(provider, modelId, modelRegistry)
   );
 }
diff --git a/src/agents/models-config.providers.ts b/src/agents/models-config.providers.ts
@@ -444,6 +444,15 @@ export function normalizeGoogleModelId(id: string): string {
   if (id === "gemini-3-flash") {
     return "gemini-3-flash-preview";
   }
+  if (id === "gemini-3.1-pro" || id === "gemini-3-1-pro") {
+    return "gemini-3.1-pro-preview";
+  }
+  if (id === "gemini-3.1-flash" || id === "gemini-3-1-flash") {
+    return "gemini-3.1-flash-preview";
+  }
+  if (id === "gemini-3.1-flash-lite" || id === "gemini-3-1-flash-lite") {
+    return "gemini-3.1-flash-lite-preview";
+  }
   return id;
 }
 
