@tanstack/ai-gemini 0.10.7 → 0.10.9

package/dist/esm/tools/google-search-retriveal-tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"google-search-retriveal-tool.js","sources":["../../../src/tools/google-search-retriveal-tool.ts"],"sourcesContent":["import type { GoogleSearchRetrieval } from '@google/genai'\nimport type { ProviderTool, Tool } from '@tanstack/ai'\n\nexport type GoogleSearchRetrievalToolConfig = GoogleSearchRetrieval\n\n/** @deprecated Renamed to `GoogleSearchRetrievalToolConfig`. Will be removed in a future release. */\nexport type GoogleSearchRetrievalTool = GoogleSearchRetrievalToolConfig\n\nexport type GeminiGoogleSearchRetrievalTool = ProviderTool<\n  'gemini',\n  'google_search_retrieval'\n>\n\nexport function convertGoogleSearchRetrievalToolToAdapterFormat(tool: Tool) {\n  const metadata = tool.metadata as GoogleSearchRetrievalToolConfig\n  return {\n    googleSearchRetrieval: metadata,\n  }\n}\n\nexport function googleSearchRetrievalTool(\n  config?: GoogleSearchRetrievalToolConfig,\n): GeminiGoogleSearchRetrievalTool {\n  // Phantom-brand cast: '~provider'/'~toolKind' are type-only and never assigned at runtime.\n  return {\n    name: 'google_search_retrieval',\n    description: '',\n    metadata: config,\n  } as unknown as GeminiGoogleSearchRetrievalTool\n}\n"],"names":[],"mappings":"AAaO,SAAS,gDAAgD,MAAY;AAC1E,QAAM,WAAW,KAAK;AACtB,SAAO;AAAA,IACL,uBAAuB;AAAA,EAAA;AAE3B;AAEO,SAAS,0BACd,QACiC;AAEjC,SAAO;AAAA,IACL,MAAM;AAAA,IACN,aAAa;AAAA,IACb,UAAU;AAAA,EAAA;AAEd;"}
+{"version":3,"file":"google-search-retriveal-tool.js","sources":["../../../src/tools/google-search-retriveal-tool.ts"],"sourcesContent":["import { brandProviderTool } from '@tanstack/ai'\nimport type { GoogleSearchRetrieval } from '@google/genai'\nimport type { ProviderTool, Tool } from '@tanstack/ai'\n\nexport type GoogleSearchRetrievalToolConfig = GoogleSearchRetrieval\n\n/** @deprecated Renamed to `GoogleSearchRetrievalToolConfig`. Will be removed in a future release. */\nexport type GoogleSearchRetrievalTool = GoogleSearchRetrievalToolConfig\n\nexport type GeminiGoogleSearchRetrievalTool = ProviderTool<\n  'gemini',\n  'google_search_retrieval'\n>\n\nexport function convertGoogleSearchRetrievalToolToAdapterFormat(tool: Tool) {\n  const metadata = tool.metadata as GoogleSearchRetrievalToolConfig\n  return {\n    googleSearchRetrieval: metadata,\n  }\n}\n\nexport function googleSearchRetrievalTool(\n  config?: GoogleSearchRetrievalToolConfig,\n): GeminiGoogleSearchRetrievalTool {\n  return brandProviderTool<GeminiGoogleSearchRetrievalTool>({\n    name: 'google_search_retrieval',\n    description: '',\n    metadata: config,\n  })\n}\n"],"names":[],"mappings":";AAcO,SAAS,gDAAgD,MAAY;AAC1E,QAAM,WAAW,KAAK;AACtB,SAAO;AAAA,IACL,uBAAuB;AAAA,EAAA;AAE3B;AAEO,SAAS,0BACd,QACiC;AACjC,SAAO,kBAAmD;AAAA,IACxD,MAAM;AAAA,IACN,aAAa;AAAA,IACb,UAAU;AAAA,EAAA,CACX;AACH;"}

package/dist/esm/tools/google-search-tool.js

@@ -1,3 +1,4 @@
+import { brandProviderTool } from "@tanstack/ai";
 function convertGoogleSearchToolToAdapterFormat(tool) {
   const metadata = tool.metadata;
   return {
@@ -5,11 +6,11 @@ function convertGoogleSearchToolToAdapterFormat(tool) {
   };
 }
 function googleSearchTool(config) {
-  return {
+  return brandProviderTool({
     name: "google_search",
     description: "",
     metadata: config
-  };
+  });
 }
 export {
   convertGoogleSearchToolToAdapterFormat,

package/dist/esm/tools/google-search-tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"google-search-tool.js","sources":["../../../src/tools/google-search-tool.ts"],"sourcesContent":["import type { GoogleSearch } from '@google/genai'\nimport type { ProviderTool, Tool } from '@tanstack/ai'\n\nexport type GoogleSearchToolConfig = GoogleSearch\n\n/** @deprecated Renamed to `GoogleSearchToolConfig`. Will be removed in a future release. */\nexport type GoogleSearchTool = GoogleSearchToolConfig\n\nexport type GeminiGoogleSearchTool = ProviderTool<'gemini', 'google_search'>\n\nexport function convertGoogleSearchToolToAdapterFormat(tool: Tool) {\n  const metadata = tool.metadata as GoogleSearchToolConfig\n  return {\n    googleSearch: metadata,\n  }\n}\n\nexport function googleSearchTool(\n  config?: GoogleSearchToolConfig,\n): GeminiGoogleSearchTool {\n  // Phantom-brand cast: '~provider'/'~toolKind' are type-only and never assigned at runtime.\n  return {\n    name: 'google_search',\n    description: '',\n    metadata: config,\n  } as unknown as GeminiGoogleSearchTool\n}\n"],"names":[],"mappings":"AAUO,SAAS,uCAAuC,MAAY;AACjE,QAAM,WAAW,KAAK;AACtB,SAAO;AAAA,IACL,cAAc;AAAA,EAAA;AAElB;AAEO,SAAS,iBACd,QACwB;AAExB,SAAO;AAAA,IACL,MAAM;AAAA,IACN,aAAa;AAAA,IACb,UAAU;AAAA,EAAA;AAEd;"}
+{"version":3,"file":"google-search-tool.js","sources":["../../../src/tools/google-search-tool.ts"],"sourcesContent":["import { brandProviderTool } from '@tanstack/ai'\nimport type { GoogleSearch } from '@google/genai'\nimport type { ProviderTool, Tool } from '@tanstack/ai'\n\nexport type GoogleSearchToolConfig = GoogleSearch\n\n/** @deprecated Renamed to `GoogleSearchToolConfig`. Will be removed in a future release. */\nexport type GoogleSearchTool = GoogleSearchToolConfig\n\nexport type GeminiGoogleSearchTool = ProviderTool<'gemini', 'google_search'>\n\nexport function convertGoogleSearchToolToAdapterFormat(tool: Tool) {\n  const metadata = tool.metadata as GoogleSearchToolConfig\n  return {\n    googleSearch: metadata,\n  }\n}\n\nexport function googleSearchTool(\n  config?: GoogleSearchToolConfig,\n): GeminiGoogleSearchTool {\n  return brandProviderTool<GeminiGoogleSearchTool>({\n    name: 'google_search',\n    description: '',\n    metadata: config,\n  })\n}\n"],"names":[],"mappings":";AAWO,SAAS,uCAAuC,MAAY;AACjE,QAAM,WAAW,KAAK;AACtB,SAAO;AAAA,IACL,cAAc;AAAA,EAAA;AAElB;AAEO,SAAS,iBACd,QACwB;AACxB,SAAO,kBAA0C;AAAA,IAC/C,MAAM;AAAA,IACN,aAAa;AAAA,IACb,UAAU;AAAA,EAAA,CACX;AACH;"}

package/dist/esm/tools/url-context-tool.js

@@ -1,14 +1,15 @@
+import { brandProviderTool } from "@tanstack/ai";
 function convertUrlContextToolToAdapterFormat(_tool) {
   return {
     urlContext: {}
   };
 }
 function urlContextTool() {
-  return {
+  return brandProviderTool({
     name: "url_context",
     description: "",
     metadata: {}
-  };
+  });
 }
 export {
   convertUrlContextToolToAdapterFormat,

package/dist/esm/tools/url-context-tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"url-context-tool.js","sources":["../../../src/tools/url-context-tool.ts"],"sourcesContent":["import type { ProviderTool, Tool } from '@tanstack/ai'\n\nexport interface UrlContextToolConfig {}\n\n/** @deprecated Renamed to `UrlContextToolConfig`. Will be removed in a future release. */\nexport type UrlContextTool = UrlContextToolConfig\n\nexport type GeminiUrlContextTool = ProviderTool<'gemini', 'url_context'>\n\nexport function convertUrlContextToolToAdapterFormat(_tool: Tool) {\n  return {\n    urlContext: {},\n  }\n}\n\nexport function urlContextTool(): GeminiUrlContextTool {\n  // Phantom-brand cast: '~provider'/'~toolKind' are type-only and never assigned at runtime.\n  return {\n    name: 'url_context',\n    description: '',\n    metadata: {},\n  } as unknown as GeminiUrlContextTool\n}\n"],"names":[],"mappings":"AASO,SAAS,qCAAqC,OAAa;AAChE,SAAO;AAAA,IACL,YAAY,CAAA;AAAA,EAAC;AAEjB;AAEO,SAAS,iBAAuC;AAErD,SAAO;AAAA,IACL,MAAM;AAAA,IACN,aAAa;AAAA,IACb,UAAU,CAAA;AAAA,EAAC;AAEf;"}
+{"version":3,"file":"url-context-tool.js","sources":["../../../src/tools/url-context-tool.ts"],"sourcesContent":["import { brandProviderTool } from '@tanstack/ai'\nimport type { ProviderTool, Tool } from '@tanstack/ai'\n\nexport interface UrlContextToolConfig {}\n\n/** @deprecated Renamed to `UrlContextToolConfig`. Will be removed in a future release. */\nexport type UrlContextTool = UrlContextToolConfig\n\nexport type GeminiUrlContextTool = ProviderTool<'gemini', 'url_context'>\n\nexport function convertUrlContextToolToAdapterFormat(_tool: Tool) {\n  return {\n    urlContext: {},\n  }\n}\n\nexport function urlContextTool(): GeminiUrlContextTool {\n  return brandProviderTool<GeminiUrlContextTool>({\n    name: 'url_context',\n    description: '',\n    metadata: {},\n  })\n}\n"],"names":[],"mappings":";AAUO,SAAS,qCAAqC,OAAa;AAChE,SAAO;AAAA,IACL,YAAY,CAAA;AAAA,EAAC;AAEjB;AAEO,SAAS,iBAAuC;AACrD,SAAO,kBAAwC;AAAA,IAC7C,MAAM;AAAA,IACN,aAAa;AAAA,IACb,UAAU,CAAA;AAAA,EAAC,CACZ;AACH;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/ai-gemini",
-  "version": "0.10.7",
+  "version": "0.10.9",
   "description": "Google Gemini adapter for TanStack AI",
   "author": "",
   "license": "MIT",
@@ -38,13 +38,13 @@
     "@tanstack/ai-utils": "0.2.0"
   },
   "peerDependencies": {
-    "@tanstack/ai": "^0.20.0"
+    "@tanstack/ai": "^0.21.0"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "4.0.14",
     "vite": "^7.3.3",
     "zod": "^4.2.0",
-    "@tanstack/ai": "0.20.0"
+    "@tanstack/ai": "0.21.0"
   },
   "scripts": {
     "build": "vite build",

package/src/adapters/audio.ts

@@ -66,7 +66,7 @@ export class GeminiAudioAdapter<
 > extends BaseAudioAdapter<TModel, GeminiAudioProviderOptions> {
   readonly name = 'gemini' as const
 
-  private client: GoogleGenAI
+  private readonly client: GoogleGenAI
 
   constructor(config: GeminiAudioConfig, model: TModel) {
     super(model, config)
@@ -120,7 +120,7 @@ export class GeminiAudioAdapter<
         model,
         audio: {
           b64Json: audioPart.inlineData.data,
-          contentType,
+          ...(contentType !== undefined && { contentType }),
         },
       }
     } catch (error) {

package/src/adapters/image.ts

@@ -61,7 +61,7 @@ export class GeminiImageAdapter<
   GeminiImageModelProviderOptionsByName,
   GeminiImageModelSizeByName
 > {
-  readonly kind = 'image' as const
+  override readonly kind = 'image' as const
   readonly name = 'gemini' as const
 
   // Type-only property - never assigned at runtime
@@ -71,7 +71,7 @@ export class GeminiImageAdapter<
     modelSizeByName: GeminiImageModelSizeByName
   }
 
-  private client: GoogleGenAI
+  private readonly client: GoogleGenAI
 
   constructor(config: GeminiImageConfig, model: TModel) {
     super(model, config)
@@ -214,7 +214,6 @@ export class GeminiImageAdapter<
       id: generateId(this.name),
       model,
       images,
-      usage: undefined,
     }
   }
 
@@ -223,10 +222,14 @@ export class GeminiImageAdapter<
   ): GenerateImagesConfig {
     const { size, numberOfImages, modelOptions } = options
 
+    // Build with conditional spreads — under exactOptionalPropertyTypes the
+    // vendor `GenerateImagesConfig` fields are `field?: T` (no `| undefined`),
+    // so we can only assign the property when we actually have a value.
+    const sizeAspectRatio = size ? sizeToAspectRatio(size) : undefined
     return {
       numberOfImages: numberOfImages ?? 1,
       // Map size to aspect ratio if provided (modelOptions.aspectRatio will override)
-      aspectRatio: size ? sizeToAspectRatio(size) : undefined,
+      ...(sizeAspectRatio !== undefined && { aspectRatio: sizeAspectRatio }),
       ...modelOptions,
     }
   }
@@ -242,7 +245,12 @@ export class GeminiImageAdapter<
     for (const item of entries) {
       const b64Json = item.image?.imageBytes
       if (b64Json) {
-        images.push({ b64Json, revisedPrompt: item.enhancedPrompt })
+        images.push({
+          b64Json,
+          ...(item.enhancedPrompt !== undefined && {
+            revisedPrompt: item.enhancedPrompt,
+          }),
+        })
         continue
       }
       // Imagen can drop individual entries with a raiFilteredReason when
@@ -277,7 +285,6 @@ export class GeminiImageAdapter<
       id: generateId(this.name),
       model,
       images,
-      usage: undefined,
     }
   }
 }

package/src/adapters/text.ts

@@ -106,10 +106,10 @@ export class GeminiTextAdapter<
   TToolCapabilities,
   GeminiToolCallMetadata
 > {
-  readonly kind = 'text' as const
+  override readonly kind = 'text' as const
   readonly name = 'gemini' as const
 
-  private client: GoogleGenAI
+  private readonly client: GoogleGenAI
 
   constructor(config: GeminiTextConfig, model: TModel) {
     super({}, model)
@@ -315,10 +315,12 @@ export class GeminiTextAdapter<
 
               accumulatedThinking += part.text
 
-              // Spec REASONING content event
+              // Spec REASONING content event — reasoningMessageId is set in the
+              // hasEmittedStepStarted block above (entered on the same `part.thought` path)
+              if (!reasoningMessageId) continue
               yield {
                 type: EventType.REASONING_MESSAGE_CONTENT,
-                messageId: reasoningMessageId!,
+                messageId: reasoningMessageId,
                 delta: part.text,
                 model,
                 timestamp: Date.now(),
@@ -399,7 +401,11 @@ export class GeminiTextAdapter<
                     : JSON.stringify(functionArgs),
                 index: nextToolIndex++,
                 started: false,
-                thoughtSignature: partThoughtSignature,
+                // Only set thoughtSignature when present — under EOPT, the
+                // optional field cannot accept an explicit `undefined`.
+                ...(partThoughtSignature !== undefined && {
+                  thoughtSignature: partThoughtSignature,
+                }),
               }
               toolCallMap.set(toolCallId, toolCallData)
             } else {
@@ -617,13 +623,16 @@ export class GeminiTextAdapter<
           model,
           timestamp: Date.now(),
           finishReason: toolCallMap.size > 0 ? 'tool_calls' : 'stop',
-          usage: chunk.usageMetadata
-            ? {
-                promptTokens: chunk.usageMetadata.promptTokenCount ?? 0,
-                completionTokens: chunk.usageMetadata.candidatesTokenCount ?? 0,
-                totalTokens: chunk.usageMetadata.totalTokenCount ?? 0,
-              }
-            : undefined,
+          // RunFinishedEvent.usage is `usage?: {...}` (no `| undefined`) under
+          // exactOptionalPropertyTypes; only include it when usageMetadata is
+          // present rather than assigning an explicit `undefined`.
+          ...(chunk.usageMetadata && {
+            usage: {
+              promptTokens: chunk.usageMetadata.promptTokenCount ?? 0,
+              completionTokens: chunk.usageMetadata.candidatesTokenCount ?? 0,
+              totalTokens: chunk.usageMetadata.totalTokenCount ?? 0,
+            },
+          }),
         }
       }
     }
@@ -707,10 +716,7 @@ export class GeminiTextAdapter<
                 >)
               : {}
           } catch {
-            parsedArgs = toolCall.function.arguments as unknown as Record<
-              string,
-              unknown
-            >
+            parsedArgs = {}
           }
 
           const thoughtSignature = (
@@ -744,7 +750,7 @@ export class GeminiTextAdapter<
             response: {
               content: msg.content || '',
             },
-          } as any,
+          },
         })
       }
 
@@ -819,31 +825,57 @@ export class GeminiTextAdapter<
   private mapCommonOptionsToGemini(
     options: TextOptions<GeminiTextProviderOptions>,
   ) {
-    const modelOpts = options.modelOptions
-    const thinkingConfig = modelOpts?.thinkingConfig
+    // Separate `thinkingConfig` from the other model options so the loose
+    // local `thinkingLevel?: keyof typeof ThinkingLevel` type doesn't leak
+    // into the SDK config object via the `...modelOpts` spread — we re-add a
+    // properly-typed `ThinkingConfig` below.
+    const { thinkingConfig, ...modelOpts } = options.modelOptions ?? {}
+    // Build the thinkingConfig payload only when the caller actually supplied
+    // one. Our local `thinkingLevel` is typed as `keyof typeof ThinkingLevel`
+    // (string union) so users can pass plain strings; the SDK target is the
+    // `ThinkingLevel` enum, and every field is `field?: T` under EOPT — so we
+    // re-emit fields via conditional spreads.
+    const mappedThinkingConfig = thinkingConfig
+      ? {
+          ...(thinkingConfig.includeThoughts !== undefined && {
+            includeThoughts: thinkingConfig.includeThoughts,
+          }),
+          ...(thinkingConfig.thinkingBudget !== undefined && {
+            thinkingBudget: thinkingConfig.thinkingBudget,
+          }),
+          ...(thinkingConfig.thinkingLevel
+            ? {
+                thinkingLevel: thinkingConfig.thinkingLevel as ThinkingLevel,
+              }
+            : {}),
+        }
+      : undefined
+
+    const normalizedPrompts = normalizeSystemPrompts(options.systemPrompts)
+    const systemInstruction =
+      normalizedPrompts.length > 0
+        ? normalizedPrompts.map((p) => p.content).join('\n')
+        : undefined
+
+    // Vendor `GenerateContentConfig` fields are `field?: T` (no `| undefined`)
+    // under EOPT, so spread each common option only when present rather than
+    // emitting `field: undefined`s into the wire payload.
     const requestOptions: GenerateContentParameters = {
       model: options.model,
       contents: this.formatMessages(options.messages),
       config: {
         ...modelOpts,
-        temperature: options.temperature,
-        topP: options.topP,
-        maxOutputTokens: options.maxTokens,
-        thinkingConfig: thinkingConfig
-          ? {
-              ...thinkingConfig,
-              thinkingLevel: thinkingConfig.thinkingLevel
-                ? // Enum is provided by the SDK, we use it for the type but cast it to string constants, here we just cast them back
-                  (thinkingConfig.thinkingLevel as ThinkingLevel)
-                : undefined,
-            }
-          : undefined,
-        systemInstruction: (() => {
-          const prompts = normalizeSystemPrompts(options.systemPrompts)
-          return prompts.length > 0
-            ? prompts.map((p) => p.content).join('\n')
-            : undefined
-        })(),
+        ...(options.temperature !== undefined && {
+          temperature: options.temperature,
+        }),
+        ...(options.topP !== undefined && { topP: options.topP }),
+        ...(options.maxTokens !== undefined && {
+          maxOutputTokens: options.maxTokens,
+        }),
+        ...(mappedThinkingConfig !== undefined && {
+          thinkingConfig: mappedThinkingConfig,
+        }),
+        ...(systemInstruction !== undefined && { systemInstruction }),
         tools: convertToolsToProviderFormat(options.tools),
       },
     }

package/src/adapters/tts.ts

@@ -121,7 +121,7 @@ export class GeminiTTSAdapter<
 > extends BaseTTSAdapter<TModel, GeminiTTSProviderOptions> {
   readonly name = 'gemini' as const
 
-  private client: GoogleGenAI
+  private readonly client: GoogleGenAI
 
   constructor(config: GeminiTTSConfig, model: TModel) {
     super(model, config)
@@ -251,8 +251,9 @@ export class GeminiTTSAdapter<
       }
 
       // Strip any mime parameters (e.g. `audio/ogg;codec=opus`) before pulling
-      // the subtype out as the file format.
-      const format = mimeType.split(';')[0]!.split('/')[1] || 'wav'
+      // the subtype out as the file format. `String.split` always returns at
+      // least one element, so [0] is defined.
+      const format = (mimeType.split(';')[0] ?? '').split('/')[1] || 'wav'
 
       return {
         id: generateId(this.name),
@@ -275,7 +276,7 @@ function parsePcmMimeType(
   mimeType: string,
 ): { sampleRate: number; channels: number; bitsPerSample: number } | undefined {
   const normalized = mimeType.toLowerCase()
-  const subtype = normalized.split(';')[0]!.split('/')[1] ?? ''
+  const subtype = (normalized.split(';')[0] ?? '').split('/')[1] ?? ''
   // Exclude containerized wav (e.g. `audio/wav;codec=pcm`) — those already
   // carry a RIFF header and must not be re-wrapped.
   if (subtype.includes('wav')) return undefined
@@ -351,8 +352,8 @@ function wrapPcmBase64AsWav(
   }
   let binary = ''
   const bytes = new Uint8Array(buffer)
-  for (let i = 0; i < bytes.byteLength; i += 1) {
-    binary += String.fromCharCode(bytes[i]!)
+  for (const byte of bytes) {
+    binary += String.fromCharCode(byte)
   }
   return btoa(binary)
 }

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

@@ -304,6 +304,7 @@ export function parseNativeImageSize(
   size: string,
 ): { aspectRatio: string; resolution: string } | undefined {
   const match = size.match(/^(\d+:\d+)_(.+)$/)
-  if (!match) return undefined
-  return { aspectRatio: match[1]!, resolution: match[2]! }
+  const [, aspectRatio, resolution] = match ?? []
+  if (aspectRatio === undefined || resolution === undefined) return undefined
+  return { aspectRatio, resolution }
 }

package/src/model-meta.ts

@@ -965,6 +965,40 @@ const VEO_2 = {
   [VEO_2.name]: VEO_2,
 } as const */
 
+const GEMINI_3_5_FLASH = {
+  name: 'gemini-3.5-flash',
+  max_input_tokens: 1_048_576,
+  max_output_tokens: 65_536,
+  supports: {
+    input: ['text', 'image', 'video', 'document', 'audio'],
+    output: ['text'],
+    capabilities: [
+      'batch_api',
+      'caching',
+      'function_calling',
+      'structured_output',
+      'thinking',
+    ],
+    tools: ['code_execution', 'file_search', 'google_search', 'url_context'],
+  },
+  pricing: {
+    input: {
+      normal: 1.5,
+      cached: 0.15,
+    },
+    output: {
+      normal: 9,
+    },
+  },
+} as const satisfies ModelMeta<
+  GeminiToolConfigOptions &
+    GeminiSafetyOptions &
+    GeminiCommonConfigOptions &
+    GeminiCachedContentOptions &
+    GeminiStructuredOutputOptions &
+    GeminiThinkingOptions
+>
+
 export const GEMINI_MODELS = [
   GEMINI_3_1_PRO.name,
   GEMINI_3_PRO.name,
@@ -977,6 +1011,8 @@ export const GEMINI_MODELS = [
   GEMINI_2_5_FLASH_LITE_PREVIEW.name,
   GEMINI_2_FLASH.name,
   GEMINI_2_FLASH_LITE.name,
+
+  GEMINI_3_5_FLASH.name,
 ] as const
 
 export type GeminiModels = (typeof GEMINI_MODELS)[number]
@@ -1135,6 +1171,12 @@ export type GeminiChatModelProviderOptionsByName = {
     GeminiCommonConfigOptions &
     GeminiCachedContentOptions &
     GeminiStructuredOutputOptions
+  [GEMINI_3_5_FLASH.name]: GeminiToolConfigOptions &
+    GeminiSafetyOptions &
+    GeminiCommonConfigOptions &
+    GeminiCachedContentOptions &
+    GeminiStructuredOutputOptions &
+    GeminiThinkingOptions
 }
 
 /**
@@ -1183,4 +1225,5 @@ export type GeminiModelInputModalitiesByName = {
   [GEMINI_2_5_FLASH_PREVIEW.name]: typeof GEMINI_2_5_FLASH_PREVIEW.supports.input
   [GEMINI_2_FLASH.name]: typeof GEMINI_2_FLASH.supports.input
   [GEMINI_2_FLASH_LITE.name]: typeof GEMINI_2_FLASH_LITE.supports.input
+  [GEMINI_3_5_FLASH.name]: typeof GEMINI_3_5_FLASH.supports.input
 }

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

@@ -1,3 +1,4 @@
+import { brandProviderTool } from '@tanstack/ai'
 import type { ProviderTool, Tool } from '@tanstack/ai'
 
 export interface CodeExecutionToolConfig {}
@@ -14,10 +15,9 @@ export function convertCodeExecutionToolToAdapterFormat(_tool: Tool) {
 }
 
 export function codeExecutionTool(): GeminiCodeExecutionTool {
-  // Phantom-brand cast: '~provider'/'~toolKind' are type-only and never assigned at runtime.
-  return {
+  return brandProviderTool<GeminiCodeExecutionTool>({
     name: 'code_execution',
     description: '',
     metadata: {},
-  } as unknown as GeminiCodeExecutionTool
+  })
 }

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

@@ -1,3 +1,4 @@
+import { brandProviderTool } from '@tanstack/ai'
 import type { ComputerUse } from '@google/genai'
 import type { ProviderTool, Tool } from '@tanstack/ai'
 
@@ -10,10 +11,17 @@ export type GeminiComputerUseTool = ProviderTool<'gemini', 'computer_use'>
 
 export function convertComputerUseToolToAdapterFormat(tool: Tool) {
   const metadata = tool.metadata 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.
   return {
     computerUse: {
-      environment: metadata.environment,
-      excludedPredefinedFunctions: metadata.excludedPredefinedFunctions,
+      ...(metadata.environment !== undefined && {
+        environment: metadata.environment,
+      }),
+      ...(metadata.excludedPredefinedFunctions !== undefined && {
+        excludedPredefinedFunctions: metadata.excludedPredefinedFunctions,
+      }),
     },
   }
 }
@@ -21,13 +29,16 @@ export function convertComputerUseToolToAdapterFormat(tool: Tool) {
 export function computerUseTool(
   config: ComputerUseToolConfig,
 ): GeminiComputerUseTool {
-  // Phantom-brand cast: '~provider'/'~toolKind' are type-only and never assigned at runtime.
-  return {
+  return brandProviderTool<GeminiComputerUseTool>({
     name: 'computer_use',
     description: '',
     metadata: {
-      environment: config.environment,
-      excludedPredefinedFunctions: config.excludedPredefinedFunctions,
+      ...(config.environment !== undefined && {
+        environment: config.environment,
+      }),
+      ...(config.excludedPredefinedFunctions !== undefined && {
+        excludedPredefinedFunctions: config.excludedPredefinedFunctions,
+      }),
     },
-  } as unknown as GeminiComputerUseTool
+  })
 }

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

@@ -1,3 +1,4 @@
+import { brandProviderTool } from '@tanstack/ai'
 import type { FileSearch } from '@google/genai'
 import type { ProviderTool, Tool } from '@tanstack/ai'
 
@@ -18,10 +19,9 @@ export function convertFileSearchToolToAdapterFormat(tool: Tool) {
 export function fileSearchTool(
   config: FileSearchToolConfig,
 ): GeminiFileSearchTool {
-  // Phantom-brand cast: '~provider'/'~toolKind' are type-only and never assigned at runtime.
-  return {
+  return brandProviderTool<GeminiFileSearchTool>({
     name: 'file_search',
     description: '',
     metadata: config,
-  } as unknown as GeminiFileSearchTool
+  })
 }

package/src/tools/function-declaration-tool.ts

@@ -4,8 +4,7 @@ export type FunctionDeclarationTool = FunctionDeclaration
 
 const validateFunctionDeclarationTool = (tool: FunctionDeclarationTool) => {
   const nameRegex = /^[a-zA-Z0-9_:.-]{1,64}$/
-  const valid = nameRegex.test(tool.name!)
-  if (!valid) {
+  if (tool.name === undefined || !nameRegex.test(tool.name)) {
     throw new Error(
       `Invalid function name: ${tool.name}. Must be 1-64 characters long and contain only a-z, A-Z, 0-9, underscores, colons, dots, and dashes.`,
     )

package/src/tools/google-maps-tool.ts

@@ -1,3 +1,4 @@
+import { brandProviderTool } from '@tanstack/ai'
 import type { GoogleMaps } from '@google/genai'
 import type { ProviderTool, Tool } from '@tanstack/ai'
 
@@ -18,10 +19,9 @@ export function convertGoogleMapsToolToAdapterFormat(tool: Tool) {
 export function googleMapsTool(
   config?: GoogleMapsToolConfig,
 ): GeminiGoogleMapsTool {
-  // Phantom-brand cast: '~provider'/'~toolKind' are type-only and never assigned at runtime.
-  return {
+  return brandProviderTool<GeminiGoogleMapsTool>({
     name: 'google_maps',
     description: '',
     metadata: config,
-  } as unknown as GeminiGoogleMapsTool
+  })
 }

package/src/tools/google-search-retriveal-tool.ts

@@ -1,3 +1,4 @@
+import { brandProviderTool } from '@tanstack/ai'
 import type { GoogleSearchRetrieval } from '@google/genai'
 import type { ProviderTool, Tool } from '@tanstack/ai'
 
@@ -21,10 +22,9 @@ export function convertGoogleSearchRetrievalToolToAdapterFormat(tool: Tool) {
 export function googleSearchRetrievalTool(
   config?: GoogleSearchRetrievalToolConfig,
 ): GeminiGoogleSearchRetrievalTool {
-  // Phantom-brand cast: '~provider'/'~toolKind' are type-only and never assigned at runtime.
-  return {
+  return brandProviderTool<GeminiGoogleSearchRetrievalTool>({
     name: 'google_search_retrieval',
     description: '',
     metadata: config,
-  } as unknown as GeminiGoogleSearchRetrievalTool
+  })
 }

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

@@ -1,3 +1,4 @@
+import { brandProviderTool } from '@tanstack/ai'
 import type { GoogleSearch } from '@google/genai'
 import type { ProviderTool, Tool } from '@tanstack/ai'
 
@@ -18,10 +19,9 @@ export function convertGoogleSearchToolToAdapterFormat(tool: Tool) {
 export function googleSearchTool(
   config?: GoogleSearchToolConfig,
 ): GeminiGoogleSearchTool {
-  // Phantom-brand cast: '~provider'/'~toolKind' are type-only and never assigned at runtime.
-  return {
+  return brandProviderTool<GeminiGoogleSearchTool>({
     name: 'google_search',
     description: '',
     metadata: config,
-  } as unknown as GeminiGoogleSearchTool
+  })
 }

package/src/tools/url-context-tool.ts

@@ -1,3 +1,4 @@
+import { brandProviderTool } from '@tanstack/ai'
 import type { ProviderTool, Tool } from '@tanstack/ai'
 
 export interface UrlContextToolConfig {}
@@ -14,10 +15,9 @@ export function convertUrlContextToolToAdapterFormat(_tool: Tool) {
 }
 
 export function urlContextTool(): GeminiUrlContextTool {
-  // Phantom-brand cast: '~provider'/'~toolKind' are type-only and never assigned at runtime.
-  return {
+  return brandProviderTool<GeminiUrlContextTool>({
     name: 'url_context',
     description: '',
     metadata: {},
-  } as unknown as GeminiUrlContextTool
+  })
 }