@ai-sdk/google 4.0.108 → 4.0.110

package/docs/15-google.mdx

@@ -97,7 +97,11 @@ You can use the following optional settings to customize the Google provider ins
   Use a different URL prefix for API calls, e.g. to use proxy servers.
   The default prefix is `https://generativelanguage.googleapis.com/v1beta`.
 
-- **apiKey** _string_
+- **apiKey** _string | PromiseLike<string> | (() => string | PromiseLike<string>)_
+
+  Pass a function to resolve credentials before each request, including when keys
+  rotate. The function can return a string or a promise. Credential caching and
+  refresh are managed by the function.
 
   API key that is being sent using the `x-goog-api-key` header.
   It defaults to the `GOOGLE_GENERATIVE_AI_API_KEY` environment variable.
@@ -482,12 +486,12 @@ Things to keep in mind:
 
 #### Long decode with the Interactions API
 
-With the [Interactions API](#interactions-api), long decode requires
-`background: true`. The server runs every request itself, so no client-side
-continuation is needed, and `usage` covers all requests. Set an explicit
-`maxOutputTokens` above 65,536 (without it, you get a single 64K request) and
-keep `store` enabled (the default). The provider polls the interaction (or
-streams it, reconnecting when the connection drops) until it finishes.
+With the [Interactions API](#interactions-api), the AI SDK currently requires
+`background: true` for long decode. The server runs every request itself, so no
+client-side continuation is needed, and `usage` covers all requests. Set an
+explicit `maxOutputTokens` above 65,536 and keep `store` enabled (the default).
+The provider polls the interaction (or streams it, reconnecting when the
+connection drops) until it finishes.
 
 ```ts
 import { google } from '@ai-sdk/google';
@@ -506,10 +510,14 @@ const result = await generateText({
 });
 ```
 
-Without `background: true`, an interaction generates at most 65,536 tokens.
-Requests with a higher `maxOutputTokens` are rejected by the API, and an
-interaction that reaches the cap finishes with `length`. Long decode is not
-available with the Vertex AI Interactions API.
+Foreground client-side continuation is not yet supported by the AI SDK.
+If you do not set `maxOutputTokens`, non-streaming calls (`generateText`)
+default to 32,768 tokens and streaming calls (`streamText`) to 65,536 tokens.
+An interaction that reaches its limit finishes with `length`. Long decode is
+not available with the Vertex AI Interactions API.
+
+The token budget includes both thinking and output tokens. To retain the previous
+64K budget for a non-streaming call, set `maxOutputTokens: 65_536` explicitly.
 
 ### File Inputs
 
@@ -1265,6 +1273,8 @@ will still validate the response against the schema in `Output.object`.
 
 ### Model Capabilities
 
+{/* model-capabilities:google-language:start */}
+
 | Model                                 | Image Input | Object Generation | Tool Usage | Tool Streaming | Google Search | URL Context |
 | ------------------------------------- | ----------- | ----------------- | ---------- | -------------- | ------------- | ----------- |
 | `gemini-nano-banana-2.1`              | <Check />   | <Cross />         | <Cross />  | <Cross />      | <Check />     | <Cross />   |
@@ -1286,6 +1296,8 @@ will still validate the response against the schema in `Output.object`.
 | `gemini-2.5-flash-lite-preview-06-17` | <Check />   | <Check />         | <Check />  | <Check />      | <Check />     | <Check />   |
 | `gemini-2.0-flash`                    | <Check />   | <Check />         | <Check />  | <Check />      | <Check />     | <Check />   |
 
+{/* model-capabilities:google-language:end */}
+
 <Note>
   The table above lists popular models. Please see the [Google Generative AI
   docs](https://ai.google.dev/gemini-api/docs/models/) for a full list of

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-sdk/google",
-  "version": "4.0.108",
+  "version": "4.0.110",
   "type": "module",
   "license": "Apache-2.0",
   "sideEffects": false,
@@ -35,8 +35,8 @@
     }
   },
   "dependencies": {
-    "@ai-sdk/provider": "4.0.34",
-    "@ai-sdk/provider-utils": "5.0.71"
+    "@ai-sdk/provider": "4.0.35",
+    "@ai-sdk/provider-utils": "5.0.73"
   },
   "devDependencies": {
     "@ai-sdk/test-server": "2.0.4",

package/src/convert-to-google-messages.ts

@@ -6,6 +6,7 @@ import {
   type SharedV4Warning,
 } from '@ai-sdk/provider';
 import {
+  stringifyWithBigIntAndCycles,
   convertToBase64,
   getTopLevelMediaType,
   isFullMediaType,
@@ -67,18 +68,26 @@ function convertUrlToolResultPart(
   };
 }
 
-function containsJSONSchemaReference(value: JSONValue | undefined): boolean {
-  if (Array.isArray(value)) {
-    return value.some(containsJSONSchemaReference);
+function containsJSONSchemaReference(
+  value: JSONValue | undefined,
+  seen: WeakSet<object> = new WeakSet(),
+): boolean {
+  if (value === null || typeof value !== 'object') {
+    return false;
   }
 
-  if (typeof value !== 'object' || value === null) {
+  if (seen.has(value)) {
     return false;
   }
+  seen.add(value);
+
+  if (Array.isArray(value)) {
+    return value.some(item => containsJSONSchemaReference(item, seen));
+  }
 
   return Object.entries(value).some(
     ([key, nestedValue]) =>
-      key === '$ref' || containsJSONSchemaReference(nestedValue),
+      key === '$ref' || containsJSONSchemaReference(nestedValue, seen),
   );
 }
 
@@ -88,7 +97,41 @@ function serializeFunctionResponseContent(
   // Google reserves { $ref: displayName } in structured function responses for
   // multimodal parts. This conflicts with JSON Schema $ref, so serialize the
   // result to preserve it without triggering Google's reference handling.
-  return containsJSONSchemaReference(value) ? JSON.stringify(value) : value;
+  if (containsJSONSchemaReference(value)) {
+    return stringifyWithBigIntAndCycles(value);
+  }
+
+  // Keep Google's structured response for ordinary JSON, but normalize values
+  // that would otherwise fail when the final request body is serialized.
+  return containsNonJsonValue(value)
+    ? secureJsonParse(stringifyWithBigIntAndCycles(value))
+    : value;
+}
+
+function containsNonJsonValue(
+  value: unknown,
+  ancestors = new Set<object>(),
+): boolean {
+  if (typeof value === 'bigint') {
+    return true;
+  }
+  if (typeof value !== 'object' || value === null) {
+    return false;
+  }
+  if (typeof (value as { toJSON?: unknown }).toJSON === 'function') {
+    return true;
+  }
+  if (ancestors.has(value)) {
+    return true;
+  }
+  ancestors.add(value);
+  try {
+    return Object.values(value).some(item =>
+      containsNonJsonValue(item, ancestors),
+    );
+  } finally {
+    ancestors.delete(value);
+  }
 }
 
 /*
@@ -586,7 +629,7 @@ export function convertToGoogleMessages(
                         ? { id: part.toolCallId }
                         : {}),
                       name: part.toolName,
-                      args: part.input,
+                      args: parseToolCallInput(part.input),
                     },
                     thoughtSignature: effectiveThoughtSignature,
                   };
@@ -775,3 +818,14 @@ export function convertToGoogleMessages(
     contents,
   };
 }
+
+function parseToolCallInput(input: unknown): unknown {
+  if (typeof input !== 'string') {
+    return input;
+  }
+  try {
+    return secureJsonParse(input);
+  } catch {
+    return input;
+  }
+}

package/src/google-batch.ts

@@ -292,7 +292,6 @@ export class GoogleBatch implements BatchV4<GoogleBatchModelIds> {
       }
     }
 
-    const headers = await this.getHeaders(options.headers);
     const createUrl = `${this.batchConfig.baseURL}/${getModelPath(
       modelId,
     )}:batchGenerateContent`;
@@ -300,7 +299,7 @@ export class GoogleBatch implements BatchV4<GoogleBatchModelIds> {
     if (fileParts == null) {
       const { value: operation } = await postJsonToApi({
         url: createUrl,
-        headers,
+        headers: await this.getHeaders(options.headers),
         body: inlineBatchBody,
         failedResponseHandler: googleFailedResponseHandler,
         successfulResponseHandler: createJsonResponseHandler(
@@ -329,7 +328,7 @@ export class GoogleBatch implements BatchV4<GoogleBatchModelIds> {
 
     const { value: uploadUrl } = await postJsonToApi({
       url: `${this.getBaseOrigin()}/upload/v1beta/files`,
-      headers: combineHeaders(headers, {
+      headers: combineHeaders(await this.getHeaders(options.headers), {
         'X-Goog-Upload-Protocol': 'resumable',
         'X-Goog-Upload-Command': 'start',
         'X-Goog-Upload-Header-Content-Length': String(inputFile.size),
@@ -370,7 +369,7 @@ export class GoogleBatch implements BatchV4<GoogleBatchModelIds> {
 
     const { value: operation } = await postJsonToApi({
       url: createUrl,
-      headers,
+      headers: await this.getHeaders(options.headers),
       body: {
         batch: {
           displayName,

package/src/google-embedding-model.ts

@@ -3,6 +3,7 @@ import {
   type EmbeddingModelV4,
 } from '@ai-sdk/provider';
 import {
+  type Resolvable,
   combineHeaders,
   createJsonResponseHandler,
   type EmbeddingModelProviderOptionsTransformer,
@@ -26,7 +27,7 @@ import {
 type GoogleEmbeddingConfig = {
   provider: string;
   baseURL: string;
-  headers?: () => Record<string, string | undefined>;
+  headers?: Resolvable<Record<string, string | undefined>>;
   fetch?: FetchFunction;
 };
 

package/src/google-error.ts

@@ -28,3 +28,40 @@ export const googleFailedResponseHandler = createJsonErrorResponseHandler({
   errorSchema: googleErrorDataSchema,
   errorToMessage: data => data.error.message,
 });
+
+// Google RPC status names can be sent without a numeric HTTP error code.
+export function mapGoogleErrorStatusToHttpStatusCode(
+  status: string,
+): number | undefined {
+  switch (status) {
+    case 'CANCELLED':
+      return 499;
+    case 'INVALID_ARGUMENT':
+    case 'FAILED_PRECONDITION':
+    case 'OUT_OF_RANGE':
+      return 400;
+    case 'DEADLINE_EXCEEDED':
+      return 504;
+    case 'NOT_FOUND':
+      return 404;
+    case 'ALREADY_EXISTS':
+    case 'ABORTED':
+      return 409;
+    case 'PERMISSION_DENIED':
+      return 403;
+    case 'UNAUTHENTICATED':
+      return 401;
+    case 'RESOURCE_EXHAUSTED':
+      return 429;
+    case 'UNIMPLEMENTED':
+      return 501;
+    case 'UNKNOWN':
+    case 'INTERNAL':
+    case 'DATA_LOSS':
+      return 500;
+    case 'UNAVAILABLE':
+      return 503;
+    default:
+      return undefined;
+  }
+}

package/src/google-files.ts

@@ -6,6 +6,8 @@ import {
   type SharedV4Warning,
 } from '@ai-sdk/provider';
 import {
+  resolve,
+  type Resolvable,
   combineHeaders,
   convertInlineFileDataToUint8Array,
   createJsonResponseHandler,
@@ -31,7 +33,7 @@ export type GoogleFilesUploadOptions = {
 interface GoogleFilesConfig {
   provider: string;
   baseURL: string;
-  headers: () => Record<string, string | undefined>;
+  headers: Resolvable<Record<string, string | undefined>>;
   fetch?: FetchFunction;
 }
 
@@ -53,10 +55,8 @@ export class GoogleFiles implements FilesV4 {
       schema: googleFilesUploadOptionsSchema,
     })) as GoogleFilesUploadOptions | undefined;
 
-    const resolvedHeaders = combineHeaders(
-      this.config.headers(),
-      options.headers,
-    );
+    const getHeaders = async () =>
+      combineHeaders(await resolve(this.config.headers), options.headers);
     const fetchFn = this.config.fetch ?? globalThis.fetch;
 
     const warnings: Array<SharedV4Warning> = [];
@@ -74,7 +74,7 @@ export class GoogleFiles implements FilesV4 {
     const initResponse = await fetchFn(`${baseOrigin}/upload/v1beta/files`, {
       method: 'POST',
       headers: {
-        ...resolvedHeaders,
+        ...(await getHeaders()),
         'X-Goog-Upload-Protocol': 'resumable',
         'X-Goog-Upload-Command': 'start',
         'X-Goog-Upload-Header-Content-Length': String(fileBytes.length),
@@ -152,7 +152,7 @@ export class GoogleFiles implements FilesV4 {
       const { value: fileStatus } = await getFromApi({
         url: `${this.config.baseURL}/${filePath}`,
         validateUrl: false,
-        headers: combineHeaders(resolvedHeaders),
+        headers: await getHeaders(),
         successfulResponseHandler: createJsonResponseHandler(
           googleFileResponseSchema,
         ),

package/src/google-language-model.ts

@@ -51,6 +51,7 @@ import { getModelPath } from './get-model-path';
 import {
   getGoogleErrorSchema,
   googleFailedResponseHandler,
+  mapGoogleErrorStatusToHttpStatusCode,
 } from './google-error';
 import { sanitizeResponseJsonSchema } from './sanitize-response-json-schema';
 import {
@@ -58,7 +59,7 @@ import {
   type GoogleLanguageModelOptions,
   type GoogleModelId,
 } from './google-language-model-options';
-import { getGoogleModelCapabilities } from './google-model-capabilities';
+import { getGoogleLanguageModelEntry } from './google-model-catalog';
 import type { GoogleProviderMetadata } from './google-prompt';
 import { prepareTools } from './google-prepare-tools';
 import {
@@ -74,8 +75,6 @@ const configurableSafetySettingCategories = [
   'HARM_CATEGORY_SEXUALLY_EXPLICIT',
 ] as const;
 
-const gemini25ModelPattern = /(^|[/.])gemini-2\.5(?:[.-]|$)/i;
-
 const googleCloudStorageFunctionResponseUrls = {
   'image/png': [/^gs:\/\/.*$/],
   'image/jpeg': [/^gs:\/\/.*$/],
@@ -296,9 +295,12 @@ export class GoogleLanguageModel implements LanguageModelV4 {
       }
     }
 
-    const isGemmaModel = modelId.toLowerCase().startsWith('gemma-');
+    const entry = getGoogleLanguageModelEntry(modelId);
+    const isGemmaModel =
+      entry.requestConfig.language.systemInstruction === 'user';
     const isGemini25DeveloperApiModel =
-      !isVertexProvider && gemini25ModelPattern.test(modelId);
+      !isVertexProvider &&
+      entry.capabilities.language.sampling.penalties !== true;
 
     if (isGemini25DeveloperApiModel && frequencyPenalty != null) {
       warnings.push({
@@ -313,7 +315,8 @@ export class GoogleLanguageModel implements LanguageModelV4 {
       });
     }
 
-    const { usesGemini3Features } = getGoogleModelCapabilities(modelId);
+    const usesGemini3Features =
+      entry.capabilities.language.tools.functionResponseParts;
     const supportedFunctionResponseUrls =
       usesGemini3Features &&
       config.downloadToolResultFiles?.supportsGoogleCloudStorageUrls
@@ -466,6 +469,8 @@ export class GoogleLanguageModel implements LanguageModelV4 {
     { isStreaming = false }: { isStreaming?: boolean } = {},
   ) {
     const { responseFormat, tools, toolChoice } = options;
+    const entry = getGoogleLanguageModelEntry(this.modelId);
+    const { structuredOutput } = entry.capabilities.language;
     let jsonResponseTool: LanguageModelV4FunctionTool | undefined;
     // Gemini models before Gemini 3 reject JSON response formatting together
     // with function tools. Gemini 3 supports the combination only with automatic
@@ -474,8 +479,8 @@ export class GoogleLanguageModel implements LanguageModelV4 {
       responseFormat?.type === 'json' &&
       responseFormat.schema != null &&
       tools?.some(tool => tool.type === 'function') &&
-      /(^|\/)gemini-/i.test(this.modelId) &&
-      (!getGoogleModelCapabilities(this.modelId).usesGemini3Features ||
+      entry.requestConfig.language.jsonResponseTool &&
+      (!structuredOutput.withFunctionTools ||
         toolChoice?.type === 'required' ||
         toolChoice?.type === 'tool')
     ) {
@@ -754,18 +759,16 @@ export class GoogleLanguageModel implements LanguageModelV4 {
       jsonResponseToolName,
     } = await this.getArgs(options);
 
-    const mergedHeaders = combineHeaders(
-      this.config.headers ? await resolve(this.config.headers) : undefined,
-      options.headers,
-      extraHeaders,
-    );
-
-    const generateContent = (body: typeof args) =>
+    const generateContent = async (body: typeof args) =>
       postJsonToApi({
         url: `${this.config.baseURL}/${getModelPath(
           this.modelId,
         )}:generateContent`,
-        headers: mergedHeaders,
+        headers: combineHeaders(
+          await resolve(this.config.headers),
+          options.headers,
+          extraHeaders,
+        ),
         body,
         failedResponseHandler: googleFailedResponseHandler,
         successfulResponseHandler: createJsonResponseHandler(responseSchema),
@@ -875,18 +878,16 @@ export class GoogleLanguageModel implements LanguageModelV4 {
         providerOptionsNames.map(name => [name, payload]),
       ) as SharedV4ProviderMetadata;
 
-    const headers = combineHeaders(
-      this.config.headers ? await resolve(this.config.headers) : undefined,
-      options.headers,
-      extraHeaders,
-    );
-
-    const streamGenerateContent = (body: typeof args) =>
+    const streamGenerateContent = async (body: typeof args) =>
       postJsonToApi({
         url: `${this.config.baseURL}/${getModelPath(
           this.modelId,
         )}:streamGenerateContent?alt=sse`,
-        headers,
+        headers: combineHeaders(
+          await resolve(this.config.headers),
+          options.headers,
+          extraHeaders,
+        ),
         body,
         failedResponseHandler: googleFailedResponseHandler,
         successfulResponseHandler:
@@ -1040,19 +1041,22 @@ export class GoogleLanguageModel implements LanguageModelV4 {
             if (value.error != null) {
               finishReason = { unified: 'error', raw: undefined };
               const error = value.error;
+              const statusCode =
+                error.code ??
+                mapGoogleErrorStatusToHttpStatusCode(error.status);
               controller.enqueue({
                 type: 'error',
                 error: createProviderStreamError({
                   message: error.message,
                   type: error.status,
                   code: error.code ?? undefined,
-                  statusCode: error.code ?? undefined,
+                  statusCode,
                   isRetryable:
-                    error.code != null &&
-                    (error.code === 408 ||
-                      error.code === 409 ||
-                      error.code === 429 ||
-                      error.code >= 500),
+                    statusCode != null &&
+                    (statusCode === 408 ||
+                      statusCode === 409 ||
+                      statusCode === 429 ||
+                      statusCode >= 500),
                   data: error,
                 }),
               });
@@ -1571,27 +1575,6 @@ export class GoogleLanguageModel implements LanguageModelV4 {
   }
 }
 
-function getMaxOutputTokensForGemini25Model(): number {
-  return 65536;
-}
-
-function getMaxThinkingTokensForGemini25Model(modelId: string): number {
-  const id = modelId.toLowerCase();
-  if (id.includes('2.5-pro') || id.includes('gemini-3-pro-image')) {
-    return 32768;
-  }
-  return 24576;
-}
-
-/**
- * Gemini 2.5 Pro cannot disable thinking and requires a thinking budget of at
- * least 128 tokens. Other Gemini 2.5 models can disable thinking with a budget
- * of 0.
- */
-function getMinThinkingTokensForGemini25Model(modelId: string): number {
-  return modelId.toLowerCase().includes('2.5-pro') ? 128 : 0;
-}
-
 type GoogleThinkingConfig = NonNullable<
   InferSchema<typeof googleLanguageModelOptions>['thinkingConfig']
 >;
@@ -1610,8 +1593,8 @@ function resolveThinkingConfig({
   }
 
   if (
-    getGoogleModelCapabilities(modelId).usesGemini3Features &&
-    !modelId.includes('gemini-3-pro-image')
+    getGoogleLanguageModelEntry(modelId).requestConfig.language
+      .thinkingFormat === 'level'
   ) {
     return resolveGemini3ThinkingConfig({ reasoning, modelId, warnings });
   }
@@ -1631,7 +1614,9 @@ function resolveGemini3ThinkingConfig({
   modelId: string;
   warnings: SharedV4Warning[];
 }): Pick<GoogleThinkingConfig, 'thinkingLevel'> | undefined {
-  const minimumThinkingLevel = getMinimumThinkingLevelForGemini3Model(modelId);
+  const minimumThinkingLevel =
+    getGoogleLanguageModelEntry(modelId).capabilities.language.reasoning
+      .efforts?.[0];
 
   // It's not possible to fully disable thinking with Gemini 3, so reasoning
   // 'none' maps to the lowest supported thinking level.
@@ -1655,41 +1640,6 @@ function resolveGemini3ThinkingConfig({
   return { thinkingLevel };
 }
 
-function getMinimumThinkingLevelForGemini3Model(
-  modelId: string,
-): 'minimal' | 'low' {
-  const modelName = /(?:^|[/.])(gemini-[^/]*)$/i
-    .exec(modelId)?.[1]
-    .toLowerCase();
-
-  if (modelName === 'gemini-flash-latest') {
-    return 'low';
-  }
-
-  const proVersionMatch = /^gemini-(\d+)(?:\.\d+)?-pro(?:$|-)/.exec(
-    modelName ?? '',
-  );
-
-  if (Number(proVersionMatch?.[1]) >= 3) {
-    return 'low';
-  }
-
-  const versionMatch = /^gemini-(\d+)\.(\d+)-flash(?:$|-(?!lite(?:-|$)))/.exec(
-    modelName ?? '',
-  );
-
-  if (versionMatch == null) {
-    return 'minimal';
-  }
-
-  const majorVersion = Number(versionMatch[1]);
-  const minorVersion = Number(versionMatch[2]);
-
-  return majorVersion > 3 || (majorVersion === 3 && minorVersion >= 7)
-    ? 'low'
-    : 'minimal';
-}
-
 function resolveGemini25ThinkingConfig({
   reasoning,
   modelId,
@@ -1702,7 +1652,8 @@ function resolveGemini25ThinkingConfig({
   modelId: string;
   warnings: SharedV4Warning[];
 }): Pick<GoogleThinkingConfig, 'thinkingBudget'> {
-  const minThinkingBudget = getMinThinkingTokensForGemini25Model(modelId);
+  const entry = getGoogleLanguageModelEntry(modelId);
+  const minThinkingBudget = entry.capabilities.language.reasoning.minBudget;
 
   if (reasoning === 'none' && minThinkingBudget === 0) {
     return { thinkingBudget: 0 };
@@ -1710,8 +1661,8 @@ function resolveGemini25ThinkingConfig({
 
   const thinkingBudget = mapReasoningToProviderBudget({
     reasoning,
-    maxOutputTokens: getMaxOutputTokensForGemini25Model(),
-    maxReasoningBudget: getMaxThinkingTokensForGemini25Model(modelId),
+    maxOutputTokens: entry.requestConfig.language.reasoningMaxOutputTokens,
+    maxReasoningBudget: entry.capabilities.language.reasoning.maxBudget,
     minReasoningBudget: minThinkingBudget,
     warnings,
   });

package/src/google-model-capabilities.ts

@@ -1,44 +1,11 @@
-type GoogleModelCapabilities = {
-  supportsGemini2Tools: boolean;
-  supportsFileSearch: boolean;
-  usesGemini3Features: boolean;
-};
-
-const gemini1ModelPattern = /(^|[/.])gemini-1(?:[.-]|$)/i;
-const gemini2ModelPattern = /(^|[/.])gemini-2(?:[.-]|$)/i;
-const gemini25ModelPattern = /(^|[/.])gemini-2\.5(?:[.-]|$)/i;
-const geminiModelPattern = /(^|[/.])gemini-/i;
-
-function isKnownPreGemini2Model(modelId: string): boolean {
-  return (
-    gemini1ModelPattern.test(modelId) ||
-    /(^|[/.])gemini-pro(?:-vision)?$/i.test(modelId) ||
-    /(^|[/.])gemini-robotics-er-1\.5(?:[.-]|$)/i.test(modelId)
-  );
-}
-
-/**
- * Classifies Gemini capabilities by excluding known older generations.
- *
- * Google model IDs are open-ended, so unrecognized Gemini IDs and aliases
- * intentionally inherit the newest supported behavior. Add exceptions here
- * only when a model is known to require a legacy request shape.
- */
-export function getGoogleModelCapabilities(
-  modelId: string,
-): GoogleModelCapabilities {
-  const isGeminiModel = geminiModelPattern.test(modelId);
-  const isGemini2Model = gemini2ModelPattern.test(modelId);
-  const isKnownPreGemini2 = isKnownPreGemini2Model(modelId);
-  const isKnownOlderModel = isKnownPreGemini2 || isGemini2Model;
-  const usesGemini3Features = isGeminiModel && !isKnownOlderModel;
+import { getGoogleLanguageModelEntry } from './google-model-catalog';
 
+/** Compatibility projection of the resolved catalog for existing request code. */
+export function getGoogleModelCapabilities(modelId: string) {
+  const { tools } = getGoogleLanguageModelEntry(modelId).capabilities.language;
   return {
-    supportsGemini2Tools:
-      (isGeminiModel && !isKnownPreGemini2) ||
-      modelId.toLowerCase().includes('nano-banana'),
-    supportsFileSearch:
-      gemini25ModelPattern.test(modelId) || usesGemini3Features,
-    usesGemini3Features,
+    supportsGemini2Tools: tools.gemini2,
+    supportsFileSearch: tools.fileSearch,
+    usesGemini3Features: tools.mixed,
   };
 }