@tanstack/ai-gemini 0.23.0 → 0.24.1

package/src/tools/gemini-provider-tool.ts

@@ -0,0 +1,60 @@
+import { brandProviderTool } from '@tanstack/ai'
+import type { ProviderTool, Tool } from '@tanstack/ai'
+
+const GEMINI_PROVIDER_TOOL_KINDS = {
+  code_execution: 'gemini.code_execution',
+  computer_use: 'gemini.computer_use',
+  file_search: 'gemini.file_search',
+  google_maps: 'gemini.google_maps',
+  google_search: 'gemini.google_search',
+  google_search_retrieval: 'gemini.google_search_retrieval',
+  url_context: 'gemini.url_context',
+} as const
+
+type GeminiProviderToolKind = keyof typeof GEMINI_PROVIDER_TOOL_KINDS
+
+export function brandGeminiProviderTool<
+  T extends ProviderTool<'gemini', GeminiProviderToolKind>,
+>(tool: Omit<T, '~provider' | '~toolKind'>, toolKind: T['~toolKind']): T {
+  return brandProviderTool<T>({
+    ...tool,
+    metadata: {
+      ...tool.metadata,
+      __kind: GEMINI_PROVIDER_TOOL_KINDS[toolKind],
+    },
+  })
+}
+
+export function getGeminiProviderToolKind(
+  tool: Tool,
+): GeminiProviderToolKind | undefined {
+  const toolKind = tool.metadata?.['__kind']
+  switch (toolKind) {
+    case 'gemini.code_execution':
+      return 'code_execution'
+    case 'gemini.computer_use':
+      return 'computer_use'
+    case 'gemini.file_search':
+      return 'file_search'
+    case 'gemini.google_maps':
+      return 'google_maps'
+    case 'gemini.google_search':
+      return 'google_search'
+    case 'gemini.google_search_retrieval':
+      return 'google_search_retrieval'
+    case 'gemini.url_context':
+      return 'url_context'
+    default:
+      return undefined
+  }
+}
+
+/** Returns adapter metadata without the internal runtime discriminator. */
+export function getGeminiProviderToolMetadata(tool: Tool): Tool['metadata'] {
+  if (!tool.metadata) {
+    return undefined
+  }
+  const { __kind: _kind, ...metadata } = tool.metadata
+  void _kind
+  return metadata
+}

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

@@ -1,4 +1,7 @@
-import { brandProviderTool } from '@tanstack/ai'
+import {
+  brandGeminiProviderTool,
+  getGeminiProviderToolMetadata,
+} from './gemini-provider-tool'
 import type { GoogleMaps } from '@google/genai'
 import type { ProviderTool, Tool } from '@tanstack/ai'
 
@@ -10,7 +13,7 @@ export type GoogleMapsTool = GoogleMapsToolConfig
 export type GeminiGoogleMapsTool = ProviderTool<'gemini', 'google_maps'>
 
 export function convertGoogleMapsToolToAdapterFormat(tool: Tool) {
-  const metadata = tool.metadata as GoogleMapsToolConfig
+  const metadata = getGeminiProviderToolMetadata(tool) as GoogleMapsToolConfig
   return {
     googleMaps: metadata,
   }
@@ -19,9 +22,12 @@ export function convertGoogleMapsToolToAdapterFormat(tool: Tool) {
 export function googleMapsTool(
   config?: GoogleMapsToolConfig,
 ): GeminiGoogleMapsTool {
-  return brandProviderTool<GeminiGoogleMapsTool>({
-    name: 'google_maps',
-    description: '',
-    metadata: config,
-  })
+  return brandGeminiProviderTool<GeminiGoogleMapsTool>(
+    {
+      name: 'google_maps',
+      description: '',
+      metadata: config,
+    },
+    'google_maps',
+  )
 }

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

@@ -1,4 +1,7 @@
-import { brandProviderTool } from '@tanstack/ai'
+import {
+  brandGeminiProviderTool,
+  getGeminiProviderToolMetadata,
+} from './gemini-provider-tool'
 import type { GoogleSearchRetrieval } from '@google/genai'
 import type { ProviderTool, Tool } from '@tanstack/ai'
 
@@ -13,7 +16,9 @@ export type GeminiGoogleSearchRetrievalTool = ProviderTool<
 >
 
 export function convertGoogleSearchRetrievalToolToAdapterFormat(tool: Tool) {
-  const metadata = tool.metadata as GoogleSearchRetrievalToolConfig
+  const metadata = getGeminiProviderToolMetadata(
+    tool,
+  ) as GoogleSearchRetrievalToolConfig
   return {
     googleSearchRetrieval: metadata,
   }
@@ -22,9 +27,12 @@ export function convertGoogleSearchRetrievalToolToAdapterFormat(tool: Tool) {
 export function googleSearchRetrievalTool(
   config?: GoogleSearchRetrievalToolConfig,
 ): GeminiGoogleSearchRetrievalTool {
-  return brandProviderTool<GeminiGoogleSearchRetrievalTool>({
-    name: 'google_search_retrieval',
-    description: '',
-    metadata: config,
-  })
+  return brandGeminiProviderTool<GeminiGoogleSearchRetrievalTool>(
+    {
+      name: 'google_search_retrieval',
+      description: '',
+      metadata: config,
+    },
+    'google_search_retrieval',
+  )
 }

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

@@ -1,4 +1,7 @@
-import { brandProviderTool } from '@tanstack/ai'
+import {
+  brandGeminiProviderTool,
+  getGeminiProviderToolMetadata,
+} from './gemini-provider-tool'
 import type { GoogleSearch } from '@google/genai'
 import type { ProviderTool, Tool } from '@tanstack/ai'
 
@@ -10,7 +13,7 @@ export type GoogleSearchTool = GoogleSearchToolConfig
 export type GeminiGoogleSearchTool = ProviderTool<'gemini', 'google_search'>
 
 export function convertGoogleSearchToolToAdapterFormat(tool: Tool) {
-  const metadata = tool.metadata as GoogleSearchToolConfig
+  const metadata = getGeminiProviderToolMetadata(tool) as GoogleSearchToolConfig
   return {
     googleSearch: metadata,
   }
@@ -19,9 +22,12 @@ export function convertGoogleSearchToolToAdapterFormat(tool: Tool) {
 export function googleSearchTool(
   config?: GoogleSearchToolConfig,
 ): GeminiGoogleSearchTool {
-  return brandProviderTool<GeminiGoogleSearchTool>({
-    name: 'google_search',
-    description: '',
-    metadata: config,
-  })
+  return brandGeminiProviderTool<GeminiGoogleSearchTool>(
+    {
+      name: 'google_search',
+      description: '',
+      metadata: config,
+    },
+    'google_search',
+  )
 }

package/src/tools/tool-converter.ts

@@ -1,6 +1,8 @@
+import { assertUniqueToolNames } from '@tanstack/ai/adapter-internals'
 import { convertCodeExecutionToolToAdapterFormat } from './code-execution-tool'
 import { convertComputerUseToolToAdapterFormat } from './computer-use-tool'
 import { convertFileSearchToolToAdapterFormat } from './file-search-tool'
+import { getGeminiProviderToolKind } from './gemini-provider-tool'
 import { convertGoogleMapsToolToAdapterFormat } from './google-maps-tool'
 import { convertGoogleSearchRetrievalToolToAdapterFormat } from './google-search-retriveal-tool'
 import { convertGoogleSearchToolToAdapterFormat } from './google-search-tool'
@@ -33,6 +35,7 @@ export function convertToolsToProviderFormat<TTool extends Tool>(
   if (!tools || tools.length === 0) {
     return []
   }
+  assertUniqueToolNames(tools)
   const result: Array<ToolUnion> = []
   const functionDeclarations: Array<{
     name: string
@@ -42,9 +45,7 @@ export function convertToolsToProviderFormat<TTool extends Tool>(
 
   // Process each tool and group function declarations together
   for (const tool of tools) {
-    const name = tool.name
-
-    switch (name) {
+    switch (getGeminiProviderToolKind(tool)) {
       case 'code_execution':
         result.push(convertCodeExecutionToolToAdapterFormat(tool))
         break
@@ -66,7 +67,7 @@ export function convertToolsToProviderFormat<TTool extends Tool>(
       case 'url_context':
         result.push(convertUrlContextToolToAdapterFormat(tool))
         break
-      default:
+      case undefined:
         // Collect function declarations to group together
         // Description is required for Gemini function declarations
         if (!tool.description) {

package/src/tools/url-context-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 UrlContextToolConfig {}
@@ -15,9 +15,12 @@ export function convertUrlContextToolToAdapterFormat(_tool: Tool) {
 }
 
 export function urlContextTool(): GeminiUrlContextTool {
-  return brandProviderTool<GeminiUrlContextTool>({
-    name: 'url_context',
-    description: '',
-    metadata: {},
-  })
+  return brandGeminiProviderTool<GeminiUrlContextTool>(
+    {
+      name: 'url_context',
+      description: '',
+      metadata: {},
+    },
+    'url_context',
+  )
 }