@tanstack/ai 0.1.0 → 0.2.0

package/dist/esm/activities/chat/tools/tool-calls.js

@@ -1,7 +1,4 @@
-function isZodSchema(schema) {
-  if (!schema) return false;
-  return "_zod" in schema && typeof schema._zod === "object";
-}
+import { isStandardSchema, parseWithStandardSchema } from "./schema-converter.js";
 class ToolCallManager {
   constructor(tools) {
     this.toolCallsMap = /* @__PURE__ */ new Map();
@@ -68,28 +65,31 @@ class ToolCallManager {
               `Failed to parse tool arguments as JSON: ${toolCall.function.arguments}`
             );
           }
-          if (tool.inputSchema && isZodSchema(tool.inputSchema)) {
+          if (tool.inputSchema && isStandardSchema(tool.inputSchema)) {
             try {
-              args = tool.inputSchema.parse(args);
+              args = parseWithStandardSchema(tool.inputSchema, args);
             } catch (validationError) {
+              const message = validationError instanceof Error ? validationError.message : "Validation failed";
               throw new Error(
-                `Input validation failed for tool ${tool.name}: ${validationError.message}`
+                `Input validation failed for tool ${tool.name}: ${message}`
               );
             }
           }
           let result = await tool.execute(args);
-          if (tool.outputSchema && isZodSchema(tool.outputSchema) && result !== void 0 && result !== null) {
+          if (tool.outputSchema && isStandardSchema(tool.outputSchema) && result !== void 0 && result !== null) {
             try {
-              result = tool.outputSchema.parse(result);
+              result = parseWithStandardSchema(tool.outputSchema, result);
             } catch (validationError) {
+              const message = validationError instanceof Error ? validationError.message : "Validation failed";
               throw new Error(
-                `Output validation failed for tool ${tool.name}: ${validationError.message}`
+                `Output validation failed for tool ${tool.name}: ${message}`
               );
             }
           }
           toolResultContent = typeof result === "string" ? result : JSON.stringify(result);
         } catch (error) {
-          toolResultContent = `Error executing tool: ${error.message}`;
+          const message = error instanceof Error ? error.message : "Unknown error";
+          toolResultContent = `Error executing tool: ${message}`;
         }
       } else {
         toolResultContent = `Tool ${toolCall.function.name} does not have an execute function`;
@@ -146,15 +146,16 @@ async function executeToolCalls(toolCalls, tools, approvals = /* @__PURE__ */ ne
         throw new Error(`Failed to parse tool arguments as JSON: ${argsStr}`);
       }
     }
-    if (tool.inputSchema && isZodSchema(tool.inputSchema)) {
+    if (tool.inputSchema && isStandardSchema(tool.inputSchema)) {
       try {
-        input = tool.inputSchema.parse(input);
+        input = parseWithStandardSchema(tool.inputSchema, input);
       } catch (validationError) {
+        const message = validationError instanceof Error ? validationError.message : "Validation failed";
         results.push({
           toolCallId: toolCall.id,
           toolName,
           result: {
-            error: `Input validation failed for tool ${tool.name}: ${validationError.message}`
+            error: `Input validation failed for tool ${tool.name}: ${message}`
           },
           state: "output-error"
         });
@@ -222,15 +223,8 @@ async function executeToolCalls(toolCalls, tools, approvals = /* @__PURE__ */ ne
           try {
             let result = await tool.execute(input);
             const duration = Date.now() - startTime2;
-            if (tool.outputSchema && isZodSchema(tool.outputSchema) && result !== void 0 && result !== null) {
-              const parsed = tool.outputSchema.safeParse(result);
-              if (parsed.success) {
-                result = parsed.data;
-              } else {
-                throw new Error(
-                  `Output validation failed for tool ${tool.name}: ${parsed.error.message}`
-                );
-              }
+            if (tool.outputSchema && isStandardSchema(tool.outputSchema) && result !== void 0 && result !== null) {
+              result = parseWithStandardSchema(tool.outputSchema, result);
             }
             results.push({
               toolCallId: toolCall.id,
@@ -240,10 +234,11 @@ async function executeToolCalls(toolCalls, tools, approvals = /* @__PURE__ */ ne
             });
           } catch (error) {
             const duration = Date.now() - startTime2;
+            const message = error instanceof Error ? error.message : "Unknown error";
             results.push({
               toolCallId: toolCall.id,
               toolName,
-              result: { error: error.message },
+              result: { error: message },
               state: "output-error",
               duration
             });
@@ -270,15 +265,8 @@ async function executeToolCalls(toolCalls, tools, approvals = /* @__PURE__ */ ne
     try {
       let result = await tool.execute(input);
       const duration = Date.now() - startTime;
-      if (tool.outputSchema && isZodSchema(tool.outputSchema) && result !== void 0 && result !== null) {
-        const parsed = tool.outputSchema.safeParse(result);
-        if (parsed.success) {
-          result = parsed.data;
-        } else {
-          throw new Error(
-            `Output validation failed for tool ${tool.name}: ${parsed.error.message}`
-          );
-        }
+      if (tool.outputSchema && isStandardSchema(tool.outputSchema) && result !== void 0 && result !== null) {
+        result = parseWithStandardSchema(tool.outputSchema, result);
       }
       results.push({
         toolCallId: toolCall.id,
@@ -288,10 +276,11 @@ async function executeToolCalls(toolCalls, tools, approvals = /* @__PURE__ */ ne
       });
     } catch (error) {
       const duration = Date.now() - startTime;
+      const message = error instanceof Error ? error.message : "Unknown error";
       results.push({
         toolCallId: toolCall.id,
         toolName,
-        result: { error: error.message },
+        result: { error: message },
         state: "output-error",
         duration
       });

package/dist/esm/activities/chat/tools/tool-calls.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-calls.js","sources":["../../../../../src/activities/chat/tools/tool-calls.ts"],"sourcesContent":["import type {\n  DoneStreamChunk,\n  ModelMessage,\n  SchemaInput,\n  Tool,\n  ToolCall,\n  ToolResultStreamChunk,\n} from '../../../types'\nimport type { z } from 'zod'\n\n/**\n * Check if a value is a Zod schema by looking for Zod-specific internals.\n */\nfunction isZodSchema(schema: SchemaInput | undefined): schema is z.ZodType {\n  if (!schema) return false\n  return '_zod' in schema && typeof (schema as any)._zod === 'object'\n}\n\n/**\n * Manages tool call accumulation and execution for the chat() method's automatic tool execution loop.\n *\n * Responsibilities:\n * - Accumulates streaming tool call chunks (ID, name, arguments)\n * - Validates tool calls (filters out incomplete ones)\n * - Executes tool `execute` functions with parsed arguments\n * - Emits `tool_result` chunks for client visibility\n * - Returns tool result messages for conversation history\n *\n * This class is used internally by the AI.chat() method to handle the automatic\n * tool execution loop. It can also be used independently for custom tool execution logic.\n *\n * @example\n * ```typescript\n * const manager = new ToolCallManager(tools);\n *\n * // During streaming, accumulate tool calls\n * for await (const chunk of stream) {\n *   if (chunk.type === \"tool_call\") {\n *     manager.addToolCallChunk(chunk);\n *   }\n * }\n *\n * // After stream completes, execute tools\n * if (manager.hasToolCalls()) {\n *   const toolResults = yield* manager.executeTools(doneChunk);\n *   messages = [...messages, ...toolResults];\n *   manager.clear();\n * }\n * ```\n */\nexport class ToolCallManager {\n  private toolCallsMap = new Map<number, ToolCall>()\n  private tools: ReadonlyArray<Tool>\n\n  constructor(tools: ReadonlyArray<Tool>) {\n    this.tools = tools\n  }\n\n  /**\n   * Add a tool call chunk to the accumulator\n   * Handles streaming tool calls by accumulating arguments\n   */\n  addToolCallChunk(chunk: {\n    toolCall: {\n      id: string\n      type: 'function'\n      function: {\n        name: string\n        arguments: string\n      }\n    }\n    index: number\n  }): void {\n    const index = chunk.index\n    const existing = this.toolCallsMap.get(index)\n\n    if (!existing) {\n      // Only create entry if we have a tool call ID and name\n      if (chunk.toolCall.id && chunk.toolCall.function.name) {\n        this.toolCallsMap.set(index, {\n          id: chunk.toolCall.id,\n          type: 'function',\n          function: {\n            name: chunk.toolCall.function.name,\n            arguments: chunk.toolCall.function.arguments || '',\n          },\n        })\n      }\n    } else {\n      // Update name if it wasn't set before\n      if (chunk.toolCall.function.name && !existing.function.name) {\n        existing.function.name = chunk.toolCall.function.name\n      }\n      // Accumulate arguments for streaming tool calls\n      if (chunk.toolCall.function.arguments) {\n        existing.function.arguments += chunk.toolCall.function.arguments\n      }\n    }\n  }\n\n  /**\n   * Check if there are any complete tool calls to execute\n   */\n  hasToolCalls(): boolean {\n    return this.getToolCalls().length > 0\n  }\n\n  /**\n   * Get all complete tool calls (filtered for valid ID and name)\n   */\n  getToolCalls(): Array<ToolCall> {\n    return Array.from(this.toolCallsMap.values()).filter(\n      (tc) => tc.id && tc.function.name && tc.function.name.trim().length > 0,\n    )\n  }\n\n  /**\n   * Execute all tool calls and return tool result messages\n   * Also yields tool_result chunks for streaming\n   */\n  async *executeTools(\n    doneChunk: DoneStreamChunk,\n  ): AsyncGenerator<ToolResultStreamChunk, Array<ModelMessage>, void> {\n    const toolCallsArray = this.getToolCalls()\n    const toolResults: Array<ModelMessage> = []\n\n    for (const toolCall of toolCallsArray) {\n      const tool = this.tools.find((t) => t.name === toolCall.function.name)\n\n      let toolResultContent: string\n      if (tool?.execute) {\n        try {\n          // Parse arguments\n          let args: any\n          try {\n            args = JSON.parse(toolCall.function.arguments)\n          } catch (parseError) {\n            throw new Error(\n              `Failed to parse tool arguments as JSON: ${toolCall.function.arguments}`,\n            )\n          }\n\n          // Validate input against inputSchema (only for Zod schemas)\n          if (tool.inputSchema && isZodSchema(tool.inputSchema)) {\n            try {\n              args = tool.inputSchema.parse(args)\n            } catch (validationError: any) {\n              throw new Error(\n                `Input validation failed for tool ${tool.name}: ${validationError.message}`,\n              )\n            }\n          }\n\n          // Execute the tool\n          let result = await tool.execute(args)\n\n          // Validate output against outputSchema if provided (only for Zod schemas)\n          if (\n            tool.outputSchema &&\n            isZodSchema(tool.outputSchema) &&\n            result !== undefined &&\n            result !== null\n          ) {\n            try {\n              result = tool.outputSchema.parse(result)\n            } catch (validationError: any) {\n              throw new Error(\n                `Output validation failed for tool ${tool.name}: ${validationError.message}`,\n              )\n            }\n          }\n\n          toolResultContent =\n            typeof result === 'string' ? result : JSON.stringify(result)\n        } catch (error: any) {\n          // If tool execution fails, add error message\n          toolResultContent = `Error executing tool: ${error.message}`\n        }\n      } else {\n        // Tool doesn't have execute function, add placeholder\n        toolResultContent = `Tool ${toolCall.function.name} does not have an execute function`\n      }\n\n      // Emit tool_result chunk so callers can track tool execution\n      yield {\n        type: 'tool_result',\n        id: doneChunk.id,\n        model: doneChunk.model,\n        timestamp: Date.now(),\n        toolCallId: toolCall.id,\n        content: toolResultContent,\n      }\n\n      // Add tool result message\n      toolResults.push({\n        role: 'tool',\n        content: toolResultContent,\n        toolCallId: toolCall.id,\n      })\n    }\n\n    return toolResults\n  }\n\n  /**\n   * Clear the tool calls map for the next iteration\n   */\n  clear(): void {\n    this.toolCallsMap.clear()\n  }\n}\n\nexport interface ToolResult {\n  toolCallId: string\n  toolName: string\n  result: any\n  state?: 'output-available' | 'output-error'\n  /** Duration of tool execution in milliseconds (only for server-executed tools) */\n  duration?: number\n}\n\nexport interface ApprovalRequest {\n  toolCallId: string\n  toolName: string\n  input: any\n  approvalId: string\n}\n\nexport interface ClientToolRequest {\n  toolCallId: string\n  toolName: string\n  input: any\n}\n\ninterface ExecuteToolCallsResult {\n  /** Tool results ready to send to LLM */\n  results: Array<ToolResult>\n  /** Tools that need user approval before execution */\n  needsApproval: Array<ApprovalRequest>\n  /** Tools that need client-side execution */\n  needsClientExecution: Array<ClientToolRequest>\n}\n\n/**\n * Execute tool calls based on their configuration\n *\n * Handles three cases:\n * 1. Client tools (no execute) - request client to execute\n * 2. Server tools with approval - check approval before executing\n * 3. Normal server tools - execute immediately\n *\n * @param toolCalls - Tool calls from the LLM\n * @param tools - Available tools with their configurations\n * @param approvals - Map of approval decisions (approval.id -> approved boolean)\n * @param clientResults - Map of client-side execution results (toolCallId -> result)\n */\nexport async function executeToolCalls(\n  toolCalls: Array<ToolCall>,\n  tools: ReadonlyArray<Tool>,\n  approvals: Map<string, boolean> = new Map(),\n  clientResults: Map<string, any> = new Map(),\n): Promise<ExecuteToolCallsResult> {\n  const results: Array<ToolResult> = []\n  const needsApproval: Array<ApprovalRequest> = []\n  const needsClientExecution: Array<ClientToolRequest> = []\n\n  // Create tool lookup map\n  const toolMap = new Map<string, Tool>()\n  for (const tool of tools) {\n    toolMap.set(tool.name, tool)\n  }\n\n  for (const toolCall of toolCalls) {\n    const tool = toolMap.get(toolCall.function.name)\n    const toolName = toolCall.function.name\n\n    if (!tool) {\n      // Unknown tool - return error\n      results.push({\n        toolCallId: toolCall.id,\n        toolName,\n        result: { error: `Unknown tool: ${toolName}` },\n        state: 'output-error',\n      })\n      continue\n    }\n\n    // Parse arguments, throwing error if invalid JSON\n    let input: any = {}\n    const argsStr = toolCall.function.arguments.trim() || '{}'\n    if (argsStr) {\n      try {\n        input = JSON.parse(argsStr)\n      } catch (parseError) {\n        // If parsing fails, throw error to fail fast\n        throw new Error(`Failed to parse tool arguments as JSON: ${argsStr}`)\n      }\n    }\n\n    // Validate input against inputSchema (only for Zod schemas)\n    if (tool.inputSchema && isZodSchema(tool.inputSchema)) {\n      try {\n        input = tool.inputSchema.parse(input)\n      } catch (validationError: any) {\n        results.push({\n          toolCallId: toolCall.id,\n          toolName,\n          result: {\n            error: `Input validation failed for tool ${tool.name}: ${validationError.message}`,\n          },\n          state: 'output-error',\n        })\n        continue\n      }\n    }\n\n    // CASE 1: Client-side tool (no execute function)\n    if (!tool.execute) {\n      // Check if tool needs approval\n      if (tool.needsApproval) {\n        const approvalId = `approval_${toolCall.id}`\n\n        // Check if approval decision exists\n        if (approvals.has(approvalId)) {\n          const approved = approvals.get(approvalId)\n\n          if (approved) {\n            // Approved - check if client has executed\n            if (clientResults.has(toolCall.id)) {\n              results.push({\n                toolCallId: toolCall.id,\n                toolName,\n                result: clientResults.get(toolCall.id),\n              })\n            } else {\n              // Approved but not executed yet - request client execution\n              needsClientExecution.push({\n                toolCallId: toolCall.id,\n                toolName,\n                input,\n              })\n            }\n          } else {\n            // User declined\n            results.push({\n              toolCallId: toolCall.id,\n              toolName,\n              result: { error: 'User declined tool execution' },\n              state: 'output-error',\n            })\n          }\n        } else {\n          // Need approval first\n          needsApproval.push({\n            toolCallId: toolCall.id,\n            toolName: toolCall.function.name,\n            input,\n            approvalId,\n          })\n        }\n      } else {\n        // No approval needed - check if client has executed\n        if (clientResults.has(toolCall.id)) {\n          results.push({\n            toolCallId: toolCall.id,\n            toolName,\n            result: clientResults.get(toolCall.id),\n          })\n        } else {\n          // Request client execution\n          needsClientExecution.push({\n            toolCallId: toolCall.id,\n            toolName,\n            input,\n          })\n        }\n      }\n      continue\n    }\n\n    // CASE 2: Server tool with approval required\n    if (tool.needsApproval) {\n      const approvalId = `approval_${toolCall.id}`\n\n      // Check if approval decision exists\n      if (approvals.has(approvalId)) {\n        const approved = approvals.get(approvalId)\n\n        if (approved) {\n          // Execute after approval\n          const startTime = Date.now()\n          try {\n            let result = await tool.execute(input)\n            const duration = Date.now() - startTime\n\n            // Validate output against outputSchema if provided (only for Zod schemas)\n            if (\n              tool.outputSchema &&\n              isZodSchema(tool.outputSchema) &&\n              result !== undefined &&\n              result !== null\n            ) {\n              const parsed = tool.outputSchema.safeParse(result)\n              if (parsed.success) {\n                result = parsed.data\n              } else {\n                throw new Error(\n                  `Output validation failed for tool ${tool.name}: ${parsed.error.message}`,\n                )\n              }\n            }\n\n            results.push({\n              toolCallId: toolCall.id,\n              toolName,\n              result:\n                typeof result === 'string'\n                  ? JSON.parse(result)\n                  : result || null,\n              duration,\n            })\n          } catch (error: any) {\n            const duration = Date.now() - startTime\n            results.push({\n              toolCallId: toolCall.id,\n              toolName,\n              result: { error: error.message },\n              state: 'output-error',\n              duration,\n            })\n          }\n        } else {\n          // User declined\n          results.push({\n            toolCallId: toolCall.id,\n            toolName,\n            result: { error: 'User declined tool execution' },\n            state: 'output-error',\n          })\n        }\n      } else {\n        // Need approval\n        needsApproval.push({\n          toolCallId: toolCall.id,\n          toolName,\n          input,\n          approvalId,\n        })\n      }\n      continue\n    }\n\n    // CASE 3: Normal server tool - execute immediately\n    const startTime = Date.now()\n    try {\n      let result = await tool.execute(input)\n      const duration = Date.now() - startTime\n\n      // Validate output against outputSchema if provided (only for Zod schemas)\n      if (\n        tool.outputSchema &&\n        isZodSchema(tool.outputSchema) &&\n        result !== undefined &&\n        result !== null\n      ) {\n        const parsed = tool.outputSchema.safeParse(result)\n        if (parsed.success) {\n          result = parsed.data\n        } else {\n          throw new Error(\n            `Output validation failed for tool ${tool.name}: ${parsed.error.message}`,\n          )\n        }\n      }\n\n      results.push({\n        toolCallId: toolCall.id,\n        toolName,\n        result:\n          typeof result === 'string' ? JSON.parse(result) : result || null,\n        duration,\n      })\n    } catch (error: any) {\n      const duration = Date.now() - startTime\n      results.push({\n        toolCallId: toolCall.id,\n        toolName,\n        result: { error: error.message },\n        state: 'output-error',\n        duration,\n      })\n    }\n  }\n\n  return { results, needsApproval, needsClientExecution }\n}\n"],"names":["startTime"],"mappings":"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"}
+{"version":3,"file":"tool-calls.js","sources":["../../../../../src/activities/chat/tools/tool-calls.ts"],"sourcesContent":["import { isStandardSchema, parseWithStandardSchema } from './schema-converter'\nimport type {\n  DoneStreamChunk,\n  ModelMessage,\n  Tool,\n  ToolCall,\n  ToolResultStreamChunk,\n} from '../../../types'\n\n/**\n * Manages tool call accumulation and execution for the chat() method's automatic tool execution loop.\n *\n * Responsibilities:\n * - Accumulates streaming tool call chunks (ID, name, arguments)\n * - Validates tool calls (filters out incomplete ones)\n * - Executes tool `execute` functions with parsed arguments\n * - Emits `tool_result` chunks for client visibility\n * - Returns tool result messages for conversation history\n *\n * This class is used internally by the AI.chat() method to handle the automatic\n * tool execution loop. It can also be used independently for custom tool execution logic.\n *\n * @example\n * ```typescript\n * const manager = new ToolCallManager(tools);\n *\n * // During streaming, accumulate tool calls\n * for await (const chunk of stream) {\n *   if (chunk.type === \"tool_call\") {\n *     manager.addToolCallChunk(chunk);\n *   }\n * }\n *\n * // After stream completes, execute tools\n * if (manager.hasToolCalls()) {\n *   const toolResults = yield* manager.executeTools(doneChunk);\n *   messages = [...messages, ...toolResults];\n *   manager.clear();\n * }\n * ```\n */\nexport class ToolCallManager {\n  private toolCallsMap = new Map<number, ToolCall>()\n  private tools: ReadonlyArray<Tool>\n\n  constructor(tools: ReadonlyArray<Tool>) {\n    this.tools = tools\n  }\n\n  /**\n   * Add a tool call chunk to the accumulator\n   * Handles streaming tool calls by accumulating arguments\n   */\n  addToolCallChunk(chunk: {\n    toolCall: {\n      id: string\n      type: 'function'\n      function: {\n        name: string\n        arguments: string\n      }\n    }\n    index: number\n  }): void {\n    const index = chunk.index\n    const existing = this.toolCallsMap.get(index)\n\n    if (!existing) {\n      // Only create entry if we have a tool call ID and name\n      if (chunk.toolCall.id && chunk.toolCall.function.name) {\n        this.toolCallsMap.set(index, {\n          id: chunk.toolCall.id,\n          type: 'function',\n          function: {\n            name: chunk.toolCall.function.name,\n            arguments: chunk.toolCall.function.arguments || '',\n          },\n        })\n      }\n    } else {\n      // Update name if it wasn't set before\n      if (chunk.toolCall.function.name && !existing.function.name) {\n        existing.function.name = chunk.toolCall.function.name\n      }\n      // Accumulate arguments for streaming tool calls\n      if (chunk.toolCall.function.arguments) {\n        existing.function.arguments += chunk.toolCall.function.arguments\n      }\n    }\n  }\n\n  /**\n   * Check if there are any complete tool calls to execute\n   */\n  hasToolCalls(): boolean {\n    return this.getToolCalls().length > 0\n  }\n\n  /**\n   * Get all complete tool calls (filtered for valid ID and name)\n   */\n  getToolCalls(): Array<ToolCall> {\n    return Array.from(this.toolCallsMap.values()).filter(\n      (tc) => tc.id && tc.function.name && tc.function.name.trim().length > 0,\n    )\n  }\n\n  /**\n   * Execute all tool calls and return tool result messages\n   * Also yields tool_result chunks for streaming\n   */\n  async *executeTools(\n    doneChunk: DoneStreamChunk,\n  ): AsyncGenerator<ToolResultStreamChunk, Array<ModelMessage>, void> {\n    const toolCallsArray = this.getToolCalls()\n    const toolResults: Array<ModelMessage> = []\n\n    for (const toolCall of toolCallsArray) {\n      const tool = this.tools.find((t) => t.name === toolCall.function.name)\n\n      let toolResultContent: string\n      if (tool?.execute) {\n        try {\n          // Parse arguments\n          let args: unknown\n          try {\n            args = JSON.parse(toolCall.function.arguments)\n          } catch (parseError) {\n            throw new Error(\n              `Failed to parse tool arguments as JSON: ${toolCall.function.arguments}`,\n            )\n          }\n\n          // Validate input against inputSchema (for Standard Schema compliant schemas)\n          if (tool.inputSchema && isStandardSchema(tool.inputSchema)) {\n            try {\n              args = parseWithStandardSchema(tool.inputSchema, args)\n            } catch (validationError: unknown) {\n              const message =\n                validationError instanceof Error\n                  ? validationError.message\n                  : 'Validation failed'\n              throw new Error(\n                `Input validation failed for tool ${tool.name}: ${message}`,\n              )\n            }\n          }\n\n          // Execute the tool\n          let result = await tool.execute(args)\n\n          // Validate output against outputSchema if provided (for Standard Schema compliant schemas)\n          if (\n            tool.outputSchema &&\n            isStandardSchema(tool.outputSchema) &&\n            result !== undefined &&\n            result !== null\n          ) {\n            try {\n              result = parseWithStandardSchema(tool.outputSchema, result)\n            } catch (validationError: unknown) {\n              const message =\n                validationError instanceof Error\n                  ? validationError.message\n                  : 'Validation failed'\n              throw new Error(\n                `Output validation failed for tool ${tool.name}: ${message}`,\n              )\n            }\n          }\n\n          toolResultContent =\n            typeof result === 'string' ? result : JSON.stringify(result)\n        } catch (error: unknown) {\n          // If tool execution fails, add error message\n          const message =\n            error instanceof Error ? error.message : 'Unknown error'\n          toolResultContent = `Error executing tool: ${message}`\n        }\n      } else {\n        // Tool doesn't have execute function, add placeholder\n        toolResultContent = `Tool ${toolCall.function.name} does not have an execute function`\n      }\n\n      // Emit tool_result chunk so callers can track tool execution\n      yield {\n        type: 'tool_result',\n        id: doneChunk.id,\n        model: doneChunk.model,\n        timestamp: Date.now(),\n        toolCallId: toolCall.id,\n        content: toolResultContent,\n      }\n\n      // Add tool result message\n      toolResults.push({\n        role: 'tool',\n        content: toolResultContent,\n        toolCallId: toolCall.id,\n      })\n    }\n\n    return toolResults\n  }\n\n  /**\n   * Clear the tool calls map for the next iteration\n   */\n  clear(): void {\n    this.toolCallsMap.clear()\n  }\n}\n\nexport interface ToolResult {\n  toolCallId: string\n  toolName: string\n  result: any\n  state?: 'output-available' | 'output-error'\n  /** Duration of tool execution in milliseconds (only for server-executed tools) */\n  duration?: number\n}\n\nexport interface ApprovalRequest {\n  toolCallId: string\n  toolName: string\n  input: any\n  approvalId: string\n}\n\nexport interface ClientToolRequest {\n  toolCallId: string\n  toolName: string\n  input: any\n}\n\ninterface ExecuteToolCallsResult {\n  /** Tool results ready to send to LLM */\n  results: Array<ToolResult>\n  /** Tools that need user approval before execution */\n  needsApproval: Array<ApprovalRequest>\n  /** Tools that need client-side execution */\n  needsClientExecution: Array<ClientToolRequest>\n}\n\n/**\n * Execute tool calls based on their configuration\n *\n * Handles three cases:\n * 1. Client tools (no execute) - request client to execute\n * 2. Server tools with approval - check approval before executing\n * 3. Normal server tools - execute immediately\n *\n * @param toolCalls - Tool calls from the LLM\n * @param tools - Available tools with their configurations\n * @param approvals - Map of approval decisions (approval.id -> approved boolean)\n * @param clientResults - Map of client-side execution results (toolCallId -> result)\n */\nexport async function executeToolCalls(\n  toolCalls: Array<ToolCall>,\n  tools: ReadonlyArray<Tool>,\n  approvals: Map<string, boolean> = new Map(),\n  clientResults: Map<string, any> = new Map(),\n): Promise<ExecuteToolCallsResult> {\n  const results: Array<ToolResult> = []\n  const needsApproval: Array<ApprovalRequest> = []\n  const needsClientExecution: Array<ClientToolRequest> = []\n\n  // Create tool lookup map\n  const toolMap = new Map<string, Tool>()\n  for (const tool of tools) {\n    toolMap.set(tool.name, tool)\n  }\n\n  for (const toolCall of toolCalls) {\n    const tool = toolMap.get(toolCall.function.name)\n    const toolName = toolCall.function.name\n\n    if (!tool) {\n      // Unknown tool - return error\n      results.push({\n        toolCallId: toolCall.id,\n        toolName,\n        result: { error: `Unknown tool: ${toolName}` },\n        state: 'output-error',\n      })\n      continue\n    }\n\n    // Parse arguments, throwing error if invalid JSON\n    let input: unknown = {}\n    const argsStr = toolCall.function.arguments.trim() || '{}'\n    if (argsStr) {\n      try {\n        input = JSON.parse(argsStr)\n      } catch (parseError) {\n        // If parsing fails, throw error to fail fast\n        throw new Error(`Failed to parse tool arguments as JSON: ${argsStr}`)\n      }\n    }\n\n    // Validate input against inputSchema (for Standard Schema compliant schemas)\n    if (tool.inputSchema && isStandardSchema(tool.inputSchema)) {\n      try {\n        input = parseWithStandardSchema(tool.inputSchema, input)\n      } catch (validationError: unknown) {\n        const message =\n          validationError instanceof Error\n            ? validationError.message\n            : 'Validation failed'\n        results.push({\n          toolCallId: toolCall.id,\n          toolName,\n          result: {\n            error: `Input validation failed for tool ${tool.name}: ${message}`,\n          },\n          state: 'output-error',\n        })\n        continue\n      }\n    }\n\n    // CASE 1: Client-side tool (no execute function)\n    if (!tool.execute) {\n      // Check if tool needs approval\n      if (tool.needsApproval) {\n        const approvalId = `approval_${toolCall.id}`\n\n        // Check if approval decision exists\n        if (approvals.has(approvalId)) {\n          const approved = approvals.get(approvalId)\n\n          if (approved) {\n            // Approved - check if client has executed\n            if (clientResults.has(toolCall.id)) {\n              results.push({\n                toolCallId: toolCall.id,\n                toolName,\n                result: clientResults.get(toolCall.id),\n              })\n            } else {\n              // Approved but not executed yet - request client execution\n              needsClientExecution.push({\n                toolCallId: toolCall.id,\n                toolName,\n                input,\n              })\n            }\n          } else {\n            // User declined\n            results.push({\n              toolCallId: toolCall.id,\n              toolName,\n              result: { error: 'User declined tool execution' },\n              state: 'output-error',\n            })\n          }\n        } else {\n          // Need approval first\n          needsApproval.push({\n            toolCallId: toolCall.id,\n            toolName: toolCall.function.name,\n            input,\n            approvalId,\n          })\n        }\n      } else {\n        // No approval needed - check if client has executed\n        if (clientResults.has(toolCall.id)) {\n          results.push({\n            toolCallId: toolCall.id,\n            toolName,\n            result: clientResults.get(toolCall.id),\n          })\n        } else {\n          // Request client execution\n          needsClientExecution.push({\n            toolCallId: toolCall.id,\n            toolName,\n            input,\n          })\n        }\n      }\n      continue\n    }\n\n    // CASE 2: Server tool with approval required\n    if (tool.needsApproval) {\n      const approvalId = `approval_${toolCall.id}`\n\n      // Check if approval decision exists\n      if (approvals.has(approvalId)) {\n        const approved = approvals.get(approvalId)\n\n        if (approved) {\n          // Execute after approval\n          const startTime = Date.now()\n          try {\n            let result = await tool.execute(input)\n            const duration = Date.now() - startTime\n\n            // Validate output against outputSchema if provided (for Standard Schema compliant schemas)\n            if (\n              tool.outputSchema &&\n              isStandardSchema(tool.outputSchema) &&\n              result !== undefined &&\n              result !== null\n            ) {\n              result = parseWithStandardSchema(tool.outputSchema, result)\n            }\n\n            results.push({\n              toolCallId: toolCall.id,\n              toolName,\n              result:\n                typeof result === 'string'\n                  ? JSON.parse(result)\n                  : result || null,\n              duration,\n            })\n          } catch (error: unknown) {\n            const duration = Date.now() - startTime\n            const message =\n              error instanceof Error ? error.message : 'Unknown error'\n            results.push({\n              toolCallId: toolCall.id,\n              toolName,\n              result: { error: message },\n              state: 'output-error',\n              duration,\n            })\n          }\n        } else {\n          // User declined\n          results.push({\n            toolCallId: toolCall.id,\n            toolName,\n            result: { error: 'User declined tool execution' },\n            state: 'output-error',\n          })\n        }\n      } else {\n        // Need approval\n        needsApproval.push({\n          toolCallId: toolCall.id,\n          toolName,\n          input,\n          approvalId,\n        })\n      }\n      continue\n    }\n\n    // CASE 3: Normal server tool - execute immediately\n    const startTime = Date.now()\n    try {\n      let result = await tool.execute(input)\n      const duration = Date.now() - startTime\n\n      // Validate output against outputSchema if provided (for Standard Schema compliant schemas)\n      if (\n        tool.outputSchema &&\n        isStandardSchema(tool.outputSchema) &&\n        result !== undefined &&\n        result !== null\n      ) {\n        result = parseWithStandardSchema(tool.outputSchema, result)\n      }\n\n      results.push({\n        toolCallId: toolCall.id,\n        toolName,\n        result:\n          typeof result === 'string' ? JSON.parse(result) : result || null,\n        duration,\n      })\n    } catch (error: unknown) {\n      const duration = Date.now() - startTime\n      const message = error instanceof Error ? error.message : 'Unknown error'\n      results.push({\n        toolCallId: toolCall.id,\n        toolName,\n        result: { error: message },\n        state: 'output-error',\n        duration,\n      })\n    }\n  }\n\n  return { results, needsApproval, needsClientExecution }\n}\n"],"names":["startTime"],"mappings":"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"}

package/dist/esm/activities/chat/tools/tool-definition.d.ts

@@ -1,34 +1,34 @@
-import { z } from 'zod';
+import { StandardJSONSchemaV1 } from '@standard-schema/spec';
 import { InferSchemaType, JSONSchema, SchemaInput, Tool } from '../../../types.js';
 /**
  * Marker type for server-side tools
  */
-export interface ServerTool<TInput extends SchemaInput = z.ZodType, TOutput extends SchemaInput = z.ZodType, TName extends string = string> extends Tool<TInput, TOutput, TName> {
+export interface ServerTool<TInput extends SchemaInput = SchemaInput, TOutput extends SchemaInput = SchemaInput, TName extends string = string> extends Tool<TInput, TOutput, TName> {
     __toolSide: 'server';
 }
 /**
  * Marker type for client-side tools
  */
-export interface ClientTool<TInput extends SchemaInput = z.ZodType, TOutput extends SchemaInput = z.ZodType, TName extends string = string> {
+export interface ClientTool<TInput extends SchemaInput = SchemaInput, TOutput extends SchemaInput = SchemaInput, TName extends string = string> {
     __toolSide: 'client';
     name: TName;
     description: string;
     inputSchema?: TInput;
     outputSchema?: TOutput;
     needsApproval?: boolean;
-    metadata?: Record<string, any>;
+    metadata?: Record<string, unknown>;
     execute?: (args: InferSchemaType<TInput>) => Promise<InferSchemaType<TOutput>> | InferSchemaType<TOutput>;
 }
 /**
  * Tool definition that can be used directly or instantiated for server/client
  */
-export interface ToolDefinitionInstance<TInput extends SchemaInput = z.ZodType, TOutput extends SchemaInput = z.ZodType, TName extends string = string> extends Tool<TInput, TOutput, TName> {
+export interface ToolDefinitionInstance<TInput extends SchemaInput = SchemaInput, TOutput extends SchemaInput = SchemaInput, TName extends string = string> extends Tool<TInput, TOutput, TName> {
     __toolSide: 'definition';
 }
 /**
  * Union type for any kind of client-side tool (client tool or definition)
  */
-export type AnyClientTool = ClientTool<any, any> | ToolDefinitionInstance<any, any>;
+export type AnyClientTool = ClientTool<SchemaInput, SchemaInput> | ToolDefinitionInstance<SchemaInput, SchemaInput>;
 /**
  * Extract the tool name as a literal type
  */
@@ -36,32 +36,32 @@ export type InferToolName<T> = T extends {
     name: infer N;
 } ? N : never;
 /**
- * Extract the input type from a tool (inferred from Zod schema, or `any` for JSONSchema)
+ * Extract the input type from a tool (inferred from Standard JSON Schema, or `unknown` for plain JSONSchema)
  */
 export type InferToolInput<T> = T extends {
     inputSchema?: infer TInput;
-} ? TInput extends z.ZodType ? z.infer<TInput> : TInput extends JSONSchema ? any : any : any;
+} ? TInput extends StandardJSONSchemaV1<infer TInferred, unknown> ? TInferred : TInput extends JSONSchema ? unknown : unknown : unknown;
 /**
- * Extract the output type from a tool (inferred from Zod schema, or `any` for JSONSchema)
+ * Extract the output type from a tool (inferred from Standard JSON Schema, or `unknown` for plain JSONSchema)
  */
 export type InferToolOutput<T> = T extends {
     outputSchema?: infer TOutput;
-} ? TOutput extends z.ZodType ? z.infer<TOutput> : TOutput extends JSONSchema ? any : any : any;
+} ? TOutput extends StandardJSONSchemaV1<infer TInferred, unknown> ? TInferred : TOutput extends JSONSchema ? unknown : unknown : unknown;
 /**
  * Tool definition configuration
  */
-export interface ToolDefinitionConfig<TInput extends SchemaInput = z.ZodType, TOutput extends SchemaInput = z.ZodType, TName extends string = string> {
+export interface ToolDefinitionConfig<TInput extends SchemaInput = SchemaInput, TOutput extends SchemaInput = SchemaInput, TName extends string = string> {
     name: TName;
     description: string;
     inputSchema?: TInput;
     outputSchema?: TOutput;
     needsApproval?: boolean;
-    metadata?: Record<string, any>;
+    metadata?: Record<string, unknown>;
 }
 /**
  * Tool definition builder that allows creating server or client tools from a shared definition
  */
-export interface ToolDefinition<TInput extends SchemaInput = z.ZodType, TOutput extends SchemaInput = z.ZodType, TName extends string = string> extends ToolDefinitionInstance<TInput, TOutput, TName> {
+export interface ToolDefinition<TInput extends SchemaInput = SchemaInput, TOutput extends SchemaInput = SchemaInput, TName extends string = string> extends ToolDefinitionInstance<TInput, TOutput, TName> {
     /**
      * Create a server-side tool with execute function
      */
@@ -79,11 +79,15 @@ export interface ToolDefinition<TInput extends SchemaInput = z.ZodType, TOutput
  * 2. Instantiated as a server tool with .server()
  * 3. Instantiated as a client tool with .client()
  *
+ * Supports any Standard JSON Schema compliant library (Zod v4+, ArkType, Valibot, etc.)
+ * or plain JSON Schema objects.
+ *
  * @example
  * ```typescript
  * import { toolDefinition } from '@tanstack/ai';
  * import { z } from 'zod';
  *
+ * // Using Zod (natively supports Standard JSON Schema)
  * const addToCartTool = toolDefinition({
  *   name: 'addToCart',
  *   description: 'Add a guitar to the shopping cart (requires approval)',
@@ -122,4 +126,4 @@ export interface ToolDefinition<TInput extends SchemaInput = z.ZodType, TOutput
  * });
  * ```
  */
-export declare function toolDefinition<TInput extends SchemaInput = z.ZodAny, TOutput extends SchemaInput = z.ZodAny, TName extends string = string>(config: ToolDefinitionConfig<TInput, TOutput, TName>): ToolDefinition<TInput, TOutput, TName>;
+export declare function toolDefinition<TInput extends SchemaInput = SchemaInput, TOutput extends SchemaInput = SchemaInput, TName extends string = string>(config: ToolDefinitionConfig<TInput, TOutput, TName>): ToolDefinition<TInput, TOutput, TName>;

package/dist/esm/activities/chat/tools/tool-definition.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-definition.js","sources":["../../../../../src/activities/chat/tools/tool-definition.ts"],"sourcesContent":["import type { z } from 'zod'\nimport type {\n  InferSchemaType,\n  JSONSchema,\n  SchemaInput,\n  Tool,\n} from '../../../types'\n\n/**\n * Marker type for server-side tools\n */\nexport interface ServerTool<\n  TInput extends SchemaInput = z.ZodType,\n  TOutput extends SchemaInput = z.ZodType,\n  TName extends string = string,\n> extends Tool<TInput, TOutput, TName> {\n  __toolSide: 'server'\n}\n\n/**\n * Marker type for client-side tools\n */\nexport interface ClientTool<\n  TInput extends SchemaInput = z.ZodType,\n  TOutput extends SchemaInput = z.ZodType,\n  TName extends string = string,\n> {\n  __toolSide: 'client'\n  name: TName\n  description: string\n  inputSchema?: TInput\n  outputSchema?: TOutput\n  needsApproval?: boolean\n  metadata?: Record<string, any>\n  execute?: (\n    args: InferSchemaType<TInput>,\n  ) => Promise<InferSchemaType<TOutput>> | InferSchemaType<TOutput>\n}\n\n/**\n * Tool definition that can be used directly or instantiated for server/client\n */\nexport interface ToolDefinitionInstance<\n  TInput extends SchemaInput = z.ZodType,\n  TOutput extends SchemaInput = z.ZodType,\n  TName extends string = string,\n> extends Tool<TInput, TOutput, TName> {\n  __toolSide: 'definition'\n}\n\n/**\n * Union type for any kind of client-side tool (client tool or definition)\n */\nexport type AnyClientTool =\n  | ClientTool<any, any>\n  | ToolDefinitionInstance<any, any>\n\n/**\n * Extract the tool name as a literal type\n */\nexport type InferToolName<T> = T extends { name: infer N } ? N : never\n\n/**\n * Extract the input type from a tool (inferred from Zod schema, or `any` for JSONSchema)\n */\nexport type InferToolInput<T> = T extends { inputSchema?: infer TInput }\n  ? TInput extends z.ZodType\n    ? z.infer<TInput>\n    : TInput extends JSONSchema\n      ? any\n      : any\n  : any\n\n/**\n * Extract the output type from a tool (inferred from Zod schema, or `any` for JSONSchema)\n */\nexport type InferToolOutput<T> = T extends { outputSchema?: infer TOutput }\n  ? TOutput extends z.ZodType\n    ? z.infer<TOutput>\n    : TOutput extends JSONSchema\n      ? any\n      : any\n  : any\n\n/**\n * Tool definition configuration\n */\nexport interface ToolDefinitionConfig<\n  TInput extends SchemaInput = z.ZodType,\n  TOutput extends SchemaInput = z.ZodType,\n  TName extends string = string,\n> {\n  name: TName\n  description: string\n  inputSchema?: TInput\n  outputSchema?: TOutput\n  needsApproval?: boolean\n  metadata?: Record<string, any>\n}\n\n/**\n * Tool definition builder that allows creating server or client tools from a shared definition\n */\nexport interface ToolDefinition<\n  TInput extends SchemaInput = z.ZodType,\n  TOutput extends SchemaInput = z.ZodType,\n  TName extends string = string,\n> extends ToolDefinitionInstance<TInput, TOutput, TName> {\n  /**\n   * Create a server-side tool with execute function\n   */\n  server: (\n    execute: (\n      args: InferSchemaType<TInput>,\n    ) => Promise<InferSchemaType<TOutput>> | InferSchemaType<TOutput>,\n  ) => ServerTool<TInput, TOutput, TName>\n\n  /**\n   * Create a client-side tool with optional execute function\n   */\n  client: (\n    execute?: (\n      args: InferSchemaType<TInput>,\n    ) => Promise<InferSchemaType<TOutput>> | InferSchemaType<TOutput>,\n  ) => ClientTool<TInput, TOutput, TName>\n}\n\n/**\n * Create an isomorphic tool definition that can be used directly or instantiated for server/client\n *\n * The definition contains all tool metadata (name, description, schemas) and can be:\n * 1. Used directly in chat() on the server (as a tool definition without execute)\n * 2. Instantiated as a server tool with .server()\n * 3. Instantiated as a client tool with .client()\n *\n * @example\n * ```typescript\n * import { toolDefinition } from '@tanstack/ai';\n * import { z } from 'zod';\n *\n * const addToCartTool = toolDefinition({\n *   name: 'addToCart',\n *   description: 'Add a guitar to the shopping cart (requires approval)',\n *   needsApproval: true,\n *   inputSchema: z.object({\n *     guitarId: z.string(),\n *     quantity: z.number(),\n *   }),\n *   outputSchema: z.object({\n *     success: z.boolean(),\n *     cartId: z.string(),\n *     totalItems: z.number(),\n *   }),\n * });\n *\n * // Use directly in chat (server-side, no execute function)\n * chat({\n *   tools: [addToCartTool],\n *   // ...\n * });\n *\n * // Or create server-side implementation\n * const addToCartServer = addToCartTool.server(async (args) => {\n *   // args is typed as { guitarId: string; quantity: number }\n *   return {\n *     success: true,\n *     cartId: 'CART_' + Date.now(),\n *     totalItems: args.quantity,\n *   };\n * });\n *\n * // Or create client-side implementation\n * const addToCartClient = addToCartTool.client(async (args) => {\n *   // Client-specific logic (e.g., localStorage)\n *   return { success: true, cartId: 'local', totalItems: 1 };\n * });\n * ```\n */\nexport function toolDefinition<\n  TInput extends SchemaInput = z.ZodAny,\n  TOutput extends SchemaInput = z.ZodAny,\n  TName extends string = string,\n>(\n  config: ToolDefinitionConfig<TInput, TOutput, TName>,\n): ToolDefinition<TInput, TOutput, TName> {\n  const definition: ToolDefinition<TInput, TOutput, TName> = {\n    __toolSide: 'definition',\n    ...config,\n    server(\n      execute: (\n        args: InferSchemaType<TInput>,\n      ) => Promise<InferSchemaType<TOutput>> | InferSchemaType<TOutput>,\n    ): ServerTool<TInput, TOutput, TName> {\n      return {\n        __toolSide: 'server',\n        ...config,\n        execute,\n      }\n    },\n\n    client(\n      execute?: (\n        args: InferSchemaType<TInput>,\n      ) => Promise<InferSchemaType<TOutput>> | InferSchemaType<TOutput>,\n    ): ClientTool<TInput, TOutput, TName> {\n      return {\n        __toolSide: 'client',\n        ...config,\n        execute,\n      }\n    },\n  }\n\n  return definition\n}\n"],"names":[],"mappings":"AAkLO,SAAS,eAKd,QACwC;AACxC,QAAM,aAAqD;AAAA,IACzD,YAAY;AAAA,IACZ,GAAG;AAAA,IACH,OACE,SAGoC;AACpC,aAAO;AAAA,QACL,YAAY;AAAA,QACZ,GAAG;AAAA,QACH;AAAA,MAAA;AAAA,IAEJ;AAAA,IAEA,OACE,SAGoC;AACpC,aAAO;AAAA,QACL,YAAY;AAAA,QACZ,GAAG;AAAA,QACH;AAAA,MAAA;AAAA,IAEJ;AAAA,EAAA;AAGF,SAAO;AACT;"}
+{"version":3,"file":"tool-definition.js","sources":["../../../../../src/activities/chat/tools/tool-definition.ts"],"sourcesContent":["import type { StandardJSONSchemaV1 } from '@standard-schema/spec'\nimport type {\n  InferSchemaType,\n  JSONSchema,\n  SchemaInput,\n  Tool,\n} from '../../../types'\n\n/**\n * Marker type for server-side tools\n */\nexport interface ServerTool<\n  TInput extends SchemaInput = SchemaInput,\n  TOutput extends SchemaInput = SchemaInput,\n  TName extends string = string,\n> extends Tool<TInput, TOutput, TName> {\n  __toolSide: 'server'\n}\n\n/**\n * Marker type for client-side tools\n */\nexport interface ClientTool<\n  TInput extends SchemaInput = SchemaInput,\n  TOutput extends SchemaInput = SchemaInput,\n  TName extends string = string,\n> {\n  __toolSide: 'client'\n  name: TName\n  description: string\n  inputSchema?: TInput\n  outputSchema?: TOutput\n  needsApproval?: boolean\n  metadata?: Record<string, unknown>\n  execute?: (\n    args: InferSchemaType<TInput>,\n  ) => Promise<InferSchemaType<TOutput>> | InferSchemaType<TOutput>\n}\n\n/**\n * Tool definition that can be used directly or instantiated for server/client\n */\nexport interface ToolDefinitionInstance<\n  TInput extends SchemaInput = SchemaInput,\n  TOutput extends SchemaInput = SchemaInput,\n  TName extends string = string,\n> extends Tool<TInput, TOutput, TName> {\n  __toolSide: 'definition'\n}\n\n/**\n * Union type for any kind of client-side tool (client tool or definition)\n */\nexport type AnyClientTool =\n  | ClientTool<SchemaInput, SchemaInput>\n  | ToolDefinitionInstance<SchemaInput, SchemaInput>\n\n/**\n * Extract the tool name as a literal type\n */\nexport type InferToolName<T> = T extends { name: infer N } ? N : never\n\n/**\n * Extract the input type from a tool (inferred from Standard JSON Schema, or `unknown` for plain JSONSchema)\n */\nexport type InferToolInput<T> = T extends { inputSchema?: infer TInput }\n  ? TInput extends StandardJSONSchemaV1<infer TInferred, unknown>\n    ? TInferred\n    : TInput extends JSONSchema\n      ? unknown\n      : unknown\n  : unknown\n\n/**\n * Extract the output type from a tool (inferred from Standard JSON Schema, or `unknown` for plain JSONSchema)\n */\nexport type InferToolOutput<T> = T extends { outputSchema?: infer TOutput }\n  ? TOutput extends StandardJSONSchemaV1<infer TInferred, unknown>\n    ? TInferred\n    : TOutput extends JSONSchema\n      ? unknown\n      : unknown\n  : unknown\n\n/**\n * Tool definition configuration\n */\nexport interface ToolDefinitionConfig<\n  TInput extends SchemaInput = SchemaInput,\n  TOutput extends SchemaInput = SchemaInput,\n  TName extends string = string,\n> {\n  name: TName\n  description: string\n  inputSchema?: TInput\n  outputSchema?: TOutput\n  needsApproval?: boolean\n  metadata?: Record<string, unknown>\n}\n\n/**\n * Tool definition builder that allows creating server or client tools from a shared definition\n */\nexport interface ToolDefinition<\n  TInput extends SchemaInput = SchemaInput,\n  TOutput extends SchemaInput = SchemaInput,\n  TName extends string = string,\n> extends ToolDefinitionInstance<TInput, TOutput, TName> {\n  /**\n   * Create a server-side tool with execute function\n   */\n  server: (\n    execute: (\n      args: InferSchemaType<TInput>,\n    ) => Promise<InferSchemaType<TOutput>> | InferSchemaType<TOutput>,\n  ) => ServerTool<TInput, TOutput, TName>\n\n  /**\n   * Create a client-side tool with optional execute function\n   */\n  client: (\n    execute?: (\n      args: InferSchemaType<TInput>,\n    ) => Promise<InferSchemaType<TOutput>> | InferSchemaType<TOutput>,\n  ) => ClientTool<TInput, TOutput, TName>\n}\n\n/**\n * Create an isomorphic tool definition that can be used directly or instantiated for server/client\n *\n * The definition contains all tool metadata (name, description, schemas) and can be:\n * 1. Used directly in chat() on the server (as a tool definition without execute)\n * 2. Instantiated as a server tool with .server()\n * 3. Instantiated as a client tool with .client()\n *\n * Supports any Standard JSON Schema compliant library (Zod v4+, ArkType, Valibot, etc.)\n * or plain JSON Schema objects.\n *\n * @example\n * ```typescript\n * import { toolDefinition } from '@tanstack/ai';\n * import { z } from 'zod';\n *\n * // Using Zod (natively supports Standard JSON Schema)\n * const addToCartTool = toolDefinition({\n *   name: 'addToCart',\n *   description: 'Add a guitar to the shopping cart (requires approval)',\n *   needsApproval: true,\n *   inputSchema: z.object({\n *     guitarId: z.string(),\n *     quantity: z.number(),\n *   }),\n *   outputSchema: z.object({\n *     success: z.boolean(),\n *     cartId: z.string(),\n *     totalItems: z.number(),\n *   }),\n * });\n *\n * // Use directly in chat (server-side, no execute function)\n * chat({\n *   tools: [addToCartTool],\n *   // ...\n * });\n *\n * // Or create server-side implementation\n * const addToCartServer = addToCartTool.server(async (args) => {\n *   // args is typed as { guitarId: string; quantity: number }\n *   return {\n *     success: true,\n *     cartId: 'CART_' + Date.now(),\n *     totalItems: args.quantity,\n *   };\n * });\n *\n * // Or create client-side implementation\n * const addToCartClient = addToCartTool.client(async (args) => {\n *   // Client-specific logic (e.g., localStorage)\n *   return { success: true, cartId: 'local', totalItems: 1 };\n * });\n * ```\n */\nexport function toolDefinition<\n  TInput extends SchemaInput = SchemaInput,\n  TOutput extends SchemaInput = SchemaInput,\n  TName extends string = string,\n>(\n  config: ToolDefinitionConfig<TInput, TOutput, TName>,\n): ToolDefinition<TInput, TOutput, TName> {\n  const definition: ToolDefinition<TInput, TOutput, TName> = {\n    __toolSide: 'definition',\n    ...config,\n    server(\n      execute: (\n        args: InferSchemaType<TInput>,\n      ) => Promise<InferSchemaType<TOutput>> | InferSchemaType<TOutput>,\n    ): ServerTool<TInput, TOutput, TName> {\n      return {\n        __toolSide: 'server',\n        ...config,\n        execute,\n      }\n    },\n\n    client(\n      execute?: (\n        args: InferSchemaType<TInput>,\n      ) => Promise<InferSchemaType<TOutput>> | InferSchemaType<TOutput>,\n    ): ClientTool<TInput, TOutput, TName> {\n      return {\n        __toolSide: 'client',\n        ...config,\n        execute,\n      }\n    },\n  }\n\n  return definition\n}\n"],"names":[],"mappings":"AAsLO,SAAS,eAKd,QACwC;AACxC,QAAM,aAAqD;AAAA,IACzD,YAAY;AAAA,IACZ,GAAG;AAAA,IACH,OACE,SAGoC;AACpC,aAAO;AAAA,QACL,YAAY;AAAA,QACZ,GAAG;AAAA,QACH;AAAA,MAAA;AAAA,IAEJ;AAAA,IAEA,OACE,SAGoC;AACpC,aAAO;AAAA,QACL,YAAY;AAAA,QACZ,GAAG;AAAA,QACH;AAAA,MAAA;AAAA,IAEJ;AAAA,EAAA;AAGF,SAAO;AACT;"}

package/dist/esm/index.d.ts

@@ -7,7 +7,7 @@ export { createSpeechOptions } from './activities/generateSpeech/index.js';
 export { createTranscriptionOptions } from './activities/generateTranscription/index.js';
 export type { AIAdapter, ImageAdapter, AnyImageAdapter, TextAdapter, AnyTextAdapter, AnySummarizeAdapter, SummarizeAdapter, AnyTTSAdapter, TTSAdapter, AnyTranscriptionAdapter, TranscriptionAdapter, AnyVideoAdapter, VideoAdapter, } from './activities/index.js';
 export { toolDefinition, type ToolDefinition, type ToolDefinitionInstance, type ToolDefinitionConfig, type ServerTool, type ClientTool, type AnyClientTool, type InferToolName, type InferToolInput, type InferToolOutput, } from './activities/chat/tools/tool-definition.js';
-export { convertZodToJsonSchema } from './activities/chat/tools/zod-converter.js';
+export { convertSchemaToJsonSchema } from './activities/chat/tools/schema-converter.js';
 export { streamToText, toServerSentEventsStream, toStreamResponse, toHttpStream, } from './stream-to-response.js';
 export { ToolCallManager } from './activities/chat/tools/tool-calls.js';
 export { maxIterations, untilFinishReason, combineStrategies, } from './activities/chat/agent-loop-strategies.js';

package/dist/esm/index.js

@@ -5,7 +5,7 @@ import { createVideoOptions, generateVideo, getVideoJobStatus } from "./activiti
 import { createSpeechOptions, generateSpeech } from "./activities/generateSpeech/index.js";
 import { createTranscriptionOptions, generateTranscription } from "./activities/generateTranscription/index.js";
 import { toolDefinition } from "./activities/chat/tools/tool-definition.js";
-import { convertZodToJsonSchema } from "./activities/chat/tools/zod-converter.js";
+import { convertSchemaToJsonSchema } from "./activities/chat/tools/schema-converter.js";
 import { streamToText, toHttpStream, toServerSentEventsStream, toStreamResponse } from "./stream-to-response.js";
 import { ToolCallManager } from "./activities/chat/tools/tool-calls.js";
 import { combineStrategies, maxIterations, untilFinishReason } from "./activities/chat/agent-loop-strategies.js";
@@ -27,7 +27,7 @@ export {
   chat,
   combineStrategies,
   convertMessagesToModelMessages,
-  convertZodToJsonSchema,
+  convertSchemaToJsonSchema,
   createChatOptions,
   createImageOptions,
   createReplayStream,

package/dist/esm/types.d.ts

@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import { StandardJSONSchemaV1 } from '@standard-schema/spec';
 /**
  * Tool call states - track the lifecycle of a tool call
  */
@@ -9,17 +9,17 @@ export type ToolCallState = 'awaiting-input' | 'input-streaming' | 'input-comple
 export type ToolResultState = 'streaming' | 'complete' | 'error';
 /**
  * JSON Schema type for defining tool input/output schemas as raw JSON Schema objects.
- * This allows tools to be defined without Zod when you have JSON Schema definitions available.
+ * This allows tools to be defined without schema libraries when you have JSON Schema definitions available.
  */
 export interface JSONSchema {
     type?: string | Array<string>;
     properties?: Record<string, JSONSchema>;
     items?: JSONSchema | Array<JSONSchema>;
     required?: Array<string>;
-    enum?: Array<any>;
-    const?: any;
+    enum?: Array<unknown>;
+    const?: unknown;
     description?: string;
-    default?: any;
+    default?: unknown;
     $ref?: string;
     $defs?: Record<string, JSONSchema>;
     definitions?: Record<string, JSONSchema>;
@@ -48,19 +48,26 @@ export interface JSONSchema {
     minProperties?: number;
     maxProperties?: number;
     title?: string;
-    examples?: Array<any>;
-    [key: string]: any;
+    examples?: Array<unknown>;
+    [key: string]: unknown;
 }
 /**
- * Union type for schema input - can be either a Zod schema or a JSONSchema object.
+ * Union type for schema input - can be any Standard JSON Schema compliant schema or a plain JSONSchema object.
+ *
+ * Standard JSON Schema compliant libraries include:
+ * - Zod v4.2+ (natively supports StandardJSONSchemaV1)
+ * - ArkType v2.1.28+ (natively supports StandardJSONSchemaV1)
+ * - Valibot v1.2+ (via `toStandardJsonSchema()` from `@valibot/to-json-schema`)
+ *
+ * @see https://standardschema.dev/json-schema
  */
-export type SchemaInput = z.ZodType | JSONSchema;
+export type SchemaInput = StandardJSONSchemaV1<any, any> | JSONSchema;
 /**
  * Infer the TypeScript type from a schema.
- * For Zod schemas, uses z.infer to get the proper type.
- * For JSONSchema, returns `any` since we can't infer types from JSON Schema at compile time.
+ * For Standard JSON Schema compliant schemas, extracts the input type.
+ * For plain JSONSchema, returns `any` since we can't infer types from JSON Schema at compile time.
  */
-export type InferSchemaType<T> = T extends z.ZodType ? z.infer<T> : any;
+export type InferSchemaType<T> = T extends StandardJSONSchemaV1<infer TInput, unknown> ? TInput : unknown;
 export interface ToolCall {
     id: string;
     type: 'function';
@@ -234,12 +241,14 @@ export type ConstrainedModelMessage<TInputModalitiesTypes extends InputModalitie
  * Tools allow the model to interact with external systems, APIs, or perform computations.
  * The model will decide when to call tools based on the user's request and the tool descriptions.
  *
- * Tools can use either Zod schemas or JSON Schema objects for runtime validation and type safety.
+ * Tools can use any Standard JSON Schema compliant library (Zod, ArkType, Valibot, etc.)
+ * or plain JSON Schema objects for runtime validation and type safety.
  *
  * @see https://platform.openai.com/docs/guides/function-calling
  * @see https://docs.anthropic.com/claude/docs/tool-use
+ * @see https://standardschema.dev/json-schema
  */
-export interface Tool<TInput extends SchemaInput = z.ZodType, TOutput extends SchemaInput = z.ZodType, TName extends string = string> {
+export interface Tool<TInput extends SchemaInput = SchemaInput, TOutput extends SchemaInput = SchemaInput, TName extends string = string> {
     /**
      * Unique name of the tool (used by the model to call it).
      *
@@ -261,16 +270,16 @@ export interface Tool<TInput extends SchemaInput = z.ZodType, TOutput extends Sc
     /**
      * Schema describing the tool's input parameters.
      *
-     * Can be either a Zod schema or a JSON Schema object.
+     * Can be any Standard JSON Schema compliant schema (Zod, ArkType, Valibot, etc.) or a plain JSON Schema object.
      * Defines the structure and types of arguments the tool accepts.
      * The model will generate arguments matching this schema.
-     * Zod schemas are converted to JSON Schema for LLM providers.
+     * Standard JSON Schema compliant schemas are converted to JSON Schema for LLM providers.
      *
-     * @see https://zod.dev/
+     * @see https://standardschema.dev/json-schema
      * @see https://json-schema.org/
      *
      * @example
-     * // Using Zod schema
+     * // Using Zod v4+ schema (natively supports Standard JSON Schema)
      * import { z } from 'zod';
      * z.object({
      *   location: z.string().describe("City name or coordinates"),
@@ -278,7 +287,15 @@ export interface Tool<TInput extends SchemaInput = z.ZodType, TOutput extends Sc
      * })
      *
      * @example
-     * // Using JSON Schema
+     * // Using ArkType (natively supports Standard JSON Schema)
+     * import { type } from 'arktype';
+     * type({
+     *   location: 'string',
+     *   unit: "'celsius' | 'fahrenheit'"
+     * })
+     *
+     * @example
+     * // Using plain JSON Schema
      * {
      *   type: 'object',
      *   properties: {
@@ -292,15 +309,16 @@ export interface Tool<TInput extends SchemaInput = z.ZodType, TOutput extends Sc
     /**
      * Optional schema for validating tool output.
      *
-     * Can be either a Zod schema or a JSON Schema object.
-     * If provided with a Zod schema, tool results will be validated against this schema before
-     * being sent back to the model. This catches bugs in tool implementations
-     * and ensures consistent output formatting.
+     * Can be any Standard JSON Schema compliant schema or a plain JSON Schema object.
+     * If provided with a Standard Schema compliant schema, tool results will be validated
+     * against this schema before being sent back to the model. This catches bugs in tool
+     * implementations and ensures consistent output formatting.
      *
      * Note: This is client-side validation only - not sent to LLM providers.
-     * Note: JSON Schema output validation is not performed at runtime.
+     * Note: Plain JSON Schema output validation is not performed at runtime.
      *
      * @example
+     * // Using Zod
      * z.object({
      *   temperature: z.number(),
      *   conditions: z.string(),
@@ -502,12 +520,13 @@ export interface TextOptions<TProviderOptionsSuperset extends Record<string, any
     modelOptions?: TProviderOptionsForModel;
     request?: Request | RequestInit;
     /**
-     * Zod schema for structured output.
+     * Schema for structured output.
      * When provided, the adapter should use the provider's native structured output API
      * to ensure the response conforms to this schema.
      * The schema will be converted to JSON Schema format before being sent to the provider.
+     * Supports any Standard JSON Schema compliant library (Zod, ArkType, Valibot, etc.).
      */
-    outputSchema?: z.ZodType;
+    outputSchema?: SchemaInput;
     /**
      * Conversation ID for correlating client and server-side devtools events.
      * When provided, server-side events will be linked to the client conversation in devtools.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/ai",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Core TanStack AI library - Open source AI SDK",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -46,13 +46,10 @@
     "@tanstack/devtools-event-client": "^0.4.0",
     "partial-json": "^0.1.7"
   },
-  "peerDependencies": {
-    "@alcyone-labs/zod-to-json-schema": "^4.0.0",
-    "zod": "^3.0.0 || ^4.0.0"
-  },
   "devDependencies": {
+    "@standard-schema/spec": "^1.1.0",
     "@vitest/coverage-v8": "4.0.14",
-    "zod": "^4.1.13"
+    "zod": "^4.2.0"
   },
   "scripts": {
     "build": "vite build",