@tambo-ai/react 0.65.3 → 0.66.1

package/esm/util/registry.js

@@ -1,4 +1,4 @@
-import zodToJsonSchema from "zod-to-json-schema";
+import { getParametersFromToolSchema, getZodFunctionArgs, getZodFunctionReturns, isStandardSchema, schemaToJsonSchema, } from "../schema";
 /**
  * Get all the available components from the component registry
  * @param componentRegistry - The component registry
@@ -10,14 +10,14 @@ export const getAvailableComponents = (componentRegistry, toolRegistry, toolAsso
     const availableComponents = [];
     for (const [name, componentEntry] of Object.entries(componentRegistry)) {
         const associatedToolNames = toolAssociations[name] || [];
-        const contextTools = [
-            ...associatedToolNames.map((toolName) => {
-                const tool = toolRegistry[toolName];
-                if (!tool)
-                    return null;
-                return mapTamboToolToContextTool(tool);
-            }),
-        ].filter((tool) => tool !== null);
+        const contextTools = associatedToolNames
+            .map((toolName) => {
+            const tool = toolRegistry[toolName];
+            if (!tool)
+                return null;
+            return mapTamboToolToContextTool(tool);
+        })
+            .filter((tool) => tool !== null);
         availableComponents.push({
             name: componentEntry.name,
             description: componentEntry.description,
@@ -40,21 +40,38 @@ export const getUnassociatedTools = (toolRegistry, toolAssociations) => {
     });
 };
 /**
- * Helper function to convert component props from Zod schema to JSON Schema
+ * Helper function to convert component props from Standard Schema or JSON Schema
  * @param component - The component to convert
- * @returns The converted props
+ * @returns The converted props as JSON Schema
  */
 export const convertPropsToJsonSchema = (component) => {
     if (!component.props) {
         return component.props;
     }
-    // Check if props is a Zod schema (we can't directly check the type, so we check for _def)
-    if (component.props._def && typeof component.props.parse === "function") {
-        // Use two-step type assertion for safety
-        return zodToJsonSchema(component.props);
+    // Check if props is a Standard Schema (Zod, Valibot, ArkType, etc.)
+    if (isStandardSchema(component.props)) {
+        return schemaToJsonSchema(component.props);
     }
+    // Already JSON Schema or unknown format - return as-is
     return component.props;
 };
+/**
+ * Adapt a Tambo tool defined with function schema to a standard Tambo tool
+ * @param tool - The Tambo tool with function schema
+ * @returns The adapted Tambo tool
+ */
+export function adaptToolFromFnSchema(tool) {
+    if (!("toolSchema" in tool)) {
+        return tool;
+    }
+    return {
+        name: tool.name,
+        description: tool.description,
+        tool: tool.tool,
+        inputSchema: getZodFunctionArgs(tool.toolSchema),
+        outputSchema: getZodFunctionReturns(tool.toolSchema),
+    };
+}
 /**
  * Get a component by name from the component registry
  * @param componentName - The name of the component to get
@@ -70,72 +87,39 @@ export const getComponentFromRegistry = (componentName, componentRegistry) => {
 };
 /**
  * Map a Tambo tool to a context tool
- * @param tool - The tool to map
+ * @param tool - The tool to map (supports both new inputSchema and deprecated toolSchema interfaces)
  * @returns The context tool
  */
 export const mapTamboToolToContextTool = (tool) => {
-    const parameters = getParametersFromZodFunction(tool.toolSchema);
+    const parameters = getParametersFromToolSchema(tool);
     return {
         name: tool.name,
         description: tool.description,
         parameters,
     };
 };
-function isJsonSchema(schema) {
-    return (typeof schema === "object" &&
-        schema !== null &&
-        "type" in schema &&
-        typeof schema.type === "string" &&
-        schema.type === "object");
-}
-const getParametersFromZodFunction = (schema) => {
-    if (isJsonSchema(schema)) {
-        return [
-            {
-                name: "args",
-                type: "object",
-                description: schema.description ?? "",
-                isRequired: true,
-                schema: schema,
-            },
-        ];
-    }
-    const parameters = schema.parameters();
-    return parameters.items.map((param, index) => {
-        const name = `param${index + 1}`;
-        const type = getZodBaseType(param);
-        const description = param.description ?? "";
-        const isRequired = !param.isOptional();
-        const schema = zodToJsonSchema(param);
-        return {
-            name,
-            type,
-            description,
-            isRequired,
-            schema,
-        };
-    });
-};
-const getZodBaseType = (schema) => {
-    const typeName = schema._def.typeName;
-    switch (typeName) {
-        case "ZodString":
-            return "string";
-        case "ZodNumber":
-            return "number";
-        case "ZodBoolean":
-            return "boolean";
-        case "ZodArray":
-            return "array";
-        case "ZodEnum":
-            return "enum";
-        case "ZodDate":
-            return "date";
-        case "ZodObject":
-            return "object";
-        default:
-            console.warn("falling back to string for", typeName);
-            return "string";
-    }
+/**
+ * Provides type safety for defining a Tambo Tool.
+ *
+ * Tambo uses the [standard-schema.dev](https://standard-schema.dev) spec which means you can use any Standard Schema
+ * compliant validator (Zod, Valibot, ArkType, etc.). This ensures the tool function args and output types are correctly
+ * inferred from the provided schemas.
+ * @example
+ * ```typescript
+ * import { z } from "zod/v4";
+ *
+ * const myTool = defineTamboTool({
+ *   inputSchema: z.tuple([z.string()]),
+ *   outputSchema: z.number(),
+ *   tool: yourToolFunction,
+ *   // ^-- (input: [string]) => number | Promise<number>
+ *   // Types are inferred from and must match inputSchema/outputSchema definitions
+ * });
+ * ```
+ * @param tool The tool definition to register
+ * @returns The registered tool definition
+ */
+export const defineTool = (tool) => {
+    return tool;
 };
 //# sourceMappingURL=registry.js.map

package/esm/util/registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/util/registry.ts"],"names":[],"mappings":"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","sourcesContent":["import TamboAI from \"@tambo-ai/typescript-sdk\";\nimport { z } from \"zod/v3\";\nimport zodToJsonSchema from \"zod-to-json-schema\";\nimport {\n  ComponentContextToolMetadata,\n  ComponentRegistry,\n  JSONSchemaLite,\n  ParameterSpec,\n  RegisteredComponent,\n  TamboTool,\n  TamboToolAssociations,\n  TamboToolRegistry,\n} from \"../model/component-metadata\";\n\n/**\n * Get all the available components from the component registry\n * @param componentRegistry - The component registry\n * @param toolRegistry - The tool registry\n * @param toolAssociations - The tool associations\n * @returns The available components\n */\nexport const getAvailableComponents = (\n  componentRegistry: ComponentRegistry,\n  toolRegistry: TamboToolRegistry,\n  toolAssociations: TamboToolAssociations,\n): TamboAI.AvailableComponent[] => {\n  const availableComponents: TamboAI.AvailableComponent[] = [];\n\n  for (const [name, componentEntry] of Object.entries(componentRegistry)) {\n    const associatedToolNames = toolAssociations[name] || [];\n\n    const contextTools = [\n      ...associatedToolNames.map((toolName) => {\n        const tool = toolRegistry[toolName];\n        if (!tool) return null;\n        return mapTamboToolToContextTool(tool);\n      }),\n    ].filter((tool): tool is ComponentContextToolMetadata => tool !== null);\n\n    availableComponents.push({\n      name: componentEntry.name,\n      description: componentEntry.description,\n      props: componentEntry.props,\n      contextTools,\n    });\n  }\n\n  return availableComponents;\n};\n\n/**\n * Get tools from tool registry that are not associated with any component\n * @param toolRegistry - The tool registry\n * @param toolAssociations - The tool associations\n * @returns The tools that are not associated with any component\n */\nexport const getUnassociatedTools = (\n  toolRegistry: TamboToolRegistry,\n  toolAssociations: TamboToolAssociations,\n): TamboTool[] => {\n  return Object.values(toolRegistry).filter((tool) => {\n    // Check if the tool's name appears in any of the tool association arrays\n    return !Object.values(toolAssociations).flat().includes(tool.name);\n  });\n};\n\n/**\n * Helper function to convert component props from Zod schema to JSON Schema\n * @param component - The component to convert\n * @returns The converted props\n */\nexport const convertPropsToJsonSchema = (\n  component: RegisteredComponent,\n): any => {\n  if (!component.props) {\n    return component.props;\n  }\n\n  // Check if props is a Zod schema (we can't directly check the type, so we check for _def)\n  if (component.props._def && typeof component.props.parse === \"function\") {\n    // Use two-step type assertion for safety\n    return zodToJsonSchema(component.props as unknown as z.ZodTypeAny);\n  }\n\n  return component.props;\n};\n\n/**\n * Get a component by name from the component registry\n * @param componentName - The name of the component to get\n * @param componentRegistry - The component registry\n * @returns The component registration information\n */\nexport const getComponentFromRegistry = (\n  componentName: string,\n  componentRegistry: ComponentRegistry,\n): RegisteredComponent => {\n  const componentEntry = componentRegistry[componentName];\n\n  if (!componentEntry) {\n    throw new Error(\n      `Tambo tried to use Component ${componentName}, but it was not found.`,\n    );\n  }\n\n  return componentEntry;\n};\n\n/**\n * Map a Tambo tool to a context tool\n * @param tool - The tool to map\n * @returns The context tool\n */\nexport const mapTamboToolToContextTool = (\n  tool: TamboTool,\n): ComponentContextToolMetadata => {\n  const parameters = getParametersFromZodFunction(tool.toolSchema);\n\n  return {\n    name: tool.name,\n    description: tool.description,\n    parameters,\n  };\n};\n\nfunction isJsonSchema(\n  schema: unknown,\n): schema is ReturnType<typeof zodToJsonSchema> {\n  return (\n    typeof schema === \"object\" &&\n    schema !== null &&\n    \"type\" in schema &&\n    typeof (schema as { type: unknown }).type === \"string\" &&\n    (schema as { type: string }).type === \"object\"\n  );\n}\n\nconst getParametersFromZodFunction = (\n  schema: z.ZodFunction<any, any> | JSONSchemaLite,\n): ParameterSpec[] => {\n  if (isJsonSchema(schema)) {\n    return [\n      {\n        name: \"args\",\n        type: \"object\",\n        description: schema.description ?? \"\",\n        isRequired: true,\n        schema: schema,\n      },\n    ];\n  }\n\n  const parameters: z.ZodTuple = schema.parameters();\n  return parameters.items.map((param, index): ParameterSpec => {\n    const name = `param${index + 1}`;\n    const type = getZodBaseType(param);\n    const description = param.description ?? \"\";\n    const isRequired = !param.isOptional();\n    const schema = zodToJsonSchema(param);\n\n    return {\n      name,\n      type,\n      description,\n      isRequired,\n      schema,\n    };\n  });\n};\n\nconst getZodBaseType = (schema: z.ZodTypeAny): string => {\n  const typeName = schema._def.typeName;\n  switch (typeName) {\n    case \"ZodString\":\n      return \"string\";\n    case \"ZodNumber\":\n      return \"number\";\n    case \"ZodBoolean\":\n      return \"boolean\";\n    case \"ZodArray\":\n      return \"array\";\n    case \"ZodEnum\":\n      return \"enum\";\n    case \"ZodDate\":\n      return \"date\";\n    case \"ZodObject\":\n      return \"object\";\n    default:\n      console.warn(\"falling back to string for\", typeName);\n      return \"string\";\n  }\n};\n"]}
+{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/util/registry.ts"],"names":[],"mappings":"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","sourcesContent":["import TamboAI from \"@tambo-ai/typescript-sdk\";\nimport {\n  ComponentContextToolMetadata,\n  ComponentRegistry,\n  DefineToolFn,\n  RegisteredComponent,\n  TamboTool,\n  TamboToolAssociations,\n  TamboToolRegistry,\n  TamboToolWithToolSchema,\n} from \"../model/component-metadata\";\nimport {\n  getParametersFromToolSchema,\n  getZodFunctionArgs,\n  getZodFunctionReturns,\n  isStandardSchema,\n  schemaToJsonSchema,\n} from \"../schema\";\n\n/**\n * Get all the available components from the component registry\n * @param componentRegistry - The component registry\n * @param toolRegistry - The tool registry\n * @param toolAssociations - The tool associations\n * @returns The available components\n */\nexport const getAvailableComponents = (\n  componentRegistry: ComponentRegistry,\n  toolRegistry: TamboToolRegistry,\n  toolAssociations: TamboToolAssociations,\n): TamboAI.AvailableComponent[] => {\n  const availableComponents: TamboAI.AvailableComponent[] = [];\n\n  for (const [name, componentEntry] of Object.entries(componentRegistry)) {\n    const associatedToolNames = toolAssociations[name] || [];\n\n    const contextTools = associatedToolNames\n      .map((toolName) => {\n        const tool = toolRegistry[toolName];\n        if (!tool) return null;\n        return mapTamboToolToContextTool(tool);\n      })\n      .filter((tool): tool is ComponentContextToolMetadata => tool !== null);\n\n    availableComponents.push({\n      name: componentEntry.name,\n      description: componentEntry.description,\n      props: componentEntry.props,\n      contextTools,\n    });\n  }\n\n  return availableComponents;\n};\n\n/**\n * Get tools from tool registry that are not associated with any component\n * @param toolRegistry - The tool registry\n * @param toolAssociations - The tool associations\n * @returns The tools that are not associated with any component\n */\nexport const getUnassociatedTools = (\n  toolRegistry: TamboToolRegistry,\n  toolAssociations: TamboToolAssociations,\n): (TamboTool | TamboToolWithToolSchema)[] => {\n  return Object.values(toolRegistry).filter((tool) => {\n    // Check if the tool's name appears in any of the tool association arrays\n    return !Object.values(toolAssociations).flat().includes(tool.name);\n  });\n};\n\n/**\n * Helper function to convert component props from Standard Schema or JSON Schema\n * @param component - The component to convert\n * @returns The converted props as JSON Schema\n */\nexport const convertPropsToJsonSchema = (\n  component: RegisteredComponent,\n): unknown => {\n  if (!component.props) {\n    return component.props;\n  }\n\n  // Check if props is a Standard Schema (Zod, Valibot, ArkType, etc.)\n  if (isStandardSchema(component.props)) {\n    return schemaToJsonSchema(component.props);\n  }\n\n  // Already JSON Schema or unknown format - return as-is\n  return component.props;\n};\n\n/**\n * Adapt a Tambo tool defined with function schema to a standard Tambo tool\n * @param tool - The Tambo tool with function schema\n * @returns The adapted Tambo tool\n */\nexport function adaptToolFromFnSchema(\n  tool: TamboTool | TamboToolWithToolSchema,\n): TamboTool {\n  if (!(\"toolSchema\" in tool)) {\n    return tool;\n  }\n\n  return {\n    name: tool.name,\n    description: tool.description,\n    tool: tool.tool,\n    inputSchema: getZodFunctionArgs(tool.toolSchema),\n    outputSchema: getZodFunctionReturns(tool.toolSchema),\n  };\n}\n\n/**\n * Get a component by name from the component registry\n * @param componentName - The name of the component to get\n * @param componentRegistry - The component registry\n * @returns The component registration information\n */\nexport const getComponentFromRegistry = (\n  componentName: string,\n  componentRegistry: ComponentRegistry,\n): RegisteredComponent => {\n  const componentEntry = componentRegistry[componentName];\n\n  if (!componentEntry) {\n    throw new Error(\n      `Tambo tried to use Component ${componentName}, but it was not found.`,\n    );\n  }\n\n  return componentEntry;\n};\n\n/**\n * Map a Tambo tool to a context tool\n * @param tool - The tool to map (supports both new inputSchema and deprecated toolSchema interfaces)\n * @returns The context tool\n */\nexport const mapTamboToolToContextTool = (\n  tool: TamboTool | TamboToolWithToolSchema,\n): ComponentContextToolMetadata => {\n  const parameters = getParametersFromToolSchema(tool);\n\n  return {\n    name: tool.name,\n    description: tool.description,\n    parameters,\n  };\n};\n\n/**\n * Provides type safety for defining a Tambo Tool.\n *\n * Tambo uses the [standard-schema.dev](https://standard-schema.dev) spec which means you can use any Standard Schema\n * compliant validator (Zod, Valibot, ArkType, etc.). This ensures the tool function args and output types are correctly\n * inferred from the provided schemas.\n * @example\n * ```typescript\n * import { z } from \"zod/v4\";\n *\n * const myTool = defineTamboTool({\n *   inputSchema: z.tuple([z.string()]),\n *   outputSchema: z.number(),\n *   tool: yourToolFunction,\n *   // ^-- (input: [string]) => number | Promise<number>\n *   // Types are inferred from and must match inputSchema/outputSchema definitions\n * });\n * ```\n * @param tool The tool definition to register\n * @returns The registered tool definition\n */\nexport const defineTool: DefineToolFn = (tool: any) => {\n  return tool;\n};\n"]}

package/esm/util/registry.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=registry.test.d.ts.map

package/esm/util/registry.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"registry.test.d.ts","sourceRoot":"","sources":["../../src/util/registry.test.ts"],"names":[],"mappings":""}

package/esm/util/registry.test.js

@@ -0,0 +1,169 @@
+import * as v from "valibot";
+import * as z3 from "zod/v3";
+import * as z4 from "zod/v4";
+import { createMockTool, createMockToolWithToolSchema } from "../testing/tools";
+import { mapTamboToolToContextTool } from "./registry";
+describe("getParametersFromToolSchema (via mapTamboToolToContextTool)", () => {
+    describe("Deprecated toolSchema interface (Zod function schemas)", () => {
+        it("should handle tool with toolSchema", () => {
+            const tool = createMockToolWithToolSchema(z3.function().args(z3.string().describe("The name")).returns(z3.void()));
+            const result = mapTamboToolToContextTool(tool);
+            // Should have at least one parameter (either extracted or wrapped)
+            expect(result.parameters.length).toBeGreaterThanOrEqual(1);
+            expect(result.name).toBe("testTool");
+            expect(result.description).toBe("A test tool");
+        });
+        it("should handle toolSchema with multiple args", () => {
+            const tool = createMockToolWithToolSchema(z3
+                .function()
+                .args(z3.string().describe("First name"), z3.number().describe("Age"), z3.boolean().describe("Is active"))
+                .returns(z3.void()));
+            const result = mapTamboToolToContextTool(tool);
+            // Should have parameters (extraction depends on JSON Schema conversion)
+            expect(result.parameters.length).toBeGreaterThanOrEqual(1);
+        });
+    });
+    describe("New inputSchema interface (object schemas)", () => {
+        describe("Zod 4 object schemas", () => {
+            it("should return single input param with object schema", () => {
+                const tool = createMockTool({
+                    inputSchema: z4.object({
+                        name: z4.string().describe("User name"),
+                        age: z4.number().describe("User age"),
+                    }),
+                    outputSchema: z4.boolean(),
+                });
+                const result = mapTamboToolToContextTool(tool);
+                expect(result.parameters).toHaveLength(1);
+                expect(result.parameters[0].name).toBe("input");
+                expect(result.parameters[0].type).toBe("object");
+                expect(result.parameters).toMatchSnapshot();
+            });
+            it("should handle complex nested objects", () => {
+                const tool = createMockTool({
+                    inputSchema: z4.object({
+                        point: z4.object({ x: z4.number(), y: z4.number() }),
+                        tags: z4.array(z4.string()),
+                        color: z4.enum(["red", "green", "blue"]),
+                    }),
+                    outputSchema: z4.void(),
+                });
+                const result = mapTamboToolToContextTool(tool);
+                expect(result.parameters).toHaveLength(1);
+                expect(result.parameters[0].name).toBe("input");
+                expect(result.parameters).toMatchSnapshot();
+            });
+        });
+        describe("Zod 3 object schemas", () => {
+            it("should return single input param with object schema", () => {
+                const tool = createMockTool({
+                    inputSchema: z3.object({
+                        name: z3.string(),
+                        age: z3.number(),
+                    }),
+                    outputSchema: z3.boolean(),
+                });
+                const result = mapTamboToolToContextTool(tool);
+                expect(result.parameters).toHaveLength(1);
+                expect(result.parameters[0].name).toBe("input");
+                expect(result.parameters).toMatchSnapshot();
+            });
+        });
+        describe("Valibot object schemas", () => {
+            it("should return single input param with object schema", () => {
+                const tool = createMockTool({
+                    inputSchema: v.object({
+                        name: v.string(),
+                        age: v.number(),
+                    }),
+                    outputSchema: v.boolean(),
+                });
+                const result = mapTamboToolToContextTool(tool);
+                expect(result.parameters).toHaveLength(1);
+                expect(result.parameters[0].name).toBe("input");
+                expect(result.parameters).toMatchSnapshot();
+            });
+            it("should handle complex nested objects", () => {
+                const tool = createMockTool({
+                    inputSchema: v.object({
+                        point: v.pipe(v.object({ x: v.number(), y: v.number() }), v.description("Point")),
+                        tags: v.array(v.string()),
+                        color: v.picklist(["red", "green", "blue"]),
+                    }),
+                    outputSchema: v.undefined(),
+                });
+                const result = mapTamboToolToContextTool(tool);
+                expect(result.parameters).toHaveLength(1);
+                expect(result.parameters[0].name).toBe("input");
+                expect(result.parameters).toMatchSnapshot();
+            });
+        });
+        describe("JSON Schema object schemas", () => {
+            it("should return single input param with object schema", () => {
+                const schema = {
+                    type: "object",
+                    properties: {
+                        name: { type: "string" },
+                        age: { type: "number" },
+                    },
+                    required: ["name"],
+                    description: "User data",
+                };
+                const tool = createMockTool({ inputSchema: schema, outputSchema: {} });
+                const result = mapTamboToolToContextTool(tool);
+                expect(result.parameters).toHaveLength(1);
+                expect(result.parameters[0].name).toBe("input");
+                expect(result.parameters[0].type).toBe("object");
+                expect(result.parameters[0].description).toBe("User data");
+                expect(result.parameters).toMatchSnapshot();
+            });
+        });
+    });
+    describe("Direct schema (shorthand for inputSchema)", () => {
+        it("should accept Zod 4 object schema directly", () => {
+            const tool = createMockTool(z4.object({
+                name: z4.string(),
+                age: z4.number(),
+            }));
+            const result = mapTamboToolToContextTool(tool);
+            expect(result.parameters).toHaveLength(1);
+            expect(result.parameters[0].name).toBe("input");
+            expect(result.parameters).toMatchSnapshot();
+        });
+        it("should accept Zod 3 object schema directly", () => {
+            const tool = createMockTool(z3.object({
+                name: z3.string(),
+                age: z3.number(),
+            }));
+            const result = mapTamboToolToContextTool(tool);
+            expect(result.parameters).toHaveLength(1);
+            expect(result.parameters[0].name).toBe("input");
+            expect(result.parameters).toMatchSnapshot();
+        });
+        it("should accept Valibot object schema directly", () => {
+            const tool = createMockTool(v.object({
+                name: v.string(),
+                age: v.number(),
+            }));
+            const result = mapTamboToolToContextTool(tool);
+            expect(result.parameters).toHaveLength(1);
+            expect(result.parameters[0].name).toBe("input");
+            expect(result.parameters).toMatchSnapshot();
+        });
+        it("should accept JSON Schema object directly", () => {
+            const schema = {
+                type: "object",
+                properties: {
+                    name: { type: "string" },
+                    age: { type: "number" },
+                },
+            };
+            const tool = createMockTool(schema);
+            const result = mapTamboToolToContextTool(tool);
+            expect(result.parameters).toHaveLength(1);
+            expect(result.parameters[0].name).toBe("input");
+            expect(result.parameters).toMatchSnapshot();
+        });
+    });
+});
+//# sourceMappingURL=registry.test.js.map

package/esm/util/registry.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"registry.test.js","sourceRoot":"","sources":["../../src/util/registry.test.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Tests for getParametersFromToolSchema via mapTamboToolToContextTool.\n *\n * These tests verify that tool schemas are correctly converted to parameter specifications:\n *\n * **New interface (inputSchema)**:\n * - inputSchema should be an object schema (Zod object, Valibot object, JSON Schema object)\n * - Returns a single \"input\" parameter representing the full object schema\n * - Tool function receives single object argument: tool({ name: \"...\", age: 30 })\n *\n * **Deprecated interface (toolSchema)**:\n * - toolSchema uses z.function().args(...) pattern\n * - Returns positional parameters: param1, param2, etc.\n * - Tool function receives spread arguments: tool(value1, value2)\n */\nimport type { JSONSchema7 } from \"json-schema\";\nimport * as v from \"valibot\";\nimport * as z3 from \"zod/v3\";\nimport * as z4 from \"zod/v4\";\nimport { createMockTool, createMockToolWithToolSchema } from \"../testing/tools\";\nimport { mapTamboToolToContextTool } from \"./registry\";\n\ndescribe(\"getParametersFromToolSchema (via mapTamboToolToContextTool)\", () => {\n  describe(\"Deprecated toolSchema interface (Zod function schemas)\", () => {\n    it(\"should handle tool with toolSchema\", () => {\n      const tool = createMockToolWithToolSchema(\n        z3.function().args(z3.string().describe(\"The name\")).returns(z3.void()),\n      );\n      const result = mapTamboToolToContextTool(tool);\n      // Should have at least one parameter (either extracted or wrapped)\n      expect(result.parameters.length).toBeGreaterThanOrEqual(1);\n      expect(result.name).toBe(\"testTool\");\n      expect(result.description).toBe(\"A test tool\");\n    });\n\n    it(\"should handle toolSchema with multiple args\", () => {\n      const tool = createMockToolWithToolSchema(\n        z3\n          .function()\n          .args(\n            z3.string().describe(\"First name\"),\n            z3.number().describe(\"Age\"),\n            z3.boolean().describe(\"Is active\"),\n          )\n          .returns(z3.void()),\n      );\n      const result = mapTamboToolToContextTool(tool);\n      // Should have parameters (extraction depends on JSON Schema conversion)\n      expect(result.parameters.length).toBeGreaterThanOrEqual(1);\n    });\n  });\n\n  describe(\"New inputSchema interface (object schemas)\", () => {\n    describe(\"Zod 4 object schemas\", () => {\n      it(\"should return single input param with object schema\", () => {\n        const tool = createMockTool({\n          inputSchema: z4.object({\n            name: z4.string().describe(\"User name\"),\n            age: z4.number().describe(\"User age\"),\n          }),\n          outputSchema: z4.boolean(),\n        });\n        const result = mapTamboToolToContextTool(tool);\n        expect(result.parameters).toHaveLength(1);\n        expect(result.parameters[0].name).toBe(\"input\");\n        expect(result.parameters[0].type).toBe(\"object\");\n        expect(result.parameters).toMatchSnapshot();\n      });\n\n      it(\"should handle complex nested objects\", () => {\n        const tool = createMockTool({\n          inputSchema: z4.object({\n            point: z4.object({ x: z4.number(), y: z4.number() }),\n            tags: z4.array(z4.string()),\n            color: z4.enum([\"red\", \"green\", \"blue\"]),\n          }),\n          outputSchema: z4.void(),\n        });\n        const result = mapTamboToolToContextTool(tool);\n        expect(result.parameters).toHaveLength(1);\n        expect(result.parameters[0].name).toBe(\"input\");\n        expect(result.parameters).toMatchSnapshot();\n      });\n    });\n\n    describe(\"Zod 3 object schemas\", () => {\n      it(\"should return single input param with object schema\", () => {\n        const tool = createMockTool({\n          inputSchema: z3.object({\n            name: z3.string(),\n            age: z3.number(),\n          }),\n          outputSchema: z3.boolean(),\n        });\n        const result = mapTamboToolToContextTool(tool);\n        expect(result.parameters).toHaveLength(1);\n        expect(result.parameters[0].name).toBe(\"input\");\n        expect(result.parameters).toMatchSnapshot();\n      });\n    });\n\n    describe(\"Valibot object schemas\", () => {\n      it(\"should return single input param with object schema\", () => {\n        const tool = createMockTool({\n          inputSchema: v.object({\n            name: v.string(),\n            age: v.number(),\n          }),\n          outputSchema: v.boolean(),\n        });\n        const result = mapTamboToolToContextTool(tool);\n        expect(result.parameters).toHaveLength(1);\n        expect(result.parameters[0].name).toBe(\"input\");\n        expect(result.parameters).toMatchSnapshot();\n      });\n\n      it(\"should handle complex nested objects\", () => {\n        const tool = createMockTool({\n          inputSchema: v.object({\n            point: v.pipe(\n              v.object({ x: v.number(), y: v.number() }),\n              v.description(\"Point\"),\n            ),\n            tags: v.array(v.string()),\n            color: v.picklist([\"red\", \"green\", \"blue\"]),\n          }),\n          outputSchema: v.undefined(),\n        });\n        const result = mapTamboToolToContextTool(tool);\n        expect(result.parameters).toHaveLength(1);\n        expect(result.parameters[0].name).toBe(\"input\");\n        expect(result.parameters).toMatchSnapshot();\n      });\n    });\n\n    describe(\"JSON Schema object schemas\", () => {\n      it(\"should return single input param with object schema\", () => {\n        const schema: JSONSchema7 = {\n          type: \"object\",\n          properties: {\n            name: { type: \"string\" },\n            age: { type: \"number\" },\n          },\n          required: [\"name\"],\n          description: \"User data\",\n        };\n        const tool = createMockTool({ inputSchema: schema, outputSchema: {} });\n        const result = mapTamboToolToContextTool(tool);\n        expect(result.parameters).toHaveLength(1);\n        expect(result.parameters[0].name).toBe(\"input\");\n        expect(result.parameters[0].type).toBe(\"object\");\n        expect(result.parameters[0].description).toBe(\"User data\");\n        expect(result.parameters).toMatchSnapshot();\n      });\n    });\n  });\n\n  describe(\"Direct schema (shorthand for inputSchema)\", () => {\n    it(\"should accept Zod 4 object schema directly\", () => {\n      const tool = createMockTool(\n        z4.object({\n          name: z4.string(),\n          age: z4.number(),\n        }),\n      );\n      const result = mapTamboToolToContextTool(tool);\n      expect(result.parameters).toHaveLength(1);\n      expect(result.parameters[0].name).toBe(\"input\");\n      expect(result.parameters).toMatchSnapshot();\n    });\n\n    it(\"should accept Zod 3 object schema directly\", () => {\n      const tool = createMockTool(\n        z3.object({\n          name: z3.string(),\n          age: z3.number(),\n        }),\n      );\n      const result = mapTamboToolToContextTool(tool);\n      expect(result.parameters).toHaveLength(1);\n      expect(result.parameters[0].name).toBe(\"input\");\n      expect(result.parameters).toMatchSnapshot();\n    });\n\n    it(\"should accept Valibot object schema directly\", () => {\n      const tool = createMockTool(\n        v.object({\n          name: v.string(),\n          age: v.number(),\n        }),\n      );\n      const result = mapTamboToolToContextTool(tool);\n      expect(result.parameters).toHaveLength(1);\n      expect(result.parameters[0].name).toBe(\"input\");\n      expect(result.parameters).toMatchSnapshot();\n    });\n\n    it(\"should accept JSON Schema object directly\", () => {\n      const schema: JSONSchema7 = {\n        type: \"object\",\n        properties: {\n          name: { type: \"string\" },\n          age: { type: \"number\" },\n        },\n      };\n      const tool = createMockTool(schema);\n      const result = mapTamboToolToContextTool(tool);\n      expect(result.parameters).toHaveLength(1);\n      expect(result.parameters[0].name).toBe(\"input\");\n      expect(result.parameters).toMatchSnapshot();\n    });\n  });\n});\n"]}

package/esm/util/resource-validators.d.ts

@@ -0,0 +1,16 @@
+import type { ListResourceItem, ResourceSource } from "../model/resource-info";
+/**
+ * Validates that a ResourceSource has both listResources and getResource defined,
+ * or neither defined. You cannot provide one without the other.
+ * @param listResources - The listResources function (or undefined)
+ * @param getResource - The getResource function (or undefined)
+ * @throws {Error} if only one of the functions is provided
+ */
+export declare function validateResourceSource(listResources: ResourceSource["listResources"] | undefined, getResource: ResourceSource["getResource"] | undefined): void;
+/**
+ * Validates that a resource has the required fields.
+ * @param resource - The resource to validate
+ * @throws {Error} if the resource is missing required fields
+ */
+export declare function validateResource(resource: ListResourceItem): void;
+//# sourceMappingURL=resource-validators.d.ts.map

package/esm/util/resource-validators.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resource-validators.d.ts","sourceRoot":"","sources":["../../src/util/resource-validators.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE/E;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,aAAa,EAAE,cAAc,CAAC,eAAe,CAAC,GAAG,SAAS,EAC1D,WAAW,EAAE,cAAc,CAAC,aAAa,CAAC,GAAG,SAAS,GACrD,IAAI,CAWN;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAUjE"}

package/esm/util/resource-validators.js

@@ -0,0 +1,30 @@
+/**
+ * Validates that a ResourceSource has both listResources and getResource defined,
+ * or neither defined. You cannot provide one without the other.
+ * @param listResources - The listResources function (or undefined)
+ * @param getResource - The getResource function (or undefined)
+ * @throws {Error} if only one of the functions is provided
+ */
+export function validateResourceSource(listResources, getResource) {
+    const hasListResources = listResources != null;
+    const hasGetResource = getResource != null;
+    if (hasListResources !== hasGetResource) {
+        throw new Error("Both listResources and getResource must be provided together, or neither should be provided. " +
+            `Got: listResources=${hasListResources ? "defined" : "undefined"}, ` +
+            `getResource=${hasGetResource ? "defined" : "undefined"}`);
+    }
+}
+/**
+ * Validates that a resource has the required fields.
+ * @param resource - The resource to validate
+ * @throws {Error} if the resource is missing required fields
+ */
+export function validateResource(resource) {
+    if (!resource.uri) {
+        throw new Error("Resource must have a 'uri' field");
+    }
+    if (!resource.name) {
+        throw new Error(`Resource with URI '${resource.uri}' must have a 'name' field`);
+    }
+}
+//# sourceMappingURL=resource-validators.js.map

package/esm/util/resource-validators.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resource-validators.js","sourceRoot":"","sources":["../../src/util/resource-validators.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CACpC,aAA0D,EAC1D,WAAsD;IAEtD,MAAM,gBAAgB,GAAG,aAAa,IAAI,IAAI,CAAC;IAC/C,MAAM,cAAc,GAAG,WAAW,IAAI,IAAI,CAAC;IAE3C,IAAI,gBAAgB,KAAK,cAAc,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CACb,+FAA+F;YAC7F,sBAAsB,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,IAAI;YACpE,eAAe,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,EAAE,CAC5D,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,QAA0B;IACzD,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CACb,sBAAsB,QAAQ,CAAC,GAAG,4BAA4B,CAC/D,CAAC;IACJ,CAAC;AACH,CAAC","sourcesContent":["import type { ListResourceItem, ResourceSource } from \"../model/resource-info\";\n\n/**\n * Validates that a ResourceSource has both listResources and getResource defined,\n * or neither defined. You cannot provide one without the other.\n * @param listResources - The listResources function (or undefined)\n * @param getResource - The getResource function (or undefined)\n * @throws {Error} if only one of the functions is provided\n */\nexport function validateResourceSource(\n  listResources: ResourceSource[\"listResources\"] | undefined,\n  getResource: ResourceSource[\"getResource\"] | undefined,\n): void {\n  const hasListResources = listResources != null;\n  const hasGetResource = getResource != null;\n\n  if (hasListResources !== hasGetResource) {\n    throw new Error(\n      \"Both listResources and getResource must be provided together, or neither should be provided. \" +\n        `Got: listResources=${hasListResources ? \"defined\" : \"undefined\"}, ` +\n        `getResource=${hasGetResource ? \"defined\" : \"undefined\"}`,\n    );\n  }\n}\n\n/**\n * Validates that a resource has the required fields.\n * @param resource - The resource to validate\n * @throws {Error} if the resource is missing required fields\n */\nexport function validateResource(resource: ListResourceItem): void {\n  if (!resource.uri) {\n    throw new Error(\"Resource must have a 'uri' field\");\n  }\n\n  if (!resource.name) {\n    throw new Error(\n      `Resource with URI '${resource.uri}' must have a 'name' field`,\n    );\n  }\n}\n"]}

package/esm/util/tool-caller.d.ts

@@ -1,5 +1,5 @@
 import TamboAI from "@tambo-ai/typescript-sdk";
-import { TamboTool, TamboToolRegistry } from "../model/component-metadata";
+import { TamboTool, TamboToolRegistry, TamboToolWithToolSchema } from "../model/component-metadata";
 /**
  * Process a message from the thread, invoking the appropriate tool and returning the result.
  * @param message - The message to handle
@@ -9,6 +9,6 @@ import { TamboTool, TamboToolRegistry } from "../model/component-metadata";
 export declare const handleToolCall: (message: TamboAI.Beta.Threads.ThreadMessage, toolRegistry: TamboToolRegistry, onCallUnregisteredTool?: (toolName: string, args: TamboAI.ToolCallParameter[]) => Promise<string>) => Promise<{
     result: unknown;
     error?: string;
-    tamboTool?: TamboTool;
+    tamboTool?: TamboTool | TamboToolWithToolSchema;
 }>;
 //# sourceMappingURL=tool-caller.d.ts.map

package/esm/util/tool-caller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-caller.d.ts","sourceRoot":"","sources":["../../src/util/tool-caller.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAEL,SAAS,EACT,iBAAiB,EAClB,MAAM,6BAA6B,CAAC;AAGrC;;;;;GAKG;AACH,eAAO,MAAM,cAAc,GACzB,SAAS,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAC3C,cAAc,iBAAiB,EAC/B,yBAAyB,CACvB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,CAAC,iBAAiB,EAAE,KAC9B,OAAO,CAAC,MAAM,CAAC,KACnB,OAAO,CAAC;IACT,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB,CAmCA,CAAC"}
+{"version":3,"file":"tool-caller.d.ts","sourceRoot":"","sources":["../../src/util/tool-caller.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAEL,SAAS,EACT,iBAAiB,EACjB,uBAAuB,EACxB,MAAM,6BAA6B,CAAC;AAIrC;;;;;GAKG;AACH,eAAO,MAAM,cAAc,GACzB,SAAS,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAC3C,cAAc,iBAAiB,EAC/B,yBAAyB,CACvB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,CAAC,iBAAiB,EAAE,KAC9B,OAAO,CAAC,MAAM,CAAC,KACnB,OAAO,CAAC;IACT,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,SAAS,GAAG,uBAAuB,CAAC;CACjD,CAmCA,CAAC"}

package/esm/util/tool-caller.js

@@ -1,3 +1,4 @@
+import { hasInputSchema } from "../schema";
 import { mapTamboToolToContextTool } from "./registry";
 /**
  * Process a message from the thread, invoking the appropriate tool and returning the result.
@@ -21,7 +22,7 @@ export const handleToolCall = async (message, toolRegistry, onCallUnregisteredTo
             throw new Error(`Tool ${message.toolCallRequest.toolName} not found in registry`);
         }
         return {
-            result: await runToolChoice(message.toolCallRequest, tool),
+            result: await runToolChoice(message.toolCallRequest, tool, tamboTool),
             tamboTool,
         };
     }
@@ -47,9 +48,16 @@ const findTool = (toolName, toolRegistry) => {
         tamboTool: registryTool,
     };
 };
-const runToolChoice = async (toolCallRequest, tool) => {
-    // Assumes parameters are in the order they are defined in the tool
-    const parameterValues = toolCallRequest.parameters?.map((param) => param.parameterValue) ?? [];
+const runToolChoice = async (toolCallRequest, tool, tamboTool) => {
+    const parameters = toolCallRequest.parameters ?? [];
+    // New interface (inputSchema): pass single object argument
+    if (hasInputSchema(tamboTool)) {
+        // Reconstruct the object from parameter name-value pairs
+        const inputObject = Object.fromEntries(parameters.map((param) => [param.parameterName, param.parameterValue]));
+        return await tool.getComponentContext(inputObject);
+    }
+    // Deprecated interface (toolSchema): spread positional arguments
+    const parameterValues = parameters.map((param) => param.parameterValue);
     return await tool.getComponentContext(...parameterValues);
 };
 //# sourceMappingURL=tool-caller.js.map

package/esm/util/tool-caller.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-caller.js","sourceRoot":"","sources":["../../src/util/tool-caller.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAEvD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EACjC,OAA2C,EAC3C,YAA+B,EAC/B,sBAGoB,EAKnB,EAAE;IACH,IAAI,CAAC,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,QAAQ,CAClC,OAAO,CAAC,eAAe,CAAC,QAAQ,EAChC,YAAY,CACb,CAAC;QACF,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,sBAAsB,EAAE,CAAC;gBAC3B,MAAM,MAAM,GAAG,MAAM,sBAAsB,CACzC,OAAO,CAAC,eAAe,CAAC,QAAQ,EAChC,OAAO,CAAC,eAAe,CAAC,UAAU,CACnC,CAAC;gBACF,OAAO;oBACL,MAAM;iBACP,CAAC;YACJ,CAAC;YACD,MAAM,IAAI,KAAK,CACb,QAAQ,OAAO,CAAC,eAAe,CAAC,QAAQ,wBAAwB,CACjE,CAAC;QACJ,CAAC;QACD,OAAO;YACL,MAAM,EAAE,MAAM,aAAa,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC;YAC1D,SAAS;SACV,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;QAChD,OAAO;YACL,MAAM,EAAE,gCAAgC,OAAO,CAAC,eAAe,CAAC,QAAQ,kCAAkC,KAAK,0EAA0E;YACzL,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe;SAChE,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,CACf,QAAgB,EAChB,YAA+B,EAMG,EAAE;IACpC,MAAM,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;IAE5C,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IACzC,CAAC;IAED,MAAM,WAAW,GAAG,yBAAyB,CAAC,YAAY,CAAC,CAAC;IAC5D,OAAO;QACL,IAAI,EAAE;YACJ,mBAAmB,EAAE,YAAY,CAAC,IAAI;YACtC,UAAU,EAAE,WAAW;SACxB;QACD,SAAS,EAAE,YAAY;KACxB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,KAAK,EACzB,eAAwC,EACxC,IAA0B,EACZ,EAAE;IAChB,mEAAmE;IACnE,MAAM,eAAe,GACnB,eAAe,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;IAEzE,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,eAAe,CAAC,CAAC;AAC5D,CAAC,CAAC","sourcesContent":["import TamboAI from \"@tambo-ai/typescript-sdk\";\nimport {\n  ComponentContextTool,\n  TamboTool,\n  TamboToolRegistry,\n} from \"../model/component-metadata\";\nimport { mapTamboToolToContextTool } from \"./registry\";\n\n/**\n * Process a message from the thread, invoking the appropriate tool and returning the result.\n * @param message - The message to handle\n * @param toolRegistry - The tool registry\n * @returns The result of the tool call along with the tool definition\n */\nexport const handleToolCall = async (\n  message: TamboAI.Beta.Threads.ThreadMessage,\n  toolRegistry: TamboToolRegistry,\n  onCallUnregisteredTool?: (\n    toolName: string,\n    args: TamboAI.ToolCallParameter[],\n  ) => Promise<string>,\n): Promise<{\n  result: unknown;\n  error?: string;\n  tamboTool?: TamboTool;\n}> => {\n  if (!message?.toolCallRequest?.toolName) {\n    throw new Error(\"Tool name is required\");\n  }\n\n  try {\n    const { tool, tamboTool } = findTool(\n      message.toolCallRequest.toolName,\n      toolRegistry,\n    );\n    if (!tool) {\n      if (onCallUnregisteredTool) {\n        const result = await onCallUnregisteredTool(\n          message.toolCallRequest.toolName,\n          message.toolCallRequest.parameters,\n        );\n        return {\n          result,\n        };\n      }\n      throw new Error(\n        `Tool ${message.toolCallRequest.toolName} not found in registry`,\n      );\n    }\n    return {\n      result: await runToolChoice(message.toolCallRequest, tool),\n      tamboTool,\n    };\n  } catch (error) {\n    console.error(\"Error in calling tool: \", error);\n    return {\n      result: `When attempting to call tool ${message.toolCallRequest.toolName} the following error occurred: ${error}. Explain to the user that the tool call failed and try again if needed.`,\n      error: error instanceof Error ? error.message : \"Unknown error\",\n    };\n  }\n};\n\nconst findTool = (\n  toolName: string,\n  toolRegistry: TamboToolRegistry,\n):\n  | {\n      tool: ComponentContextTool;\n      tamboTool: TamboTool;\n    }\n  | { tool: null; tamboTool: null } => {\n  const registryTool = toolRegistry[toolName];\n\n  if (!registryTool) {\n    return { tool: null, tamboTool: null };\n  }\n\n  const contextTool = mapTamboToolToContextTool(registryTool);\n  return {\n    tool: {\n      getComponentContext: registryTool.tool,\n      definition: contextTool,\n    },\n    tamboTool: registryTool,\n  };\n};\n\nconst runToolChoice = async (\n  toolCallRequest: TamboAI.ToolCallRequest,\n  tool: ComponentContextTool,\n): Promise<any> => {\n  // Assumes parameters are in the order they are defined in the tool\n  const parameterValues =\n    toolCallRequest.parameters?.map((param) => param.parameterValue) ?? [];\n\n  return await tool.getComponentContext(...parameterValues);\n};\n"]}
+{"version":3,"file":"tool-caller.js","sourceRoot":"","sources":["../../src/util/tool-caller.ts"],"names":[],"mappings":"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","sourcesContent":["import TamboAI from \"@tambo-ai/typescript-sdk\";\nimport {\n  ComponentContextTool,\n  TamboTool,\n  TamboToolRegistry,\n  TamboToolWithToolSchema,\n} from \"../model/component-metadata\";\nimport { hasInputSchema } from \"../schema\";\nimport { mapTamboToolToContextTool } from \"./registry\";\n\n/**\n * Process a message from the thread, invoking the appropriate tool and returning the result.\n * @param message - The message to handle\n * @param toolRegistry - The tool registry\n * @returns The result of the tool call along with the tool definition\n */\nexport const handleToolCall = async (\n  message: TamboAI.Beta.Threads.ThreadMessage,\n  toolRegistry: TamboToolRegistry,\n  onCallUnregisteredTool?: (\n    toolName: string,\n    args: TamboAI.ToolCallParameter[],\n  ) => Promise<string>,\n): Promise<{\n  result: unknown;\n  error?: string;\n  tamboTool?: TamboTool | TamboToolWithToolSchema;\n}> => {\n  if (!message?.toolCallRequest?.toolName) {\n    throw new Error(\"Tool name is required\");\n  }\n\n  try {\n    const { tool, tamboTool } = findTool(\n      message.toolCallRequest.toolName,\n      toolRegistry,\n    );\n    if (!tool) {\n      if (onCallUnregisteredTool) {\n        const result = await onCallUnregisteredTool(\n          message.toolCallRequest.toolName,\n          message.toolCallRequest.parameters,\n        );\n        return {\n          result,\n        };\n      }\n      throw new Error(\n        `Tool ${message.toolCallRequest.toolName} not found in registry`,\n      );\n    }\n    return {\n      result: await runToolChoice(message.toolCallRequest, tool, tamboTool),\n      tamboTool,\n    };\n  } catch (error) {\n    console.error(\"Error in calling tool: \", error);\n    return {\n      result: `When attempting to call tool ${message.toolCallRequest.toolName} the following error occurred: ${error}. Explain to the user that the tool call failed and try again if needed.`,\n      error: error instanceof Error ? error.message : \"Unknown error\",\n    };\n  }\n};\n\nconst findTool = (\n  toolName: string,\n  toolRegistry: TamboToolRegistry,\n):\n  | {\n      tool: ComponentContextTool;\n      tamboTool: TamboTool | TamboToolWithToolSchema;\n    }\n  | { tool: null; tamboTool: null } => {\n  const registryTool = toolRegistry[toolName];\n\n  if (!registryTool) {\n    return { tool: null, tamboTool: null };\n  }\n\n  const contextTool = mapTamboToolToContextTool(registryTool);\n  return {\n    tool: {\n      getComponentContext: registryTool.tool,\n      definition: contextTool,\n    },\n    tamboTool: registryTool,\n  };\n};\n\nconst runToolChoice = async (\n  toolCallRequest: TamboAI.ToolCallRequest,\n  tool: ComponentContextTool,\n  tamboTool: TamboTool | TamboToolWithToolSchema,\n): Promise<unknown> => {\n  const parameters = toolCallRequest.parameters ?? [];\n\n  // New interface (inputSchema): pass single object argument\n  if (hasInputSchema(tamboTool)) {\n    // Reconstruct the object from parameter name-value pairs\n    const inputObject = Object.fromEntries(\n      parameters.map((param) => [param.parameterName, param.parameterValue]),\n    );\n    return await tool.getComponentContext(inputObject);\n  }\n\n  // Deprecated interface (toolSchema): spread positional arguments\n  const parameterValues = parameters.map((param) => param.parameterValue);\n  return await tool.getComponentContext(...parameterValues);\n};\n"]}