@ai-sdk/google 4.0.0-beta.44 → 4.0.0-beta.46

package/src/{google-generative-ai-language-model.ts → google-language-model.ts}

@@ -34,24 +34,24 @@ import {
 } from '@ai-sdk/provider-utils';
 import { z } from 'zod/v4';
 import {
-  convertGoogleGenerativeAIUsage,
-  GoogleGenerativeAIUsageMetadata,
-} from './convert-google-generative-ai-usage';
+  convertGoogleUsage,
+  GoogleUsageMetadata,
+} from './convert-google-usage';
 import { convertJSONSchemaToOpenAPISchema } from './convert-json-schema-to-openapi-schema';
-import { convertToGoogleGenerativeAIMessages } from './convert-to-google-generative-ai-messages';
+import { convertToGoogleMessages } from './convert-to-google-messages';
 import { getModelPath } from './get-model-path';
 import { googleFailedResponseHandler } from './google-error';
 import {
-  GoogleGenerativeAIModelId,
+  GoogleModelId,
   googleLanguageModelOptions,
   VertexServiceTierMap,
-} from './google-generative-ai-options';
-import { GoogleGenerativeAIProviderMetadata } from './google-generative-ai-prompt';
+} from './google-options';
+import { GoogleProviderMetadata } from './google-prompt';
 import { prepareTools } from './google-prepare-tools';
 import { GoogleJSONAccumulator, PartialArg } from './google-json-accumulator';
-import { mapGoogleGenerativeAIFinishReason } from './map-google-generative-ai-finish-reason';
+import { mapGoogleFinishReason } from './map-google-finish-reason';
 
-type GoogleGenerativeAIConfig = {
+type GoogleConfig = {
   provider: string;
   baseURL: string;
   headers?: Resolvable<Record<string, string | undefined>>;
@@ -64,15 +64,15 @@ type GoogleGenerativeAIConfig = {
   supportedUrls?: () => LanguageModelV4['supportedUrls'];
 };
 
-export class GoogleGenerativeAILanguageModel implements LanguageModelV4 {
+export class GoogleLanguageModel implements LanguageModelV4 {
   readonly specificationVersion = 'v4';
 
-  readonly modelId: GoogleGenerativeAIModelId;
+  readonly modelId: GoogleModelId;
 
-  private readonly config: GoogleGenerativeAIConfig;
+  private readonly config: GoogleConfig;
   private readonly generateId: () => string;
 
-  static [WORKFLOW_SERIALIZE](model: GoogleGenerativeAILanguageModel) {
+  static [WORKFLOW_SERIALIZE](model: GoogleLanguageModel) {
     return serializeModelOptions({
       modelId: model.modelId,
       config: model.config,
@@ -81,15 +81,12 @@ export class GoogleGenerativeAILanguageModel implements LanguageModelV4 {
 
   static [WORKFLOW_DESERIALIZE](options: {
     modelId: string;
-    config: GoogleGenerativeAIConfig;
+    config: GoogleConfig;
   }) {
-    return new GoogleGenerativeAILanguageModel(options.modelId, options.config);
+    return new GoogleLanguageModel(options.modelId, options.config);
   }
 
-  constructor(
-    modelId: GoogleGenerativeAIModelId,
-    config: GoogleGenerativeAIConfig,
-  ) {
+  constructor(modelId: GoogleModelId, config: GoogleConfig) {
     this.modelId = modelId;
     this.config = config;
     this.generateId = config.generateId ?? generateId;
@@ -179,14 +176,11 @@ export class GoogleGenerativeAILanguageModel implements LanguageModelV4 {
     const isGemmaModel = this.modelId.toLowerCase().startsWith('gemma-');
     const supportsFunctionResponseParts = this.modelId.startsWith('gemini-3');
 
-    const { contents, systemInstruction } = convertToGoogleGenerativeAIMessages(
-      prompt,
-      {
-        isGemmaModel,
-        providerOptionsName,
-        supportsFunctionResponseParts,
-      },
-    );
+    const { contents, systemInstruction } = convertToGoogleMessages(prompt, {
+      isGemmaModel,
+      providerOptionsName,
+      supportsFunctionResponseParts,
+    });
 
     const {
       tools: googleTools,
@@ -196,6 +190,7 @@ export class GoogleGenerativeAILanguageModel implements LanguageModelV4 {
       tools,
       toolChoice,
       modelId: this.modelId,
+      isVertexProvider,
     });
 
     const resolvedThinking = resolveThinkingConfig({
@@ -469,7 +464,7 @@ export class GoogleGenerativeAILanguageModel implements LanguageModelV4 {
     return {
       content,
       finishReason: {
-        unified: mapGoogleGenerativeAIFinishReason({
+        unified: mapGoogleFinishReason({
           finishReason: candidate.finishReason,
           // Only count client-executed tool calls for finish reason determination.
           hasToolCalls: content.some(
@@ -478,7 +473,7 @@ export class GoogleGenerativeAILanguageModel implements LanguageModelV4 {
         }),
         raw: candidate.finishReason ?? undefined,
       },
-      usage: convertGoogleGenerativeAIUsage(usageMetadata),
+      usage: convertGoogleUsage(usageMetadata),
       warnings,
       providerMetadata: {
         [providerOptionsName]: {
@@ -489,7 +484,7 @@ export class GoogleGenerativeAILanguageModel implements LanguageModelV4 {
           usageMetadata: usageMetadata ?? null,
           finishMessage: candidate.finishMessage ?? null,
           serviceTier: response.serviceTier ?? null,
-        } satisfies GoogleGenerativeAIProviderMetadata,
+        } satisfies GoogleProviderMetadata,
       },
       request: { body: args },
       response: {
@@ -529,7 +524,7 @@ export class GoogleGenerativeAILanguageModel implements LanguageModelV4 {
       unified: 'other',
       raw: undefined,
     };
-    let usage: GoogleGenerativeAIUsageMetadata | undefined = undefined;
+    let usage: GoogleUsageMetadata | undefined = undefined;
     let providerMetadata: SharedV4ProviderMetadata | undefined = undefined;
     let lastGroundingMetadata: GroundingMetadataSchema | null = null;
     let lastUrlContextMetadata: UrlContextMetadataSchema | null = null;
@@ -965,7 +960,7 @@ export class GoogleGenerativeAILanguageModel implements LanguageModelV4 {
 
             if (candidate.finishReason != null) {
               finishReason = {
-                unified: mapGoogleGenerativeAIFinishReason({
+                unified: mapGoogleFinishReason({
                   finishReason: candidate.finishReason,
                   hasToolCalls,
                 }),
@@ -981,7 +976,7 @@ export class GoogleGenerativeAILanguageModel implements LanguageModelV4 {
                   usageMetadata: usageMetadata ?? null,
                   finishMessage: candidate.finishMessage ?? null,
                   serviceTier,
-                } satisfies GoogleGenerativeAIProviderMetadata,
+                } satisfies GoogleProviderMetadata,
               };
             }
           },
@@ -1003,7 +998,7 @@ export class GoogleGenerativeAILanguageModel implements LanguageModelV4 {
             controller.enqueue({
               type: 'finish',
               finishReason,
-              usage: convertGoogleGenerativeAIUsage(usage),
+              usage: convertGoogleUsage(usage),
               providerMetadata,
             });
           },

package/src/{google-generative-ai-options.ts → google-options.ts}

@@ -1,7 +1,7 @@
 import { InferSchema, lazySchema, zodSchema } from '@ai-sdk/provider-utils';
 import { z } from 'zod/v4';
 
-export type GoogleGenerativeAIModelId =
+export type GoogleModelId =
   // Stable models
   // https://ai.google.dev/gemini-api/docs/models/gemini
   | 'gemini-2.0-flash'
@@ -73,7 +73,7 @@ export const googleLanguageModelOptions = lazySchema(() =>
        *
        * This is useful when the JSON Schema contains elements that are
        * not supported by the OpenAPI schema version that
-       * Google Generative AI uses. You can use this to disable
+       * Google uses. You can use this to disable
        * structured outputs if you need to.
        */
       structuredOutputs: z.boolean().optional(),

package/src/google-prepare-tools.ts

@@ -4,16 +4,18 @@ import {
   UnsupportedFunctionalityError,
 } from '@ai-sdk/provider';
 import { convertJSONSchemaToOpenAPISchema } from './convert-json-schema-to-openapi-schema';
-import { GoogleGenerativeAIModelId } from './google-generative-ai-options';
+import { GoogleModelId } from './google-options';
 
 export function prepareTools({
   tools,
   toolChoice,
   modelId,
+  isVertexProvider = false,
 }: {
   tools: LanguageModelV4CallOptions['tools'];
   toolChoice?: LanguageModelV4CallOptions['toolChoice'];
-  modelId: GoogleGenerativeAIModelId;
+  modelId: GoogleModelId;
+  isVertexProvider?: boolean;
 }): {
   tools:
     | Array<
@@ -49,7 +51,7 @@ export function prepareTools({
       'gemini-flash-latest',
       'gemini-flash-lite-latest',
       'gemini-pro-latest',
-    ] as const satisfies GoogleGenerativeAIModelId[]
+    ] as const satisfies GoogleModelId[]
   ).some(id => id === modelId);
   const isGemini2orNewer =
     modelId.includes('gemini-2') ||
@@ -202,10 +204,12 @@ export function prepareTools({
           mode: 'VALIDATED' | 'ANY' | 'NONE';
           allowedFunctionNames?: string[];
         };
-        includeServerSideToolInvocations: true;
+        includeServerSideToolInvocations?: true;
       } = {
         functionCallingConfig: { mode: 'VALIDATED' },
-        includeServerSideToolInvocations: true,
+        ...(!isVertexProvider && {
+          includeServerSideToolInvocations: true,
+        }),
       };
 
       if (toolChoice != null) {

package/src/google-prompt.ts

@@ -0,0 +1,82 @@
+import {
+  GroundingMetadataSchema,
+  PromptFeedbackSchema,
+  UrlContextMetadataSchema,
+  type SafetyRatingSchema,
+  UsageMetadataSchema,
+} from './google-language-model';
+
+export type GooglePrompt = {
+  systemInstruction?: GoogleSystemInstruction;
+  contents: Array<GoogleContent>;
+};
+
+export type GoogleSystemInstruction = {
+  parts: Array<{ text: string }>;
+};
+
+export type GoogleContent = {
+  role: 'user' | 'model';
+  parts: Array<GoogleContentPart>;
+};
+
+export type GoogleContentPart =
+  | { text: string; thought?: boolean; thoughtSignature?: string }
+  | {
+      inlineData: { mimeType: string; data: string };
+      thought?: boolean;
+      thoughtSignature?: string;
+    }
+  | { functionCall: { name: string; args: unknown }; thoughtSignature?: string }
+  | {
+      functionResponse: {
+        name: string;
+        response: unknown;
+        parts?: Array<GoogleFunctionResponsePart>;
+      };
+    }
+  | {
+      fileData: { mimeType: string; fileUri: string };
+      thought?: boolean;
+      thoughtSignature?: string;
+    }
+  | {
+      toolCall: {
+        toolType: string;
+        args?: unknown;
+        id: string;
+      };
+      thoughtSignature?: string;
+    }
+  | {
+      toolResponse: {
+        toolType: string;
+        response?: unknown;
+        id: string;
+      };
+      thoughtSignature?: string;
+    };
+
+export type GoogleFunctionResponsePart = {
+  inlineData: { mimeType: string; data: string };
+};
+
+export type GoogleGroundingMetadata = GroundingMetadataSchema;
+
+export type GoogleUrlContextMetadata = UrlContextMetadataSchema;
+
+export type GoogleSafetyRating = SafetyRatingSchema;
+
+export type GooglePromptFeedback = PromptFeedbackSchema;
+
+export type GoogleUsageMetadata = UsageMetadataSchema;
+
+export interface GoogleProviderMetadata {
+  promptFeedback: GooglePromptFeedback | null;
+  groundingMetadata: GoogleGroundingMetadata | null;
+  urlContextMetadata: GoogleUrlContextMetadata | null;
+  safetyRatings: GoogleSafetyRating[] | null;
+  usageMetadata: GoogleUsageMetadata | null;
+  finishMessage: string | null;
+  serviceTier: string | null;
+}

package/src/google-provider.ts

@@ -14,81 +14,77 @@ import {
   withUserAgentSuffix,
 } from '@ai-sdk/provider-utils';
 import { VERSION } from './version';
-import { GoogleGenerativeAIEmbeddingModel } from './google-generative-ai-embedding-model';
-import { GoogleGenerativeAIEmbeddingModelId } from './google-generative-ai-embedding-options';
-import { GoogleGenerativeAILanguageModel } from './google-generative-ai-language-model';
-import { GoogleGenerativeAIModelId } from './google-generative-ai-options';
+import { GoogleEmbeddingModel } from './google-embedding-model';
+import { GoogleEmbeddingModelId } from './google-embedding-options';
+import { GoogleLanguageModel } from './google-language-model';
+import { GoogleModelId } from './google-options';
 import { googleTools } from './google-tools';
 
 import {
-  GoogleGenerativeAIImageSettings,
-  GoogleGenerativeAIImageModelId,
-} from './google-generative-ai-image-settings';
-import { GoogleGenerativeAIImageModel } from './google-generative-ai-image-model';
-import { GoogleGenerativeAIFiles } from './google-generative-ai-files';
-import { GoogleGenerativeAIVideoModel } from './google-generative-ai-video-model';
-import { GoogleGenerativeAIVideoModelId } from './google-generative-ai-video-settings';
+  GoogleImageSettings,
+  GoogleImageModelId,
+} from './google-image-settings';
+import { GoogleImageModel } from './google-image-model';
+import { GoogleFiles } from './google-files';
+import { GoogleVideoModel } from './google-video-model';
+import { GoogleVideoModelId } from './google-video-settings';
 
-export interface GoogleGenerativeAIProvider extends ProviderV4 {
-  (modelId: GoogleGenerativeAIModelId): LanguageModelV4;
+export interface GoogleProvider extends ProviderV4 {
+  (modelId: GoogleModelId): LanguageModelV4;
 
-  languageModel(modelId: GoogleGenerativeAIModelId): LanguageModelV4;
+  languageModel(modelId: GoogleModelId): LanguageModelV4;
 
-  chat(modelId: GoogleGenerativeAIModelId): LanguageModelV4;
+  chat(modelId: GoogleModelId): LanguageModelV4;
 
   /**
    * Creates a model for image generation.
    */
   image(
-    modelId: GoogleGenerativeAIImageModelId,
-    settings?: GoogleGenerativeAIImageSettings,
+    modelId: GoogleImageModelId,
+    settings?: GoogleImageSettings,
   ): ImageModelV4;
 
   /**
    * @deprecated Use `chat()` instead.
    */
-  generativeAI(modelId: GoogleGenerativeAIModelId): LanguageModelV4;
+  generativeAI(modelId: GoogleModelId): LanguageModelV4;
 
   /**
    * Creates a model for text embeddings.
    */
-  embedding(modelId: GoogleGenerativeAIEmbeddingModelId): EmbeddingModelV4;
+  embedding(modelId: GoogleEmbeddingModelId): EmbeddingModelV4;
 
   /**
    * Creates a model for text embeddings.
    */
-  embeddingModel(modelId: GoogleGenerativeAIEmbeddingModelId): EmbeddingModelV4;
+  embeddingModel(modelId: GoogleEmbeddingModelId): EmbeddingModelV4;
 
   /**
    * @deprecated Use `embedding` instead.
    */
-  textEmbedding(modelId: GoogleGenerativeAIEmbeddingModelId): EmbeddingModelV4;
+  textEmbedding(modelId: GoogleEmbeddingModelId): EmbeddingModelV4;
 
   /**
    * @deprecated Use `embeddingModel` instead.
    */
-  textEmbeddingModel(
-    modelId: GoogleGenerativeAIEmbeddingModelId,
-  ): EmbeddingModelV4;
+  textEmbeddingModel(modelId: GoogleEmbeddingModelId): EmbeddingModelV4;
 
   /**
    * Creates a model for video generation.
    */
-  video(modelId: GoogleGenerativeAIVideoModelId): Experimental_VideoModelV4;
+  video(modelId: GoogleVideoModelId): Experimental_VideoModelV4;
 
   /**
    * Creates a model for video generation.
    */
-  videoModel(
-    modelId: GoogleGenerativeAIVideoModelId,
-  ): Experimental_VideoModelV4;
+  videoModel(modelId: GoogleVideoModelId): Experimental_VideoModelV4;
 
   files(): FilesV4;
 
   tools: typeof googleTools;
 }
 
-export interface GoogleGenerativeAIProviderSettings {
+export interface GoogleProviderSettings {
   /**
    * Use a different URL prefix for API calls, e.g. to use proxy servers.
    * The default prefix is `https://generativelanguage.googleapis.com/v1beta`.
@@ -125,11 +121,11 @@ export interface GoogleGenerativeAIProviderSettings {
 }
 
 /**
- * Create a Google Generative AI provider instance.
+ * Create a Google provider instance.
  */
-export function createGoogleGenerativeAI(
-  options: GoogleGenerativeAIProviderSettings = {},
-): GoogleGenerativeAIProvider {
+export function createGoogle(
+  options: GoogleProviderSettings = {},
+): GoogleProvider {
   const baseURL =
     withoutTrailingSlash(options.baseURL) ??
     'https://generativelanguage.googleapis.com/v1beta';
@@ -149,8 +145,8 @@ export function createGoogleGenerativeAI(
       `ai-sdk/google/${VERSION}`,
     );
 
-  const createChatModel = (modelId: GoogleGenerativeAIModelId) =>
-    new GoogleGenerativeAILanguageModel(modelId, {
+  const createChatModel = (modelId: GoogleModelId) =>
+    new GoogleLanguageModel(modelId, {
       provider: providerName,
       baseURL,
       headers: getHeaders,
@@ -170,8 +166,8 @@ export function createGoogleGenerativeAI(
       fetch: options.fetch,
     });
 
-  const createEmbeddingModel = (modelId: GoogleGenerativeAIEmbeddingModelId) =>
-    new GoogleGenerativeAIEmbeddingModel(modelId, {
+  const createEmbeddingModel = (modelId: GoogleEmbeddingModelId) =>
+    new GoogleEmbeddingModel(modelId, {
       provider: providerName,
       baseURL,
       headers: getHeaders,
@@ -179,10 +175,10 @@ export function createGoogleGenerativeAI(
     });
 
   const createImageModel = (
-    modelId: GoogleGenerativeAIImageModelId,
-    settings: GoogleGenerativeAIImageSettings = {},
+    modelId: GoogleImageModelId,
+    settings: GoogleImageSettings = {},
   ) =>
-    new GoogleGenerativeAIImageModel(modelId, settings, {
+    new GoogleImageModel(modelId, settings, {
       provider: providerName,
       baseURL,
       headers: getHeaders,
@@ -190,15 +186,15 @@ export function createGoogleGenerativeAI(
     });
 
   const createFiles = () =>
-    new GoogleGenerativeAIFiles({
+    new GoogleFiles({
       provider: providerName,
       baseURL,
       headers: getHeaders,
       fetch: options.fetch,
     });
 
-  const createVideoModel = (modelId: GoogleGenerativeAIVideoModelId) =>
-    new GoogleGenerativeAIVideoModel(modelId, {
+  const createVideoModel = (modelId: GoogleVideoModelId) =>
+    new GoogleVideoModel(modelId, {
       provider: providerName,
       baseURL,
       headers: getHeaders,
@@ -206,7 +202,7 @@ export function createGoogleGenerativeAI(
       generateId: options.generateId ?? generateId,
     });
 
-  const provider = function (modelId: GoogleGenerativeAIModelId) {
+  const provider = function (modelId: GoogleModelId) {
     if (new.target) {
       throw new Error(
         'The Google Generative AI model function cannot be called with the new keyword.',
@@ -231,10 +227,10 @@ export function createGoogleGenerativeAI(
   provider.files = createFiles;
   provider.tools = googleTools;
 
-  return provider as GoogleGenerativeAIProvider;
+  return provider as GoogleProvider;
 }
 
 /**
  * Default Google Generative AI provider instance.
  */
-export const google = createGoogleGenerativeAI();
+export const google = createGoogle();

package/src/{google-generative-ai-video-model.ts → google-video-model.ts}

@@ -19,7 +19,7 @@ import {
 } from '@ai-sdk/provider-utils';
 import { z } from 'zod/v4';
 import { googleFailedResponseHandler } from './google-error';
-import type { GoogleGenerativeAIVideoModelId } from './google-generative-ai-video-settings';
+import type { GoogleVideoModelId } from './google-video-settings';
 
 export type GoogleVideoModelOptions = {
   // Polling configuration
@@ -39,7 +39,7 @@ export type GoogleVideoModelOptions = {
   [key: string]: unknown; // For passthrough
 };
 
-interface GoogleGenerativeAIVideoModelConfig {
+interface GoogleVideoModelConfig {
   provider: string;
   baseURL: string;
   headers?: Resolvable<Record<string, string | undefined>>;
@@ -50,7 +50,7 @@ interface GoogleGenerativeAIVideoModelConfig {
   };
 }
 
-export class GoogleGenerativeAIVideoModel implements Experimental_VideoModelV4 {
+export class GoogleVideoModel implements Experimental_VideoModelV4 {
   readonly specificationVersion = 'v4';
 
   get provider(): string {
@@ -63,8 +63,8 @@ export class GoogleGenerativeAIVideoModel implements Experimental_VideoModelV4 {
   }
 
   constructor(
-    readonly modelId: GoogleGenerativeAIVideoModelId,
-    private readonly config: GoogleGenerativeAIVideoModelConfig,
+    readonly modelId: GoogleVideoModelId,
+    private readonly config: GoogleVideoModelConfig,
   ) {}
 
   async doGenerate(

package/src/{google-generative-ai-video-settings.ts → google-video-settings.ts}

@@ -1,4 +1,4 @@
-export type GoogleGenerativeAIVideoModelId =
+export type GoogleVideoModelId =
   | 'veo-3.1-fast-generate-preview'
   | 'veo-3.1-generate-preview'
   | 'veo-3.1-generate'

package/src/index.ts

@@ -3,28 +3,46 @@ export type {
   GoogleLanguageModelOptions,
   /** @deprecated Use `GoogleLanguageModelOptions` instead. */
   GoogleLanguageModelOptions as GoogleGenerativeAIProviderOptions,
-} from './google-generative-ai-options';
-export type { GoogleGenerativeAIProviderMetadata } from './google-generative-ai-prompt';
+} from './google-options';
+export type {
+  GoogleProviderMetadata,
+  /** @deprecated Use `GoogleProviderMetadata` instead. */
+  GoogleProviderMetadata as GoogleGenerativeAIProviderMetadata,
+} from './google-prompt';
 export type {
   GoogleImageModelOptions,
   /** @deprecated Use `GoogleImageModelOptions` instead. */
   GoogleImageModelOptions as GoogleGenerativeAIImageProviderOptions,
-} from './google-generative-ai-image-model';
+} from './google-image-model';
 export type {
   GoogleEmbeddingModelOptions,
   /** @deprecated Use `GoogleEmbeddingModelOptions` instead. */
   GoogleEmbeddingModelOptions as GoogleGenerativeAIEmbeddingProviderOptions,
-} from './google-generative-ai-embedding-options';
+} from './google-embedding-options';
 export type {
   GoogleVideoModelOptions,
   /** @deprecated Use `GoogleVideoModelOptions` instead. */
   GoogleVideoModelOptions as GoogleGenerativeAIVideoProviderOptions,
-} from './google-generative-ai-video-model';
-export type { GoogleGenerativeAIVideoModelId } from './google-generative-ai-video-settings';
-export type { GoogleFilesUploadOptions } from './google-generative-ai-files';
-export { createGoogleGenerativeAI, google } from './google-provider';
+} from './google-video-model';
+export type {
+  GoogleVideoModelId,
+  /** @deprecated Use `GoogleVideoModelId` instead. */
+  GoogleVideoModelId as GoogleGenerativeAIVideoModelId,
+} from './google-video-settings';
+export type { GoogleFilesUploadOptions } from './google-files';
+export {
+  createGoogle,
+  google,
+  /** @deprecated Use `createGoogle` instead. */
+  createGoogle as createGoogleGenerativeAI,
+} from './google-provider';
 export type {
-  GoogleGenerativeAIProvider,
-  GoogleGenerativeAIProviderSettings,
+  GoogleProvider,
+  GoogleProviderSettings,
+  /** @deprecated Use `GoogleProvider` instead. */
+  GoogleProvider as GoogleGenerativeAIProvider,
+  /** @deprecated Use `GoogleProviderSettings` instead. */
+  GoogleProviderSettings as GoogleGenerativeAIProviderSettings,
 } from './google-provider';
+
 export { VERSION } from './version';

package/src/internal/index.ts

@@ -1,3 +1,3 @@
-export * from '../google-generative-ai-language-model';
+export * from '../google-language-model';
 export { googleTools } from '../google-tools';
-export type { GoogleGenerativeAIModelId } from '../google-generative-ai-options';
+export type { GoogleModelId } from '../google-options';

package/src/{map-google-generative-ai-finish-reason.ts → map-google-finish-reason.ts}

@@ -1,6 +1,6 @@
 import { LanguageModelV4FinishReason } from '@ai-sdk/provider';
 
-export function mapGoogleGenerativeAIFinishReason({
+export function mapGoogleFinishReason({
   finishReason,
   hasToolCalls,
 }: {

package/src/tool/code-execution.ts

@@ -1,4 +1,4 @@
-import { createProviderToolFactoryWithOutputSchema } from '@ai-sdk/provider-utils';
+import { createProviderExecutedToolFactory } from '@ai-sdk/provider-utils';
 import { z } from 'zod/v4';
 
 /**
@@ -10,7 +10,7 @@ import { z } from 'zod/v4';
  * @see https://ai.google.dev/gemini-api/docs/code-execution (Google AI)
  * @see https://cloud.google.com/vertex-ai/generative-ai/docs/model-reference/code-execution-api (Vertex AI)
  */
-export const codeExecution = createProviderToolFactoryWithOutputSchema<
+export const codeExecution = createProviderExecutedToolFactory<
   {
     language: string;
     code: string;

package/src/tool/enterprise-web-search.ts

@@ -1,5 +1,5 @@
 import {
-  createProviderToolFactory,
+  createProviderExecutedToolFactory,
   lazySchema,
   zodSchema,
 } from '@ai-sdk/provider-utils';
@@ -7,12 +7,18 @@ import { z } from 'zod/v4';
 
 // https://cloud.google.com/vertex-ai/generative-ai/docs/grounding/web-grounding-enterprise
 
-export const enterpriseWebSearch = createProviderToolFactory<
+export const enterpriseWebSearch = createProviderExecutedToolFactory<
   {
     // Enterprise Web Search does not have any input schema
   },
-  {}
+  {
+    // Enterprise Web Search does not have any output parameters
+  },
+  {
+    // Enterprise Web Search does not have any configuration options
+  }
 >({
   id: 'google.enterprise_web_search',
   inputSchema: lazySchema(() => zodSchema(z.object({}))),
+  outputSchema: lazySchema(() => zodSchema(z.object({}))),
 });