@tanstack/ai-anthropic 0.16.5 → 0.16.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/ai-anthropic",
-  "version": "0.16.5",
+  "version": "0.16.7",
   "description": "Anthropic Claude adapter for TanStack AI chat, tool calling, thinking, and structured outputs.",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -53,12 +53,12 @@
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@tanstack/ai": "^0.44.0"
+    "@tanstack/ai": "^0.46.0"
   },
   "devDependencies": {
-    "@vitest/coverage-v8": "4.0.14",
+    "@vitest/coverage-v8": "4.1.10",
     "zod": "^4.2.0",
-    "@tanstack/ai": "0.44.0"
+    "@tanstack/ai": "0.46.0"
   },
   "scripts": {
     "build": "vite build",

package/src/adapters/text.ts

@@ -2,6 +2,7 @@ import { EventType, normalizeSystemPrompts } from '@tanstack/ai'
 import { toRunErrorRawEvent } from '@tanstack/ai/adapter-internals'
 import { BaseTextAdapter } from '@tanstack/ai/adapters'
 import { convertToolsToProviderFormat } from '../tools/tool-converter'
+import { getAnthropicProviderToolKind } from '../tools/anthropic-provider-tool'
 import {
   readCodeExecutionConfig,
   readCodeExecutionSkills,
@@ -171,7 +172,9 @@ export function computeAnthropicBetas(
 
   // Code-execution beta is version-aware: select from the FIRST code_execution
   // tool's config type.
-  const codeExecTool = tools?.find((t) => t.name === 'code_execution')
+  const codeExecTool = tools?.find(
+    (tool) => getAnthropicProviderToolKind(tool) === 'code_execution',
+  )
   if (codeExecTool) {
     const cfgType = readCodeExecutionConfig(codeExecTool)?.type
     // Each code_execution tool version pairs with a specific beta. Known
@@ -188,9 +191,9 @@ export function computeAnthropicBetas(
   // container-lift, which lifts skills from any code_execution tool that
   // carries them (not just the first).
   const hasSkills = tools?.some(
-    (t) =>
-      t.name === 'code_execution' &&
-      (readCodeExecutionSkills(t)?.length ?? 0) > 0,
+    (tool) =>
+      getAnthropicProviderToolKind(tool) === 'code_execution' &&
+      (readCodeExecutionSkills(tool)?.length ?? 0) > 0,
   )
   if (hasSkills) betas.add('skills-2025-10-02')
 
@@ -575,7 +578,7 @@ export class AnthropicTextAdapter<
     // canonical path for skills; `modelOptions.container.skills` is deprecated.
     const toolSkills = options.tools
       ?.map((tool) =>
-        tool.name === 'code_execution'
+        getAnthropicProviderToolKind(tool) === 'code_execution'
           ? readCodeExecutionSkills(tool)
           : undefined,
       )

package/src/model-meta.ts

@@ -502,7 +502,67 @@ const CLAUDE_SONNET_5 = {
  * via the `speed` parameter, not a model id) were removed after Anthropic
  * turned them off.
  */
+const CLAUDE_OPUS_5 = {
+  name: 'claude-opus-5',
+  id: 'claude-opus-5',
+  context_window: 1_000_000,
+  max_output_tokens: 128_000,
+  supports: {
+    input: ['text', 'image', 'document'],
+    tools: [],
+  },
+  pricing: {
+    input: {
+      normal: 5,
+      cached: 0.5,
+    },
+    output: {
+      normal: 25,
+    },
+  },
+} as const satisfies ModelMeta<
+  AnthropicContainerOptions &
+    AnthropicContextManagementOptions &
+    AnthropicMCPOptions &
+    AnthropicServiceTierOptions &
+    AnthropicStopSequencesOptions &
+    AnthropicThinkingOptions &
+    AnthropicToolChoiceOptions &
+    AnthropicSamplingOptions
+>
+
+const CLAUDE_OPUS_5_FAST = {
+  name: 'claude-opus-5-fast',
+  id: 'claude-opus-5-fast',
+  context_window: 1_000_000,
+  max_output_tokens: 128_000,
+  supports: {
+    input: ['text', 'image', 'document'],
+    tools: [],
+  },
+  pricing: {
+    input: {
+      normal: 10,
+      cached: 1,
+    },
+    output: {
+      normal: 50,
+    },
+  },
+} as const satisfies ModelMeta<
+  AnthropicContainerOptions &
+    AnthropicContextManagementOptions &
+    AnthropicMCPOptions &
+    AnthropicServiceTierOptions &
+    AnthropicStopSequencesOptions &
+    AnthropicThinkingOptions &
+    AnthropicToolChoiceOptions &
+    AnthropicSamplingOptions
+>
+
 export const ANTHROPIC_MODELS = [
+  CLAUDE_OPUS_5.id,
+  CLAUDE_OPUS_5_FAST.id,
   CLAUDE_OPUS_4_6.id,
   CLAUDE_OPUS_4_5.id,
   CLAUDE_SONNET_4_6.id,
@@ -552,6 +612,8 @@ const ANTHROPIC_MODEL_MAX_OUTPUT_TOKENS: Record<string, number> = {
   [CLAUDE_OPUS_4_8.id]: CLAUDE_OPUS_4_8.max_output_tokens,
   [CLAUDE_FABLE_5.id]: CLAUDE_FABLE_5.max_output_tokens,
   [CLAUDE_SONNET_5.id]: CLAUDE_SONNET_5.max_output_tokens,
+  [CLAUDE_OPUS_5.id]: CLAUDE_OPUS_5.max_output_tokens,
+  [CLAUDE_OPUS_5_FAST.id]: CLAUDE_OPUS_5_FAST.max_output_tokens,
 }
 
 /**
@@ -728,6 +790,22 @@ export type AnthropicChatModelProviderOptionsByName = {
     AnthropicToolChoiceOptions &
     AnthropicMaxTokensOptions &
     AnthropicOutputConfigOptions
+  [CLAUDE_OPUS_5.id]: AnthropicContainerOptions &
+    AnthropicContextManagementOptions &
+    AnthropicMCPOptions &
+    AnthropicServiceTierOptions &
+    AnthropicStopSequencesOptions &
+    AnthropicThinkingOptions &
+    AnthropicToolChoiceOptions &
+    AnthropicSamplingOptions
+  [CLAUDE_OPUS_5_FAST.id]: AnthropicContainerOptions &
+    AnthropicContextManagementOptions &
+    AnthropicMCPOptions &
+    AnthropicServiceTierOptions &
+    AnthropicStopSequencesOptions &
+    AnthropicThinkingOptions &
+    AnthropicToolChoiceOptions &
+    AnthropicSamplingOptions
 }
 
 export type AnthropicChatModelToolCapabilitiesByName = {
@@ -741,6 +819,8 @@ export type AnthropicChatModelToolCapabilitiesByName = {
   [CLAUDE_OPUS_4_8.id]: typeof CLAUDE_OPUS_4_8.supports.tools
   [CLAUDE_FABLE_5.id]: typeof CLAUDE_FABLE_5.supports.tools
   [CLAUDE_SONNET_5.id]: typeof CLAUDE_SONNET_5.supports.tools
+  [CLAUDE_OPUS_5.id]: typeof CLAUDE_OPUS_5.supports.tools
+  [CLAUDE_OPUS_5_FAST.id]: typeof CLAUDE_OPUS_5_FAST.supports.tools
 }
 
 /**
@@ -765,4 +845,6 @@ export type AnthropicModelInputModalitiesByName = {
   [CLAUDE_OPUS_4_8.id]: typeof CLAUDE_OPUS_4_8.supports.input
   [CLAUDE_FABLE_5.id]: typeof CLAUDE_FABLE_5.supports.input
   [CLAUDE_SONNET_5.id]: typeof CLAUDE_SONNET_5.supports.input
+  [CLAUDE_OPUS_5.id]: typeof CLAUDE_OPUS_5.supports.input
+  [CLAUDE_OPUS_5_FAST.id]: typeof CLAUDE_OPUS_5_FAST.supports.input
 }

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

@@ -0,0 +1,68 @@
+import { brandProviderTool } from '@tanstack/ai'
+import type { ProviderTool, Tool } from '@tanstack/ai'
+
+const ANTHROPIC_PROVIDER_TOOL_KINDS = {
+  bash: 'anthropic.bash',
+  code_execution: 'anthropic.code_execution',
+  computer_use: 'anthropic.computer_use',
+  memory: 'anthropic.memory',
+  text_editor: 'anthropic.text_editor',
+  web_fetch: 'anthropic.web_fetch',
+  web_search: 'anthropic.web_search',
+} as const
+
+type AnthropicProviderToolKind = keyof typeof ANTHROPIC_PROVIDER_TOOL_KINDS
+
+/**
+ * Adds a stable runtime discriminator to an Anthropic-native tool.
+ *
+ * The core ProviderTool brand is intentionally type-only. Anthropic also needs
+ * a runtime discriminator because custom functions may use the same public
+ * names as native tools. Adapter metadata is the repository-wide extension
+ * point for this plain-data marker; converters remove it from the wire shape.
+ */
+export function brandAnthropicProviderTool<
+  T extends ProviderTool<'anthropic', AnthropicProviderToolKind>,
+>(tool: Omit<T, '~provider' | '~toolKind'>, toolKind: T['~toolKind']): T {
+  return brandProviderTool<T>({
+    ...tool,
+    metadata: {
+      ...tool.metadata,
+      __kind: ANTHROPIC_PROVIDER_TOOL_KINDS[toolKind],
+    },
+  })
+}
+
+export function getAnthropicProviderToolKind(
+  tool: Tool,
+): AnthropicProviderToolKind | undefined {
+  const toolKind = tool.metadata?.['__kind']
+  switch (toolKind) {
+    case 'anthropic.bash':
+      return 'bash'
+    case 'anthropic.code_execution':
+      return 'code_execution'
+    case 'anthropic.computer_use':
+      return 'computer_use'
+    case 'anthropic.memory':
+      return 'memory'
+    case 'anthropic.text_editor':
+      return 'text_editor'
+    case 'anthropic.web_fetch':
+      return 'web_fetch'
+    case 'anthropic.web_search':
+      return 'web_search'
+    default:
+      return undefined
+  }
+}
+
+/** Returns adapter metadata without the internal runtime discriminator. */
+export function getAnthropicProviderToolMetadata(tool: Tool): Tool['metadata'] {
+  if (!tool.metadata) {
+    return undefined
+  }
+  const { __kind: _kind, ...metadata } = tool.metadata
+  void _kind
+  return metadata
+}

package/src/tools/bash-tool.ts

@@ -1,4 +1,7 @@
-import { brandProviderTool } from '@tanstack/ai'
+import {
+  brandAnthropicProviderTool,
+  getAnthropicProviderToolMetadata,
+} from './anthropic-provider-tool'
 import type {
   BetaToolBash20241022,
   BetaToolBash20250124,
@@ -13,14 +16,17 @@ export type BashTool = BashToolConfig
 export type AnthropicBashTool = ProviderTool<'anthropic', 'bash'>
 
 export function convertBashToolToAdapterFormat(tool: Tool): BashToolConfig {
-  const metadata = tool.metadata as BashToolConfig
+  const metadata = getAnthropicProviderToolMetadata(tool) as BashToolConfig
   return metadata
 }
 
 export function bashTool(config: BashToolConfig): AnthropicBashTool {
-  return brandProviderTool<AnthropicBashTool>({
-    name: 'bash',
-    description: '',
-    metadata: config,
-  })
+  return brandAnthropicProviderTool<AnthropicBashTool>(
+    {
+      name: 'bash',
+      description: '',
+      metadata: config,
+    },
+    'bash',
+  )
 }

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

@@ -1,4 +1,7 @@
-import { brandProviderTool } from '@tanstack/ai'
+import {
+  brandAnthropicProviderTool,
+  getAnthropicProviderToolMetadata,
+} from './anthropic-provider-tool'
 import type {
   BetaCodeExecutionTool20250522,
   BetaCodeExecutionTool20250825,
@@ -56,7 +59,11 @@ export function convertCodeExecutionToolToAdapterFormat(
 export function readCodeExecutionConfig(
   tool: Tool,
 ): CodeExecutionToolConfig | undefined {
-  return (tool.metadata as CodeExecutionToolMetadata | undefined)?.config
+  return (
+    getAnthropicProviderToolMetadata(tool) as
+      | CodeExecutionToolMetadata
+      | undefined
+  )?.config
 }
 
 /**
@@ -66,7 +73,11 @@ export function readCodeExecutionConfig(
 export function readCodeExecutionSkills(
   tool: Tool,
 ): Array<AnthropicContainerSkill> | undefined {
-  return (tool.metadata as CodeExecutionToolMetadata | undefined)?.skills
+  return (
+    getAnthropicProviderToolMetadata(tool) as
+      | CodeExecutionToolMetadata
+      | undefined
+  )?.skills
 }
 
 export function codeExecutionTool(
@@ -88,9 +99,12 @@ export function codeExecutionTool(
     config,
     ...(skills && { skills }),
   }
-  return brandProviderTool<AnthropicCodeExecutionTool>({
-    name: 'code_execution',
-    description: '',
-    metadata,
-  })
+  return brandAnthropicProviderTool<AnthropicCodeExecutionTool>(
+    {
+      name: 'code_execution',
+      description: '',
+      metadata,
+    },
+    'code_execution',
+  )
 }

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

@@ -1,4 +1,7 @@
-import { brandProviderTool } from '@tanstack/ai'
+import {
+  brandAnthropicProviderTool,
+  getAnthropicProviderToolMetadata,
+} from './anthropic-provider-tool'
 import type {
   BetaToolComputerUse20241022,
   BetaToolComputerUse20250124,
@@ -17,16 +20,21 @@ export type AnthropicComputerUseTool = ProviderTool<'anthropic', 'computer_use'>
 export function convertComputerUseToolToAdapterFormat(
   tool: Tool,
 ): ComputerUseToolConfig {
-  const metadata = tool.metadata as ComputerUseToolConfig
+  const metadata = getAnthropicProviderToolMetadata(
+    tool,
+  ) as ComputerUseToolConfig
   return metadata
 }
 
 export function computerUseTool(
   config: ComputerUseToolConfig,
 ): AnthropicComputerUseTool {
-  return brandProviderTool<AnthropicComputerUseTool>({
-    name: 'computer',
-    description: '',
-    metadata: config,
-  })
+  return brandAnthropicProviderTool<AnthropicComputerUseTool>(
+    {
+      name: 'computer',
+      description: '',
+      metadata: config,
+    },
+    'computer_use',
+  )
 }

package/src/tools/memory-tool.ts

@@ -1,4 +1,7 @@
-import { brandProviderTool } from '@tanstack/ai'
+import {
+  brandAnthropicProviderTool,
+  getAnthropicProviderToolMetadata,
+} from './anthropic-provider-tool'
 import type { BetaMemoryTool20250818 } from '@anthropic-ai/sdk/resources/beta'
 import type { ProviderTool, Tool } from '@tanstack/ai'
 
@@ -10,7 +13,10 @@ export type MemoryTool = MemoryToolConfig
 export type AnthropicMemoryTool = ProviderTool<'anthropic', 'memory'>
 
 export function convertMemoryToolToAdapterFormat(tool: Tool): MemoryToolConfig {
-  const metadata = tool.metadata as Omit<MemoryToolConfig, 'type'>
+  const metadata = getAnthropicProviderToolMetadata(tool) as Omit<
+    MemoryToolConfig,
+    'type'
+  >
   return {
     type: 'memory_20250818',
     ...metadata,
@@ -18,9 +24,12 @@ export function convertMemoryToolToAdapterFormat(tool: Tool): MemoryToolConfig {
 }
 
 export function memoryTool(config?: MemoryToolConfig): AnthropicMemoryTool {
-  return brandProviderTool<AnthropicMemoryTool>({
-    name: 'memory',
-    description: '',
-    metadata: config,
-  })
+  return brandAnthropicProviderTool<AnthropicMemoryTool>(
+    {
+      name: 'memory',
+      description: '',
+      metadata: config,
+    },
+    'memory',
+  )
 }

package/src/tools/text-editor-tool.ts

@@ -1,4 +1,7 @@
-import { brandProviderTool } from '@tanstack/ai'
+import {
+  brandAnthropicProviderTool,
+  getAnthropicProviderToolMetadata,
+} from './anthropic-provider-tool'
 import type {
   ToolTextEditor20250124,
   ToolTextEditor20250429,
@@ -19,7 +22,9 @@ export type AnthropicTextEditorTool = ProviderTool<'anthropic', 'text_editor'>
 export function convertTextEditorToolToAdapterFormat(
   tool: Tool,
 ): TextEditorToolConfig {
-  const metadata = tool.metadata as TextEditorToolConfig
+  const metadata = getAnthropicProviderToolMetadata(
+    tool,
+  ) as TextEditorToolConfig
   return {
     ...metadata,
   }
@@ -28,9 +33,12 @@ export function convertTextEditorToolToAdapterFormat(
 export function textEditorTool<T extends TextEditorToolConfig>(
   config: T,
 ): AnthropicTextEditorTool {
-  return brandProviderTool<AnthropicTextEditorTool>({
-    name: 'str_replace_editor',
-    description: '',
-    metadata: config,
-  })
+  return brandAnthropicProviderTool<AnthropicTextEditorTool>(
+    {
+      name: 'str_replace_editor',
+      description: '',
+      metadata: config,
+    },
+    'text_editor',
+  )
 }

package/src/tools/tool-converter.ts

@@ -1,3 +1,5 @@
+import { assertUniqueToolNames } from '@tanstack/ai/adapter-internals'
+import { getAnthropicProviderToolKind } from './anthropic-provider-tool'
 import { convertBashToolToAdapterFormat } from './bash-tool'
 import { convertCodeExecutionToolToAdapterFormat } from './code-execution-tool'
 import { convertComputerUseToolToAdapterFormat } from './computer-use-tool'
@@ -36,25 +38,24 @@ import type { Tool } from '@tanstack/ai'
 export function convertToolsToProviderFormat<TTool extends Tool>(
   tools: Array<TTool>,
 ): Array<AnthropicTool> {
+  assertUniqueToolNames(tools)
   return tools.map((tool) => {
-    const name = tool.name
-
-    switch (name) {
+    switch (getAnthropicProviderToolKind(tool)) {
       case 'bash':
         return convertBashToolToAdapterFormat(tool)
       case 'code_execution':
         return convertCodeExecutionToolToAdapterFormat(tool)
-      case 'computer':
+      case 'computer_use':
         return convertComputerUseToolToAdapterFormat(tool)
       case 'memory':
         return convertMemoryToolToAdapterFormat(tool)
-      case 'str_replace_editor':
+      case 'text_editor':
         return convertTextEditorToolToAdapterFormat(tool)
       case 'web_fetch':
         return convertWebFetchToolToAdapterFormat(tool)
       case 'web_search':
         return convertWebSearchToolToAdapterFormat(tool)
-      default:
+      case undefined:
         return convertCustomToolToAdapterFormat(tool)
     }
   })

package/src/tools/web-fetch-tool.ts

@@ -1,4 +1,7 @@
-import { brandProviderTool } from '@tanstack/ai'
+import {
+  brandAnthropicProviderTool,
+  getAnthropicProviderToolMetadata,
+} from './anthropic-provider-tool'
 import type { BetaWebFetchTool20250910 } from '@anthropic-ai/sdk/resources/beta'
 import type { ProviderTool, Tool } from '@tanstack/ai'
 
@@ -12,7 +15,10 @@ export type AnthropicWebFetchTool = ProviderTool<'anthropic', 'web_fetch'>
 export function convertWebFetchToolToAdapterFormat(
   tool: Tool,
 ): WebFetchToolConfig {
-  const metadata = tool.metadata as Omit<WebFetchToolConfig, 'type' | 'name'>
+  const metadata = getAnthropicProviderToolMetadata(tool) as Omit<
+    WebFetchToolConfig,
+    'type' | 'name'
+  >
   return {
     name: 'web_fetch',
     type: 'web_fetch_20250910',
@@ -23,9 +29,12 @@ export function convertWebFetchToolToAdapterFormat(
 export function webFetchTool(
   config?: Omit<WebFetchToolConfig, 'type' | 'name'>,
 ): AnthropicWebFetchTool {
-  return brandProviderTool<AnthropicWebFetchTool>({
-    name: 'web_fetch',
-    description: '',
-    metadata: config,
-  })
+  return brandAnthropicProviderTool<AnthropicWebFetchTool>(
+    {
+      name: 'web_fetch',
+      description: '',
+      metadata: config,
+    },
+    'web_fetch',
+  )
 }

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

@@ -1,6 +1,8 @@
-import { brandProviderTool } from '@tanstack/ai'
+import {
+  brandAnthropicProviderTool,
+  getAnthropicProviderToolMetadata,
+} from './anthropic-provider-tool'
 import type { WebSearchTool20250305 } from '@anthropic-ai/sdk/resources/messages'
-import type { CacheControl } from '../text/text-provider-options'
 import type { ProviderTool, Tool } from '@tanstack/ai'
 
 export type WebSearchToolConfig = WebSearchTool20250305
@@ -54,36 +56,27 @@ const validateUserLocation = (tool: WebSearchToolConfig) => {
 export function convertWebSearchToolToAdapterFormat(
   tool: Tool,
 ): WebSearchToolConfig {
-  const metadata = tool.metadata as {
-    allowedDomains?: Array<string> | null
-    blockedDomains?: Array<string> | null
-    maxUses?: number | null
-    userLocation?: {
-      type: 'approximate'
-      city?: string | null
-      country?: string | null
-      region?: string | null
-      timezone?: string | null
-    } | null
-    cacheControl?: CacheControl | null
-  }
-  // Vendor `WebSearchTool20250305` declares these fields as `T | null`
-  // (no `| undefined`) under exactOptionalPropertyTypes, so spread them
-  // conditionally rather than passing explicit `undefined`.
+  // The factory stores the SDK config (`allowed_domains`, `max_uses`, …)
+  // on `metadata`. Vendor `WebSearchTool20250305` declares those fields as
+  // `T | null` (no `| undefined`) under exactOptionalPropertyTypes, so
+  // spread them only when present rather than passing explicit `undefined`.
+  const metadata = getAnthropicProviderToolMetadata(tool)
   return {
     name: 'web_search',
     type: 'web_search_20250305',
-    ...(metadata.allowedDomains !== undefined && {
-      allowed_domains: metadata.allowedDomains,
+    ...(metadata?.allowed_domains !== undefined && {
+      allowed_domains: metadata.allowed_domains,
+    }),
+    ...(metadata?.blocked_domains !== undefined && {
+      blocked_domains: metadata.blocked_domains,
     }),
-    ...(metadata.blockedDomains !== undefined && {
-      blocked_domains: metadata.blockedDomains,
+    ...(metadata?.max_uses !== undefined && { max_uses: metadata.max_uses }),
+    ...(metadata?.user_location !== undefined && {
+      user_location: metadata.user_location,
     }),
-    ...(metadata.maxUses !== undefined && { max_uses: metadata.maxUses }),
-    ...(metadata.userLocation !== undefined && {
-      user_location: metadata.userLocation,
+    ...(metadata?.cache_control !== undefined && {
+      cache_control: metadata.cache_control,
     }),
-    cache_control: metadata.cacheControl || null,
   }
 }
 
@@ -92,9 +85,12 @@ export function webSearchTool(
 ): AnthropicWebSearchTool {
   validateDomains(config)
   validateUserLocation(config)
-  return brandProviderTool<AnthropicWebSearchTool>({
-    name: 'web_search',
-    description: '',
-    metadata: config,
-  })
+  return brandAnthropicProviderTool<AnthropicWebSearchTool>(
+    {
+      name: 'web_search',
+      description: '',
+      metadata: config,
+    },
+    'web_search',
+  )
 }