llmz 0.9.0 → 0.9.2

package/dist/{jsx-owqxrquU.cjs → jsx-BJ6GWXI2.cjs}

@@ -1,4 +1,4 @@
-const require_compiler = require("./compiler-C-OI9sim.cjs");
+const require_compiler = require("./compiler-BJJUmNS9.cjs");
 const require__overArg = require("./_overArg-C5Hy7oCi.cjs");
 const require_isPlainObject = require("./isPlainObject-CSxXVKCk.cjs");
 let _bpinternal_zui = require("@bpinternal/zui");

package/dist/runtime/generate.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/{tool-Bv8N4IPj.js → tool-B6Pmuk6K.js}

@@ -164,13 +164,15 @@ var tool_exports = /* @__PURE__ */ __exportAll({ Tool: () => Tool });
 *
 * Tools automatically handle:
 * - **Input validation**: Invalid inputs throw descriptive errors
-* - **Output validation**: Outputs are validated but invalid outputs are still returned
+* - **Output descriptions**: Output schemas describe likely results; handler output is returned unchanged
 * - **Handler errors**: Exceptions in handlers are caught and can trigger retries
 * - **Type coercion**: Basic type coercion where possible
 *
 */
 var Tool = class Tool {
 	_staticInputValues;
+	_inputSchema;
+	_outputSchema;
 	name;
 	aliases = [];
 	description;
@@ -241,23 +243,14 @@ var Tool = class Tool {
 	* @internal
 	*/
 	get zInput() {
-		let input;
-		if (this.input) try {
-			input = transforms.fromJSONSchema(this.input);
-		} catch {
-			input = transforms.fromJSONSchemaLegacy(this.input);
-		}
-		else input = z.any();
-		if (!isEmpty(this._staticInputValues)) {
-			if (z.is.zuiObject(input)) {
-				const inputExtensions = convertObjectToZuiLiterals(this._staticInputValues);
-				input = input.extend(inputExtensions);
-			} else if (z.is.zuiArray(input)) {
-				const inputExtensions = convertObjectToZuiLiterals(this._staticInputValues);
-				input = z.array(input.element.extend(inputExtensions));
-			} else input = convertObjectToZuiLiterals(this._staticInputValues);
-		}
-		return input;
+		const input = this._inputSchema ?? (this.input ? fromJSONSchemaCompat(this.input) : z.any());
+		if (isEmpty(this._staticInputValues)) return input;
+		const shape = this.input ? fromJSONSchemaCompat(this.input) : z.any();
+		let overrides;
+		if (z.is.zuiObject(shape)) overrides = z.object(convertObjectToZuiLiterals(this._staticInputValues)).passthrough();
+		else if (z.is.zuiArray(shape)) overrides = z.array(z.object(convertObjectToZuiLiterals(this._staticInputValues)).passthrough());
+		else overrides = convertObjectToZuiLiterals(this._staticInputValues);
+		return overrides.pipe(input);
 	}
 	/**
 	* Gets the output schema for validation.
@@ -354,18 +347,8 @@ var Tool = class Tool {
 	clone(props = {}) {
 		try {
 			var _props$input, _props$output;
-			let zInput;
-			if (this.input) try {
-				zInput = transforms.fromJSONSchema(this.input);
-			} catch {
-				zInput = transforms.fromJSONSchemaLegacy(this.input);
-			}
-			let zOutput;
-			if (this.output) try {
-				zOutput = transforms.fromJSONSchema(this.output);
-			} catch {
-				zOutput = transforms.fromJSONSchemaLegacy(this.output);
-			}
+			const zInput = this._inputSchema ?? (this.input ? fromJSONSchemaCompat(this.input) : void 0);
+			const zOutput = this._outputSchema ?? (this.output ? fromJSONSchemaCompat(this.output) : void 0);
 			return new Tool({
 				name: props.name ?? this.name,
 				aliases: props.aliases ?? [...this.aliases],
@@ -388,7 +371,7 @@ var Tool = class Tool {
 	* @param props.name - Unique tool name (must be valid TypeScript identifier)
 	* @param props.description - Human-readable description for the LLM
 	* @param props.input - Zui/Zod schema for input validation (optional)
-	* @param props.output - Zui/Zod schema for output validation (optional)
+	* @param props.output - Zui/Zod schema describing output (optional)
 	* @param props.handler - Async function that implements the tool logic
 	* @param props.aliases - Alternative names for the tool (optional)
 	* @param props.metadata - Additional metadata for the tool (optional)
@@ -465,21 +448,25 @@ var Tool = class Tool {
 		if (props.aliases !== void 0 && !Array.isArray(props.aliases)) throw new Error(`Invalid aliases for tool ${props.name}. Expected an array, but got type "${typeof props.aliases}"`);
 		if (props.aliases && props.aliases.some((alias) => !isValidIdentifier(alias))) throw new Error(`Invalid aliases for tool ${props.name}. Expected an array of valid identifiers.`);
 		if (typeof props.input !== "undefined") {
-			if (isZuiSchema(props.input)) try {
-				this.input = transforms.toJSONSchema(props.input);
-			} catch {
-				this.input = transforms.toJSONSchemaLegacy(props.input);
-			}
-			else if (isJsonSchema(props.input)) this.input = props.input;
+			if (isZuiSchema(props.input)) {
+				this._inputSchema = props.input;
+				try {
+					this.input = transforms.toJSONSchema(props.input);
+				} catch {
+					this.input = transforms.toJSONSchemaLegacy(props.input);
+				}
+			} else if (isJsonSchema(props.input)) this.input = props.input;
 			else throw new Error(`Invalid input schema for tool ${props.name}. Expected a ZodType or JSONSchema, but got type "${typeof props.input}"`);
 		}
 		if (typeof props.output !== "undefined") {
-			if (isZuiSchema(props.output)) try {
-				this.output = transforms.toJSONSchema(props.output);
-			} catch {
-				this.output = transforms.toJSONSchemaLegacy(props.output);
-			}
-			else if (isJsonSchema(props.output)) this.output = props.output;
+			if (isZuiSchema(props.output)) {
+				this._outputSchema = props.output;
+				try {
+					this.output = transforms.toJSONSchema(props.output);
+				} catch {
+					this.output = transforms.toJSONSchemaLegacy(props.output);
+				}
+			} else if (isJsonSchema(props.output)) this.output = props.output;
 			else throw new Error(`Invalid output schema for tool ${props.name}. Expected a ZodType or JSONSchema, but got type "${typeof props.output}"`);
 		}
 		this.name = props.name;
@@ -511,7 +498,7 @@ var Tool = class Tool {
 	/**
 	* Executes the tool with the given input and context.
 	*
-	* This method handles input validation, retry logic, output validation, and error handling.
+	* This method handles input validation, retry logic, and error handling.
 	* It's called internally by the LLMz execution engine when generated code calls the tool.
 	*
 	* @param input - Input data to pass to the tool handler
@@ -533,17 +520,16 @@ var Tool = class Tool {
 	* @internal This method is primarily used internally by the LLMz execution engine
 	*/
 	async execute(rawInput, ctx, chat) {
-		const input = this.zInput._def.typeName === "ZodObject" ? rawInput ?? {} : rawInput;
-		const pInput = this.zInput.safeParse(input);
+		const shape = this.input ? fromJSONSchemaCompat(this.input) : z.any();
+		const input = z.is.zuiObject(shape) ? rawInput ?? {} : rawInput;
+		const pInput = await this.zInput.safeParseAsync(input);
 		if (!pInput.success) throw new Error(`Tool "${this.name}" received invalid input: ${pInput.error.message}`);
 		let attempt = 0;
 		let yieldedCount = 0;
 		while (attempt < this.MAX_RETRIES) try {
-			const result = await this._executeHandler(pInput.data, ctx, chat, yieldedCount, (n) => {
+			return await this._executeHandler(pInput.data, ctx, chat, yieldedCount, (n) => {
 				yieldedCount = n;
 			});
-			const pOutput = this.zOutput.safeParse(result);
-			return pOutput.success ? pOutput.data : result;
 		} catch (err) {
 			var _this$retry;
 			if (!await ((_this$retry = this.retry) === null || _this$retry === void 0 ? void 0 : _this$retry.call(this, {

package/dist/{tool-Dy6AJpJH.cjs → tool-BLTrA-sL.cjs}

@@ -1,8 +1,8 @@
-const require_compiler = require("./compiler-C-OI9sim.cjs");
+const require_compiler = require("./compiler-BJJUmNS9.cjs");
 const require_uniq = require("./uniq-G872RWmE.cjs");
-const require_utils = require("./utils-3ESwP3yg.cjs");
+const require_utils = require("./utils-DGQ4sRke.cjs");
 const require_isEmpty = require("./isEmpty-LY533Wmh.cjs");
-const require_typings = require("./typings-3lsqCbkn.cjs");
+const require_typings = require("./typings-DXJMu59O.cjs");
 let _bpinternal_zui = require("@bpinternal/zui");
 //#region src/convert.ts
 function convertObjectToZuiLiterals(obj, nested = false) {
@@ -164,13 +164,15 @@ var tool_exports = /* @__PURE__ */ require_compiler.__exportAll({ Tool: () => To
 *
 * Tools automatically handle:
 * - **Input validation**: Invalid inputs throw descriptive errors
-* - **Output validation**: Outputs are validated but invalid outputs are still returned
+* - **Output descriptions**: Output schemas describe likely results; handler output is returned unchanged
 * - **Handler errors**: Exceptions in handlers are caught and can trigger retries
 * - **Type coercion**: Basic type coercion where possible
 *
 */
 var Tool = class Tool {
 	_staticInputValues;
+	_inputSchema;
+	_outputSchema;
 	name;
 	aliases = [];
 	description;
@@ -241,23 +243,14 @@ var Tool = class Tool {
 	* @internal
 	*/
 	get zInput() {
-		let input;
-		if (this.input) try {
-			input = _bpinternal_zui.transforms.fromJSONSchema(this.input);
-		} catch {
-			input = _bpinternal_zui.transforms.fromJSONSchemaLegacy(this.input);
-		}
-		else input = _bpinternal_zui.z.any();
-		if (!require_isEmpty.isEmpty(this._staticInputValues)) {
-			if (_bpinternal_zui.z.is.zuiObject(input)) {
-				const inputExtensions = convertObjectToZuiLiterals(this._staticInputValues);
-				input = input.extend(inputExtensions);
-			} else if (_bpinternal_zui.z.is.zuiArray(input)) {
-				const inputExtensions = convertObjectToZuiLiterals(this._staticInputValues);
-				input = _bpinternal_zui.z.array(input.element.extend(inputExtensions));
-			} else input = convertObjectToZuiLiterals(this._staticInputValues);
-		}
-		return input;
+		const input = this._inputSchema ?? (this.input ? require_utils.fromJSONSchemaCompat(this.input) : _bpinternal_zui.z.any());
+		if (require_isEmpty.isEmpty(this._staticInputValues)) return input;
+		const shape = this.input ? require_utils.fromJSONSchemaCompat(this.input) : _bpinternal_zui.z.any();
+		let overrides;
+		if (_bpinternal_zui.z.is.zuiObject(shape)) overrides = _bpinternal_zui.z.object(convertObjectToZuiLiterals(this._staticInputValues)).passthrough();
+		else if (_bpinternal_zui.z.is.zuiArray(shape)) overrides = _bpinternal_zui.z.array(_bpinternal_zui.z.object(convertObjectToZuiLiterals(this._staticInputValues)).passthrough());
+		else overrides = convertObjectToZuiLiterals(this._staticInputValues);
+		return overrides.pipe(input);
 	}
 	/**
 	* Gets the output schema for validation.
@@ -354,18 +347,8 @@ var Tool = class Tool {
 	clone(props = {}) {
 		try {
 			var _props$input, _props$output;
-			let zInput;
-			if (this.input) try {
-				zInput = _bpinternal_zui.transforms.fromJSONSchema(this.input);
-			} catch {
-				zInput = _bpinternal_zui.transforms.fromJSONSchemaLegacy(this.input);
-			}
-			let zOutput;
-			if (this.output) try {
-				zOutput = _bpinternal_zui.transforms.fromJSONSchema(this.output);
-			} catch {
-				zOutput = _bpinternal_zui.transforms.fromJSONSchemaLegacy(this.output);
-			}
+			const zInput = this._inputSchema ?? (this.input ? require_utils.fromJSONSchemaCompat(this.input) : void 0);
+			const zOutput = this._outputSchema ?? (this.output ? require_utils.fromJSONSchemaCompat(this.output) : void 0);
 			return new Tool({
 				name: props.name ?? this.name,
 				aliases: props.aliases ?? [...this.aliases],
@@ -388,7 +371,7 @@ var Tool = class Tool {
 	* @param props.name - Unique tool name (must be valid TypeScript identifier)
 	* @param props.description - Human-readable description for the LLM
 	* @param props.input - Zui/Zod schema for input validation (optional)
-	* @param props.output - Zui/Zod schema for output validation (optional)
+	* @param props.output - Zui/Zod schema describing output (optional)
 	* @param props.handler - Async function that implements the tool logic
 	* @param props.aliases - Alternative names for the tool (optional)
 	* @param props.metadata - Additional metadata for the tool (optional)
@@ -465,21 +448,25 @@ var Tool = class Tool {
 		if (props.aliases !== void 0 && !Array.isArray(props.aliases)) throw new Error(`Invalid aliases for tool ${props.name}. Expected an array, but got type "${typeof props.aliases}"`);
 		if (props.aliases && props.aliases.some((alias) => !require_utils.isValidIdentifier(alias))) throw new Error(`Invalid aliases for tool ${props.name}. Expected an array of valid identifiers.`);
 		if (typeof props.input !== "undefined") {
-			if (require_utils.isZuiSchema(props.input)) try {
-				this.input = _bpinternal_zui.transforms.toJSONSchema(props.input);
-			} catch {
-				this.input = _bpinternal_zui.transforms.toJSONSchemaLegacy(props.input);
-			}
-			else if (require_utils.isJsonSchema(props.input)) this.input = props.input;
+			if (require_utils.isZuiSchema(props.input)) {
+				this._inputSchema = props.input;
+				try {
+					this.input = _bpinternal_zui.transforms.toJSONSchema(props.input);
+				} catch {
+					this.input = _bpinternal_zui.transforms.toJSONSchemaLegacy(props.input);
+				}
+			} else if (require_utils.isJsonSchema(props.input)) this.input = props.input;
 			else throw new Error(`Invalid input schema for tool ${props.name}. Expected a ZodType or JSONSchema, but got type "${typeof props.input}"`);
 		}
 		if (typeof props.output !== "undefined") {
-			if (require_utils.isZuiSchema(props.output)) try {
-				this.output = _bpinternal_zui.transforms.toJSONSchema(props.output);
-			} catch {
-				this.output = _bpinternal_zui.transforms.toJSONSchemaLegacy(props.output);
-			}
-			else if (require_utils.isJsonSchema(props.output)) this.output = props.output;
+			if (require_utils.isZuiSchema(props.output)) {
+				this._outputSchema = props.output;
+				try {
+					this.output = _bpinternal_zui.transforms.toJSONSchema(props.output);
+				} catch {
+					this.output = _bpinternal_zui.transforms.toJSONSchemaLegacy(props.output);
+				}
+			} else if (require_utils.isJsonSchema(props.output)) this.output = props.output;
 			else throw new Error(`Invalid output schema for tool ${props.name}. Expected a ZodType or JSONSchema, but got type "${typeof props.output}"`);
 		}
 		this.name = props.name;
@@ -511,7 +498,7 @@ var Tool = class Tool {
 	/**
 	* Executes the tool with the given input and context.
 	*
-	* This method handles input validation, retry logic, output validation, and error handling.
+	* This method handles input validation, retry logic, and error handling.
 	* It's called internally by the LLMz execution engine when generated code calls the tool.
 	*
 	* @param input - Input data to pass to the tool handler
@@ -533,17 +520,16 @@ var Tool = class Tool {
 	* @internal This method is primarily used internally by the LLMz execution engine
 	*/
 	async execute(rawInput, ctx, chat) {
-		const input = this.zInput._def.typeName === "ZodObject" ? rawInput ?? {} : rawInput;
-		const pInput = this.zInput.safeParse(input);
+		const shape = this.input ? require_utils.fromJSONSchemaCompat(this.input) : _bpinternal_zui.z.any();
+		const input = _bpinternal_zui.z.is.zuiObject(shape) ? rawInput ?? {} : rawInput;
+		const pInput = await this.zInput.safeParseAsync(input);
 		if (!pInput.success) throw new Error(`Tool "${this.name}" received invalid input: ${pInput.error.message}`);
 		let attempt = 0;
 		let yieldedCount = 0;
 		while (attempt < this.MAX_RETRIES) try {
-			const result = await this._executeHandler(pInput.data, ctx, chat, yieldedCount, (n) => {
+			return await this._executeHandler(pInput.data, ctx, chat, yieldedCount, (n) => {
 				yieldedCount = n;
 			});
-			const pOutput = this.zOutput.safeParse(result);
-			return pOutput.success ? pOutput.data : result;
 		} catch (err) {
 			var _this$retry;
 			if (!await ((_this$retry = this.retry) === null || _this$retry === void 0 ? void 0 : _this$retry.call(this, {

package/dist/tool.d.ts

@@ -200,13 +200,15 @@ export declare namespace Tool {
  *
  * Tools automatically handle:
  * - **Input validation**: Invalid inputs throw descriptive errors
- * - **Output validation**: Outputs are validated but invalid outputs are still returned
+ * - **Output descriptions**: Output schemas describe likely results; handler output is returned unchanged
  * - **Handler errors**: Exceptions in handlers are caught and can trigger retries
  * - **Type coercion**: Basic type coercion where possible
  *
  */
 export declare class Tool<I extends z.ZodType = z.ZodType, O extends z.ZodType = z.ZodType> implements Serializable<Tool.JSON> {
     private _staticInputValues?;
+    private _inputSchema?;
+    private _outputSchema?;
     name: string;
     aliases: string[];
     description?: string;
@@ -364,7 +366,7 @@ export declare class Tool<I extends z.ZodType = z.ZodType, O extends z.ZodType =
      * @param props.name - Unique tool name (must be valid TypeScript identifier)
      * @param props.description - Human-readable description for the LLM
      * @param props.input - Zui/Zod schema for input validation (optional)
-     * @param props.output - Zui/Zod schema for output validation (optional)
+     * @param props.output - Zui/Zod schema describing output (optional)
      * @param props.handler - Async function that implements the tool logic
      * @param props.aliases - Alternative names for the tool (optional)
      * @param props.metadata - Additional metadata for the tool (optional)
@@ -448,7 +450,7 @@ export declare class Tool<I extends z.ZodType = z.ZodType, O extends z.ZodType =
     /**
      * Executes the tool with the given input and context.
      *
-     * This method handles input validation, retry logic, output validation, and error handling.
+     * This method handles input validation, retry logic, and error handling.
      * It's called internally by the LLMz execution engine when generated code calls the tool.
      *
      * @param input - Input data to pass to the tool handler

package/dist/{truncator-DZqEqnpD.js → truncator-CD7QtE84.js}

@@ -126,9 +126,9 @@ function truncateWrappedContent({ messages, tokenLimit, throwOnFailure = true })
 	* After                       { content: 'content', tokens: 10, truncatable: false }
 	*/
 	const parts = [];
-	for (const msg of messages) {
+	const contents = messages.flatMap((message) => typeof message.content === "string" ? [message.content] : (message.content ?? []).flatMap((part) => part.type === "text" ? [part.text ?? ""] : []));
+	for (const content of contents) {
 		const current = [];
-		const content = typeof msg.content === "string" ? msg.content : "";
 		let match;
 		const parser = new _MessageContentParser();
 		while ((match = parser.parse(content)) !== null) {
@@ -190,11 +190,16 @@ function truncateWrappedContent({ messages, tokenLimit, throwOnFailure = true })
 		biggest.tokens -= toRemove;
 		currentCount -= toRemove;
 	}
-	return messages.map((msg, i) => {
-		const p = parts[i];
+	let textIndex = 0;
+	const renderText = () => _renderRemainingWrappers(parts[textIndex++].map((part) => part.content).join(""));
+	return messages.map((message) => {
+		var _message$content;
 		return {
-			...msg,
-			content: typeof msg.content === "string" ? _renderRemainingWrappers(p.map((part) => part.content).join("")) : msg.content
+			...message,
+			content: typeof message.content === "string" ? renderText() : ((_message$content = message.content) === null || _message$content === void 0 ? void 0 : _message$content.map((part) => part.type === "text" ? {
+				...part,
+				text: renderText()
+			} : part)) ?? message.content
 		};
 	});
 }

package/dist/{truncator-CLkouTCO.cjs → truncator-DmCu9M4m.cjs}

@@ -1,5 +1,5 @@
-const require_compiler = require("./compiler-C-OI9sim.cjs");
-const require_utils = require("./utils-3ESwP3yg.cjs");
+const require_compiler = require("./compiler-BJJUmNS9.cjs");
+const require_utils = require("./utils-DGQ4sRke.cjs");
 //#region src/truncator.ts
 var truncator_exports = /* @__PURE__ */ require_compiler.__exportAll({
 	stripTruncationTags: () => stripTruncationTags,
@@ -126,9 +126,9 @@ function truncateWrappedContent({ messages, tokenLimit, throwOnFailure = true })
 	* After                       { content: 'content', tokens: 10, truncatable: false }
 	*/
 	const parts = [];
-	for (const msg of messages) {
+	const contents = messages.flatMap((message) => typeof message.content === "string" ? [message.content] : (message.content ?? []).flatMap((part) => part.type === "text" ? [part.text ?? ""] : []));
+	for (const content of contents) {
 		const current = [];
-		const content = typeof msg.content === "string" ? msg.content : "";
 		let match;
 		const parser = new _MessageContentParser();
 		while ((match = parser.parse(content)) !== null) {
@@ -190,11 +190,16 @@ function truncateWrappedContent({ messages, tokenLimit, throwOnFailure = true })
 		biggest.tokens -= toRemove;
 		currentCount -= toRemove;
 	}
-	return messages.map((msg, i) => {
-		const p = parts[i];
+	let textIndex = 0;
+	const renderText = () => _renderRemainingWrappers(parts[textIndex++].map((part) => part.content).join(""));
+	return messages.map((message) => {
+		var _message$content;
 		return {
-			...msg,
-			content: typeof msg.content === "string" ? _renderRemainingWrappers(p.map((part) => part.content).join("")) : msg.content
+			...message,
+			content: typeof message.content === "string" ? renderText() : ((_message$content = message.content) === null || _message$content === void 0 ? void 0 : _message$content.map((part) => part.type === "text" ? {
+				...part,
+				text: renderText()
+			} : part)) ?? message.content
 		};
 	});
 }

package/dist/{typings-3lsqCbkn.cjs → typings-DXJMu59O.cjs}

@@ -1,5 +1,5 @@
-const require_compiler = require("./compiler-C-OI9sim.cjs");
-const require_utils = require("./utils-3ESwP3yg.cjs");
+const require_compiler = require("./compiler-BJJUmNS9.cjs");
+const require_utils = require("./utils-DGQ4sRke.cjs");
 const require_errors = require("./errors-C962uJdS.cjs");
 let _bpinternal_zui = require("@bpinternal/zui");
 //#region src/typings-formatter.ts

package/dist/{utils-3ESwP3yg.cjs → utils-DGQ4sRke.cjs}

@@ -1,4 +1,4 @@
-const require_compiler = require("./compiler-C-OI9sim.cjs");
+const require_compiler = require("./compiler-BJJUmNS9.cjs");
 const require__baseIteratee = require("./_baseIteratee-CF4qP2a8.cjs");
 const require__getPrototype = require("./_getPrototype-DQDlNVVM.cjs");
 let _bpinternal_zui = require("@bpinternal/zui");