@tanstack/openai-base 0.9.13 → 0.9.15

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

@@ -1,3 +1,4 @@
+import { getOpenAIProviderToolMetadata, openAIProviderTool } from "./openai-provider-tool.js";
 //#region src/tools/file-search-tool.ts
 var validateMaxNumResults = (maxNumResults) => {
 	if (maxNumResults !== void 0 && (maxNumResults < 1 || maxNumResults > 50)) throw new Error("max_num_results must be between 1 and 50.");
@@ -6,7 +7,7 @@ var validateMaxNumResults = (maxNumResults) => {
 * Converts a standard Tool to OpenAI FileSearchTool format
 */
 function convertFileSearchToolToAdapterFormat(tool) {
-	const metadata = tool.metadata;
+	const metadata = getOpenAIProviderToolMetadata(tool);
 	return {
 		type: "file_search",
 		vector_store_ids: metadata.vector_store_ids,
@@ -23,11 +24,11 @@ function convertFileSearchToolToAdapterFormat(tool) {
 */
 function fileSearchTool(toolData) {
 	validateMaxNumResults(toolData.max_num_results);
-	return {
+	return openAIProviderTool({
 		name: "file_search",
 		description: "Search files in vector stores",
 		metadata: { ...toolData }
-	};
+	}, "file_search");
 }
 //#endregion
 export { convertFileSearchToolToAdapterFormat, fileSearchTool, validateMaxNumResults };

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

@@ -1 +1 @@
-{"version":3,"file":"file-search-tool.js","names":[],"sources":["../../../src/tools/file-search-tool.ts"],"sourcesContent":["import type { FileSearchTool as FileSearchToolConfig } from 'openai/resources/responses/responses'\nimport type { Tool } from '@tanstack/ai'\n\nexport type { FileSearchToolConfig }\n\nconst validateMaxNumResults = (maxNumResults: number | undefined) => {\n  if (\n    maxNumResults !== undefined &&\n    (maxNumResults < 1 || maxNumResults > 50)\n  ) {\n    throw new Error('max_num_results must be between 1 and 50.')\n  }\n}\n\n/** @deprecated Renamed to `FileSearchToolConfig`. Will be removed in a future release. */\nexport type FileSearchTool = FileSearchToolConfig\n\n/**\n * Converts a standard Tool to OpenAI FileSearchTool format\n */\nexport function convertFileSearchToolToAdapterFormat(\n  tool: Tool,\n): FileSearchToolConfig {\n  const metadata = tool.metadata as FileSearchToolConfig\n  // Conditional spread: SDK's `FileSearchToolConfig` declares the\n  // optional fields without `| undefined`, so we omit absent values\n  // rather than passing them through as explicit `undefined`.\n  return {\n    type: 'file_search',\n    vector_store_ids: metadata.vector_store_ids,\n    ...(metadata.max_num_results !== undefined && {\n      max_num_results: metadata.max_num_results,\n    }),\n    ...(metadata.ranking_options !== undefined && {\n      ranking_options: metadata.ranking_options,\n    }),\n    ...(metadata.filters !== undefined && { filters: metadata.filters }),\n  }\n}\n\n/**\n * Creates a standard Tool from FileSearchTool parameters.\n *\n * Validates max_num_results. Base (non-branded) factory; providers that need\n * branded return types should re-wrap in their own package.\n */\nexport function fileSearchTool(toolData: FileSearchToolConfig): Tool {\n  validateMaxNumResults(toolData.max_num_results)\n  return {\n    name: 'file_search',\n    description: 'Search files in vector stores',\n    metadata: {\n      ...toolData,\n    },\n  }\n}\n\nexport { validateMaxNumResults }\n"],"mappings":";AAKA,IAAM,yBAAyB,kBAAsC;CACnE,IACE,kBAAkB,KAAA,MACjB,gBAAgB,KAAK,gBAAgB,KAEtC,MAAM,IAAI,MAAM,2CAA2C;AAE/D;;;;AAQA,SAAgB,qCACd,MACsB;CACtB,MAAM,WAAW,KAAK;CAItB,OAAO;EACL,MAAM;EACN,kBAAkB,SAAS;EAC3B,GAAI,SAAS,oBAAoB,KAAA,KAAa,EAC5C,iBAAiB,SAAS,gBAC5B;EACA,GAAI,SAAS,oBAAoB,KAAA,KAAa,EAC5C,iBAAiB,SAAS,gBAC5B;EACA,GAAI,SAAS,YAAY,KAAA,KAAa,EAAE,SAAS,SAAS,QAAQ;CACpE;AACF;;;;;;;AAQA,SAAgB,eAAe,UAAsC;CACnE,sBAAsB,SAAS,eAAe;CAC9C,OAAO;EACL,MAAM;EACN,aAAa;EACb,UAAU,EACR,GAAG,SACL;CACF;AACF"}
+{"version":3,"file":"file-search-tool.js","names":[],"sources":["../../../src/tools/file-search-tool.ts"],"sourcesContent":["import {\n  getOpenAIProviderToolMetadata,\n  openAIProviderTool,\n} from './openai-provider-tool'\nimport type { FileSearchTool as FileSearchToolConfig } from 'openai/resources/responses/responses'\nimport type { Tool } from '@tanstack/ai'\n\nexport type { FileSearchToolConfig }\n\nconst validateMaxNumResults = (maxNumResults: number | undefined) => {\n  if (\n    maxNumResults !== undefined &&\n    (maxNumResults < 1 || maxNumResults > 50)\n  ) {\n    throw new Error('max_num_results must be between 1 and 50.')\n  }\n}\n\n/** @deprecated Renamed to `FileSearchToolConfig`. Will be removed in a future release. */\nexport type FileSearchTool = FileSearchToolConfig\n\n/**\n * Converts a standard Tool to OpenAI FileSearchTool format\n */\nexport function convertFileSearchToolToAdapterFormat(\n  tool: Tool,\n): FileSearchToolConfig {\n  const metadata = getOpenAIProviderToolMetadata(tool) as FileSearchToolConfig\n  // Conditional spread: SDK's `FileSearchToolConfig` declares the\n  // optional fields without `| undefined`, so we omit absent values\n  // rather than passing them through as explicit `undefined`.\n  return {\n    type: 'file_search',\n    vector_store_ids: metadata.vector_store_ids,\n    ...(metadata.max_num_results !== undefined && {\n      max_num_results: metadata.max_num_results,\n    }),\n    ...(metadata.ranking_options !== undefined && {\n      ranking_options: metadata.ranking_options,\n    }),\n    ...(metadata.filters !== undefined && { filters: metadata.filters }),\n  }\n}\n\n/**\n * Creates a standard Tool from FileSearchTool parameters.\n *\n * Validates max_num_results. Base (non-branded) factory; providers that need\n * branded return types should re-wrap in their own package.\n */\nexport function fileSearchTool(toolData: FileSearchToolConfig): Tool {\n  validateMaxNumResults(toolData.max_num_results)\n  return openAIProviderTool(\n    {\n      name: 'file_search',\n      description: 'Search files in vector stores',\n      metadata: {\n        ...toolData,\n      },\n    },\n    'file_search',\n  )\n}\n\nexport { validateMaxNumResults }\n"],"mappings":";;AASA,IAAM,yBAAyB,kBAAsC;CACnE,IACE,kBAAkB,KAAA,MACjB,gBAAgB,KAAK,gBAAgB,KAEtC,MAAM,IAAI,MAAM,2CAA2C;AAE/D;;;;AAQA,SAAgB,qCACd,MACsB;CACtB,MAAM,WAAW,8BAA8B,IAAI;CAInD,OAAO;EACL,MAAM;EACN,kBAAkB,SAAS;EAC3B,GAAI,SAAS,oBAAoB,KAAA,KAAa,EAC5C,iBAAiB,SAAS,gBAC5B;EACA,GAAI,SAAS,oBAAoB,KAAA,KAAa,EAC5C,iBAAiB,SAAS,gBAC5B;EACA,GAAI,SAAS,YAAY,KAAA,KAAa,EAAE,SAAS,SAAS,QAAQ;CACpE;AACF;;;;;;;AAQA,SAAgB,eAAe,UAAsC;CACnE,sBAAsB,SAAS,eAAe;CAC9C,OAAO,mBACL;EACE,MAAM;EACN,aAAa;EACb,UAAU,EACR,GAAG,SACL;CACF,GACA,aACF;AACF"}

package/dist/esm/tools/image-generation-tool.d.ts

@@ -7,10 +7,8 @@ export type ImageGenerationTool = ImageGenerationToolConfig;
 declare const validatePartialImages: (value: number | undefined) => void;
 /**
  * Converts a standard Tool to OpenAI ImageGenerationTool format. Spread
- * `metadata` first, then force `type: 'image_generation'` last — otherwise a
- * `metadata.type` snuck in by a hand-built tool would shadow the literal and
- * the dispatcher (which routed by `tool.name`) would emit a tool whose
- * runtime `type` doesn't match `image_generation`.
+ * `metadata` first, then force `type: 'image_generation'` last so a stray
+ * `metadata.type` cannot shadow the wire discriminator.
  */
 export declare function convertImageGenerationToolToAdapterFormat(tool: Tool): ImageGenerationToolConfig;
 /**

package/dist/esm/tools/image-generation-tool.js

@@ -1,17 +1,16 @@
+import { getOpenAIProviderToolMetadata, openAIProviderTool } from "./openai-provider-tool.js";
 //#region src/tools/image-generation-tool.ts
 var validatePartialImages = (value) => {
 	if (value !== void 0 && (value < 0 || value > 3)) throw new Error("partial_images must be between 0 and 3");
 };
 /**
 * Converts a standard Tool to OpenAI ImageGenerationTool format. Spread
-* `metadata` first, then force `type: 'image_generation'` last — otherwise a
-* `metadata.type` snuck in by a hand-built tool would shadow the literal and
-* the dispatcher (which routed by `tool.name`) would emit a tool whose
-* runtime `type` doesn't match `image_generation`.
+* `metadata` first, then force `type: 'image_generation'` last so a stray
+* `metadata.type` cannot shadow the wire discriminator.
 */
 function convertImageGenerationToolToAdapterFormat(tool) {
 	return {
-		...tool.metadata,
+		...getOpenAIProviderToolMetadata(tool),
 		type: "image_generation"
 	};
 }
@@ -23,11 +22,11 @@ function convertImageGenerationToolToAdapterFormat(tool) {
 */
 function imageGenerationTool(toolData) {
 	validatePartialImages(toolData.partial_images);
-	return {
+	return openAIProviderTool({
 		name: "image_generation",
 		description: "Generate images based on text descriptions",
 		metadata: { ...toolData }
-	};
+	}, "image_generation");
 }
 //#endregion
 export { convertImageGenerationToolToAdapterFormat, imageGenerationTool, validatePartialImages };

package/dist/esm/tools/image-generation-tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"image-generation-tool.js","names":[],"sources":["../../../src/tools/image-generation-tool.ts"],"sourcesContent":["import type { Tool as SDKTool } from 'openai/resources/responses/responses'\nimport type { Tool } from '@tanstack/ai'\n\ntype ImageGenerationToolConfig = SDKTool.ImageGeneration\n\nexport type { ImageGenerationToolConfig }\n\n/** @deprecated Renamed to `ImageGenerationToolConfig`. Will be removed in a future release. */\nexport type ImageGenerationTool = ImageGenerationToolConfig\n\nconst validatePartialImages = (value: number | undefined) => {\n  if (value !== undefined && (value < 0 || value > 3)) {\n    throw new Error('partial_images must be between 0 and 3')\n  }\n}\n\n/**\n * Converts a standard Tool to OpenAI ImageGenerationTool format. Spread\n * `metadata` first, then force `type: 'image_generation'` last — otherwise a\n * `metadata.type` snuck in by a hand-built tool would shadow the literal and\n * the dispatcher (which routed by `tool.name`) would emit a tool whose\n * runtime `type` doesn't match `image_generation`.\n */\nexport function convertImageGenerationToolToAdapterFormat(\n  tool: Tool,\n): ImageGenerationToolConfig {\n  const metadata = tool.metadata as Omit<ImageGenerationToolConfig, 'type'>\n  return {\n    ...metadata,\n    type: 'image_generation',\n  }\n}\n\n/**\n * Creates a standard Tool from ImageGenerationTool parameters.\n *\n * Base (non-branded) factory. Providers that need branded return types should\n * re-wrap this in their own package.\n */\nexport function imageGenerationTool(\n  toolData: Omit<ImageGenerationToolConfig, 'type'>,\n): Tool {\n  validatePartialImages(toolData.partial_images)\n  return {\n    name: 'image_generation',\n    description: 'Generate images based on text descriptions',\n    metadata: {\n      ...toolData,\n    },\n  }\n}\n\nexport { validatePartialImages }\n"],"mappings":";AAUA,IAAM,yBAAyB,UAA8B;CAC3D,IAAI,UAAU,KAAA,MAAc,QAAQ,KAAK,QAAQ,IAC/C,MAAM,IAAI,MAAM,wCAAwC;AAE5D;;;;;;;;AASA,SAAgB,0CACd,MAC2B;CAE3B,OAAO;EACL,GAFe,KAAK;EAGpB,MAAM;CACR;AACF;;;;;;;AAQA,SAAgB,oBACd,UACM;CACN,sBAAsB,SAAS,cAAc;CAC7C,OAAO;EACL,MAAM;EACN,aAAa;EACb,UAAU,EACR,GAAG,SACL;CACF;AACF"}
+{"version":3,"file":"image-generation-tool.js","names":[],"sources":["../../../src/tools/image-generation-tool.ts"],"sourcesContent":["import {\n  getOpenAIProviderToolMetadata,\n  openAIProviderTool,\n} from './openai-provider-tool'\nimport type { Tool as SDKTool } from 'openai/resources/responses/responses'\nimport type { Tool } from '@tanstack/ai'\n\ntype ImageGenerationToolConfig = SDKTool.ImageGeneration\n\nexport type { ImageGenerationToolConfig }\n\n/** @deprecated Renamed to `ImageGenerationToolConfig`. Will be removed in a future release. */\nexport type ImageGenerationTool = ImageGenerationToolConfig\n\nconst validatePartialImages = (value: number | undefined) => {\n  if (value !== undefined && (value < 0 || value > 3)) {\n    throw new Error('partial_images must be between 0 and 3')\n  }\n}\n\n/**\n * Converts a standard Tool to OpenAI ImageGenerationTool format. Spread\n * `metadata` first, then force `type: 'image_generation'` last so a stray\n * `metadata.type` cannot shadow the wire discriminator.\n */\nexport function convertImageGenerationToolToAdapterFormat(\n  tool: Tool,\n): ImageGenerationToolConfig {\n  const metadata = getOpenAIProviderToolMetadata(tool) as Omit<\n    ImageGenerationToolConfig,\n    'type'\n  >\n  return {\n    ...metadata,\n    type: 'image_generation',\n  }\n}\n\n/**\n * Creates a standard Tool from ImageGenerationTool parameters.\n *\n * Base (non-branded) factory. Providers that need branded return types should\n * re-wrap this in their own package.\n */\nexport function imageGenerationTool(\n  toolData: Omit<ImageGenerationToolConfig, 'type'>,\n): Tool {\n  validatePartialImages(toolData.partial_images)\n  return openAIProviderTool(\n    {\n      name: 'image_generation',\n      description: 'Generate images based on text descriptions',\n      metadata: {\n        ...toolData,\n      },\n    },\n    'image_generation',\n  )\n}\n\nexport { validatePartialImages }\n"],"mappings":";;AAcA,IAAM,yBAAyB,UAA8B;CAC3D,IAAI,UAAU,KAAA,MAAc,QAAQ,KAAK,QAAQ,IAC/C,MAAM,IAAI,MAAM,wCAAwC;AAE5D;;;;;;AAOA,SAAgB,0CACd,MAC2B;CAK3B,OAAO;EACL,GALe,8BAA8B,IAK1C;EACH,MAAM;CACR;AACF;;;;;;;AAQA,SAAgB,oBACd,UACM;CACN,sBAAsB,SAAS,cAAc;CAC7C,OAAO,mBACL;EACE,MAAM;EACN,aAAa;EACb,UAAU,EACR,GAAG,SACL;CACF,GACA,kBACF;AACF"}

package/dist/esm/tools/index.js

@@ -0,0 +1,14 @@
+import { applyPatchTool, convertApplyPatchToolToAdapterFormat } from "./apply-patch-tool.js";
+import { codeInterpreterTool, convertCodeInterpreterToolToAdapterFormat } from "./code-interpreter-tool.js";
+import { computerUseTool, convertComputerUseToolToAdapterFormat } from "./computer-use-tool.js";
+import { convertCustomToolToAdapterFormat, customTool } from "./custom-tool.js";
+import { convertFileSearchToolToAdapterFormat, fileSearchTool, validateMaxNumResults } from "./file-search-tool.js";
+import { convertFunctionToolToAdapterFormat } from "./function-tool.js";
+import { convertImageGenerationToolToAdapterFormat, imageGenerationTool, validatePartialImages } from "./image-generation-tool.js";
+import { convertLocalShellToolToAdapterFormat, localShellTool } from "./local-shell-tool.js";
+import { convertMCPToolToAdapterFormat, mcpTool, validateMCPtool } from "./mcp-tool.js";
+import { convertShellToolToAdapterFormat, shellTool } from "./shell-tool.js";
+import { convertWebSearchPreviewToolToAdapterFormat, webSearchPreviewTool } from "./web-search-preview-tool.js";
+import { convertWebSearchToolToAdapterFormat, webSearchTool } from "./web-search-tool.js";
+import { convertToolsToProviderFormat } from "./tool-converter.js";
+export { applyPatchTool, codeInterpreterTool, computerUseTool, convertApplyPatchToolToAdapterFormat, convertCodeInterpreterToolToAdapterFormat, convertComputerUseToolToAdapterFormat, convertCustomToolToAdapterFormat, convertFileSearchToolToAdapterFormat, convertFunctionToolToAdapterFormat, convertImageGenerationToolToAdapterFormat, convertLocalShellToolToAdapterFormat, convertMCPToolToAdapterFormat, convertShellToolToAdapterFormat, convertToolsToProviderFormat, convertWebSearchPreviewToolToAdapterFormat, convertWebSearchToolToAdapterFormat, customTool, fileSearchTool, imageGenerationTool, localShellTool, mcpTool, shellTool, validateMCPtool, validateMaxNumResults, validatePartialImages, webSearchPreviewTool, webSearchTool };

package/dist/esm/tools/local-shell-tool.js

@@ -1,3 +1,4 @@
+import { openAIProviderTool } from "./openai-provider-tool.js";
 //#region src/tools/local-shell-tool.ts
 /**
 * Converts a standard Tool to OpenAI LocalShellTool format
@@ -12,11 +13,11 @@ function convertLocalShellToolToAdapterFormat(_tool) {
 * re-wrap this in their own package.
 */
 function localShellTool() {
-	return {
+	return openAIProviderTool({
 		name: "local_shell",
 		description: "Execute local shell commands",
 		metadata: {}
-	};
+	}, "local_shell");
 }
 //#endregion
 export { convertLocalShellToolToAdapterFormat, localShellTool };

package/dist/esm/tools/local-shell-tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"local-shell-tool.js","names":[],"sources":["../../../src/tools/local-shell-tool.ts"],"sourcesContent":["import type { Tool as SDKTool } from 'openai/resources/responses/responses'\nimport type { Tool } from '@tanstack/ai'\n\ntype LocalShellToolConfig = SDKTool.LocalShell\n\nexport type { LocalShellToolConfig }\n\n/** @deprecated Renamed to `LocalShellToolConfig`. Will be removed in a future release. */\nexport type LocalShellTool = LocalShellToolConfig\n\n/**\n * Converts a standard Tool to OpenAI LocalShellTool format\n */\nexport function convertLocalShellToolToAdapterFormat(\n  _tool: Tool,\n): LocalShellToolConfig {\n  return {\n    type: 'local_shell',\n  }\n}\n\n/**\n * Creates a standard Tool from LocalShellTool parameters.\n *\n * Base (non-branded) factory. Providers that need branded return types should\n * re-wrap this in their own package.\n */\nexport function localShellTool(): Tool {\n  return {\n    name: 'local_shell',\n    description: 'Execute local shell commands',\n    metadata: {},\n  }\n}\n"],"mappings":";;;;AAaA,SAAgB,qCACd,OACsB;CACtB,OAAO,EACL,MAAM,cACR;AACF;;;;;;;AAQA,SAAgB,iBAAuB;CACrC,OAAO;EACL,MAAM;EACN,aAAa;EACb,UAAU,CAAC;CACb;AACF"}
+{"version":3,"file":"local-shell-tool.js","names":[],"sources":["../../../src/tools/local-shell-tool.ts"],"sourcesContent":["import { openAIProviderTool } from './openai-provider-tool'\nimport type { Tool as SDKTool } from 'openai/resources/responses/responses'\nimport type { Tool } from '@tanstack/ai'\n\ntype LocalShellToolConfig = SDKTool.LocalShell\n\nexport type { LocalShellToolConfig }\n\n/** @deprecated Renamed to `LocalShellToolConfig`. Will be removed in a future release. */\nexport type LocalShellTool = LocalShellToolConfig\n\n/**\n * Converts a standard Tool to OpenAI LocalShellTool format\n */\nexport function convertLocalShellToolToAdapterFormat(\n  _tool: Tool,\n): LocalShellToolConfig {\n  return {\n    type: 'local_shell',\n  }\n}\n\n/**\n * Creates a standard Tool from LocalShellTool parameters.\n *\n * Base (non-branded) factory. Providers that need branded return types should\n * re-wrap this in their own package.\n */\nexport function localShellTool(): Tool {\n  return openAIProviderTool(\n    {\n      name: 'local_shell',\n      description: 'Execute local shell commands',\n      metadata: {},\n    },\n    'local_shell',\n  )\n}\n"],"mappings":";;;;;AAcA,SAAgB,qCACd,OACsB;CACtB,OAAO,EACL,MAAM,cACR;AACF;;;;;;;AAQA,SAAgB,iBAAuB;CACrC,OAAO,mBACL;EACE,MAAM;EACN,aAAa;EACb,UAAU,CAAC;CACb,GACA,aACF;AACF"}

package/dist/esm/tools/mcp-tool.js

@@ -1,3 +1,4 @@
+import { getOpenAIProviderToolMetadata, openAIProviderTool } from "./openai-provider-tool.js";
 //#region src/tools/mcp-tool.ts
 function validateMCPtool(tool) {
 	if (!tool.server_url && !tool.connector_id) throw new Error("Either server_url or connector_id must be provided.");
@@ -7,12 +8,12 @@ function validateMCPtool(tool) {
 * Converts a standard Tool to OpenAI MCPTool format
 */
 function convertMCPToolToAdapterFormat(tool) {
-	const mcpTool = {
-		...tool.metadata,
+	const convertedTool = {
+		...getOpenAIProviderToolMetadata(tool),
 		type: "mcp"
 	};
-	validateMCPtool(mcpTool);
-	return mcpTool;
+	validateMCPtool(convertedTool);
+	return convertedTool;
 }
 /**
 * Creates a standard Tool from MCPTool parameters.
@@ -25,11 +26,11 @@ function mcpTool(toolData) {
 		...toolData,
 		type: "mcp"
 	});
-	return {
+	return openAIProviderTool({
 		name: "mcp",
 		description: toolData.server_description || "",
 		metadata: toolData
-	};
+	}, "mcp");
 }
 //#endregion
 export { convertMCPToolToAdapterFormat, mcpTool, validateMCPtool };

package/dist/esm/tools/mcp-tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-tool.js","names":[],"sources":["../../../src/tools/mcp-tool.ts"],"sourcesContent":["import type { Tool as SDKTool } from 'openai/resources/responses/responses'\nimport type { Tool } from '@tanstack/ai'\n\ntype MCPToolConfig = SDKTool.Mcp\n\nexport type { MCPToolConfig }\n\n/** @deprecated Renamed to `MCPToolConfig`. Will be removed in a future release. */\nexport type MCPTool = MCPToolConfig\n\nexport function validateMCPtool(tool: MCPToolConfig) {\n  if (!tool.server_url && !tool.connector_id) {\n    throw new Error('Either server_url or connector_id must be provided.')\n  }\n  if (tool.connector_id && tool.server_url) {\n    throw new Error('Only one of server_url or connector_id can be provided.')\n  }\n}\n\n/**\n * Converts a standard Tool to OpenAI MCPTool format\n */\nexport function convertMCPToolToAdapterFormat(tool: Tool): MCPToolConfig {\n  const metadata = tool.metadata as Omit<MCPToolConfig, 'type'>\n\n  const mcpTool: MCPToolConfig = {\n    ...metadata,\n    type: 'mcp',\n  }\n\n  validateMCPtool(mcpTool)\n  return mcpTool\n}\n\n/**\n * Creates a standard Tool from MCPTool parameters.\n *\n * Base (non-branded) factory. Providers that need branded return types should\n * re-wrap this in their own package.\n */\nexport function mcpTool(toolData: Omit<MCPToolConfig, 'type'>): Tool {\n  validateMCPtool({ ...toolData, type: 'mcp' })\n\n  return {\n    name: 'mcp',\n    description: toolData.server_description || '',\n    metadata: toolData,\n  }\n}\n"],"mappings":";AAUA,SAAgB,gBAAgB,MAAqB;CACnD,IAAI,CAAC,KAAK,cAAc,CAAC,KAAK,cAC5B,MAAM,IAAI,MAAM,qDAAqD;CAEvE,IAAI,KAAK,gBAAgB,KAAK,YAC5B,MAAM,IAAI,MAAM,yDAAyD;AAE7E;;;;AAKA,SAAgB,8BAA8B,MAA2B;CAGvE,MAAM,UAAyB;EAC7B,GAHe,KAAK;EAIpB,MAAM;CACR;CAEA,gBAAgB,OAAO;CACvB,OAAO;AACT;;;;;;;AAQA,SAAgB,QAAQ,UAA6C;CACnE,gBAAgB;EAAE,GAAG;EAAU,MAAM;CAAM,CAAC;CAE5C,OAAO;EACL,MAAM;EACN,aAAa,SAAS,sBAAsB;EAC5C,UAAU;CACZ;AACF"}
+{"version":3,"file":"mcp-tool.js","names":[],"sources":["../../../src/tools/mcp-tool.ts"],"sourcesContent":["import {\n  getOpenAIProviderToolMetadata,\n  openAIProviderTool,\n} from './openai-provider-tool'\nimport type { Tool as SDKTool } from 'openai/resources/responses/responses'\nimport type { Tool } from '@tanstack/ai'\n\ntype MCPToolConfig = SDKTool.Mcp\n\nexport type { MCPToolConfig }\n\n/** @deprecated Renamed to `MCPToolConfig`. Will be removed in a future release. */\nexport type MCPTool = MCPToolConfig\n\nexport function validateMCPtool(tool: MCPToolConfig) {\n  if (!tool.server_url && !tool.connector_id) {\n    throw new Error('Either server_url or connector_id must be provided.')\n  }\n  if (tool.connector_id && tool.server_url) {\n    throw new Error('Only one of server_url or connector_id can be provided.')\n  }\n}\n\n/**\n * Converts a standard Tool to OpenAI MCPTool format\n */\nexport function convertMCPToolToAdapterFormat(tool: Tool): MCPToolConfig {\n  const metadata = getOpenAIProviderToolMetadata(tool) as Omit<\n    MCPToolConfig,\n    'type'\n  >\n\n  const convertedTool: MCPToolConfig = {\n    ...metadata,\n    type: 'mcp',\n  }\n\n  validateMCPtool(convertedTool)\n  return convertedTool\n}\n\n/**\n * Creates a standard Tool from MCPTool parameters.\n *\n * Base (non-branded) factory. Providers that need branded return types should\n * re-wrap this in their own package.\n */\nexport function mcpTool(toolData: Omit<MCPToolConfig, 'type'>): Tool {\n  validateMCPtool({ ...toolData, type: 'mcp' })\n\n  return openAIProviderTool(\n    {\n      name: 'mcp',\n      description: toolData.server_description || '',\n      metadata: toolData,\n    },\n    'mcp',\n  )\n}\n"],"mappings":";;AAcA,SAAgB,gBAAgB,MAAqB;CACnD,IAAI,CAAC,KAAK,cAAc,CAAC,KAAK,cAC5B,MAAM,IAAI,MAAM,qDAAqD;CAEvE,IAAI,KAAK,gBAAgB,KAAK,YAC5B,MAAM,IAAI,MAAM,yDAAyD;AAE7E;;;;AAKA,SAAgB,8BAA8B,MAA2B;CAMvE,MAAM,gBAA+B;EACnC,GANe,8BAA8B,IAM1C;EACH,MAAM;CACR;CAEA,gBAAgB,aAAa;CAC7B,OAAO;AACT;;;;;;;AAQA,SAAgB,QAAQ,UAA6C;CACnE,gBAAgB;EAAE,GAAG;EAAU,MAAM;CAAM,CAAC;CAE5C,OAAO,mBACL;EACE,MAAM;EACN,aAAa,SAAS,sBAAsB;EAC5C,UAAU;CACZ,GACA,KACF;AACF"}

package/dist/esm/tools/openai-provider-tool.d.ts

@@ -0,0 +1,20 @@
+import { Tool } from '@tanstack/ai';
+declare const OPENAI_PROVIDER_TOOL_KINDS: {
+    readonly apply_patch: "openai.apply_patch";
+    readonly code_interpreter: "openai.code_interpreter";
+    readonly computer_use: "openai.computer_use";
+    readonly custom: "openai.custom";
+    readonly file_search: "openai.file_search";
+    readonly image_generation: "openai.image_generation";
+    readonly local_shell: "openai.local_shell";
+    readonly mcp: "openai.mcp";
+    readonly shell: "openai.shell";
+    readonly web_search: "openai.web_search";
+    readonly web_search_preview: "openai.web_search_preview";
+};
+export type OpenAIProviderToolKind = keyof typeof OPENAI_PROVIDER_TOOL_KINDS;
+export declare function openAIProviderTool(tool: Tool, toolKind: OpenAIProviderToolKind): Tool;
+export declare function getOpenAIProviderToolKind(tool: Tool): OpenAIProviderToolKind | undefined;
+/** Returns adapter metadata without the internal runtime discriminator. */
+export declare function getOpenAIProviderToolMetadata(tool: Tool): Tool['metadata'];
+export {};

package/dist/esm/tools/openai-provider-tool.js

@@ -0,0 +1,49 @@
+//#region src/tools/openai-provider-tool.ts
+var OPENAI_PROVIDER_TOOL_KINDS = {
+	apply_patch: "openai.apply_patch",
+	code_interpreter: "openai.code_interpreter",
+	computer_use: "openai.computer_use",
+	custom: "openai.custom",
+	file_search: "openai.file_search",
+	image_generation: "openai.image_generation",
+	local_shell: "openai.local_shell",
+	mcp: "openai.mcp",
+	shell: "openai.shell",
+	web_search: "openai.web_search",
+	web_search_preview: "openai.web_search_preview"
+};
+function openAIProviderTool(tool, toolKind) {
+	return {
+		...tool,
+		metadata: {
+			...tool.metadata,
+			__kind: OPENAI_PROVIDER_TOOL_KINDS[toolKind]
+		}
+	};
+}
+function getOpenAIProviderToolKind(tool) {
+	switch (tool.metadata?.["__kind"]) {
+		case "openai.apply_patch": return "apply_patch";
+		case "openai.code_interpreter": return "code_interpreter";
+		case "openai.computer_use": return "computer_use";
+		case "openai.custom": return "custom";
+		case "openai.file_search": return "file_search";
+		case "openai.image_generation": return "image_generation";
+		case "openai.local_shell": return "local_shell";
+		case "openai.mcp": return "mcp";
+		case "openai.shell": return "shell";
+		case "openai.web_search": return "web_search";
+		case "openai.web_search_preview": return "web_search_preview";
+		default: return;
+	}
+}
+/** Returns adapter metadata without the internal runtime discriminator. */
+function getOpenAIProviderToolMetadata(tool) {
+	if (!tool.metadata) return;
+	const { __kind: _kind, ...metadata } = tool.metadata;
+	return metadata;
+}
+//#endregion
+export { getOpenAIProviderToolKind, getOpenAIProviderToolMetadata, openAIProviderTool };
+
+//# sourceMappingURL=openai-provider-tool.js.map

package/dist/esm/tools/openai-provider-tool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"openai-provider-tool.js","names":[],"sources":["../../../src/tools/openai-provider-tool.ts"],"sourcesContent":["import type { Tool } from '@tanstack/ai'\n\nconst OPENAI_PROVIDER_TOOL_KINDS = {\n  apply_patch: 'openai.apply_patch',\n  code_interpreter: 'openai.code_interpreter',\n  computer_use: 'openai.computer_use',\n  custom: 'openai.custom',\n  file_search: 'openai.file_search',\n  image_generation: 'openai.image_generation',\n  local_shell: 'openai.local_shell',\n  mcp: 'openai.mcp',\n  shell: 'openai.shell',\n  web_search: 'openai.web_search',\n  web_search_preview: 'openai.web_search_preview',\n} as const\n\nexport type OpenAIProviderToolKind = keyof typeof OPENAI_PROVIDER_TOOL_KINDS\n\nexport function openAIProviderTool(\n  tool: Tool,\n  toolKind: OpenAIProviderToolKind,\n): Tool {\n  return {\n    ...tool,\n    metadata: {\n      ...tool.metadata,\n      __kind: OPENAI_PROVIDER_TOOL_KINDS[toolKind],\n    },\n  }\n}\n\nexport function getOpenAIProviderToolKind(\n  tool: Tool,\n): OpenAIProviderToolKind | undefined {\n  const toolKind = tool.metadata?.['__kind']\n  switch (toolKind) {\n    case 'openai.apply_patch':\n      return 'apply_patch'\n    case 'openai.code_interpreter':\n      return 'code_interpreter'\n    case 'openai.computer_use':\n      return 'computer_use'\n    case 'openai.custom':\n      return 'custom'\n    case 'openai.file_search':\n      return 'file_search'\n    case 'openai.image_generation':\n      return 'image_generation'\n    case 'openai.local_shell':\n      return 'local_shell'\n    case 'openai.mcp':\n      return 'mcp'\n    case 'openai.shell':\n      return 'shell'\n    case 'openai.web_search':\n      return 'web_search'\n    case 'openai.web_search_preview':\n      return 'web_search_preview'\n    default:\n      return undefined\n  }\n}\n\n/** Returns adapter metadata without the internal runtime discriminator. */\nexport function getOpenAIProviderToolMetadata(tool: Tool): Tool['metadata'] {\n  if (!tool.metadata) {\n    return undefined\n  }\n  const { __kind: _kind, ...metadata } = tool.metadata\n  void _kind\n  return metadata\n}\n"],"mappings":";AAEA,IAAM,6BAA6B;CACjC,aAAa;CACb,kBAAkB;CAClB,cAAc;CACd,QAAQ;CACR,aAAa;CACb,kBAAkB;CAClB,aAAa;CACb,KAAK;CACL,OAAO;CACP,YAAY;CACZ,oBAAoB;AACtB;AAIA,SAAgB,mBACd,MACA,UACM;CACN,OAAO;EACL,GAAG;EACH,UAAU;GACR,GAAG,KAAK;GACR,QAAQ,2BAA2B;EACrC;CACF;AACF;AAEA,SAAgB,0BACd,MACoC;CAEpC,QADiB,KAAK,WAAW,WACjC;EACE,KAAK,sBACH,OAAO;EACT,KAAK,2BACH,OAAO;EACT,KAAK,uBACH,OAAO;EACT,KAAK,iBACH,OAAO;EACT,KAAK,sBACH,OAAO;EACT,KAAK,2BACH,OAAO;EACT,KAAK,sBACH,OAAO;EACT,KAAK,cACH,OAAO;EACT,KAAK,gBACH,OAAO;EACT,KAAK,qBACH,OAAO;EACT,KAAK,6BACH,OAAO;EACT,SACE;CACJ;AACF;;AAGA,SAAgB,8BAA8B,MAA8B;CAC1E,IAAI,CAAC,KAAK,UACR;CAEF,MAAM,EAAE,QAAQ,OAAO,GAAG,aAAa,KAAK;CAE5C,OAAO;AACT"}

package/dist/esm/tools/shell-tool.js

@@ -1,10 +1,11 @@
+import { getOpenAIProviderToolMetadata, openAIProviderTool } from "./openai-provider-tool.js";
 //#region src/tools/shell-tool.ts
 /**
 * Converts a standard Tool to OpenAI ShellTool format, preserving any
 * `environment` (container config + skills) stored in metadata.
 */
 function convertShellToolToAdapterFormat(tool) {
-	const metadata = tool.metadata ?? {};
+	const metadata = getOpenAIProviderToolMetadata(tool) ?? {};
 	return {
 		type: "shell",
 		...metadata.environment !== void 0 && { environment: metadata.environment }
@@ -17,11 +18,11 @@ function convertShellToolToAdapterFormat(tool) {
 * re-wrap this in their own package.
 */
 function shellTool(config = {}) {
-	return {
+	return openAIProviderTool({
 		name: "shell",
 		description: "Execute shell commands",
 		metadata: { ...config.environment !== void 0 && { environment: config.environment } }
-	};
+	}, "shell");
 }
 //#endregion
 export { convertShellToolToAdapterFormat, shellTool };

package/dist/esm/tools/shell-tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"shell-tool.js","names":[],"sources":["../../../src/tools/shell-tool.ts"],"sourcesContent":["import type { FunctionShellTool as ShellToolConfig } from 'openai/resources/responses/responses'\nimport type { Tool } from '@tanstack/ai'\n\nexport type { ShellToolConfig }\n\n/** @deprecated Renamed to `ShellToolConfig`. Will be removed in a future release. */\nexport type ShellTool = ShellToolConfig\n\n/**\n * Config accepted by {@link shellTool}. `environment` mirrors the OpenAI\n * Responses API shell tool environment (e.g. `container_auto` + `skills`).\n * Typed via indexed access so it tracks the installed SDK without naming the\n * union members directly.\n */\nexport interface ShellToolFactoryConfig {\n  environment?: NonNullable<ShellToolConfig['environment']>\n}\n\n/**\n * Converts a standard Tool to OpenAI ShellTool format, preserving any\n * `environment` (container config + skills) stored in metadata.\n */\nexport function convertShellToolToAdapterFormat(tool: Tool): ShellToolConfig {\n  const metadata = (tool.metadata ?? {}) as ShellToolFactoryConfig\n  return {\n    type: 'shell',\n    ...(metadata.environment !== undefined && {\n      environment: metadata.environment,\n    }),\n  }\n}\n\n/**\n * Creates a standard Tool from ShellTool parameters.\n *\n * Base (non-branded) factory. Providers that need branded return types should\n * re-wrap this in their own package.\n */\nexport function shellTool(config: ShellToolFactoryConfig = {}): Tool {\n  return {\n    name: 'shell',\n    description: 'Execute shell commands',\n    metadata: {\n      ...(config.environment !== undefined && {\n        environment: config.environment,\n      }),\n    },\n  }\n}\n"],"mappings":";;;;;AAsBA,SAAgB,gCAAgC,MAA6B;CAC3E,MAAM,WAAY,KAAK,YAAY,CAAC;CACpC,OAAO;EACL,MAAM;EACN,GAAI,SAAS,gBAAgB,KAAA,KAAa,EACxC,aAAa,SAAS,YACxB;CACF;AACF;;;;;;;AAQA,SAAgB,UAAU,SAAiC,CAAC,GAAS;CACnE,OAAO;EACL,MAAM;EACN,aAAa;EACb,UAAU,EACR,GAAI,OAAO,gBAAgB,KAAA,KAAa,EACtC,aAAa,OAAO,YACtB,EACF;CACF;AACF"}
+{"version":3,"file":"shell-tool.js","names":[],"sources":["../../../src/tools/shell-tool.ts"],"sourcesContent":["import {\n  getOpenAIProviderToolMetadata,\n  openAIProviderTool,\n} from './openai-provider-tool'\nimport type { FunctionShellTool as ShellToolConfig } from 'openai/resources/responses/responses'\nimport type { Tool } from '@tanstack/ai'\n\nexport type { ShellToolConfig }\n\n/** @deprecated Renamed to `ShellToolConfig`. Will be removed in a future release. */\nexport type ShellTool = ShellToolConfig\n\n/**\n * Config accepted by {@link shellTool}. `environment` mirrors the OpenAI\n * Responses API shell tool environment (e.g. `container_auto` + `skills`).\n * Typed via indexed access so it tracks the installed SDK without naming the\n * union members directly.\n */\nexport interface ShellToolFactoryConfig {\n  environment?: NonNullable<ShellToolConfig['environment']>\n}\n\n/**\n * Converts a standard Tool to OpenAI ShellTool format, preserving any\n * `environment` (container config + skills) stored in metadata.\n */\nexport function convertShellToolToAdapterFormat(tool: Tool): ShellToolConfig {\n  const metadata = (getOpenAIProviderToolMetadata(tool) ??\n    {}) as ShellToolFactoryConfig\n  return {\n    type: 'shell',\n    ...(metadata.environment !== undefined && {\n      environment: metadata.environment,\n    }),\n  }\n}\n\n/**\n * Creates a standard Tool from ShellTool parameters.\n *\n * Base (non-branded) factory. Providers that need branded return types should\n * re-wrap this in their own package.\n */\nexport function shellTool(config: ShellToolFactoryConfig = {}): Tool {\n  return openAIProviderTool(\n    {\n      name: 'shell',\n      description: 'Execute shell commands',\n      metadata: {\n        ...(config.environment !== undefined && {\n          environment: config.environment,\n        }),\n      },\n    },\n    'shell',\n  )\n}\n"],"mappings":";;;;;;AA0BA,SAAgB,gCAAgC,MAA6B;CAC3E,MAAM,WAAY,8BAA8B,IAAI,KAClD,CAAC;CACH,OAAO;EACL,MAAM;EACN,GAAI,SAAS,gBAAgB,KAAA,KAAa,EACxC,aAAa,SAAS,YACxB;CACF;AACF;;;;;;;AAQA,SAAgB,UAAU,SAAiC,CAAC,GAAS;CACnE,OAAO,mBACL;EACE,MAAM;EACN,aAAa;EACb,UAAU,EACR,GAAI,OAAO,gBAAgB,KAAA,KAAa,EACtC,aAAa,OAAO,YACtB,EACF;CACF,GACA,OACF;AACF"}

package/dist/esm/tools/tool-converter.js

@@ -1,3 +1,4 @@
+import { getOpenAIProviderToolKind } from "./openai-provider-tool.js";
 import { convertApplyPatchToolToAdapterFormat } from "./apply-patch-tool.js";
 import { convertCodeInterpreterToolToAdapterFormat } from "./code-interpreter-tool.js";
 import { convertComputerUseToolToAdapterFormat } from "./computer-use-tool.js";
@@ -10,30 +11,19 @@ import { convertMCPToolToAdapterFormat } from "./mcp-tool.js";
 import { convertShellToolToAdapterFormat } from "./shell-tool.js";
 import { convertWebSearchPreviewToolToAdapterFormat } from "./web-search-preview-tool.js";
 import { convertWebSearchToolToAdapterFormat } from "./web-search-tool.js";
+import { assertUniqueToolNames } from "@tanstack/ai/adapter-internals";
 //#region src/tools/tool-converter.ts
-var SPECIAL_TOOL_NAMES = /* @__PURE__ */ new Set([
-	"apply_patch",
-	"code_interpreter",
-	"computer_use_preview",
-	"file_search",
-	"image_generation",
-	"local_shell",
-	"mcp",
-	"shell",
-	"web_search_preview",
-	"web_search",
-	"custom"
-]);
 /**
 * Converts an array of standard Tools to OpenAI-specific format
 */
 function convertToolsToProviderFormat(tools) {
+	assertUniqueToolNames(tools);
 	return tools.map((tool) => {
-		const toolName = tool.name;
-		if (SPECIAL_TOOL_NAMES.has(toolName)) switch (toolName) {
+		switch (getOpenAIProviderToolKind(tool)) {
 			case "apply_patch": return convertApplyPatchToolToAdapterFormat(tool);
 			case "code_interpreter": return convertCodeInterpreterToolToAdapterFormat(tool);
-			case "computer_use_preview": return convertComputerUseToolToAdapterFormat(tool);
+			case "computer_use": return convertComputerUseToolToAdapterFormat(tool);
+			case "custom": return convertCustomToolToAdapterFormat(tool);
 			case "file_search": return convertFileSearchToolToAdapterFormat(tool);
 			case "image_generation": return convertImageGenerationToolToAdapterFormat(tool);
 			case "local_shell": return convertLocalShellToolToAdapterFormat(tool);
@@ -41,9 +31,8 @@ function convertToolsToProviderFormat(tools) {
 			case "shell": return convertShellToolToAdapterFormat(tool);
 			case "web_search_preview": return convertWebSearchPreviewToolToAdapterFormat(tool);
 			case "web_search": return convertWebSearchToolToAdapterFormat(tool);
-			case "custom": return convertCustomToolToAdapterFormat(tool);
+			case void 0: return convertFunctionToolToAdapterFormat(tool);
 		}
-		return convertFunctionToolToAdapterFormat(tool);
 	});
 }
 //#endregion

package/dist/esm/tools/tool-converter.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-converter.js","names":[],"sources":["../../../src/tools/tool-converter.ts"],"sourcesContent":["import { convertApplyPatchToolToAdapterFormat } from './apply-patch-tool'\nimport { convertCodeInterpreterToolToAdapterFormat } from './code-interpreter-tool'\nimport { convertComputerUseToolToAdapterFormat } from './computer-use-tool'\nimport { convertCustomToolToAdapterFormat } from './custom-tool'\nimport { convertFileSearchToolToAdapterFormat } from './file-search-tool'\nimport { convertFunctionToolToAdapterFormat } from './function-tool'\nimport { convertImageGenerationToolToAdapterFormat } from './image-generation-tool'\nimport { convertLocalShellToolToAdapterFormat } from './local-shell-tool'\nimport { convertMCPToolToAdapterFormat } from './mcp-tool'\nimport { convertShellToolToAdapterFormat } from './shell-tool'\nimport { convertWebSearchPreviewToolToAdapterFormat } from './web-search-preview-tool'\nimport { convertWebSearchToolToAdapterFormat } from './web-search-tool'\nimport type { OpenAITool } from './index'\nimport type { Tool } from '@tanstack/ai'\n\nconst SPECIAL_TOOL_NAMES = new Set([\n  'apply_patch',\n  'code_interpreter',\n  'computer_use_preview',\n  'file_search',\n  'image_generation',\n  'local_shell',\n  'mcp',\n  'shell',\n  'web_search_preview',\n  'web_search',\n  'custom',\n])\n\n/**\n * Converts an array of standard Tools to OpenAI-specific format\n */\nexport function convertToolsToProviderFormat(\n  tools: Array<Tool>,\n): Array<OpenAITool> {\n  return tools.map((tool) => {\n    const toolName = tool.name\n\n    if (SPECIAL_TOOL_NAMES.has(toolName)) {\n      switch (toolName) {\n        case 'apply_patch':\n          return convertApplyPatchToolToAdapterFormat(tool)\n        case 'code_interpreter':\n          return convertCodeInterpreterToolToAdapterFormat(tool)\n        case 'computer_use_preview':\n          return convertComputerUseToolToAdapterFormat(tool)\n        case 'file_search':\n          return convertFileSearchToolToAdapterFormat(tool)\n        case 'image_generation':\n          return convertImageGenerationToolToAdapterFormat(tool)\n        case 'local_shell':\n          return convertLocalShellToolToAdapterFormat(tool)\n        case 'mcp':\n          return convertMCPToolToAdapterFormat(tool)\n        case 'shell':\n          return convertShellToolToAdapterFormat(tool)\n        case 'web_search_preview':\n          return convertWebSearchPreviewToolToAdapterFormat(tool)\n        case 'web_search':\n          return convertWebSearchToolToAdapterFormat(tool)\n        case 'custom':\n          return convertCustomToolToAdapterFormat(tool)\n      }\n    }\n\n    return convertFunctionToolToAdapterFormat(tool)\n  })\n}\n"],"mappings":";;;;;;;;;;;;;AAeA,IAAM,qCAAqB,IAAI,IAAI;CACjC;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;AACF,CAAC;;;;AAKD,SAAgB,6BACd,OACmB;CACnB,OAAO,MAAM,KAAK,SAAS;EACzB,MAAM,WAAW,KAAK;EAEtB,IAAI,mBAAmB,IAAI,QAAQ,GACjC,QAAQ,UAAR;GACE,KAAK,eACH,OAAO,qCAAqC,IAAI;GAClD,KAAK,oBACH,OAAO,0CAA0C,IAAI;GACvD,KAAK,wBACH,OAAO,sCAAsC,IAAI;GACnD,KAAK,eACH,OAAO,qCAAqC,IAAI;GAClD,KAAK,oBACH,OAAO,0CAA0C,IAAI;GACvD,KAAK,eACH,OAAO,qCAAqC,IAAI;GAClD,KAAK,OACH,OAAO,8BAA8B,IAAI;GAC3C,KAAK,SACH,OAAO,gCAAgC,IAAI;GAC7C,KAAK,sBACH,OAAO,2CAA2C,IAAI;GACxD,KAAK,cACH,OAAO,oCAAoC,IAAI;GACjD,KAAK,UACH,OAAO,iCAAiC,IAAI;EAChD;EAGF,OAAO,mCAAmC,IAAI;CAChD,CAAC;AACH"}
+{"version":3,"file":"tool-converter.js","names":[],"sources":["../../../src/tools/tool-converter.ts"],"sourcesContent":["import { convertApplyPatchToolToAdapterFormat } from './apply-patch-tool'\nimport { convertCodeInterpreterToolToAdapterFormat } from './code-interpreter-tool'\nimport { convertComputerUseToolToAdapterFormat } from './computer-use-tool'\nimport { convertCustomToolToAdapterFormat } from './custom-tool'\nimport { convertFileSearchToolToAdapterFormat } from './file-search-tool'\nimport { convertFunctionToolToAdapterFormat } from './function-tool'\nimport { convertImageGenerationToolToAdapterFormat } from './image-generation-tool'\nimport { convertLocalShellToolToAdapterFormat } from './local-shell-tool'\nimport { convertMCPToolToAdapterFormat } from './mcp-tool'\nimport { getOpenAIProviderToolKind } from './openai-provider-tool'\nimport { convertShellToolToAdapterFormat } from './shell-tool'\nimport { convertWebSearchPreviewToolToAdapterFormat } from './web-search-preview-tool'\nimport { convertWebSearchToolToAdapterFormat } from './web-search-tool'\nimport type { OpenAITool } from './index'\nimport { assertUniqueToolNames } from '@tanstack/ai/adapter-internals'\nimport type { Tool } from '@tanstack/ai'\n\n/**\n * Converts an array of standard Tools to OpenAI-specific format\n */\nexport function convertToolsToProviderFormat(\n  tools: Array<Tool>,\n): Array<OpenAITool> {\n  assertUniqueToolNames(tools)\n  return tools.map((tool) => {\n    switch (getOpenAIProviderToolKind(tool)) {\n      case 'apply_patch':\n        return convertApplyPatchToolToAdapterFormat(tool)\n      case 'code_interpreter':\n        return convertCodeInterpreterToolToAdapterFormat(tool)\n      case 'computer_use':\n        return convertComputerUseToolToAdapterFormat(tool)\n      case 'custom':\n        return convertCustomToolToAdapterFormat(tool)\n      case 'file_search':\n        return convertFileSearchToolToAdapterFormat(tool)\n      case 'image_generation':\n        return convertImageGenerationToolToAdapterFormat(tool)\n      case 'local_shell':\n        return convertLocalShellToolToAdapterFormat(tool)\n      case 'mcp':\n        return convertMCPToolToAdapterFormat(tool)\n      case 'shell':\n        return convertShellToolToAdapterFormat(tool)\n      case 'web_search_preview':\n        return convertWebSearchPreviewToolToAdapterFormat(tool)\n      case 'web_search':\n        return convertWebSearchToolToAdapterFormat(tool)\n      case undefined:\n        return convertFunctionToolToAdapterFormat(tool)\n    }\n  })\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAoBA,SAAgB,6BACd,OACmB;CACnB,sBAAsB,KAAK;CAC3B,OAAO,MAAM,KAAK,SAAS;EACzB,QAAQ,0BAA0B,IAAI,GAAtC;GACE,KAAK,eACH,OAAO,qCAAqC,IAAI;GAClD,KAAK,oBACH,OAAO,0CAA0C,IAAI;GACvD,KAAK,gBACH,OAAO,sCAAsC,IAAI;GACnD,KAAK,UACH,OAAO,iCAAiC,IAAI;GAC9C,KAAK,eACH,OAAO,qCAAqC,IAAI;GAClD,KAAK,oBACH,OAAO,0CAA0C,IAAI;GACvD,KAAK,eACH,OAAO,qCAAqC,IAAI;GAClD,KAAK,OACH,OAAO,8BAA8B,IAAI;GAC3C,KAAK,SACH,OAAO,gCAAgC,IAAI;GAC7C,KAAK,sBACH,OAAO,2CAA2C,IAAI;GACxD,KAAK,cACH,OAAO,oCAAoC,IAAI;GACjD,KAAK,KAAA,GACH,OAAO,mCAAmC,IAAI;EAClD;CACF,CAAC;AACH"}

package/dist/esm/tools/web-search-preview-tool.d.ts

@@ -6,8 +6,7 @@ export type WebSearchPreviewTool = WebSearchPreviewToolConfig;
 /**
  * Converts a standard Tool to OpenAI WebSearchPreviewTool format. Force the
  * literal `type: 'web_search_preview'` instead of trusting `metadata.type`,
- * since a hand-authored tool with a missing or wrong `type` would emit a
- * malformed payload while the dispatcher already routed by `tool.name`.
+ * so a missing or wrong metadata type cannot produce a malformed payload.
  */
 export declare function convertWebSearchPreviewToolToAdapterFormat(tool: Tool): WebSearchPreviewToolConfig;
 /**

package/dist/esm/tools/web-search-preview-tool.js

@@ -1,13 +1,13 @@
+import { getOpenAIProviderToolMetadata, openAIProviderTool } from "./openai-provider-tool.js";
 //#region src/tools/web-search-preview-tool.ts
 /**
 * Converts a standard Tool to OpenAI WebSearchPreviewTool format. Force the
 * literal `type: 'web_search_preview'` instead of trusting `metadata.type`,
-* since a hand-authored tool with a missing or wrong `type` would emit a
-* malformed payload while the dispatcher already routed by `tool.name`.
+* so a missing or wrong metadata type cannot produce a malformed payload.
 */
 function convertWebSearchPreviewToolToAdapterFormat(tool) {
 	return {
-		...tool.metadata,
+		...getOpenAIProviderToolMetadata(tool),
 		type: "web_search_preview"
 	};
 }
@@ -18,11 +18,11 @@ function convertWebSearchPreviewToolToAdapterFormat(tool) {
 * re-wrap this in their own package.
 */
 function webSearchPreviewTool(toolData) {
-	return {
+	return openAIProviderTool({
 		name: "web_search_preview",
 		description: "Search the web (preview version)",
 		metadata: toolData
-	};
+	}, "web_search_preview");
 }
 //#endregion
 export { convertWebSearchPreviewToolToAdapterFormat, webSearchPreviewTool };

package/dist/esm/tools/web-search-preview-tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"web-search-preview-tool.js","names":[],"sources":["../../../src/tools/web-search-preview-tool.ts"],"sourcesContent":["import type { WebSearchPreviewTool as WebSearchPreviewToolConfig } from 'openai/resources/responses/responses'\nimport type { Tool } from '@tanstack/ai'\n\nexport type { WebSearchPreviewToolConfig }\n\n/** @deprecated Renamed to `WebSearchPreviewToolConfig`. Will be removed in a future release. */\nexport type WebSearchPreviewTool = WebSearchPreviewToolConfig\n\n/**\n * Converts a standard Tool to OpenAI WebSearchPreviewTool format. Force the\n * literal `type: 'web_search_preview'` instead of trusting `metadata.type`,\n * since a hand-authored tool with a missing or wrong `type` would emit a\n * malformed payload while the dispatcher already routed by `tool.name`.\n */\nexport function convertWebSearchPreviewToolToAdapterFormat(\n  tool: Tool,\n): WebSearchPreviewToolConfig {\n  const metadata = tool.metadata as Omit<WebSearchPreviewToolConfig, 'type'>\n  return {\n    ...metadata,\n    type: 'web_search_preview',\n  }\n}\n\n/**\n * Creates a standard Tool from WebSearchPreviewTool parameters.\n *\n * Base (non-branded) factory. Providers that need branded return types should\n * re-wrap this in their own package.\n */\nexport function webSearchPreviewTool(\n  toolData: WebSearchPreviewToolConfig,\n): Tool {\n  return {\n    name: 'web_search_preview',\n    description: 'Search the web (preview version)',\n    metadata: toolData,\n  }\n}\n"],"mappings":";;;;;;;AAcA,SAAgB,2CACd,MAC4B;CAE5B,OAAO;EACL,GAFe,KAAK;EAGpB,MAAM;CACR;AACF;;;;;;;AAQA,SAAgB,qBACd,UACM;CACN,OAAO;EACL,MAAM;EACN,aAAa;EACb,UAAU;CACZ;AACF"}
+{"version":3,"file":"web-search-preview-tool.js","names":[],"sources":["../../../src/tools/web-search-preview-tool.ts"],"sourcesContent":["import {\n  getOpenAIProviderToolMetadata,\n  openAIProviderTool,\n} from './openai-provider-tool'\nimport type { WebSearchPreviewTool as WebSearchPreviewToolConfig } from 'openai/resources/responses/responses'\nimport type { Tool } from '@tanstack/ai'\n\nexport type { WebSearchPreviewToolConfig }\n\n/** @deprecated Renamed to `WebSearchPreviewToolConfig`. Will be removed in a future release. */\nexport type WebSearchPreviewTool = WebSearchPreviewToolConfig\n\n/**\n * Converts a standard Tool to OpenAI WebSearchPreviewTool format. Force the\n * literal `type: 'web_search_preview'` instead of trusting `metadata.type`,\n * so a missing or wrong metadata type cannot produce a malformed payload.\n */\nexport function convertWebSearchPreviewToolToAdapterFormat(\n  tool: Tool,\n): WebSearchPreviewToolConfig {\n  const metadata = getOpenAIProviderToolMetadata(tool) as Omit<\n    WebSearchPreviewToolConfig,\n    'type'\n  >\n  return {\n    ...metadata,\n    type: 'web_search_preview',\n  }\n}\n\n/**\n * Creates a standard Tool from WebSearchPreviewTool parameters.\n *\n * Base (non-branded) factory. Providers that need branded return types should\n * re-wrap this in their own package.\n */\nexport function webSearchPreviewTool(\n  toolData: WebSearchPreviewToolConfig,\n): Tool {\n  return openAIProviderTool(\n    {\n      name: 'web_search_preview',\n      description: 'Search the web (preview version)',\n      metadata: toolData,\n    },\n    'web_search_preview',\n  )\n}\n"],"mappings":";;;;;;;AAiBA,SAAgB,2CACd,MAC4B;CAK5B,OAAO;EACL,GALe,8BAA8B,IAK1C;EACH,MAAM;CACR;AACF;;;;;;;AAQA,SAAgB,qBACd,UACM;CACN,OAAO,mBACL;EACE,MAAM;EACN,aAAa;EACb,UAAU;CACZ,GACA,oBACF;AACF"}

package/dist/esm/tools/web-search-tool.d.ts

@@ -5,10 +5,8 @@ export type { WebSearchToolConfig };
 export type WebSearchTool = WebSearchToolConfig;
 /**
  * Converts a standard Tool to OpenAI WebSearchTool format. Spread `metadata`
- * first, then force `type: 'web_search'` last to keep the runtime `type`
- * matching the discriminator the dispatcher routed by — otherwise a tool
- * authored by hand with a different `metadata.type` would emit a malformed
- * payload.
+ * first, then force `type: 'web_search'` last so a different metadata type
+ * cannot produce a malformed payload.
  */
 export declare function convertWebSearchToolToAdapterFormat(tool: Tool): WebSearchToolConfig;
 /**

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

@@ -1,14 +1,13 @@
+import { getOpenAIProviderToolMetadata, openAIProviderTool } from "./openai-provider-tool.js";
 //#region src/tools/web-search-tool.ts
 /**
 * Converts a standard Tool to OpenAI WebSearchTool format. Spread `metadata`
-* first, then force `type: 'web_search'` last to keep the runtime `type`
-* matching the discriminator the dispatcher routed by — otherwise a tool
-* authored by hand with a different `metadata.type` would emit a malformed
-* payload.
+* first, then force `type: 'web_search'` last so a different metadata type
+* cannot produce a malformed payload.
 */
 function convertWebSearchToolToAdapterFormat(tool) {
 	return {
-		...tool.metadata,
+		...getOpenAIProviderToolMetadata(tool),
 		type: "web_search"
 	};
 }
@@ -19,11 +18,11 @@ function convertWebSearchToolToAdapterFormat(tool) {
 * re-wrap this in their own package.
 */
 function webSearchTool(toolData) {
-	return {
+	return openAIProviderTool({
 		name: "web_search",
 		description: "Search the web",
 		metadata: toolData
-	};
+	}, "web_search");
 }
 //#endregion
 export { convertWebSearchToolToAdapterFormat, webSearchTool };

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

@@ -1 +1 @@
-{"version":3,"file":"web-search-tool.js","names":[],"sources":["../../../src/tools/web-search-tool.ts"],"sourcesContent":["import type { WebSearchTool as WebSearchToolConfig } from 'openai/resources/responses/responses'\nimport type { Tool } from '@tanstack/ai'\n\nexport type { WebSearchToolConfig }\n\n/** @deprecated Renamed to `WebSearchToolConfig`. Will be removed in a future release. */\nexport type WebSearchTool = WebSearchToolConfig\n\n/**\n * Converts a standard Tool to OpenAI WebSearchTool format. Spread `metadata`\n * first, then force `type: 'web_search'` last to keep the runtime `type`\n * matching the discriminator the dispatcher routed by — otherwise a tool\n * authored by hand with a different `metadata.type` would emit a malformed\n * payload.\n */\nexport function convertWebSearchToolToAdapterFormat(\n  tool: Tool,\n): WebSearchToolConfig {\n  const metadata = tool.metadata as Omit<WebSearchToolConfig, 'type'>\n  return {\n    ...metadata,\n    type: 'web_search',\n  }\n}\n\n/**\n * Creates a standard Tool from WebSearchTool parameters.\n *\n * Base (non-branded) factory. Providers that need branded return types should\n * re-wrap this in their own package.\n */\nexport function webSearchTool(toolData: WebSearchToolConfig): Tool {\n  return {\n    name: 'web_search',\n    description: 'Search the web',\n    metadata: toolData,\n  }\n}\n"],"mappings":";;;;;;;;AAeA,SAAgB,oCACd,MACqB;CAErB,OAAO;EACL,GAFe,KAAK;EAGpB,MAAM;CACR;AACF;;;;;;;AAQA,SAAgB,cAAc,UAAqC;CACjE,OAAO;EACL,MAAM;EACN,aAAa;EACb,UAAU;CACZ;AACF"}
+{"version":3,"file":"web-search-tool.js","names":[],"sources":["../../../src/tools/web-search-tool.ts"],"sourcesContent":["import {\n  getOpenAIProviderToolMetadata,\n  openAIProviderTool,\n} from './openai-provider-tool'\nimport type { WebSearchTool as WebSearchToolConfig } from 'openai/resources/responses/responses'\nimport type { Tool } from '@tanstack/ai'\n\nexport type { WebSearchToolConfig }\n\n/** @deprecated Renamed to `WebSearchToolConfig`. Will be removed in a future release. */\nexport type WebSearchTool = WebSearchToolConfig\n\n/**\n * Converts a standard Tool to OpenAI WebSearchTool format. Spread `metadata`\n * first, then force `type: 'web_search'` last so a different metadata type\n * cannot produce a malformed payload.\n */\nexport function convertWebSearchToolToAdapterFormat(\n  tool: Tool,\n): WebSearchToolConfig {\n  const metadata = getOpenAIProviderToolMetadata(tool) as Omit<\n    WebSearchToolConfig,\n    'type'\n  >\n  return {\n    ...metadata,\n    type: 'web_search',\n  }\n}\n\n/**\n * Creates a standard Tool from WebSearchTool parameters.\n *\n * Base (non-branded) factory. Providers that need branded return types should\n * re-wrap this in their own package.\n */\nexport function webSearchTool(toolData: WebSearchToolConfig): Tool {\n  return openAIProviderTool(\n    {\n      name: 'web_search',\n      description: 'Search the web',\n      metadata: toolData,\n    },\n    'web_search',\n  )\n}\n"],"mappings":";;;;;;;AAiBA,SAAgB,oCACd,MACqB;CAKrB,OAAO;EACL,GALe,8BAA8B,IAK1C;EACH,MAAM;CACR;AACF;;;;;;;AAQA,SAAgB,cAAc,UAAqC;CACjE,OAAO,mBACL;EACE,MAAM;EACN,aAAa;EACb,UAAU;CACZ,GACA,YACF;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/openai-base",
-  "version": "0.9.13",
+  "version": "0.9.15",
   "description": "Shared OpenAI SDK base adapters for TanStack AI providers using Chat Completions and Responses APIs.",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -47,13 +47,13 @@
     "@tanstack/ai-utils": "^0.4.0"
   },
   "peerDependencies": {
-    "@tanstack/ai": "^0.45.0"
+    "@tanstack/ai": "^0.46.0"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "4.1.10",
     "vite": "^8.2.1",
     "zod": "^4.2.0",
-    "@tanstack/ai": "0.45.0"
+    "@tanstack/ai": "0.46.0"
   },
   "scripts": {
     "build": "vite build",

package/src/adapters/chat-completions-text.ts

@@ -115,6 +115,53 @@ export abstract class OpenAIBaseChatCompletionsTextAdapter<
         }
       }
 
+      const rejectedToolCall = this.extractRejectedToolCall(
+        rawEvent,
+        errorPayload.message,
+      )
+      if (rejectedToolCall) {
+        const toolCallId = generateId(this.name)
+        yield {
+          type: EventType.TOOL_CALL_START,
+          toolCallId,
+          toolCallName: rejectedToolCall.toolName,
+          toolName: rejectedToolCall.toolName,
+          parentMessageId: aguiState.messageId,
+          model: options.model,
+          timestamp: Date.now(),
+        }
+        yield {
+          type: EventType.TOOL_CALL_ARGS,
+          toolCallId,
+          delta: rejectedToolCall.arguments,
+          args: rejectedToolCall.arguments,
+          model: options.model,
+          timestamp: Date.now(),
+        }
+        yield {
+          type: EventType.TOOL_CALL_END,
+          toolCallId,
+          toolCallName: rejectedToolCall.toolName,
+          toolName: rejectedToolCall.toolName,
+          ...(rejectedToolCall.input !== undefined && {
+            input: rejectedToolCall.input,
+          }),
+          result: JSON.stringify({ error: rejectedToolCall.error }),
+          state: 'output-error',
+          model: options.model,
+          timestamp: Date.now(),
+        }
+        yield {
+          type: EventType.RUN_FINISHED,
+          runId: aguiState.runId,
+          threadId: aguiState.threadId,
+          model: options.model,
+          timestamp: Date.now(),
+          finishReason: 'tool_calls',
+        }
+        return
+      }
+
       // Emit AG-UI RUN_ERROR. Conditional `code` spread keeps the wire
       // shape spec-compliant under `exactOptionalPropertyTypes`: AG-UI's
       // `RunErrorEvent.code` is `string?` (absent vs explicit `undefined`
@@ -142,6 +189,24 @@ export abstract class OpenAIBaseChatCompletionsTextAdapter<
     }
   }
 
+  /**
+   * Extracts a rejected tool call from a provider error. Returned calls are
+   * emitted as non-executable `output-error` results so the model can repair them.
+   */
+  protected extractRejectedToolCall(
+    _rawEvent: unknown,
+    _fallbackMessage: string,
+  ):
+    | {
+        toolName: string
+        arguments: string
+        input?: unknown
+        error: string
+      }
+    | undefined {
+    return undefined
+  }
+
   /**
    * Generate structured output using the provider's JSON Schema response format.
    * Uses stream: false to get the complete response in one call.