@tanstack/ai-gemini 0.23.0 → 0.24.1

package/src/image/image-provider-options.ts

@@ -1,12 +1,24 @@
 import type { GeminiImageModels } from '../model-meta'
 import type {
+  ContentUnion,
+  ImageConfig,
   ImagePromptLanguage,
   PersonGeneration,
   SafetyFilterLevel,
+  SafetySetting,
+  ThinkingConfig,
 } from '@google/genai'
 
 // Re-export SDK types so users can use them directly
-export type { ImagePromptLanguage, PersonGeneration, SafetyFilterLevel }
+export type {
+  ContentUnion,
+  ImageConfig,
+  ImagePromptLanguage,
+  PersonGeneration,
+  SafetyFilterLevel,
+  SafetySetting,
+  ThinkingConfig,
+}
 
 /**
  * Gemini Imagen aspect ratio options
@@ -121,11 +133,80 @@ export interface GeminiImageProviderOptions {
 }
 
 /**
- * Model-specific provider options mapping
- * Currently all Imagen models use the same options structure
+ * Provider options for Gemini native image models (Nano Banana and friends).
+ *
+ * These models are served by `generateContent`, not `generateImages`, so they
+ * are configured by @google/genai's `GenerateContentConfig` — a different
+ * shape from the Imagen-only {@link GeminiImageProviderOptions} above. Only
+ * the `GenerateContentConfig` fields with clear image-generation semantics are
+ * surfaced; sampling knobs (`temperature`, `topK`, …) and chat-only plumbing
+ * (`tools`, `responseSchema`, …) are deliberately left out.
+ *
+ * `responseModalities` is intentionally absent: the adapter always requests
+ * `['TEXT', 'IMAGE']`, and letting a caller override it would silently disable
+ * image output on an image-generation call.
+ */
+export interface GeminiNativeImageProviderOptions {
+  /**
+   * Optional seed for reproducible image generation
+   * When the same seed is used with the same prompt and settings,
+   * you should get similar (though not identical) results
+   */
+  seed?: number
+
+  /**
+   * Per-category safety thresholds applied to the request
+   * Each entry pairs a HarmCategory with a HarmBlockThreshold
+   */
+  safetySettings?: Array<SafetySetting>
+
+  /**
+   * Controls the model's internal reasoning before it emits an image
+   * Use to raise or disable the thinking budget on models that support it
+   */
+  thinkingConfig?: ThinkingConfig
+
+  /**
+   * Native image output controls. Merged over the values derived from the
+   * portable `size` option, so fields set here win per field while the rest
+   * of `size` is preserved.
+   *
+   * Only `aspectRatio` and `imageSize` are accepted on the Gemini Developer
+   * API. Other SDK `ImageConfig` keys throw on this surface.
+   */
+  imageConfig?: GeminiNativeImageConfig
+
+  /**
+   * System-level instructions that steer the model for the whole request,
+   * e.g. a house art direction applied on top of the per-call prompt
+   */
+  systemInstruction?: ContentUnion
+}
+
+/**
+ * Every provider-option field this adapter understands, across both API
+ * paths. Used as the adapter's base (model-agnostic) option type; the
+ * per-model map below is what narrows a given model to the half that
+ * actually applies to it.
+ */
+export type GeminiAnyImageProviderOptions = GeminiImageProviderOptions &
+  GeminiNativeImageProviderOptions
+
+/**
+ * Model-specific provider options mapping.
+ * Gemini native image models go through `generateContent` and take
+ * `GenerateContentConfig` fields; Imagen models go through `generateImages`
+ * and take `GenerateImagesConfig` fields. Mirrors the native/Imagen split in
+ * {@link GeminiImageModelSizeByName} and
+ * {@link GeminiImageModelInputModalitiesByName}.
  */
 export type GeminiImageModelProviderOptionsByName = {
-  [K in GeminiImageModels]: GeminiImageProviderOptions
+  [K in GeminiNativeImageModels]: GeminiNativeImageProviderOptions
+} & {
+  [K in Exclude<
+    GeminiImageModels,
+    GeminiNativeImageModels
+  >]: GeminiImageProviderOptions
 }
 
 /**
@@ -145,47 +226,157 @@ export type GeminiImageSize =
   | '1080x1920'
 
 /**
- * Aspect ratios supported by Gemini native image models (via generateContent API).
- * Matches the SDK's ImageConfig.aspectRatio values.
+ * The ten aspect ratios every Gemini native image model accepts.
+ *
+ * Note `9:21` is deliberately absent: it exists only on Vertex / Cloud and is
+ * rejected by the Gemini API (`generateContent`), which is the surface this
+ * adapter targets.
+ *
+ * @see https://ai.google.dev/gemini-api/docs/image-generation
  */
-export type GeminiNativeImageAspectRatio =
+export type GeminiStandardImageAspectRatio =
   | '1:1'
   | '2:3'
   | '3:2'
   | '3:4'
   | '4:3'
+  | '4:5'
+  | '5:4'
   | '9:16'
   | '16:9'
   | '21:9'
 
 /**
- * Resolution tiers for Gemini native image models.
- * Matches the SDK's ImageConfig.imageSize values.
+ * The ten standard ratios plus the four extreme banner/strip ratios that only
+ * the Gemini 3.1 Flash Image models accept — 14 values, matching the
+ * `generateContent` `ImageConfig.aspectRatio` field union.
+ *
+ * @see https://ai.google.dev/api/generate-content
+ */
+export type GeminiExtendedImageAspectRatio =
+  | GeminiStandardImageAspectRatio
+  | '1:4'
+  | '4:1'
+  | '1:8'
+  | '8:1'
+
+/**
+ * Sizes for `gemini-3.1-flash-image` (and its shut-down `-preview` alias):
+ * all 14 aspect ratios at 512 / 1K / 2K / 4K. `512` is the wire token for the
+ * 0.5K tier — not `512px`, and the `K` is case-sensitive (`1k` is rejected).
+ */
+export type Gemini31FlashImageSize =
+  `${GeminiExtendedImageAspectRatio}_${'512' | '1K' | '2K' | '4K'}`
+
+/**
+ * Sizes for `gemini-3.1-flash-lite-image`: all 14 aspect ratios, 1K only.
+ * 2K and 4K are unsupported on this model.
+ *
+ * The four banner ratios (`1:4`, `4:1`, `1:8`, `8:1`) come from the Cloud
+ * model page. The Gemini API page states a count of 14 but does not list them.
+ *
+ * @see https://docs.cloud.google.com/gemini-enterprise-agent-platform/models/gemini/3-1-flash-lite-image
+ * @see https://ai.google.dev/gemini-api/docs/models/gemini-3.1-flash-lite-image
+ */
+export type Gemini31FlashLiteImageSize = `${GeminiExtendedImageAspectRatio}_1K`
+
+/**
+ * Sizes for `gemini-3-pro-image` (and its shut-down `-preview` alias): the ten
+ * standard aspect ratios at 1K / 2K / 4K. Pro has no 512 tier and none of the
+ * extreme banner ratios on the Gemini API.
+ */
+export type Gemini3ProImageSize =
+  `${GeminiStandardImageAspectRatio}_${'1K' | '2K' | '4K'}`
+
+/**
+ * Sizes for `gemini-2.5-flash-image`: a bare aspect ratio with no resolution
+ * suffix, e.g. `'16:9'`. Google documents no `image_size` value or default for
+ * this model — it emits a single fixed 1024px-class output — so the adapter
+ * sends `imageConfig.aspectRatio` and omits `imageSize` entirely rather than
+ * guessing a tier the API never documented.
  */
-export type GeminiNativeImageResolution = '1K' | '2K' | '4K'
+export type Gemini25FlashImageSize = GeminiStandardImageAspectRatio
 
 /**
- * Template literal size type for Gemini native image models: "16:9_4K", "1:1_2K", etc.
+ * `imageConfig` fields the Gemini Developer API accepts on `generateContent`.
+ * Other `@google/genai` `ImageConfig` keys (`personGeneration`,
+ * `outputMimeType`, and more) throw on this surface.
+ */
+export type GeminiNativeImageConfig = {
+  aspectRatio?: GeminiExtendedImageAspectRatio
+  imageSize?: '512' | '1K' | '2K' | '4K'
+}
+
+/**
+ * Any size accepted by any Gemini native image model. Prefer the per-model
+ * narrowing in {@link GeminiImageModelSizeByName} — this union is the widest
+ * possible set and accepts combinations no single model supports.
  */
 export type GeminiNativeImageSize =
-  `${GeminiNativeImageAspectRatio}_${GeminiNativeImageResolution}`
+  | Gemini31FlashImageSize
+  | Gemini31FlashLiteImageSize
+  | Gemini3ProImageSize
+  | Gemini25FlashImageSize
 
 /**
  * Gemini native image models that use the generateContent API path.
- * These models support template literal sizes (aspectRatio_resolution).
+ * These models take an aspect-ratio-based size rather than Imagen's
+ * WIDTHxHEIGHT pixel strings.
+ *
+ * This array is the single source of truth for the native/Imagen split: the
+ * `GeminiNativeImageModels` union and the per-model option/size/modality maps
+ * all derive from it. The `satisfies` clause makes a typo (or a name that
+ * is not a known image model) a build error rather than a phantom key on every
+ * per-model map.
+ *
+ * It is also the single source of truth for the adapter's runtime routing
+ * — see {@link isGeminiNativeImageModel}. Adding a new `gemini-*` image model
+ * means adding it here as well as to `GEMINI_IMAGE_MODELS` in model-meta.
+ * Until it is listed here it routes to the Imagen API instead and fails
+ * loudly on the first call, rather than silently taking the wrong option
+ * shape.
  */
+export const GEMINI_NATIVE_IMAGE_MODELS = [
+  'gemini-3.1-flash-image',
+  'gemini-3.1-flash-image-preview',
+  'gemini-3.1-flash-lite-image',
+  'gemini-3-pro-image',
+  'gemini-3-pro-image-preview',
+  'gemini-2.5-flash-image',
+] as const satisfies ReadonlyArray<GeminiImageModels>
+
 export type GeminiNativeImageModels =
-  | 'gemini-3.1-flash-image-preview'
-  | 'gemini-3.1-flash-lite-image'
-  | 'gemini-3-pro-image-preview'
-  | 'gemini-2.5-flash-image'
+  (typeof GEMINI_NATIVE_IMAGE_MODELS)[number]
+
+const NATIVE_IMAGE_MODEL_NAMES: ReadonlySet<string> = new Set(
+  GEMINI_NATIVE_IMAGE_MODELS,
+)
 
 /**
- * Model-specific size options mapping.
- * Gemini native image models use template literal sizes, Imagen models use pixel sizes.
+ * Runtime counterpart to {@link GeminiNativeImageModels} — decides which of
+ * the two Gemini image APIs a model goes to.
+ *
+ * Membership in {@link GEMINI_NATIVE_IMAGE_MODELS}, not a `gemini-` prefix
+ * test, so the runtime route and the type-level split cannot drift apart. An
+ * id this package does not know about reaches the Imagen endpoint and fails
+ * there, which is the intended signal to add the model here rather than to
+ * have it silently take the native path with Imagen-shaped option types.
+ */
+export function isGeminiNativeImageModel(model: string): boolean {
+  return NATIVE_IMAGE_MODEL_NAMES.has(model)
+}
+
+/**
+ * Model-specific size options mapping. Each native model gets its own ratio ×
+ * resolution set (they genuinely differ); Imagen models use pixel sizes.
  */
 export type GeminiImageModelSizeByName = {
-  [K in GeminiNativeImageModels]: GeminiNativeImageSize
+  'gemini-3.1-flash-image': Gemini31FlashImageSize
+  'gemini-3.1-flash-image-preview': Gemini31FlashImageSize
+  'gemini-3.1-flash-lite-image': Gemini31FlashLiteImageSize
+  'gemini-3-pro-image': Gemini3ProImageSize
+  'gemini-3-pro-image-preview': Gemini3ProImageSize
+  'gemini-2.5-flash-image': Gemini25FlashImageSize
 } & {
   [K in Exclude<GeminiImageModels, GeminiNativeImageModels>]: GeminiImageSize
 }
@@ -309,13 +500,23 @@ export function validatePrompt(options: {
 
 /**
  * Parses a Gemini native image size string into its components.
- * Format: "aspectRatio_resolution" e.g. "16:9_4K" → { aspectRatio: "16:9", resolution: "4K" }
+ *
+ * Format: `"aspectRatio_resolution"`, e.g. `"16:9_4K"` →
+ * `{ aspectRatio: "16:9", resolution: "4K" }`.
+ *
+ * The resolution suffix is optional: `gemini-2.5-flash-image` takes a bare
+ * aspect ratio (`"16:9"` → `{ aspectRatio: "16:9" }`) because Google documents
+ * no `image_size` for it, and the caller must then omit `imageSize` from the
+ * request rather than substituting a default.
  */
 export function parseNativeImageSize(
   size: string,
-): { aspectRatio: string; resolution: string } | undefined {
-  const match = size.match(/^(\d+:\d+)_(.+)$/)
+): { aspectRatio: string; resolution?: string } | undefined {
+  const match = size.match(/^(\d+:\d+)(?:_(.+))?$/)
   const [, aspectRatio, resolution] = match ?? []
-  if (aspectRatio === undefined || resolution === undefined) return undefined
-  return { aspectRatio, resolution }
+  if (aspectRatio === undefined) return undefined
+  return {
+    aspectRatio,
+    ...(resolution !== undefined && { resolution }),
+  }
 }

package/src/index.ts

@@ -28,13 +28,37 @@ export {
 } from './adapters/image'
 export type {
   GeminiImageProviderOptions,
+  GeminiNativeImageConfig,
+  GeminiNativeImageProviderOptions,
+  GeminiAnyImageProviderOptions,
   GeminiImageModelProviderOptionsByName,
   GeminiAspectRatio,
+  // Per-model size narrowing. `GeminiImageModelSizeByName` is the map
+  // `generateImage()` applies at the call site; the per-model aliases let you
+  // name a single model's set directly. `GeminiNativeImageSize` is the widest
+  // union across all native models — prefer the narrower types above it.
+  GeminiImageModelSizeByName,
+  GeminiStandardImageAspectRatio,
+  GeminiExtendedImageAspectRatio,
+  Gemini31FlashImageSize,
+  Gemini31FlashLiteImageSize,
+  Gemini3ProImageSize,
+  Gemini25FlashImageSize,
+  GeminiNativeImageSize,
   // Re-export SDK types for convenience
   PersonGeneration,
   SafetyFilterLevel,
   ImagePromptLanguage,
+  SafetySetting,
+  ThinkingConfig,
+  ImageConfig,
+  ContentUnion,
 } from './image/image-provider-options'
+// `SafetySetting` is built from two SDK enums, and enums are values — they
+// cannot travel through `export type`. Re-exported here so `safetySettings`
+// is usable with only `@tanstack/ai-gemini` installed, without the consumer
+// having to add `@google/genai` to their own dependencies.
+export { HarmBlockThreshold, HarmCategory } from '@google/genai'
 
 // Embedding adapter - for embedding vectors
 export {
@@ -104,6 +128,10 @@ export {
 } from './model-meta'
 export { GEMINI_MODELS as GeminiTextModels } from './model-meta'
 export { GEMINI_IMAGE_MODELS as GeminiImageModels } from './model-meta'
+export {
+  GEMINI_NATIVE_IMAGE_MODELS,
+  isGeminiNativeImageModel,
+} from './image/image-provider-options'
 export { GEMINI_TTS_MODELS as GeminiTTSModels } from './model-meta'
 export { GEMINI_TTS_VOICES as GeminiTTSVoices } from './model-meta'
 export { GEMINI_AUDIO_MODELS as GeminiAudioModels } from './model-meta'

package/src/model-meta.ts

@@ -118,7 +118,46 @@ const GEMINI_3_FLASH = {
     GeminiThinkingOptions
 >
 
+/**
+ * Gemini 3 Pro Image ("Nano Banana Pro") — GA. Accepts the ten standard
+ * aspect ratios at 1K / 2K / 4K.
+ * @see https://ai.google.dev/gemini-api/docs/models/gemini-3-pro-image
+ */
 const GEMINI_3_PRO_IMAGE = {
+  name: 'gemini-3-pro-image',
+  max_input_tokens: 65_536,
+  max_output_tokens: 32_768,
+  knowledge_cutoff: '2025-01-01',
+  supports: {
+    input: ['text', 'image'],
+    output: ['text', 'image'],
+    capabilities: ['batch_api', 'structured_output', 'thinking'],
+    tools: ['google_search'],
+  },
+  pricing: {
+    input: {
+      normal: 2,
+    },
+    output: {
+      normal: 0.134,
+    },
+  },
+} as const satisfies ModelMeta<
+  GeminiToolConfigOptions &
+    GeminiSafetyOptions &
+    GeminiCommonConfigOptions &
+    GeminiCachedContentOptions &
+    GeminiStructuredOutputOptions &
+    GeminiThinkingOptions
+>
+
+/**
+ * @deprecated `gemini-3-pro-image-preview` was shut down on 2026-06-25. Use
+ * the GA id `gemini-3-pro-image` instead — the preview id now 404s.
+ * Kept in the model union so existing code still compiles.
+ * @see https://ai.google.dev/gemini-api/docs/deprecations
+ */
+const GEMINI_3_PRO_IMAGE_PREVIEW = {
   name: 'gemini-3-pro-image-preview',
   max_input_tokens: 65_536,
   max_output_tokens: 32_768,
@@ -146,7 +185,46 @@ const GEMINI_3_PRO_IMAGE = {
     GeminiThinkingOptions
 >
 
+/**
+ * Gemini 3.1 Flash Image ("Nano Banana 2") — GA. The only native image model
+ * that accepts the four extreme banner ratios (1:4, 4:1, 1:8, 8:1) and the
+ * 512 (0.5K) resolution tier.
+ * @see https://ai.google.dev/gemini-api/docs/models/gemini-3.1-flash-image
+ */
 const GEMINI_3_1_FLASH_IMAGE = {
+  name: 'gemini-3.1-flash-image',
+  max_input_tokens: 131_072,
+  max_output_tokens: 32_768,
+  knowledge_cutoff: '2025-01-01',
+  supports: {
+    input: ['text', 'image'],
+    output: ['text', 'image'],
+    capabilities: ['batch_api', 'thinking'],
+    tools: ['google_search'],
+  },
+  pricing: {
+    input: {
+      normal: 0.5,
+    },
+    output: {
+      normal: 3,
+    },
+  },
+} as const satisfies ModelMeta<
+  GeminiToolConfigOptions &
+    GeminiSafetyOptions &
+    GeminiCommonConfigOptions &
+    GeminiCachedContentOptions &
+    GeminiThinkingOptions
+>
+
+/**
+ * @deprecated `gemini-3.1-flash-image-preview` was shut down on 2026-06-25.
+ * Use the GA id `gemini-3.1-flash-image` instead — the preview id now 404s.
+ * Kept in the model union so existing code still compiles.
+ * @see https://ai.google.dev/gemini-api/docs/deprecations
+ */
+const GEMINI_3_1_FLASH_IMAGE_PREVIEW = {
   name: 'gemini-3.1-flash-image-preview',
   max_input_tokens: 65_536,
   max_output_tokens: 65_536,
@@ -174,6 +252,10 @@ const GEMINI_3_1_FLASH_IMAGE = {
     GeminiThinkingOptions
 >
 
+/**
+ * Gemini 3.1 Flash Lite Image ("Nano Banana 2 Lite") — GA. 1K output only.
+ * @see https://ai.google.dev/gemini-api/docs/models/gemini-3.1-flash-lite-image
+ */
 const GEMINI_3_1_FLASH_LITE_IMAGE = {
   name: 'gemini-3.1-flash-lite-image',
   max_input_tokens: 65_536,
@@ -375,6 +457,17 @@ const GEMINI_2_5_FLASH = {
     GeminiThinkingOptions
 >
 
+/**
+ * Gemini 2.5 Flash Image ("Nano Banana") — still GA, but documented as the
+ * legacy member of the family. Google publishes no `image_size` value for it,
+ * so its size type is a bare aspect ratio and the adapter sends no
+ * `imageConfig.imageSize`.
+ * @deprecated `gemini-2.5-flash-image` shuts down on 2026-10-02. Migrate to
+ * `gemini-3.1-flash-lite-image` (cheapest successor) or
+ * `gemini-3.1-flash-image`. Google's deprecations table still names the
+ * already-dead `gemini-3.1-flash-image-preview` as the replacement.
+ * @see https://ai.google.dev/gemini-api/docs/deprecations
+ */
 const GEMINI_2_5_FLASH_IMAGE = {
   name: 'gemini-2.5-flash-image',
   max_input_tokens: 1_048_576,
@@ -946,8 +1039,29 @@ export const GEMINI_COMBINED_TOOLS_AND_SCHEMA_MODELS = new Set<string>([
 
 export type GeminiModels = (typeof GEMINI_MODELS)[number]
 
-export type GeminiImageModels = (typeof GEMINI_IMAGE_MODELS)[number]
+/**
+ * @deprecated Shut down 2026-06-25. Use `gemini-3.1-flash-image`.
+ */
+type Gemini31FlashImagePreviewModel = 'gemini-3.1-flash-image-preview'
+
+/**
+ * @deprecated Shut down 2026-06-25. Use `gemini-3-pro-image`.
+ */
+type Gemini3ProImagePreviewModel = 'gemini-3-pro-image-preview'
 
+export type GeminiImageModels =
+  | Exclude<
+      (typeof GEMINI_IMAGE_MODELS)[number],
+      Gemini31FlashImagePreviewModel | Gemini3ProImagePreviewModel
+    >
+  | Gemini31FlashImagePreviewModel
+  | Gemini3ProImagePreviewModel
+
+/**
+ * Image generation models. GA ids come first; the trailing `-preview` ids are
+ * shut-down aliases kept only so existing code keeps compiling — new code
+ * should use the GA id above its alias.
+ */
 export const GEMINI_IMAGE_MODELS = [
   GEMINI_3_1_FLASH_IMAGE.name,
   GEMINI_3_1_FLASH_LITE_IMAGE.name,
@@ -956,6 +1070,9 @@ export const GEMINI_IMAGE_MODELS = [
   IMAGEN_4_GENERATE.name,
   IMAGEN_4_GENERATE_FAST.name,
   IMAGEN_4_GENERATE_ULTRA.name,
+  // Deprecated aliases — shut down 2026-06-25.
+  GEMINI_3_1_FLASH_IMAGE_PREVIEW.name,
+  GEMINI_3_PRO_IMAGE_PREVIEW.name,
 ] as const
 
 /**

package/src/tools/code-execution-tool.ts

@@ -1,4 +1,4 @@
-import { brandProviderTool } from '@tanstack/ai'
+import { brandGeminiProviderTool } from './gemini-provider-tool'
 import type { ProviderTool, Tool } from '@tanstack/ai'
 
 export interface CodeExecutionToolConfig {}
@@ -15,9 +15,12 @@ export function convertCodeExecutionToolToAdapterFormat(_tool: Tool) {
 }
 
 export function codeExecutionTool(): GeminiCodeExecutionTool {
-  return brandProviderTool<GeminiCodeExecutionTool>({
-    name: 'code_execution',
-    description: '',
-    metadata: {},
-  })
+  return brandGeminiProviderTool<GeminiCodeExecutionTool>(
+    {
+      name: 'code_execution',
+      description: '',
+      metadata: {},
+    },
+    'code_execution',
+  )
 }

package/src/tools/computer-use-tool.ts

@@ -1,4 +1,7 @@
-import { brandProviderTool } from '@tanstack/ai'
+import {
+  brandGeminiProviderTool,
+  getGeminiProviderToolMetadata,
+} from './gemini-provider-tool'
 import type { ComputerUse } from '@google/genai'
 import type { ProviderTool, Tool } from '@tanstack/ai'
 
@@ -10,7 +13,7 @@ export type ComputerUseTool = ComputerUseToolConfig
 export type GeminiComputerUseTool = ProviderTool<'gemini', 'computer_use'>
 
 export function convertComputerUseToolToAdapterFormat(tool: Tool) {
-  const metadata = tool.metadata as ComputerUseToolConfig
+  const metadata = getGeminiProviderToolMetadata(tool) as ComputerUseToolConfig
   // Vendor `ComputerUse` fields are `field?: T` (no `| undefined`) under EOPT,
   // so spread each field conditionally rather than emitting explicit
   // `undefined`s on the wire payload.
@@ -29,16 +32,19 @@ export function convertComputerUseToolToAdapterFormat(tool: Tool) {
 export function computerUseTool(
   config: ComputerUseToolConfig,
 ): GeminiComputerUseTool {
-  return brandProviderTool<GeminiComputerUseTool>({
-    name: 'computer_use',
-    description: '',
-    metadata: {
-      ...(config.environment !== undefined && {
-        environment: config.environment,
-      }),
-      ...(config.excludedPredefinedFunctions !== undefined && {
-        excludedPredefinedFunctions: config.excludedPredefinedFunctions,
-      }),
+  return brandGeminiProviderTool<GeminiComputerUseTool>(
+    {
+      name: 'computer_use',
+      description: '',
+      metadata: {
+        ...(config.environment !== undefined && {
+          environment: config.environment,
+        }),
+        ...(config.excludedPredefinedFunctions !== undefined && {
+          excludedPredefinedFunctions: config.excludedPredefinedFunctions,
+        }),
+      },
     },
-  })
+    'computer_use',
+  )
 }

package/src/tools/file-search-tool.ts

@@ -1,4 +1,7 @@
-import { brandProviderTool } from '@tanstack/ai'
+import {
+  brandGeminiProviderTool,
+  getGeminiProviderToolMetadata,
+} from './gemini-provider-tool'
 import type { FileSearch } from '@google/genai'
 import type { ProviderTool, Tool } from '@tanstack/ai'
 
@@ -10,7 +13,7 @@ export type FileSearchTool = FileSearchToolConfig
 export type GeminiFileSearchTool = ProviderTool<'gemini', 'file_search'>
 
 export function convertFileSearchToolToAdapterFormat(tool: Tool) {
-  const metadata = tool.metadata as FileSearchToolConfig
+  const metadata = getGeminiProviderToolMetadata(tool) as FileSearchToolConfig
   return {
     fileSearch: metadata,
   }
@@ -19,9 +22,12 @@ export function convertFileSearchToolToAdapterFormat(tool: Tool) {
 export function fileSearchTool(
   config: FileSearchToolConfig,
 ): GeminiFileSearchTool {
-  return brandProviderTool<GeminiFileSearchTool>({
-    name: 'file_search',
-    description: '',
-    metadata: config,
-  })
+  return brandGeminiProviderTool<GeminiFileSearchTool>(
+    {
+      name: 'file_search',
+      description: '',
+      metadata: config,
+    },
+    'file_search',
+  )
 }