@orpc/ai-sdk 2.0.0-beta.47 → 2.0.0-beta.48

package/README.md

@@ -191,15 +191,14 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
    <td align="center"><a href="https://kellychan.im/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Kelly Peilin Chan"><img src="https://avatars.githubusercontent.com/u/520852?u=6b0f7105f694e7b5cacf410a3f04c7044b469dc8&amp;v=4" width="139" alt="Kelly Peilin Chan"/><br />Kelly Peilin Chan</a></td>
    <td align="center"><a href="https://guyariely.com/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Guy Ariely"><img src="https://avatars.githubusercontent.com/u/42813496?u=edb6b7f563bf28e160a290832e7da57c0506f8ca&amp;v=4" width="139" alt="Guy Ariely"/><br />Guy Ariely</a></td>
    <td align="center"><a href="https://paulsenon.com/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="PaulSenon"><img src="https://avatars.githubusercontent.com/u/19531087?u=6385741eb91d200b8c513ec6045482e301767ca6&amp;v=4" width="139" alt="PaulSenon"/><br />PaulSenon</a></td>
-   <td align="center"><a href="https://nakasyou.how/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Shotaro Nakamura"><img src="https://avatars.githubusercontent.com/u/79000684?u=f644df3f29f0e8677a90967115774564f1d9d6ab&amp;v=4" width="139" alt="Shotaro Nakamura"/><br />Shotaro Nakamura</a></td>
+   <td align="center"><a href="https://piscis.dev/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Alex"><img src="https://avatars.githubusercontent.com/u/326163?u=b245f368bd940cf51d08c0b6bf55f8257f359437&amp;v=4" width="139" alt="Alex"/><br />Alex</a></td>
   </tr>
   <tr>
-   <td align="center"><a href="https://piscis.dev/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Alex"><img src="https://avatars.githubusercontent.com/u/326163?u=b245f368bd940cf51d08c0b6bf55f8257f359437&amp;v=4" width="139" alt="Alex"/><br />Alex</a></td>
    <td align="center"><a href="https://opensource.gubanov.eu/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Andrey Gubanov"><img src="https://avatars.githubusercontent.com/u/1082083?u=c5f2daf7ebece498e85c83367bb37b4e10e2649d&amp;v=4" width="139" alt="Andrey Gubanov"/><br />Andrey Gubanov</a></td>
   </tr>
 </table>
 
-With thanks to [39 past sponsors](https://orpc.dev/sponsors#past-sponsors) who helped get oRPC here.
+With thanks to [40 past sponsors](https://orpc.dev/sponsors#past-sponsors) who helped get oRPC here.
 
 ## Open Source Programs
 

package/dist/index.d.mts

@@ -1,172 +1,2 @@
-import { ClientOptions } from '@orpc/client';
-import { AnySchema, ErrorMap, InferSchemaOutput, InferSchemaInput, MetaPlugin, AnyProcedureContract, Schema, ProcedureContract } from '@orpc/contract';
-import { Lazy, Context, ProcedureClientOptions, Procedure } from '@orpc/server';
-import { Public, MaybeOptionalOptions } from '@orpc/shared';
-import { JSONValue, Tool } from 'ai';
-import { OpenAPIJsonSerializer } from '@orpc/openapi';
-
-/**
- * The [function tool](https://ai-sdk.dev/docs/foundations/tools) member of the AI SDK `Tool` union,
- * which is the kind of tool this package produces.
- */
-type FunctionTool<INPUT extends JSONValue | unknown | never = any, OUTPUT extends JSONValue | unknown | never = any> = Extract<Tool<INPUT, OUTPUT>, {
-    type?: 'function' | undefined;
-}>;
-/**
- * Base [AI SDK Tool](https://ai-sdk.dev/docs/foundations/tools) options attached to a procedure/contract,
- * used as defaults when creating tools from it.
- *
- * @remarks
- * **Note**: When defined multiple times, options are overridden by the most recent call.
- *
- * @see {@link https://orpc.dev/docs/integrations/ai-sdk#tool-implementer | AI SDK Integration - Tool Implementer}
- */
-type AiSdkToolMeta<TInputSchema extends AnySchema = AnySchema, TOutputSchema extends AnySchema = AnySchema> = Partial<Omit<FunctionTool<InferSchemaOutput<TInputSchema>, ToolOutput<InferSchemaInput<TOutputSchema>>>, 'inputSchema' | 'outputSchema' | 'execute'>>;
-interface AiSdkToolMetaPlugin<TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> extends MetaPlugin<TInputSchema, TOutputSchema, TErrorMap> {
-    name: '~ai-sdk/tool';
-}
-interface AiSdkToolFunction {
-    <TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap>(meta: AiSdkToolMeta<TInputSchema, TOutputSchema>): AiSdkToolMetaPlugin<TInputSchema, TOutputSchema, TErrorMap>;
-}
-/**
- * Attaches base [AI SDK Tool](https://ai-sdk.dev/docs/foundations/tools) options to a procedure/contract,
- * used as defaults when creating tools from it.
- *
- * @remarks
- * **Note**: When defined multiple times, options are overridden by the most recent call.
- *
- * @example
- * ```ts
- * const getWeatherContract = oc
- *   .meta(aiSdkTool({
- *     description: 'Get the weather in a location',
- *     metadata: { source: 'weather-service' },
- *   }))
- *   .input(z.object({ location: z.string() }))
- * ```
- *
- * @see {@link https://orpc.dev/docs/integrations/ai-sdk#tool-implementer | AI SDK Integration - Tool Implementer}
- */
-declare const aiSdkTool: AiSdkToolFunction;
-/**
- * Reads the base [AI SDK Tool](https://ai-sdk.dev/docs/foundations/tools) options
- * attached to a procedure/contract by {@link aiSdkTool}.
- *
- * @see {@link https://orpc.dev/docs/integrations/ai-sdk#tool-implementer | AI SDK Integration - Tool Implementer}
- */
-declare function getAiSdkToolMeta(procedureOrLazy: AnyProcedureContract | Lazy<any>): AiSdkToolMeta | undefined;
-
-/**
- * Infers the value an AI SDK tool outputs for a given oRPC output type.
- *
- * For [AsyncIteratorObject](https://orpc.dev/docs/async-iterator-object) outputs, the tool streams
- * each yielded event as a [preliminary result](https://ai-sdk.dev/docs/ai-sdk-core/tools-and-tool-calling#preliminary-tool-results)
- * and the last event becomes the final result, so the tool output is the yield type.
- *
- * @see {@link https://orpc.dev/docs/integrations/ai-sdk#streaming-tool-outputs | AI SDK Integration - Streaming Tool Outputs}
- */
-type ToolOutput<T> = T extends AsyncIteratorObject<infer TYield, any, any> ? TYield : T;
-interface ImplementToolFactoryOptions {
-    /**
-     * Serializes outputs for the default `toModelOutput`, converting types such as `Date`, `BigInt`, and `Set`
-     * the same way OpenAPI responses do.
-     *
-     * @default new OpenAPIJsonSerializer()
-     * @see {@link https://orpc.dev/docs/integrations/ai-sdk#tool-outputs | AI SDK Integration - Tool Outputs}
-     */
-    serializer?: Public<OpenAPIJsonSerializer> | undefined;
-}
-interface ToolImplementer {
-    <TInputSchema extends AnySchema, TOutputSchema extends AnySchema>(contract: ProcedureContract<TInputSchema, TOutputSchema, any>, ...rest: MaybeOptionalOptions<Omit<FunctionTool<InferSchemaOutput<TInputSchema>, ToolOutput<InferSchemaInput<TOutputSchema>>>, 'inputSchema' | 'outputSchema'>>): Tool<InferSchemaOutput<TInputSchema>, ToolOutput<InferSchemaInput<TOutputSchema>>>;
-}
-/**
- * Creates a builder that implements [procedure contracts](https://orpc.dev/docs/contract/procedure)
- * as [AI SDK Tools](https://ai-sdk.dev/docs/foundations/tools) by leveraging existing contract definitions.
- *
- * The factory accepts oRPC related options, and the resulting builder
- * accepts a contract alongside AI SDK tool options.
- *
- * @remarks
- * **Note**: [Procedures](https://orpc.dev/docs/procedure) are also compatible with [procedure contracts](https://orpc.dev/docs/contract/procedure).
- *
- * @example
- * ```ts
- * import { aiSdkTool, implementToolFactory } from '@orpc/ai-sdk'
- * import { oc } from '@orpc/contract'
- *
- * const getWeatherContract = oc
- *   .meta(
- *     aiSdkTool({ description: 'Get the weather in a location' }), // default AI SDK tool options
- *   )
- *   .input(
- *     z.object({
- *       location: z.string().describe('The location to get the weather for'),
- *     }),
- *   )
- *   .output(
- *     z.object({
- *       location: z.string().describe('The location the weather is for'),
- *       temperature: z.number().describe('The temperature in Celsius'),
- *     }),
- *   )
- *
- * const implementTool = implementToolFactory()
- *
- * const getWeatherTool = implementTool(getWeatherContract, {
- *   execute: async ({ location }) => ({
- *     location,
- *     temperature: 72 + Math.floor(Math.random() * 21) - 10,
- *   }),
- * })
- * ```
- *
- * @see {@link https://orpc.dev/docs/integrations/ai-sdk#tool-implementer | AI SDK Integration - Tool Implementer}
- */
-declare function implementToolFactory(options?: ImplementToolFactoryOptions): ToolImplementer;
-type CreateToolFactoryOptions<TInitialContext extends Context> = ImplementToolFactoryOptions & ProcedureClientOptions<TInitialContext, Schema<unknown>, object, object> & Omit<ClientOptions<object>, 'context' | 'signal'>;
-interface ToolFactory<TInitialContext extends Context> {
-    <TInputSchema extends AnySchema, TOutputSchema extends AnySchema>(procedure: Procedure<TInitialContext, any, TInputSchema, TOutputSchema, any>, ...rest: MaybeOptionalOptions<Omit<FunctionTool<InferSchemaOutput<TInputSchema>, ToolOutput<InferSchemaInput<TOutputSchema>>>, 'inputSchema' | 'outputSchema' | 'execute'>>): Tool<InferSchemaOutput<TInputSchema>, ToolOutput<InferSchemaInput<TOutputSchema>>>;
-}
-/**
- * Creates a builder that converts [procedures](https://orpc.dev/docs/procedure)
- * into [AI SDK Tools](https://ai-sdk.dev/docs/foundations/tools) by leveraging existing procedure definitions.
- *
- * The factory accepts oRPC related options, and the resulting builder
- * accepts a procedure alongside AI SDK tool options.
- *
- * @example
- * ```ts
- * import { aiSdkTool, createToolFactory } from '@orpc/ai-sdk'
- * import { os } from '@orpc/server'
- *
- * const getWeatherProcedure = os
- *   .meta(
- *     aiSdkTool({ description: 'Get the weather in a location' }), // default AI SDK tool options
- *   )
- *   .input(z.object({
- *     location: z.string().describe('The location to get the weather for'),
- *   }))
- *   .output(z.object({
- *     location: z.string().describe('The location the weather is for'),
- *     temperature: z.number().describe('The temperature in Celsius'),
- *   }))
- *   .handler(async ({ input }) => ({
- *     location: input.location,
- *     temperature: 72 + Math.floor(Math.random() * 21) - 10,
- *   }))
- *
- * const createTool = createToolFactory({
- *   context: {}, // provide initial context if needed
- * })
- *
- * const getWeatherTool = createTool(getWeatherProcedure, {
- *   // ...AI SDK tool options/overrides here if needed
- * })
- * ```
- *
- * @see {@link https://orpc.dev/docs/integrations/ai-sdk#tool-factory | AI SDK Integration - Tool Factory}
- */
-declare function createToolFactory<TInitialContext extends Context = object>(...rest: MaybeOptionalOptions<CreateToolFactoryOptions<TInitialContext>>): ToolFactory<TInitialContext>;
-
-export { aiSdkTool, createToolFactory, getAiSdkToolMeta, implementToolFactory };
-export type { AiSdkToolFunction, AiSdkToolMeta, AiSdkToolMetaPlugin, CreateToolFactoryOptions, FunctionTool, ImplementToolFactoryOptions, ToolFactory, ToolImplementer, ToolOutput };
+export * from "./tool.mjs";
+export * from "./tool-meta.mjs";

package/dist/index.mjs

@@ -1,148 +1,2 @@
-import { getAsyncIteratorObjectSchemasDetails } from '@orpc/contract';
-import { combineJsonSchemasWithComposition } from '@orpc/json-schema';
-import { OpenAPIJsonSerializer } from '@orpc/openapi';
-import { Procedure, call } from '@orpc/server';
-import { resolveMaybeOptionalOptions, isAsyncGeneratorFunction, toArray, ORPC_NAME, mergeTwoLevels, encodeBase64, loadBytes, stringifyJSON } from '@orpc/shared';
-import { tool } from 'ai';
-
-const aiSdkTool = (incoming) => ({
-  name: "~ai-sdk/tool",
-  init(meta) {
-    const existing = meta["~ai-sdk/tool"];
-    return {
-      ...meta,
-      "~ai-sdk/tool": { ...existing, ...incoming }
-    };
-  }
-});
-function getAiSdkToolMeta(procedureOrLazy) {
-  return procedureOrLazy["~orpc"].meta["~ai-sdk/tool"];
-}
-
-const ANY_SCHEMA = {
-  "~standard": {
-    vendor: ORPC_NAME,
-    version: 1,
-    validate: (value) => ({ value }),
-    jsonSchema: {
-      input: () => ({}),
-      output: () => ({})
-    }
-  }
-};
-function combineJsonSchemas(jsonSchemas) {
-  let $schema;
-  const branches = jsonSchemas.map((jsonSchema) => {
-    if ("$schema" in jsonSchema) {
-      const { $schema: branch$schema, ...rest } = jsonSchema;
-      $schema ??= branch$schema;
-      return rest;
-    }
-    return jsonSchema;
-  });
-  const combined = combineJsonSchemasWithComposition("allOf", branches);
-  return { $schema, ...combined };
-}
-function combineSchemas(schemas, merge) {
-  if (schemas.length === 0) {
-    return void 0;
-  }
-  if (schemas.length === 1) {
-    return schemas[0];
-  }
-  const standardJsonSchemas = schemas.filter((schema) => schema["~standard"].jsonSchema);
-  const jsonSchema = standardJsonSchemas.length ? {
-    input: (options) => combineJsonSchemas(standardJsonSchemas.map((schema) => schema["~standard"].jsonSchema.input(options))),
-    output: (options) => combineJsonSchemas(standardJsonSchemas.map((schema) => schema["~standard"].jsonSchema.output(options)))
-  } : void 0;
-  return {
-    "~standard": {
-      vendor: ORPC_NAME,
-      version: 1,
-      async validate(value) {
-        let current = value;
-        for (const [index, schema] of schemas.entries()) {
-          const merging = merge && index !== 0;
-          const result = await schema["~standard"].validate(merging ? mergeTwoLevels(value, current) : current);
-          if (result.issues) {
-            return result;
-          }
-          current = merging ? mergeTwoLevels(current, result.value) : result.value;
-        }
-        return { value: current };
-      },
-      jsonSchema
-    }
-  };
-}
-function combineOutputSchemas(outputSchemas) {
-  const yieldSchemas = getAsyncIteratorObjectSchemasDetails(outputSchemas)?.yieldSchemas;
-  return combineSchemas([...yieldSchemas ?? outputSchemas].reverse(), false);
-}
-async function toModelOutput(serializer, output) {
-  const { json, maps, blobs } = serializer.serializeJson(output);
-  if (typeof json === "string") {
-    return { type: "text", value: json };
-  }
-  if (!blobs?.length) {
-    return { type: "json", value: json ?? null };
-  }
-  const files = await Promise.all(blobs.map(async (blob, i) => {
-    const path = maps[i];
-    const names = blob instanceof File && blob.name !== "" ? [...path, blob.name] : path;
-    return {
-      type: "file",
-      mediaType: blob.type || "application/octet-stream",
-      // base64 is encoded once, providers would otherwise re-encode the bytes on every step
-      data: { type: "data", data: encodeBase64(await loadBytes(blob)) },
-      ...names.length === 0 ? {} : { filename: names.join("/") }
-    };
-  }));
-  return { type: "content", value: json instanceof Blob ? files : [{ type: "text", text: stringifyJSON(json) }, ...files] };
-}
-function implementToolFactory(options = {}) {
-  const serializer = options.serializer ?? new OpenAPIJsonSerializer();
-  const defaultToModelOutput = ({ output }) => toModelOutput(serializer, output);
-  const factory = (contract, ...rest) => {
-    const toolOptions = resolveMaybeOptionalOptions(rest);
-    const inputSchemas = toArray(contract["~orpc"].inputSchemas);
-    const outputSchemas = toArray(contract["~orpc"].outputSchemas);
-    const defaults = getAiSdkToolMeta(contract);
-    return tool({
-      ...defaults,
-      ...toolOptions,
-      toModelOutput: toolOptions.toModelOutput ?? defaults?.toModelOutput ?? defaultToModelOutput,
-      inputSchema: combineSchemas(inputSchemas, true) ?? ANY_SCHEMA,
-      outputSchema: combineOutputSchemas(outputSchemas)
-    });
-  };
-  return factory;
-}
-function createToolFactory(...rest) {
-  const options = resolveMaybeOptionalOptions(rest);
-  const implementTool = implementToolFactory(options);
-  const factory = (procedure, ...rest2) => {
-    const toolOptions = resolveMaybeOptionalOptions(rest2);
-    const disabledValidation = new Procedure({
-      ...procedure["~orpc"],
-      disableInputValidation: true
-    });
-    const isIteratorOutput = getAsyncIteratorObjectSchemasDetails(procedure["~orpc"].outputSchemas) !== void 0 || isAsyncGeneratorFunction(procedure["~orpc"].handler);
-    return implementTool(procedure, {
-      ...toolOptions,
-      /**
-       * For async iterator outputs, the tool streams each event as a
-       * [preliminary result](https://ai-sdk.dev/docs/ai-sdk-core/tools-and-tool-calling#preliminary-tool-results),
-       * and the last event becomes the final result.
-       */
-      execute: isIteratorOutput ? async function* (input, callingOptions) {
-        yield* await call(disabledValidation, input, { ...options, signal: callingOptions.abortSignal });
-      } : (input, callingOptions) => {
-        return call(disabledValidation, input, { ...options, signal: callingOptions.abortSignal });
-      }
-    });
-  };
-  return factory;
-}
-
-export { aiSdkTool, createToolFactory, getAiSdkToolMeta, implementToolFactory };
+export * from "./tool.mjs";
+export * from "./tool-meta.mjs";

package/dist/tool-meta.d.mts

@@ -0,0 +1,68 @@
+import type { AnyProcedureContract, AnySchema, ErrorMap, InferSchemaInput, InferSchemaOutput, MetaPlugin } from "@orpc/contract";
+import type { Lazy } from "@orpc/server";
+import type { JSONValue, Tool } from "ai";
+import type { ToolOutput } from "./tool.mjs";
+/**
+* The [function tool](https://ai-sdk.dev/docs/foundations/tools) member of the AI SDK `Tool` union,
+* which is the kind of tool this package produces.
+*/
+export type FunctionTool<
+	INPUT extends JSONValue | unknown | never = any,
+	OUTPUT extends JSONValue | unknown | never = any
+> = Extract<Tool<INPUT, OUTPUT>, {
+	type?: "function" | undefined;
+}>;
+/**
+* Base [AI SDK Tool](https://ai-sdk.dev/docs/foundations/tools) options attached to a procedure/contract,
+* used as defaults when creating tools from it.
+*
+* @remarks
+* **Note**: When defined multiple times, options are overridden by the most recent call.
+*
+* @see {@link https://orpc.dev/docs/integrations/ai-sdk#tool-implementer | AI SDK Integration - Tool Implementer}
+*/
+export type AiSdkToolMeta<
+	TInputSchema extends AnySchema = AnySchema,
+	TOutputSchema extends AnySchema = AnySchema
+> = Partial<Omit<FunctionTool<InferSchemaOutput<TInputSchema>, ToolOutput<InferSchemaInput<TOutputSchema>>>, "inputSchema" | "outputSchema" | "execute">>;
+export interface AiSdkToolMetaPlugin<
+	TInputSchema extends AnySchema,
+	TOutputSchema extends AnySchema,
+	TErrorMap extends ErrorMap
+> extends MetaPlugin<TInputSchema, TOutputSchema, TErrorMap> {
+	name: "~ai-sdk/tool";
+}
+export interface AiSdkToolFunction {
+	<
+		TInputSchema extends AnySchema,
+		TOutputSchema extends AnySchema,
+		TErrorMap extends ErrorMap
+	>(meta: AiSdkToolMeta<TInputSchema, TOutputSchema>): AiSdkToolMetaPlugin<TInputSchema, TOutputSchema, TErrorMap>;
+}
+/**
+* Attaches base [AI SDK Tool](https://ai-sdk.dev/docs/foundations/tools) options to a procedure/contract,
+* used as defaults when creating tools from it.
+*
+* @remarks
+* **Note**: When defined multiple times, options are overridden by the most recent call.
+*
+* @example
+* ```ts
+* const getWeatherContract = oc
+*   .meta(aiSdkTool({
+*     description: 'Get the weather in a location',
+*     metadata: { source: 'weather-service' },
+*   }))
+*   .input(z.object({ location: z.string() }))
+* ```
+*
+* @see {@link https://orpc.dev/docs/integrations/ai-sdk#tool-implementer | AI SDK Integration - Tool Implementer}
+*/
+export declare const aiSdkTool: AiSdkToolFunction;
+/**
+* Reads the base [AI SDK Tool](https://ai-sdk.dev/docs/foundations/tools) options
+* attached to a procedure/contract by {@link aiSdkTool}.
+*
+* @see {@link https://orpc.dev/docs/integrations/ai-sdk#tool-implementer | AI SDK Integration - Tool Implementer}
+*/
+export declare function getAiSdkToolMeta(procedureOrLazy: AnyProcedureContract | Lazy<any>): AiSdkToolMeta | undefined;

package/dist/tool-meta.mjs

@@ -0,0 +1,18 @@
+
+export const aiSdkTool = (incoming) => ({
+	name: "~ai-sdk/tool",
+	init(meta) {
+		const existing = meta["~ai-sdk/tool"];
+		return {
+			...meta,
+			"~ai-sdk/tool": {
+				...existing,
+				...incoming
+			}
+		};
+	}
+});
+
+export function getAiSdkToolMeta(procedureOrLazy) {
+	return procedureOrLazy["~orpc"].meta["~ai-sdk/tool"];
+}

package/dist/tool.d.mts

@@ -0,0 +1,125 @@
+import type { ClientOptions } from "@orpc/client";
+import type { AnySchema, InferSchemaInput, InferSchemaOutput, ProcedureContract, Schema } from "@orpc/contract";
+import type { Context, ProcedureClientOptions } from "@orpc/server";
+import type { MaybeOptionalOptions, Public } from "@orpc/shared";
+import type { Tool } from "ai";
+import type { FunctionTool } from "./tool-meta.mjs";
+import { OpenAPIJsonSerializer } from "@orpc/openapi";
+import { Procedure } from "@orpc/server";
+/**
+* Infers the value an AI SDK tool outputs for a given oRPC output type.
+*
+* For [AsyncIteratorObject](https://orpc.dev/docs/async-iterator-object) outputs, the tool streams
+* each yielded event as a [preliminary result](https://ai-sdk.dev/docs/ai-sdk-core/tools-and-tool-calling#preliminary-tool-results)
+* and the last event becomes the final result, so the tool output is the yield type.
+*
+* @see {@link https://orpc.dev/docs/integrations/ai-sdk#streaming-tool-outputs | AI SDK Integration - Streaming Tool Outputs}
+*/
+export type ToolOutput<T> = T extends AsyncIteratorObject<infer TYield, any, any> ? TYield : T;
+export interface ImplementToolFactoryOptions {
+	/**
+	* Serializes outputs for the default `toModelOutput`, converting types such as `Date`, `BigInt`, and `Set`
+	* the same way OpenAPI responses do.
+	*
+	* @default new OpenAPIJsonSerializer()
+	* @see {@link https://orpc.dev/docs/integrations/ai-sdk#tool-outputs | AI SDK Integration - Tool Outputs}
+	*/
+	serializer?: Public<OpenAPIJsonSerializer> | undefined;
+}
+export interface ToolImplementer {
+	<
+		TInputSchema extends AnySchema,
+		TOutputSchema extends AnySchema
+	>(contract: ProcedureContract<TInputSchema, TOutputSchema, any>, ...rest: MaybeOptionalOptions<Omit<FunctionTool<InferSchemaOutput<TInputSchema>, ToolOutput<InferSchemaInput<TOutputSchema>>>, "inputSchema" | "outputSchema">>): Tool<InferSchemaOutput<TInputSchema>, ToolOutput<InferSchemaInput<TOutputSchema>>>;
+}
+/**
+* Creates a builder that implements [procedure contracts](https://orpc.dev/docs/contract/procedure)
+* as [AI SDK Tools](https://ai-sdk.dev/docs/foundations/tools) by leveraging existing contract definitions.
+*
+* The factory accepts oRPC related options, and the resulting builder
+* accepts a contract alongside AI SDK tool options.
+*
+* @remarks
+* **Note**: [Procedures](https://orpc.dev/docs/procedure) are also compatible with [procedure contracts](https://orpc.dev/docs/contract/procedure).
+*
+* @example
+* ```ts
+* import { aiSdkTool, implementToolFactory } from '@orpc/ai-sdk'
+* import { oc } from '@orpc/contract'
+*
+* const getWeatherContract = oc
+*   .meta(
+*     aiSdkTool({ description: 'Get the weather in a location' }), // default AI SDK tool options
+*   )
+*   .input(
+*     z.object({
+*       location: z.string().describe('The location to get the weather for'),
+*     }),
+*   )
+*   .output(
+*     z.object({
+*       location: z.string().describe('The location the weather is for'),
+*       temperature: z.number().describe('The temperature in Celsius'),
+*     }),
+*   )
+*
+* const implementTool = implementToolFactory()
+*
+* const getWeatherTool = implementTool(getWeatherContract, {
+*   execute: async ({ location }) => ({
+*     location,
+*     temperature: 72 + Math.floor(Math.random() * 21) - 10,
+*   }),
+* })
+* ```
+*
+* @see {@link https://orpc.dev/docs/integrations/ai-sdk#tool-implementer | AI SDK Integration - Tool Implementer}
+*/
+export declare function implementToolFactory(options?: ImplementToolFactoryOptions): ToolImplementer;
+export type CreateToolFactoryOptions<TInitialContext extends Context> = ImplementToolFactoryOptions & ProcedureClientOptions<TInitialContext, Schema<unknown>, object, object> & Omit<ClientOptions<object>, "context" | "signal">;
+export interface ToolFactory<TInitialContext extends Context> {
+	<
+		TInputSchema extends AnySchema,
+		TOutputSchema extends AnySchema
+	>(procedure: Procedure<TInitialContext, any, TInputSchema, TOutputSchema, any>, ...rest: MaybeOptionalOptions<Omit<FunctionTool<InferSchemaOutput<TInputSchema>, ToolOutput<InferSchemaInput<TOutputSchema>>>, "inputSchema" | "outputSchema" | "execute">>): Tool<InferSchemaOutput<TInputSchema>, ToolOutput<InferSchemaInput<TOutputSchema>>>;
+}
+/**
+* Creates a builder that converts [procedures](https://orpc.dev/docs/procedure)
+* into [AI SDK Tools](https://ai-sdk.dev/docs/foundations/tools) by leveraging existing procedure definitions.
+*
+* The factory accepts oRPC related options, and the resulting builder
+* accepts a procedure alongside AI SDK tool options.
+*
+* @example
+* ```ts
+* import { aiSdkTool, createToolFactory } from '@orpc/ai-sdk'
+* import { os } from '@orpc/server'
+*
+* const getWeatherProcedure = os
+*   .meta(
+*     aiSdkTool({ description: 'Get the weather in a location' }), // default AI SDK tool options
+*   )
+*   .input(z.object({
+*     location: z.string().describe('The location to get the weather for'),
+*   }))
+*   .output(z.object({
+*     location: z.string().describe('The location the weather is for'),
+*     temperature: z.number().describe('The temperature in Celsius'),
+*   }))
+*   .handler(async ({ input }) => ({
+*     location: input.location,
+*     temperature: 72 + Math.floor(Math.random() * 21) - 10,
+*   }))
+*
+* const createTool = createToolFactory({
+*   context: {}, // provide initial context if needed
+* })
+*
+* const getWeatherTool = createTool(getWeatherProcedure, {
+*   // ...AI SDK tool options/overrides here if needed
+* })
+* ```
+*
+* @see {@link https://orpc.dev/docs/integrations/ai-sdk#tool-factory | AI SDK Integration - Tool Factory}
+*/
+export declare function createToolFactory<TInitialContext extends Context = object>(...rest: MaybeOptionalOptions<CreateToolFactoryOptions<TInitialContext>>): ToolFactory<TInitialContext>;

package/dist/tool.mjs

@@ -0,0 +1,154 @@
+import { getAsyncIteratorObjectSchemasDetails } from "@orpc/contract";
+import { combineJsonSchemasWithComposition } from "@orpc/json-schema";
+import { OpenAPIJsonSerializer } from "@orpc/openapi";
+import { call, Procedure } from "@orpc/server";
+import { encodeBase64, isAsyncGeneratorFunction, loadBytes, mergeTwoLevels, ORPC_NAME, resolveMaybeOptionalOptions, stringifyJSON, toArray } from "@orpc/shared";
+import { tool } from "ai";
+import { getAiSdkToolMeta } from "./tool-meta.mjs";
+const ANY_SCHEMA = { "~standard": {
+	vendor: ORPC_NAME,
+	version: 1,
+	validate: (value) => ({ value }),
+	jsonSchema: {
+		input: () => ({}),
+		output: () => ({})
+	}
+} };
+function combineJsonSchemas(jsonSchemas) {
+	let $schema;
+	const branches = jsonSchemas.map((jsonSchema) => {
+		if ("$schema" in jsonSchema) {
+			const { $schema: branch$schema, ...rest } = jsonSchema;
+			$schema ??= branch$schema;
+			return rest;
+		}
+		return jsonSchema;
+	});
+	const combined = combineJsonSchemasWithComposition("allOf", branches);
+	return {
+		$schema,
+		...combined
+	};
+}
+function combineSchemas(schemas, merge) {
+	if (schemas.length === 0) {
+		return undefined;
+	}
+	if (schemas.length === 1) {
+		return schemas[0];
+	}
+	const standardJsonSchemas = schemas.filter((schema) => schema["~standard"].jsonSchema);
+	const jsonSchema = standardJsonSchemas.length ? {
+		input: (options) => combineJsonSchemas(standardJsonSchemas.map((schema) => schema["~standard"].jsonSchema.input(options))),
+		output: (options) => combineJsonSchemas(standardJsonSchemas.map((schema) => schema["~standard"].jsonSchema.output(options)))
+	} : undefined;
+	return { "~standard": {
+		vendor: ORPC_NAME,
+		version: 1,
+		async validate(value) {
+			let current = value;
+			
+			for (const [index, schema] of schemas.entries()) {
+				const merging = merge && index !== 0;
+				const result = await schema["~standard"].validate(merging ? mergeTwoLevels(value, current) : current);
+				if (result.issues) {
+					return result;
+				}
+				current = merging ? mergeTwoLevels(current, result.value) : result.value;
+			}
+			return { value: current };
+		},
+		jsonSchema
+	} };
+}
+function combineOutputSchemas(outputSchemas) {
+	const yieldSchemas = getAsyncIteratorObjectSchemasDetails(outputSchemas)?.yieldSchemas;
+	return combineSchemas([...yieldSchemas ?? outputSchemas].reverse(), false);
+}
+
+async function toModelOutput(serializer, output) {
+	const { json, maps, blobs } = serializer.serializeJson(output);
+	if (typeof json === "string") {
+		return {
+			type: "text",
+			value: json
+		};
+	}
+	if (!blobs?.length) {
+		return {
+			type: "json",
+			value: json ?? null
+		};
+	}
+	const files = await Promise.all(blobs.map(async (blob, i) => {
+		const path = maps[i];
+		const names = blob instanceof File && blob.name !== "" ? [...path, blob.name] : path;
+		return {
+			type: "file",
+			mediaType: blob.type || "application/octet-stream",
+			
+			data: {
+				type: "data",
+				data: encodeBase64(await loadBytes(blob))
+			},
+			...names.length === 0 ? {} : { filename: names.join("/") }
+		};
+	}));
+	return {
+		type: "content",
+		value: json instanceof Blob ? files : [{
+			type: "text",
+			text: stringifyJSON(json)
+		}, ...files]
+	};
+}
+
+export function implementToolFactory(options = {}) {
+	const serializer = options.serializer ?? new OpenAPIJsonSerializer();
+	const defaultToModelOutput = ({ output }) => toModelOutput(serializer, output);
+	const factory = (contract, ...rest) => {
+		const toolOptions = resolveMaybeOptionalOptions(rest);
+		const inputSchemas = toArray(contract["~orpc"].inputSchemas);
+		const outputSchemas = toArray(contract["~orpc"].outputSchemas);
+		const defaults = getAiSdkToolMeta(contract);
+		return tool({
+			...defaults,
+			...toolOptions,
+			toModelOutput: toolOptions.toModelOutput ?? defaults?.toModelOutput ?? defaultToModelOutput,
+			inputSchema: combineSchemas(inputSchemas, true) ?? ANY_SCHEMA,
+			outputSchema: combineOutputSchemas(outputSchemas)
+		});
+	};
+	return factory;
+}
+
+export function createToolFactory(...rest) {
+	const options = resolveMaybeOptionalOptions(rest);
+	const implementTool = implementToolFactory(options);
+	const factory = (procedure, ...rest) => {
+		const toolOptions = resolveMaybeOptionalOptions(rest);
+		
+		const disabledValidation = new Procedure({
+			...procedure["~orpc"],
+			disableInputValidation: true
+		});
+		
+		const isIteratorOutput = getAsyncIteratorObjectSchemasDetails(procedure["~orpc"].outputSchemas) !== undefined || isAsyncGeneratorFunction(procedure["~orpc"].handler);
+		return implementTool(procedure, {
+			...toolOptions,
+			
+			execute: isIteratorOutput ? async function* (input, callingOptions) {
+				yield* await call(disabledValidation, input, {
+					...options,
+					signal: callingOptions.abortSignal
+				});
+			} : (input, callingOptions) => {
+				return call(disabledValidation, input, {
+					...options,
+					signal: callingOptions.abortSignal
+				});
+			}
+		});
+	};
+	return factory;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/ai-sdk",
   "type": "module",
-  "version": "2.0.0-beta.47",
+  "version": "2.0.0-beta.48",
   "description": "AI SDK integration for oRPC: turn contracts and procedures into typesafe AI SDK tools",
   "license": "MIT",
   "funding": [
@@ -40,15 +40,15 @@
     "ai": ">=7.0.31"
   },
   "dependencies": {
-    "@orpc/client": "2.0.0-beta.47",
-    "@orpc/contract": "2.0.0-beta.47",
-    "@orpc/json-schema": "2.0.0-beta.47",
-    "@orpc/openapi": "2.0.0-beta.47",
-    "@orpc/server": "2.0.0-beta.47",
-    "@orpc/shared": "2.0.0-beta.47"
+    "@orpc/client": "2.0.0-beta.48",
+    "@orpc/contract": "2.0.0-beta.48",
+    "@orpc/json-schema": "2.0.0-beta.48",
+    "@orpc/openapi": "2.0.0-beta.48",
+    "@orpc/server": "2.0.0-beta.48",
+    "@orpc/shared": "2.0.0-beta.48"
   },
   "devDependencies": {
-    "ai": "^7.0.141",
+    "ai": "^7.0.157",
     "zod": "^4.6.7"
   },
   "scripts": {

package/dist/index.d.ts

@@ -1,172 +0,0 @@
-import { ClientOptions } from '@orpc/client';
-import { AnySchema, ErrorMap, InferSchemaOutput, InferSchemaInput, MetaPlugin, AnyProcedureContract, Schema, ProcedureContract } from '@orpc/contract';
-import { Lazy, Context, ProcedureClientOptions, Procedure } from '@orpc/server';
-import { Public, MaybeOptionalOptions } from '@orpc/shared';
-import { JSONValue, Tool } from 'ai';
-import { OpenAPIJsonSerializer } from '@orpc/openapi';
-
-/**
- * The [function tool](https://ai-sdk.dev/docs/foundations/tools) member of the AI SDK `Tool` union,
- * which is the kind of tool this package produces.
- */
-type FunctionTool<INPUT extends JSONValue | unknown | never = any, OUTPUT extends JSONValue | unknown | never = any> = Extract<Tool<INPUT, OUTPUT>, {
-    type?: 'function' | undefined;
-}>;
-/**
- * Base [AI SDK Tool](https://ai-sdk.dev/docs/foundations/tools) options attached to a procedure/contract,
- * used as defaults when creating tools from it.
- *
- * @remarks
- * **Note**: When defined multiple times, options are overridden by the most recent call.
- *
- * @see {@link https://orpc.dev/docs/integrations/ai-sdk#tool-implementer | AI SDK Integration - Tool Implementer}
- */
-type AiSdkToolMeta<TInputSchema extends AnySchema = AnySchema, TOutputSchema extends AnySchema = AnySchema> = Partial<Omit<FunctionTool<InferSchemaOutput<TInputSchema>, ToolOutput<InferSchemaInput<TOutputSchema>>>, 'inputSchema' | 'outputSchema' | 'execute'>>;
-interface AiSdkToolMetaPlugin<TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> extends MetaPlugin<TInputSchema, TOutputSchema, TErrorMap> {
-    name: '~ai-sdk/tool';
-}
-interface AiSdkToolFunction {
-    <TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap>(meta: AiSdkToolMeta<TInputSchema, TOutputSchema>): AiSdkToolMetaPlugin<TInputSchema, TOutputSchema, TErrorMap>;
-}
-/**
- * Attaches base [AI SDK Tool](https://ai-sdk.dev/docs/foundations/tools) options to a procedure/contract,
- * used as defaults when creating tools from it.
- *
- * @remarks
- * **Note**: When defined multiple times, options are overridden by the most recent call.
- *
- * @example
- * ```ts
- * const getWeatherContract = oc
- *   .meta(aiSdkTool({
- *     description: 'Get the weather in a location',
- *     metadata: { source: 'weather-service' },
- *   }))
- *   .input(z.object({ location: z.string() }))
- * ```
- *
- * @see {@link https://orpc.dev/docs/integrations/ai-sdk#tool-implementer | AI SDK Integration - Tool Implementer}
- */
-declare const aiSdkTool: AiSdkToolFunction;
-/**
- * Reads the base [AI SDK Tool](https://ai-sdk.dev/docs/foundations/tools) options
- * attached to a procedure/contract by {@link aiSdkTool}.
- *
- * @see {@link https://orpc.dev/docs/integrations/ai-sdk#tool-implementer | AI SDK Integration - Tool Implementer}
- */
-declare function getAiSdkToolMeta(procedureOrLazy: AnyProcedureContract | Lazy<any>): AiSdkToolMeta | undefined;
-
-/**
- * Infers the value an AI SDK tool outputs for a given oRPC output type.
- *
- * For [AsyncIteratorObject](https://orpc.dev/docs/async-iterator-object) outputs, the tool streams
- * each yielded event as a [preliminary result](https://ai-sdk.dev/docs/ai-sdk-core/tools-and-tool-calling#preliminary-tool-results)
- * and the last event becomes the final result, so the tool output is the yield type.
- *
- * @see {@link https://orpc.dev/docs/integrations/ai-sdk#streaming-tool-outputs | AI SDK Integration - Streaming Tool Outputs}
- */
-type ToolOutput<T> = T extends AsyncIteratorObject<infer TYield, any, any> ? TYield : T;
-interface ImplementToolFactoryOptions {
-    /**
-     * Serializes outputs for the default `toModelOutput`, converting types such as `Date`, `BigInt`, and `Set`
-     * the same way OpenAPI responses do.
-     *
-     * @default new OpenAPIJsonSerializer()
-     * @see {@link https://orpc.dev/docs/integrations/ai-sdk#tool-outputs | AI SDK Integration - Tool Outputs}
-     */
-    serializer?: Public<OpenAPIJsonSerializer> | undefined;
-}
-interface ToolImplementer {
-    <TInputSchema extends AnySchema, TOutputSchema extends AnySchema>(contract: ProcedureContract<TInputSchema, TOutputSchema, any>, ...rest: MaybeOptionalOptions<Omit<FunctionTool<InferSchemaOutput<TInputSchema>, ToolOutput<InferSchemaInput<TOutputSchema>>>, 'inputSchema' | 'outputSchema'>>): Tool<InferSchemaOutput<TInputSchema>, ToolOutput<InferSchemaInput<TOutputSchema>>>;
-}
-/**
- * Creates a builder that implements [procedure contracts](https://orpc.dev/docs/contract/procedure)
- * as [AI SDK Tools](https://ai-sdk.dev/docs/foundations/tools) by leveraging existing contract definitions.
- *
- * The factory accepts oRPC related options, and the resulting builder
- * accepts a contract alongside AI SDK tool options.
- *
- * @remarks
- * **Note**: [Procedures](https://orpc.dev/docs/procedure) are also compatible with [procedure contracts](https://orpc.dev/docs/contract/procedure).
- *
- * @example
- * ```ts
- * import { aiSdkTool, implementToolFactory } from '@orpc/ai-sdk'
- * import { oc } from '@orpc/contract'
- *
- * const getWeatherContract = oc
- *   .meta(
- *     aiSdkTool({ description: 'Get the weather in a location' }), // default AI SDK tool options
- *   )
- *   .input(
- *     z.object({
- *       location: z.string().describe('The location to get the weather for'),
- *     }),
- *   )
- *   .output(
- *     z.object({
- *       location: z.string().describe('The location the weather is for'),
- *       temperature: z.number().describe('The temperature in Celsius'),
- *     }),
- *   )
- *
- * const implementTool = implementToolFactory()
- *
- * const getWeatherTool = implementTool(getWeatherContract, {
- *   execute: async ({ location }) => ({
- *     location,
- *     temperature: 72 + Math.floor(Math.random() * 21) - 10,
- *   }),
- * })
- * ```
- *
- * @see {@link https://orpc.dev/docs/integrations/ai-sdk#tool-implementer | AI SDK Integration - Tool Implementer}
- */
-declare function implementToolFactory(options?: ImplementToolFactoryOptions): ToolImplementer;
-type CreateToolFactoryOptions<TInitialContext extends Context> = ImplementToolFactoryOptions & ProcedureClientOptions<TInitialContext, Schema<unknown>, object, object> & Omit<ClientOptions<object>, 'context' | 'signal'>;
-interface ToolFactory<TInitialContext extends Context> {
-    <TInputSchema extends AnySchema, TOutputSchema extends AnySchema>(procedure: Procedure<TInitialContext, any, TInputSchema, TOutputSchema, any>, ...rest: MaybeOptionalOptions<Omit<FunctionTool<InferSchemaOutput<TInputSchema>, ToolOutput<InferSchemaInput<TOutputSchema>>>, 'inputSchema' | 'outputSchema' | 'execute'>>): Tool<InferSchemaOutput<TInputSchema>, ToolOutput<InferSchemaInput<TOutputSchema>>>;
-}
-/**
- * Creates a builder that converts [procedures](https://orpc.dev/docs/procedure)
- * into [AI SDK Tools](https://ai-sdk.dev/docs/foundations/tools) by leveraging existing procedure definitions.
- *
- * The factory accepts oRPC related options, and the resulting builder
- * accepts a procedure alongside AI SDK tool options.
- *
- * @example
- * ```ts
- * import { aiSdkTool, createToolFactory } from '@orpc/ai-sdk'
- * import { os } from '@orpc/server'
- *
- * const getWeatherProcedure = os
- *   .meta(
- *     aiSdkTool({ description: 'Get the weather in a location' }), // default AI SDK tool options
- *   )
- *   .input(z.object({
- *     location: z.string().describe('The location to get the weather for'),
- *   }))
- *   .output(z.object({
- *     location: z.string().describe('The location the weather is for'),
- *     temperature: z.number().describe('The temperature in Celsius'),
- *   }))
- *   .handler(async ({ input }) => ({
- *     location: input.location,
- *     temperature: 72 + Math.floor(Math.random() * 21) - 10,
- *   }))
- *
- * const createTool = createToolFactory({
- *   context: {}, // provide initial context if needed
- * })
- *
- * const getWeatherTool = createTool(getWeatherProcedure, {
- *   // ...AI SDK tool options/overrides here if needed
- * })
- * ```
- *
- * @see {@link https://orpc.dev/docs/integrations/ai-sdk#tool-factory | AI SDK Integration - Tool Factory}
- */
-declare function createToolFactory<TInitialContext extends Context = object>(...rest: MaybeOptionalOptions<CreateToolFactoryOptions<TInitialContext>>): ToolFactory<TInitialContext>;
-
-export { aiSdkTool, createToolFactory, getAiSdkToolMeta, implementToolFactory };
-export type { AiSdkToolFunction, AiSdkToolMeta, AiSdkToolMetaPlugin, CreateToolFactoryOptions, FunctionTool, ImplementToolFactoryOptions, ToolFactory, ToolImplementer, ToolOutput };