chore: clean up provider tool imports

Author: jan-kubica

packages/ai-anthropic/tests/provider-tools-smoke.test.ts

@@ -7,7 +7,7 @@
  *   2. Each factory produces a runtime shape with `name`, `description`, `metadata`.
  *   3. `convertToolsToProviderFormat` transforms those outputs into the SDK shape.
  */
-import { describe, it, expect } from 'vitest'
+import { describe, expect, it } from 'vitest'
 import {
   bashTool,
   codeExecutionTool,
@@ -94,7 +94,7 @@ describe('convertToolsToProviderFormat — end-to-end shape', () => {
           type: 'web_search_20250305',
           max_uses: 2,
         }),
-      } as unknown as Tool,
+      },
     ])
     expect(converted).toEqual({
       name: 'web_search',
@@ -142,7 +142,7 @@ describe('convertToolsToProviderFormat — end-to-end shape', () => {
         type: 'text_editor_20250124',
         name: 'str_replace_editor',
       }),
-    ] as unknown as Tool[])
+    ])
     expect(converted).toHaveLength(7)
     expect(JSON.stringify(converted)).not.toContain('__kind')
     const names = converted.map((t) => ('name' in t ? t.name : undefined))

packages/openai-base/src/tools/code-interpreter-tool.ts

@@ -1,3 +1,7 @@
+import {
+  getOpenAIProviderToolMetadata,
+  openAIProviderTool,
+} from './openai-provider-tool'
 import type { Tool as SDKTool } from 'openai/resources/responses/responses'
 import type { Tool } from '@tanstack/ai'
 
@@ -44,7 +48,3 @@ export function codeInterpreterTool(
     'code_interpreter',
   )
 }
-import {
-  getOpenAIProviderToolMetadata,
-  openAIProviderTool,
-} from './openai-provider-tool'

packages/openai-base/src/tools/computer-use-tool.ts

@@ -1,3 +1,7 @@
+import {
+  getOpenAIProviderToolMetadata,
+  openAIProviderTool,
+} from './openai-provider-tool'
 import type { ComputerUsePreviewTool as ComputerUseToolConfig } from 'openai/resources/responses/responses'
 import type { Tool } from '@tanstack/ai'
 
@@ -39,7 +43,3 @@ export function computerUseTool(toolData: ComputerUseToolConfig): Tool {
     'computer_use',
   )
 }
-import {
-  getOpenAIProviderToolMetadata,
-  openAIProviderTool,
-} from './openai-provider-tool'

packages/openai-base/src/tools/custom-tool.ts

@@ -1,3 +1,7 @@
+import {
+  getOpenAIProviderToolMetadata,
+  openAIProviderTool,
+} from './openai-provider-tool'
 import type { CustomTool as CustomToolConfig } from 'openai/resources/responses/responses'
 import type { Tool } from '@tanstack/ai'
 
@@ -40,7 +44,3 @@ export function customTool(toolData: CustomToolConfig): Tool {
     'custom',
   )
 }
-import {
-  getOpenAIProviderToolMetadata,
-  openAIProviderTool,
-} from './openai-provider-tool'

packages/openai-base/src/tools/file-search-tool.ts

@@ -1,3 +1,7 @@
+import {
+  getOpenAIProviderToolMetadata,
+  openAIProviderTool,
+} from './openai-provider-tool'
 import type { FileSearchTool as FileSearchToolConfig } from 'openai/resources/responses/responses'
 import type { Tool } from '@tanstack/ai'
 
@@ -59,7 +63,3 @@ export function fileSearchTool(toolData: FileSearchToolConfig): Tool {
 }
 
 export { validateMaxNumResults }
-import {
-  getOpenAIProviderToolMetadata,
-  openAIProviderTool,
-} from './openai-provider-tool'

packages/openai-base/src/tools/image-generation-tool.ts

@@ -1,3 +1,7 @@
+import {
+  getOpenAIProviderToolMetadata,
+  openAIProviderTool,
+} from './openai-provider-tool'
 import type { Tool as SDKTool } from 'openai/resources/responses/responses'
 import type { Tool } from '@tanstack/ai'
 
@@ -55,7 +59,3 @@ export function imageGenerationTool(
 }
 
 export { validatePartialImages }
-import {
-  getOpenAIProviderToolMetadata,
-  openAIProviderTool,
-} from './openai-provider-tool'

packages/openai-base/src/tools/mcp-tool.ts

@@ -1,3 +1,7 @@
+import {
+  getOpenAIProviderToolMetadata,
+  openAIProviderTool,
+} from './openai-provider-tool'
 import type { Tool as SDKTool } from 'openai/resources/responses/responses'
 import type { Tool } from '@tanstack/ai'
 
@@ -26,13 +30,13 @@ export function convertMCPToolToAdapterFormat(tool: Tool): MCPToolConfig {
     'type'
   >
 
-  const mcpTool: MCPToolConfig = {
+  const convertedTool: MCPToolConfig = {
     ...metadata,
     type: 'mcp',
   }
 
-  validateMCPtool(mcpTool)
-  return mcpTool
+  validateMCPtool(convertedTool)
+  return convertedTool
 }
 
 /**
@@ -53,7 +57,3 @@ export function mcpTool(toolData: Omit<MCPToolConfig, 'type'>): Tool {
     'mcp',
   )
 }
-import {
-  getOpenAIProviderToolMetadata,
-  openAIProviderTool,
-} from './openai-provider-tool'

packages/openai-base/src/tools/shell-tool.ts

@@ -1,3 +1,7 @@
+import {
+  getOpenAIProviderToolMetadata,
+  openAIProviderTool,
+} from './openai-provider-tool'
 import type { FunctionShellTool as ShellToolConfig } from 'openai/resources/responses/responses'
 import type { Tool } from '@tanstack/ai'
 
@@ -51,7 +55,3 @@ export function shellTool(config: ShellToolFactoryConfig = {}): Tool {
     'shell',
   )
 }
-import {
-  getOpenAIProviderToolMetadata,
-  openAIProviderTool,
-} from './openai-provider-tool'

packages/openai-base/src/tools/web-search-preview-tool.ts

@@ -1,3 +1,7 @@
+import {
+  getOpenAIProviderToolMetadata,
+  openAIProviderTool,
+} from './openai-provider-tool'
 import type { WebSearchPreviewTool as WebSearchPreviewToolConfig } from 'openai/resources/responses/responses'
 import type { Tool } from '@tanstack/ai'
 
@@ -42,7 +46,3 @@ export function webSearchPreviewTool(
     'web_search_preview',
   )
 }
-import {
-  getOpenAIProviderToolMetadata,
-  openAIProviderTool,
-} from './openai-provider-tool'

packages/openai-base/src/tools/web-search-tool.ts

@@ -1,3 +1,7 @@
+import {
+  getOpenAIProviderToolMetadata,
+  openAIProviderTool,
+} from './openai-provider-tool'
 import type { WebSearchTool as WebSearchToolConfig } from 'openai/resources/responses/responses'
 import type { Tool } from '@tanstack/ai'
 
@@ -40,7 +44,3 @@ export function webSearchTool(toolData: WebSearchToolConfig): Tool {
     'web_search',
   )
 }
-import {
-  getOpenAIProviderToolMetadata,
-  openAIProviderTool,
-} from './openai-provider-tool'