@tanstack/ai-gemini 0.8.9 → 0.9.0

package/src/model-meta.ts

@@ -17,16 +17,19 @@ interface ModelMeta<TProviderOptions = unknown> {
       | 'audio_generation'
       | 'batch_api'
       | 'caching'
-      | 'code_execution'
-      | 'file_search'
       | 'function_calling'
-      | 'grounding_with_gmaps'
-      | 'image_generation'
       | 'live_api'
-      | 'search_grounding'
       | 'structured_output'
       | 'thinking'
+    >
+    tools?: Array<
+      | 'code_execution'
+      | 'file_search'
+      | 'google_search'
+      | 'google_search_retrieval'
+      | 'google_maps'
       | 'url_context'
+      | 'computer_use'
     >
   }
   max_input_tokens?: number
@@ -58,14 +61,11 @@ const GEMINI_3_1_PRO = {
     capabilities: [
       'batch_api',
       'caching',
-      'code_execution',
-      'file_search',
       'function_calling',
-      'search_grounding',
       'structured_output',
       'thinking',
-      'url_context',
     ],
+    tools: ['code_execution', 'file_search', 'google_search', 'url_context'],
   },
   pricing: {
     input: {
@@ -96,14 +96,11 @@ const GEMINI_3_PRO = {
     capabilities: [
       'batch_api',
       'caching',
-      'code_execution',
-      'file_search',
       'function_calling',
-      'search_grounding',
       'structured_output',
       'thinking',
-      'url_context',
     ],
+    tools: ['code_execution', 'file_search', 'google_search', 'url_context'],
   },
   pricing: {
     input: {
@@ -134,14 +131,11 @@ const GEMINI_3_FLASH = {
     capabilities: [
       'batch_api',
       'caching',
-      'code_execution',
-      'file_search',
       'function_calling',
-      'search_grounding',
       'structured_output',
       'thinking',
-      'url_context',
     ],
+    tools: ['code_execution', 'file_search', 'google_search', 'url_context'],
   },
   pricing: {
     input: {
@@ -169,13 +163,8 @@ const GEMINI_3_PRO_IMAGE = {
   supports: {
     input: ['text', 'image'],
     output: ['text', 'image'],
-    capabilities: [
-      'batch_api',
-      'image_generation',
-      'search_grounding',
-      'structured_output',
-      'thinking',
-    ],
+    capabilities: ['batch_api', 'structured_output', 'thinking'],
+    tools: ['google_search'],
   },
   pricing: {
     input: {
@@ -203,13 +192,8 @@ const GEMINI_3_1_FLASH_IMAGE = {
   supports: {
     input: ['text', 'image'],
     output: ['text', 'image'],
-    capabilities: [
-      'batch_api',
-      'image_generation',
-      'search_grounding',
-      'structured_output',
-      'thinking',
-    ],
+    capabilities: ['batch_api', 'structured_output', 'thinking'],
+    tools: ['google_search'],
   },
   pricing: {
     input: {
@@ -239,14 +223,11 @@ const GEMINI_3_1_FLASH_LITE = {
     capabilities: [
       'batch_api',
       'caching',
-      'code_execution',
-      'file_search',
       'function_calling',
-      'search_grounding',
       'structured_output',
       'thinking',
-      'url_context',
     ],
+    tools: ['code_execution', 'file_search', 'google_search', 'url_context'],
   },
   pricing: {
     input: {
@@ -276,13 +257,15 @@ const GEMINI_2_5_PRO = {
     capabilities: [
       'batch_api',
       'caching',
-      'code_execution',
-      'file_search',
       'function_calling',
-      'grounding_with_gmaps',
-      'search_grounding',
       'structured_output',
       'thinking',
+    ],
+    tools: [
+      'code_execution',
+      'file_search',
+      'google_maps',
+      'google_search',
       'url_context',
     ],
   },
@@ -311,7 +294,8 @@ const GEMINI_2_5_PRO_TTS = {
   supports: {
     input: ['text'],
     output: ['audio'],
-    capabilities: ['audio_generation', 'file_search'],
+    capabilities: ['audio_generation'],
+    tools: ['file_search'],
   },
   pricing: {
     input: {
@@ -339,13 +323,15 @@ const GEMINI_2_5_FLASH = {
     capabilities: [
       'batch_api',
       'caching',
-      'code_execution',
-      'file_search',
       'function_calling',
-      'grounding_with_gmaps',
-      'search_grounding',
       'structured_output',
       'thinking',
+    ],
+    tools: [
+      'code_execution',
+      'file_search',
+      'google_maps',
+      'google_search',
       'url_context',
     ],
   },
@@ -377,14 +363,11 @@ const GEMINI_2_5_FLASH_PREVIEW = {
     capabilities: [
       'batch_api',
       'caching',
-      'code_execution',
-      'file_search',
       'function_calling',
-      'search_grounding',
       'structured_output',
       'thinking',
-      'url_context',
     ],
+    tools: ['code_execution', 'file_search', 'google_search', 'url_context'],
   },
   pricing: {
     input: {
@@ -411,13 +394,8 @@ const GEMINI_2_5_FLASH_IMAGE = {
   supports: {
     input: ['text', 'image'],
     output: ['text', 'image'],
-    capabilities: [
-      'batch_api',
-      'caching',
-      'file_search',
-      'image_generation',
-      'structured_output',
-    ],
+    capabilities: ['batch_api', 'caching', 'structured_output'],
+    tools: ['file_search'],
   },
   pricing: {
     input: {
@@ -476,7 +454,8 @@ const GEMINI_2_5_FLASH_TTS = {
   supports: {
     input: ['text'],
     output: ['audio'],
-    capabilities: ['audio_generation', 'batch_api', 'file_search'],
+    capabilities: ['audio_generation', 'batch_api'],
+    tools: ['file_search'],
   },
   pricing: {
     input: {
@@ -504,14 +483,11 @@ const GEMINI_2_5_FLASH_LITE = {
     capabilities: [
       'batch_api',
       'caching',
-      'code_execution',
       'function_calling',
-      'grounding_with_gmaps',
-      'search_grounding',
       'structured_output',
       'thinking',
-      'url_context',
     ],
+    tools: ['code_execution', 'google_maps', 'google_search', 'url_context'],
   },
   pricing: {
     input: {
@@ -541,13 +517,11 @@ const GEMINI_2_5_FLASH_LITE_PREVIEW = {
     capabilities: [
       'batch_api',
       'caching',
-      'code_execution',
       'function_calling',
-      'search_grounding',
       'structured_output',
       'thinking',
-      'url_context',
     ],
+    tools: ['code_execution', 'google_search', 'url_context'],
   },
   pricing: {
     input: {
@@ -577,13 +551,11 @@ const GEMINI_2_FLASH = {
     capabilities: [
       'batch_api',
       'caching',
-      'code_execution',
       'function_calling',
-      'grounding_with_gmaps',
       'live_api',
-      'search_grounding',
       'structured_output',
     ],
+    tools: ['code_execution', 'google_maps', 'google_search'],
   },
   pricing: {
     input: {
@@ -609,12 +581,8 @@ const GEMINI_2_FLASH_IMAGE = {
   supports: {
     input: ['text', 'image', 'audio', 'video'],
     output: ['text'],
-    capabilities: [
-      'batch_api',
-      'caching',
-      'image_generation',
-      'structured_output',
-    ],
+    capabilities: ['batch_api', 'caching', 'structured_output'],
+    tools: [],
   },
   pricing: {
     input: {
@@ -679,6 +647,7 @@ const GEMINI_2_FLASH_LITE = {
       'function_calling',
       'structured_output',
     ],
+    tools: [],
   },
   pricing: {
     input: {
@@ -1092,6 +1061,24 @@ export type GeminiChatModelProviderOptionsByName = {
     GeminiStructuredOutputOptions
 }
 
+/**
+ * Type-only map from chat model name to its supported tool capabilities.
+ * Based on the 'supports.tools' arrays defined for each model.
+ */
+export type GeminiChatModelToolCapabilitiesByName = {
+  [GEMINI_3_1_PRO.name]: typeof GEMINI_3_1_PRO.supports.tools
+  [GEMINI_3_PRO.name]: typeof GEMINI_3_PRO.supports.tools
+  [GEMINI_3_FLASH.name]: typeof GEMINI_3_FLASH.supports.tools
+  [GEMINI_3_1_FLASH_LITE.name]: typeof GEMINI_3_1_FLASH_LITE.supports.tools
+  [GEMINI_2_5_PRO.name]: typeof GEMINI_2_5_PRO.supports.tools
+  [GEMINI_2_5_FLASH.name]: typeof GEMINI_2_5_FLASH.supports.tools
+  [GEMINI_2_5_FLASH_PREVIEW.name]: typeof GEMINI_2_5_FLASH_PREVIEW.supports.tools
+  [GEMINI_2_5_FLASH_LITE.name]: typeof GEMINI_2_5_FLASH_LITE.supports.tools
+  [GEMINI_2_5_FLASH_LITE_PREVIEW.name]: typeof GEMINI_2_5_FLASH_LITE_PREVIEW.supports.tools
+  [GEMINI_2_FLASH.name]: typeof GEMINI_2_FLASH.supports.tools
+  [GEMINI_2_FLASH_LITE.name]: typeof GEMINI_2_FLASH_LITE.supports.tools
+}
+
 /**
  * Type-only map from chat model name to its supported input modalities.
  * Based on the 'supports.input' arrays defined for each model.

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

@@ -1,6 +1,11 @@
-import type { Tool } from '@tanstack/ai'
+import type { ProviderTool, Tool } from '@tanstack/ai'
 
-export interface CodeExecutionTool {}
+export interface CodeExecutionToolConfig {}
+
+/** @deprecated Renamed to `CodeExecutionToolConfig`. Will be removed in a future release. */
+export type CodeExecutionTool = CodeExecutionToolConfig
+
+export type GeminiCodeExecutionTool = ProviderTool<'gemini', 'code_execution'>
 
 export function convertCodeExecutionToolToAdapterFormat(_tool: Tool) {
   return {
@@ -8,10 +13,11 @@ export function convertCodeExecutionToolToAdapterFormat(_tool: Tool) {
   }
 }
 
-export function codeExecutionTool(): Tool {
+export function codeExecutionTool(): GeminiCodeExecutionTool {
+  // Phantom-brand cast: '~provider'/'~toolKind' are type-only and never assigned at runtime.
   return {
     name: 'code_execution',
     description: '',
     metadata: {},
-  }
+  } as unknown as GeminiCodeExecutionTool
 }

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

@@ -1,10 +1,15 @@
 import type { ComputerUse } from '@google/genai'
-import type { Tool } from '@tanstack/ai'
+import type { ProviderTool, Tool } from '@tanstack/ai'
 
-export type ComputerUseTool = ComputerUse
+export type ComputerUseToolConfig = ComputerUse
+
+/** @deprecated Renamed to `ComputerUseToolConfig`. Will be removed in a future release. */
+export type ComputerUseTool = ComputerUseToolConfig
+
+export type GeminiComputerUseTool = ProviderTool<'gemini', 'computer_use'>
 
 export function convertComputerUseToolToAdapterFormat(tool: Tool) {
-  const metadata = tool.metadata as ComputerUseTool
+  const metadata = tool.metadata as ComputerUseToolConfig
   return {
     computerUse: {
       environment: metadata.environment,
@@ -13,7 +18,10 @@ export function convertComputerUseToolToAdapterFormat(tool: Tool) {
   }
 }
 
-export function computerUseTool(config: ComputerUseTool): Tool {
+export function computerUseTool(
+  config: ComputerUseToolConfig,
+): GeminiComputerUseTool {
+  // Phantom-brand cast: '~provider'/'~toolKind' are type-only and never assigned at runtime.
   return {
     name: 'computer_use',
     description: '',
@@ -21,5 +29,5 @@ export function computerUseTool(config: ComputerUseTool): Tool {
       environment: config.environment,
       excludedPredefinedFunctions: config.excludedPredefinedFunctions,
     },
-  }
+  } as unknown as GeminiComputerUseTool
 }

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

@@ -1,19 +1,27 @@
-import type { Tool } from '@tanstack/ai'
 import type { FileSearch } from '@google/genai'
+import type { ProviderTool, Tool } from '@tanstack/ai'
 
-export type FileSearchTool = FileSearch
+export type FileSearchToolConfig = FileSearch
+
+/** @deprecated Renamed to `FileSearchToolConfig`. Will be removed in a future release. */
+export type FileSearchTool = FileSearchToolConfig
+
+export type GeminiFileSearchTool = ProviderTool<'gemini', 'file_search'>
 
 export function convertFileSearchToolToAdapterFormat(tool: Tool) {
-  const metadata = tool.metadata as FileSearchTool
+  const metadata = tool.metadata as FileSearchToolConfig
   return {
     fileSearch: metadata,
   }
 }
 
-export function fileSearchTool(config: FileSearchTool): Tool {
+export function fileSearchTool(
+  config: FileSearchToolConfig,
+): GeminiFileSearchTool {
+  // Phantom-brand cast: '~provider'/'~toolKind' are type-only and never assigned at runtime.
   return {
     name: 'file_search',
     description: '',
     metadata: config,
-  }
+  } as unknown as GeminiFileSearchTool
 }

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

@@ -1,19 +1,27 @@
 import type { GoogleMaps } from '@google/genai'
-import type { Tool } from '@tanstack/ai'
+import type { ProviderTool, Tool } from '@tanstack/ai'
 
-export type GoogleMapsTool = GoogleMaps
+export type GoogleMapsToolConfig = GoogleMaps
+
+/** @deprecated Renamed to `GoogleMapsToolConfig`. Will be removed in a future release. */
+export type GoogleMapsTool = GoogleMapsToolConfig
+
+export type GeminiGoogleMapsTool = ProviderTool<'gemini', 'google_maps'>
 
 export function convertGoogleMapsToolToAdapterFormat(tool: Tool) {
-  const metadata = tool.metadata as GoogleMapsTool
+  const metadata = tool.metadata as GoogleMapsToolConfig
   return {
     googleMaps: metadata,
   }
 }
 
-export function googleMapsTool(config?: GoogleMapsTool): Tool {
+export function googleMapsTool(
+  config?: GoogleMapsToolConfig,
+): GeminiGoogleMapsTool {
+  // Phantom-brand cast: '~provider'/'~toolKind' are type-only and never assigned at runtime.
   return {
     name: 'google_maps',
     description: '',
     metadata: config,
-  }
+  } as unknown as GeminiGoogleMapsTool
 }

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

@@ -1,21 +1,30 @@
 import type { GoogleSearchRetrieval } from '@google/genai'
-import type { Tool } from '@tanstack/ai'
+import type { ProviderTool, Tool } from '@tanstack/ai'
 
-export type GoogleSearchRetrievalTool = GoogleSearchRetrieval
+export type GoogleSearchRetrievalToolConfig = GoogleSearchRetrieval
+
+/** @deprecated Renamed to `GoogleSearchRetrievalToolConfig`. Will be removed in a future release. */
+export type GoogleSearchRetrievalTool = GoogleSearchRetrievalToolConfig
+
+export type GeminiGoogleSearchRetrievalTool = ProviderTool<
+  'gemini',
+  'google_search_retrieval'
+>
 
 export function convertGoogleSearchRetrievalToolToAdapterFormat(tool: Tool) {
-  const metadata = tool.metadata as GoogleSearchRetrievalTool
+  const metadata = tool.metadata as GoogleSearchRetrievalToolConfig
   return {
     googleSearchRetrieval: metadata,
   }
 }
 
 export function googleSearchRetrievalTool(
-  config?: GoogleSearchRetrievalTool,
-): Tool {
+  config?: GoogleSearchRetrievalToolConfig,
+): GeminiGoogleSearchRetrievalTool {
+  // Phantom-brand cast: '~provider'/'~toolKind' are type-only and never assigned at runtime.
   return {
     name: 'google_search_retrieval',
     description: '',
     metadata: config,
-  }
+  } as unknown as GeminiGoogleSearchRetrievalTool
 }

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

@@ -1,19 +1,27 @@
 import type { GoogleSearch } from '@google/genai'
-import type { Tool } from '@tanstack/ai'
+import type { ProviderTool, Tool } from '@tanstack/ai'
 
-export type GoogleSearchTool = GoogleSearch
+export type GoogleSearchToolConfig = GoogleSearch
+
+/** @deprecated Renamed to `GoogleSearchToolConfig`. Will be removed in a future release. */
+export type GoogleSearchTool = GoogleSearchToolConfig
+
+export type GeminiGoogleSearchTool = ProviderTool<'gemini', 'google_search'>
 
 export function convertGoogleSearchToolToAdapterFormat(tool: Tool) {
-  const metadata = tool.metadata as GoogleSearchTool
+  const metadata = tool.metadata as GoogleSearchToolConfig
   return {
     googleSearch: metadata,
   }
 }
 
-export function googleSearchTool(config?: GoogleSearchTool): Tool {
+export function googleSearchTool(
+  config?: GoogleSearchToolConfig,
+): GeminiGoogleSearchTool {
+  // Phantom-brand cast: '~provider'/'~toolKind' are type-only and never assigned at runtime.
   return {
     name: 'google_search',
     description: '',
     metadata: config,
-  }
+  } as unknown as GeminiGoogleSearchTool
 }

package/src/tools/index.ts

@@ -7,6 +7,55 @@ import type { GoogleSearchRetrievalTool } from './google-search-retriveal-tool'
 import type { GoogleSearchTool } from './google-search-tool'
 import type { UrlContextTool } from './url-context-tool'
 
+export {
+  codeExecutionTool,
+  type GeminiCodeExecutionTool,
+  type CodeExecutionToolConfig,
+  type CodeExecutionTool,
+} from './code-execution-tool'
+export {
+  computerUseTool,
+  type GeminiComputerUseTool,
+  type ComputerUseToolConfig,
+  type ComputerUseTool,
+} from './computer-use-tool'
+export {
+  fileSearchTool,
+  type GeminiFileSearchTool,
+  type FileSearchToolConfig,
+  type FileSearchTool,
+} from './file-search-tool'
+export {
+  functionDeclarationTools,
+  type FunctionDeclarationTool,
+} from './function-declaration-tool'
+export {
+  googleMapsTool,
+  type GeminiGoogleMapsTool,
+  type GoogleMapsToolConfig,
+  type GoogleMapsTool,
+} from './google-maps-tool'
+export {
+  googleSearchRetrievalTool,
+  type GeminiGoogleSearchRetrievalTool,
+  type GoogleSearchRetrievalToolConfig,
+  type GoogleSearchRetrievalTool,
+} from './google-search-retriveal-tool'
+export {
+  googleSearchTool,
+  type GeminiGoogleSearchTool,
+  type GoogleSearchToolConfig,
+  type GoogleSearchTool,
+} from './google-search-tool'
+export {
+  urlContextTool,
+  type GeminiUrlContextTool,
+  type UrlContextToolConfig,
+  type UrlContextTool,
+} from './url-context-tool'
+
+// Keep the existing discriminated union defined inline (no barrel exports).
+// Built from the deprecated config-type aliases — matches the SDK-adapter shape.
 export type GoogleGeminiTool =
   | CodeExecutionTool
   | ComputerUseTool
@@ -16,3 +65,5 @@ export type GoogleGeminiTool =
   | GoogleSearchRetrievalTool
   | GoogleSearchTool
   | UrlContextTool
+
+export { convertToolsToProviderFormat } from './tool-converter'

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

@@ -1,6 +1,11 @@
-import type { Tool } from '@tanstack/ai'
+import type { ProviderTool, Tool } from '@tanstack/ai'
 
-export interface UrlContextTool {}
+export interface UrlContextToolConfig {}
+
+/** @deprecated Renamed to `UrlContextToolConfig`. Will be removed in a future release. */
+export type UrlContextTool = UrlContextToolConfig
+
+export type GeminiUrlContextTool = ProviderTool<'gemini', 'url_context'>
 
 export function convertUrlContextToolToAdapterFormat(_tool: Tool) {
   return {
@@ -8,10 +13,11 @@ export function convertUrlContextToolToAdapterFormat(_tool: Tool) {
   }
 }
 
-export function urlContextTool(): Tool {
+export function urlContextTool(): GeminiUrlContextTool {
+  // Phantom-brand cast: '~provider'/'~toolKind' are type-only and never assigned at runtime.
   return {
     name: 'url_context',
     description: '',
     metadata: {},
-  }
+  } as unknown as GeminiUrlContextTool
 }