llmz 0.0.2 → 0.0.4

package/dist/{llmz-EGTGPSTX.cjs → llmz-R6XZG3JQ.cjs}

@@ -1,16 +1,17 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } async function _asyncNullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return await rhsFn(); } } var _class; var _class2;
 
-var _chunkBKGPO722cjs = require('./chunk-BKGPO722.cjs');
-require('./chunk-BOLDQGES.cjs');
+var _chunkW6U2VXSFcjs = require('./chunk-W6U2VXSF.cjs');
 
 
-var _chunkC2TSWGYCcjs = require('./chunk-C2TSWGYC.cjs');
+var _chunk5NVNEEYWcjs = require('./chunk-5NVNEEYW.cjs');
 
 
-var _chunkYPOOKE3Acjs = require('./chunk-YPOOKE3A.cjs');
-require('./chunk-YUDUY7XW.cjs');
+var _chunk6YWYCVABcjs = require('./chunk-6YWYCVAB.cjs');
+require('./chunk-VAF2H6UD.cjs');
 
 
+var _chunk4QTK5ALHcjs = require('./chunk-4QTK5ALH.cjs');
+require('./chunk-HYVKY3W6.cjs');
 
 
 
@@ -18,44 +19,43 @@ require('./chunk-YUDUY7XW.cjs');
 
 
 
-var _chunkZUAFUOURcjs = require('./chunk-ZUAFUOUR.cjs');
 
 
-var _chunkR2N2UUKCcjs = require('./chunk-R2N2UUKC.cjs');
+var _chunkJDABP4SDcjs = require('./chunk-JDABP4SD.cjs');
 
 
-var _chunkE2B5DRICcjs = require('./chunk-E2B5DRIC.cjs');
-require('./chunk-QZGFCB4T.cjs');
+var _chunkIKSIOIIPcjs = require('./chunk-IKSIOIIP.cjs');
 
 
-var _chunkPQN6HW7Acjs = require('./chunk-PQN6HW7A.cjs');
+var _chunkLVKZYKTPcjs = require('./chunk-LVKZYKTP.cjs');
 
 
-var _chunkE5W3P7EOcjs = require('./chunk-E5W3P7EO.cjs');
+var _chunkJK2LZW2Gcjs = require('./chunk-JK2LZW2G.cjs');
+require('./chunk-KMZDFWYZ.cjs');
 
 
 
-var _chunkVP6WWAE2cjs = require('./chunk-VP6WWAE2.cjs');
+var _chunkFIVFS4HGcjs = require('./chunk-FIVFS4HG.cjs');
 
 
 
-var _chunkENFB45AIcjs = require('./chunk-ENFB45AI.cjs');
+var _chunkP7J2WCBBcjs = require('./chunk-P7J2WCBB.cjs');
 
 
 
 
 
 
-var _chunk3CGLDS5Tcjs = require('./chunk-3CGLDS5T.cjs');
-require('./chunk-A7BDFLAE.cjs');
+var _chunkUQOBUJIQcjs = require('./chunk-UQOBUJIQ.cjs');
 
 // src/llmz.ts
 var _cognitive = require('@botpress/cognitive');
 var _zui = require('@bpinternal/zui');
 var _ms = require('ms'); var _ms2 = _interopRequireDefault(_ms);
+var _ulid = require('ulid');
 
 // src/context.ts
-var _ulid = require('ulid');
+
 
 // src/getter.ts
 var getValue = async (valueOrGetter, ctx) => {
@@ -72,15 +72,15 @@ var getValue = async (valueOrGetter, ctx) => {
 
 // src/handlers.ts
 var Emitter = (_class = class {constructor() { _class.prototype.__init.call(this);_class.prototype.__init2.call(this); }
-  __init() {this.handlers = []}
+  __init() {this._handlers = []}
   __init2() {this.subscribe = (fn) => {
-    this.handlers.push(fn);
+    this._handlers.push(fn);
     return () => {
-      this.handlers = this.handlers.filter((handler) => handler !== fn);
+      this._handlers = this._handlers.filter((handler) => handler !== fn);
     };
   }}
   emit(event) {
-    this.handlers.forEach((handler) => handler(event));
+    this._handlers.forEach((handler) => handler(event));
   }
 }, _class);
 var HookedArray = class extends Array {
@@ -145,11 +145,11 @@ ${preview.trim()}
 };
 
 // src/context.ts
-var ThinkExit = new (0, _chunkR2N2UUKCcjs.Exit)({
+var ThinkExit = new (0, _chunkLVKZYKTPcjs.Exit)({
   name: "think",
   description: "Think about the current situation and provide a response"
 });
-var ListenExit = new (0, _chunkR2N2UUKCcjs.Exit)({
+var ListenExit = new (0, _chunkLVKZYKTPcjs.Exit)({
   name: "listen",
   description: "Listen to the user and provide a response"
 });
@@ -262,17 +262,19 @@ var Context = (_class2 = class {
   
   
   
-  __init3() {this.version = _chunkE2B5DRICcjs.DualModePrompt}
+  __init3() {this.version = _chunkW6U2VXSFcjs.DualModePrompt}
+  __init4() {this.timeout = 6e4}
+  // Default timeout of 60 seconds
   
   
   
   
   
-  __init4() {this.iteration = 0}
+  __init5() {this.iteration = 0}
   
   async nextIteration() {
     if (this.iterations.length >= this.loop) {
-      throw new (0, _chunkZUAFUOURcjs.LoopExceededError)();
+      throw new (0, _chunkJDABP4SDcjs.LoopExceededError)();
     }
     if (this.snapshot && this.snapshot.status.type === "pending") {
       throw new Error(
@@ -297,12 +299,12 @@ var Context = (_class2 = class {
     const variables = {};
     if ((lastIteration == null ? void 0 : lastIteration.status.type) === "thinking_requested") {
       const lastThinkingVariables = lastIteration.status.thinking_requested.variables;
-      if (_chunk3CGLDS5Tcjs.isPlainObject_default.call(void 0, lastThinkingVariables)) {
-        Object.assign(variables, _chunk3CGLDS5Tcjs.cloneDeep_default.call(void 0, lastThinkingVariables));
+      if (_chunkUQOBUJIQcjs.isPlainObject_default.call(void 0, lastThinkingVariables)) {
+        Object.assign(variables, _chunkUQOBUJIQcjs.cloneDeep_default.call(void 0, lastThinkingVariables));
       }
     }
-    if (_chunk3CGLDS5Tcjs.isPlainObject_default.call(void 0, lastIteration == null ? void 0 : lastIteration.variables)) {
-      Object.assign(variables, _chunk3CGLDS5Tcjs.cloneDeep_default.call(void 0, _nullishCoalesce((lastIteration == null ? void 0 : lastIteration.variables), () => ( {}))));
+    if (_chunkUQOBUJIQcjs.isPlainObject_default.call(void 0, lastIteration == null ? void 0 : lastIteration.variables)) {
+      Object.assign(variables, _chunkUQOBUJIQcjs.cloneDeep_default.call(void 0, _nullishCoalesce((lastIteration == null ? void 0 : lastIteration.variables), () => ( {}))));
     }
     return variables;
   }
@@ -375,7 +377,7 @@ var Context = (_class2 = class {
         ...lastIterationMessages,
         {
           role: "assistant",
-          content: _chunkVP6WWAE2cjs.wrapContent.call(void 0, _nullishCoalesce(((_c = lastIteration.llm) == null ? void 0 : _c.output), () => ( "")), { preserve: "top", flex: 4, minTokens: 25 })
+          content: _chunkFIVFS4HGcjs.wrapContent.call(void 0, _nullishCoalesce(((_c = lastIteration.llm) == null ? void 0 : _c.output), () => ( "")), { preserve: "top", flex: 4, minTokens: 25 })
         },
         await this.version.getThinkingMessage({
           reason: lastIteration.status.thinking_requested.reason,
@@ -388,7 +390,7 @@ var Context = (_class2 = class {
         ...lastIterationMessages,
         {
           role: "assistant",
-          content: _chunkVP6WWAE2cjs.wrapContent.call(void 0, _nullishCoalesce(((_d = lastIteration.llm) == null ? void 0 : _d.output), () => ( "")), { preserve: "top", flex: 4, minTokens: 25 })
+          content: _chunkFIVFS4HGcjs.wrapContent.call(void 0, _nullishCoalesce(((_d = lastIteration.llm) == null ? void 0 : _d.output), () => ( "")), { preserve: "top", flex: 4, minTokens: 25 })
         },
         await this.version.getInvalidCodeMessage({
           code: _nullishCoalesce(lastIteration.code, () => ( "// No code generated")),
@@ -401,7 +403,7 @@ var Context = (_class2 = class {
         ...lastIterationMessages,
         {
           role: "assistant",
-          content: _chunkVP6WWAE2cjs.wrapContent.call(void 0, _nullishCoalesce(((_e = lastIteration.llm) == null ? void 0 : _e.output), () => ( "")), { preserve: "top", flex: 4, minTokens: 25 })
+          content: _chunkFIVFS4HGcjs.wrapContent.call(void 0, _nullishCoalesce(((_e = lastIteration.llm) == null ? void 0 : _e.output), () => ( "")), { preserve: "top", flex: 4, minTokens: 25 })
         },
         await this.version.getInvalidCodeMessage({
           code: _nullishCoalesce(lastIteration.code, () => ( "// No code generated")),
@@ -414,7 +416,7 @@ var Context = (_class2 = class {
         ...lastIterationMessages,
         {
           role: "assistant",
-          content: _chunkVP6WWAE2cjs.wrapContent.call(void 0, _nullishCoalesce(((_f = lastIteration.llm) == null ? void 0 : _f.output), () => ( "")), { preserve: "top", flex: 4, minTokens: 25 })
+          content: _chunkFIVFS4HGcjs.wrapContent.call(void 0, _nullishCoalesce(((_f = lastIteration.llm) == null ? void 0 : _f.output), () => ( "")), { preserve: "top", flex: 4, minTokens: 25 })
         },
         await this.version.getCodeExecutionErrorMessage({
           message: lastIteration.status.execution_error.message,
@@ -430,7 +432,7 @@ var Context = (_class2 = class {
     var _a;
     const instructions = await getValue(this.instructions, this);
     const transcript = new TranscriptArray(await _asyncNullishCoalesce(await getValue(this.transcript, this), async () => ( [])));
-    const tools = _chunkYPOOKE3Acjs.Tool.withUniqueNames(await _asyncNullishCoalesce(await getValue(this.tools, this), async () => ( [])));
+    const tools = _chunk4QTK5ALHcjs.Tool.withUniqueNames(await _asyncNullishCoalesce(await getValue(this.tools, this), async () => ( [])));
     const objects = await _asyncNullishCoalesce(await getValue(this.objects, this), async () => ( []));
     const exits = await _asyncNullishCoalesce(await getValue(this.exits, this), async () => ( []));
     const components = await _asyncNullishCoalesce(await getValue(this.components, this), async () => ( []));
@@ -441,7 +443,7 @@ var Context = (_class2 = class {
       throw new Error("Too many tools. Expected at most 100 tools.");
     }
     for (const component of components) {
-      _chunkE5W3P7EOcjs.assertValidComponent.call(void 0, component);
+      _chunkJK2LZW2Gcjs.assertValidComponent.call(void 0, component.definition);
     }
     const ReservedToolNames = [
       "think",
@@ -472,7 +474,10 @@ var Context = (_class2 = class {
     }
     if (MessageTool && components.length) {
       MessageTool.aliases = Array.from(
-        /* @__PURE__ */ new Set([...MessageTool.aliases, ...components.flatMap((x) => [x.name, ..._nullishCoalesce(x.aliases, () => ( []))])])
+        /* @__PURE__ */ new Set([
+          ...MessageTool.aliases,
+          ...components.flatMap((x) => [x.definition.name, ..._nullishCoalesce(x.definition.aliases, () => ( []))])
+        ])
       );
     }
     const nonMessageTools = tools.filter((x) => {
@@ -486,10 +491,12 @@ var Context = (_class2 = class {
         if (ReservedToolNames.includes(name)) {
           throw new Error(`Tool name "${name}" (${tool.name}) is reserved. Please choose a different name.`);
         }
-        if (components.find((x) => {
-          var _a2;
-          return x.name.toLowerCase() === name || ((_a2 = x.aliases) == null ? void 0 : _a2.map((x2) => x2.toLowerCase()).includes(name));
-        })) {
+        if (components.find(
+          (x) => {
+            var _a2;
+            return x.definition.name.toLowerCase() === name || ((_a2 = x.definition.aliases) == null ? void 0 : _a2.map((x2) => x2.toLowerCase()).includes(name));
+          }
+        )) {
           throw new Error(
             `Tool name "${name}" (${tool.name}) is already used by a component. Please choose a different name.`
           );
@@ -528,7 +535,7 @@ var Context = (_class2 = class {
       components
     };
   }
-  constructor(props) {;_class2.prototype.__init3.call(this);_class2.prototype.__init4.call(this);
+  constructor(props) {;_class2.prototype.__init3.call(this);_class2.prototype.__init4.call(this);_class2.prototype.__init5.call(this);
     this.id = `llmz_${_ulid.ulid.call(void 0, )}`;
     this.transcript = props.transcript;
     this.instructions = props.instructions;
@@ -536,6 +543,7 @@ var Context = (_class2 = class {
     this.tools = props.tools;
     this.exits = props.exits;
     this.components = props.components;
+    this.timeout = Math.min(999999999, Math.max(0, _nullishCoalesce(props.timeout, () => ( 6e4))));
     this.loop = _nullishCoalesce(props.loop, () => ( 3));
     this.temperature = _nullishCoalesce(props.temperature, () => ( 0.7));
     this.model = props.model;
@@ -559,15 +567,15 @@ var RESPONSE_LENGTH_BUFFER = {
   MAX_TOKENS: 16e3,
   PERCENTAGE: 0.1
 };
-var getModelOutputLimit = (inputLength) => _chunk3CGLDS5Tcjs.clamp_default.call(void 0, 
+var getModelOutputLimit = (inputLength) => _chunkUQOBUJIQcjs.clamp_default.call(void 0, 
   RESPONSE_LENGTH_BUFFER.PERCENTAGE * inputLength,
   RESPONSE_LENGTH_BUFFER.MIN_TOKENS,
   RESPONSE_LENGTH_BUFFER.MAX_TOKENS
 );
 var executeContext = async (props) => {
-  var _a, _b, _c;
-  await _chunkENFB45AIcjs.init.call(void 0, );
-  const { signal, onIterationEnd, onTrace, onExit } = props;
+  var _a, _b, _c, _d;
+  await _chunkP7J2WCBBcjs.init.call(void 0, );
+  const { signal, onIterationEnd, onTrace, onExit, onBeforeExecution } = props;
   const cognitive = props.client instanceof _cognitive.Cognitive ? props.client : new (0, _cognitive.Cognitive)({ client: props.client });
   const cleanups = [];
   const ctx = new Context({
@@ -577,6 +585,7 @@ var executeContext = async (props) => {
     loop: (_a = props.options) == null ? void 0 : _a.loop,
     temperature: (_b = props.options) == null ? void 0 : _b.temperature,
     model: (_c = props.options) == null ? void 0 : _c.model,
+    timeout: (_d = props.options) == null ? void 0 : _d.timeout,
     transcript: props.transcript,
     exits: props.exits,
     components: props.components,
@@ -593,6 +602,20 @@ var executeContext = async (props) => {
         };
       }
       const iteration = await ctx.nextIteration();
+      if (signal == null ? void 0 : signal.aborted) {
+        iteration.end({
+          type: "aborted",
+          aborted: {
+            reason: _nullishCoalesce(signal.reason, () => ( "The operation was aborted"))
+          }
+        });
+        return {
+          status: "error",
+          error: _nullishCoalesce(signal.reason, () => ( "The operation was aborted")),
+          context: ctx,
+          iterations: ctx.iterations
+        };
+      }
       cleanups.push(
         iteration.traces.onPush((traces) => {
           for (const trace of traces) {
@@ -606,14 +629,15 @@ var executeContext = async (props) => {
           ctx,
           cognitive,
           abortSignal: signal,
-          onExit
+          onExit,
+          onBeforeExecution
         });
       } catch (err) {
         iteration.end({
           type: "execution_error",
           execution_error: {
-            stack: _chunkPQN6HW7Acjs.cleanStackTrace.call(void 0, _nullishCoalesce(err.stack, () => ( "No stack trace available"))),
-            message: "An unexpected error occurred: " + getErrorMessage(err)
+            message: "An unexpected error occurred: " + getErrorMessage(err),
+            stack: _chunkIKSIOIIPcjs.cleanStackTrace.call(void 0, _nullishCoalesce(err.stack, () => ( "No stack trace available")))
           }
         });
       }
@@ -635,7 +659,7 @@ var executeContext = async (props) => {
           context: ctx,
           iterations: ctx.iterations,
           signal: iteration.status.callback_requested.signal,
-          snapshot: _chunkC2TSWGYCcjs.Snapshot.fromSignal(iteration.status.callback_requested.signal)
+          snapshot: _chunk6YWYCVABcjs.Snapshot.fromSignal(iteration.status.callback_requested.signal)
         };
       }
       if (iteration.status.type === "thinking_requested" || iteration.status.type === "exit_error" || iteration.status.type === "execution_error" || iteration.status.type === "invalid_code_error") {
@@ -669,14 +693,15 @@ var executeIteration = async ({
   ctx,
   cognitive,
   abortSignal,
-  onExit
+  onExit,
+  onBeforeExecution
 }) => {
   var _a, _b, _c, _d, _e;
   let startedAt = Date.now();
   const traces = iteration.traces;
   const modelLimit = 128e3;
   const responseLengthBuffer = getModelOutputLimit(modelLimit);
-  const messages = _chunkVP6WWAE2cjs.truncateWrappedContent.call(void 0, {
+  const messages = _chunkFIVFS4HGcjs.truncateWrappedContent.call(void 0, {
     messages: iteration.messages,
     tokenLimit: modelLimit - responseLengthBuffer,
     throwOnFailure: false
@@ -687,6 +712,12 @@ var executeIteration = async ({
       x.content.trim().length > 0
     )
   );
+  traces.push({
+    type: "llm_call_started",
+    started_at: startedAt,
+    ended_at: startedAt,
+    model: _nullishCoalesce(ctx.model, () => ( ""))
+  });
   const output = await cognitive.generateContent({
     signal: abortSignal,
     systemPrompt: (_a = messages.find((x) => x.role === "system")) == null ? void 0 : _a.content,
@@ -708,6 +739,28 @@ var executeIteration = async ({
   }
   const assistantResponse = ctx.version.parseAssistantResponse(out);
   iteration.code = assistantResponse.code.trim();
+  if (typeof onBeforeExecution === "function") {
+    try {
+      await onBeforeExecution(iteration);
+    } catch (err) {
+      if (err instanceof _chunkJDABP4SDcjs.ThinkSignal) {
+        return iteration.end({
+          type: "thinking_requested",
+          thinking_requested: {
+            variables: err.context,
+            reason: err.reason
+          }
+        });
+      }
+      return iteration.end({
+        type: "execution_error",
+        execution_error: {
+          message: `Error in onBeforeExecution hook: ${getErrorMessage(err)}`,
+          stack: _chunkIKSIOIIPcjs.cleanStackTrace.call(void 0, _nullishCoalesce(err.stack, () => ( "No stack trace available")))
+        }
+      });
+    }
+  }
   iteration.llm = {
     cached: output.meta.cached || false,
     ended_at: Date.now(),
@@ -725,7 +778,7 @@ var executeIteration = async ({
     model: _nullishCoalesce(ctx.model, () => ( "")),
     code: iteration.code
   });
-  const vmContext = { ..._chunkENFB45AIcjs.stripInvalidIdentifiers.call(void 0, iteration.variables) };
+  const vmContext = { ..._chunkP7J2WCBBcjs.stripInvalidIdentifiers.call(void 0, iteration.variables) };
   for (const obj of iteration.objects) {
     const internalValues = {};
     const instance = {};
@@ -740,18 +793,18 @@ var executeIteration = async ({
           return internalValues[name];
         },
         set(value2) {
-          if (_chunk3CGLDS5Tcjs.isEqual_default.call(void 0, value2, internalValues[name])) {
+          if (_chunkUQOBUJIQcjs.isEqual_default.call(void 0, value2, internalValues[name])) {
             return;
           }
           if (!writable) {
-            throw new (0, _chunkZUAFUOURcjs.AssignmentError)(`Property ${obj.name}.${name} is read-only and cannot be modified`);
+            throw new (0, _chunkJDABP4SDcjs.AssignmentError)(`Property ${obj.name}.${name} is read-only and cannot be modified`);
           }
           if (value2 === internalValues[name]) {
             return;
           }
           const parsed = schema.safeParse(value2);
           if (!parsed.success) {
-            throw new (0, _chunkZUAFUOURcjs.AssignmentError)(
+            throw new (0, _chunkJDABP4SDcjs.AssignmentError)(
               `Invalid value for Object property ${obj.name}.${name}: ${getErrorMessage(parsed.error)}`
             );
           }
@@ -794,7 +847,7 @@ var executeIteration = async ({
     });
   }
   startedAt = Date.now();
-  const result = await _chunkBKGPO722cjs.runAsyncFunction.call(void 0, vmContext, assistantResponse.code.trim(), traces, abortSignal).catch(
+  const result = await _chunk5NVNEEYWcjs.runAsyncFunction.call(void 0, vmContext, iteration.code, traces, abortSignal, ctx.timeout).catch(
     (err) => {
       return {
         success: false,
@@ -805,7 +858,7 @@ var executeIteration = async ({
       };
     }
   );
-  if (result.error && result.error instanceof _chunkZUAFUOURcjs.InvalidCodeError) {
+  if (result.error && result.error instanceof _chunkJDABP4SDcjs.InvalidCodeError) {
     return iteration.end({
       type: "invalid_code_error",
       invalid_code_error: {
@@ -819,12 +872,12 @@ var executeIteration = async ({
     started_at: startedAt,
     ended_at: Date.now()
   });
-  if (result.error && result.error instanceof _chunkZUAFUOURcjs.CodeExecutionError) {
+  if (result.error && result.error instanceof _chunkJDABP4SDcjs.CodeExecutionError) {
     return iteration.end({
       type: "execution_error",
       execution_error: {
         message: result.error.message,
-        stack: _chunkPQN6HW7Acjs.cleanStackTrace.call(void 0, _nullishCoalesce(result.error.stack, () => ( "No stack trace available")))
+        stack: _chunkIKSIOIIPcjs.cleanStackTrace.call(void 0, _nullishCoalesce(_nullishCoalesce(result.error.stacktrace, () => ( result.error.stack)), () => ( "No stack trace available")))
       }
     });
   }
@@ -841,20 +894,20 @@ var executeIteration = async ({
       type: "execution_error",
       execution_error: {
         message: _nullishCoalesce(((_e = result == null ? void 0 : result.error) == null ? void 0 : _e.message), () => ( "Unknown error occurred")),
-        stack: _chunkPQN6HW7Acjs.cleanStackTrace.call(void 0, _nullishCoalesce(result.error.stack, () => ( "No stack trace available")))
+        stack: _chunkIKSIOIIPcjs.cleanStackTrace.call(void 0, _nullishCoalesce(result.error.stack, () => ( "No stack trace available")))
       }
     });
   }
-  if (result.signal instanceof _chunkZUAFUOURcjs.ThinkSignal) {
+  if (result.signal instanceof _chunkJDABP4SDcjs.ThinkSignal) {
     return iteration.end({
       type: "thinking_requested",
       thinking_requested: {
-        variables: result.signal.variables,
+        variables: result.signal.context,
         reason: result.signal.reason
       }
     });
   }
-  if (result.signal instanceof _chunkZUAFUOURcjs.SnapshotSignal) {
+  if (result.signal instanceof _chunkJDABP4SDcjs.SnapshotSignal) {
     return iteration.end({
       type: "callback_requested",
       callback_requested: {
@@ -867,8 +920,8 @@ var executeIteration = async ({
   const returnAction = returnValue == null ? void 0 : returnValue.action;
   const returnExit = _nullishCoalesce(iteration.exits.find((x) => x.name.toLowerCase() === (returnAction == null ? void 0 : returnAction.toLowerCase())), () => ( iteration.exits.find((x) => x.aliases.some((a) => a.toLowerCase() === (returnAction == null ? void 0 : returnAction.toLowerCase())))));
   if (returnAction === "think") {
-    const variables = _chunk3CGLDS5Tcjs.omit_default.call(void 0, _nullishCoalesce(returnValue, () => ( {})), "action");
-    if (_chunk3CGLDS5Tcjs.isPlainObject_default.call(void 0, variables) && Object.keys(variables).length > 0) {
+    const variables = _chunkUQOBUJIQcjs.omit_default.call(void 0, _nullishCoalesce(returnValue, () => ( {})), "action");
+    if (_chunkUQOBUJIQcjs.isPlainObject_default.call(void 0, variables) && Object.keys(variables).length > 0) {
       return iteration.end({
         type: "thinking_requested",
         thinking_requested: {
@@ -942,10 +995,12 @@ var executeIteration = async ({
 function wrapTool({ tool, traces, object }) {
   const getToolInput = (input) => _nullishCoalesce(tool.zInput.safeParse(input).data, () => ( input));
   return function(input) {
+    const toolCallId = `tcall_${_ulid.ulid.call(void 0, )}`;
     const alertSlowTool = setTimeout(
       () => traces.push({
         type: "tool_slow",
         tool_name: tool.name,
+        tool_call_id: toolCallId,
         started_at: Date.now(),
         input: getToolInput(input),
         object,
@@ -962,16 +1017,16 @@ function wrapTool({ tool, traces, object }) {
       if (output === error2) {
         return true;
       }
-      if (error2 instanceof _chunkZUAFUOURcjs.SnapshotSignal) {
+      if (error2 instanceof _chunkJDABP4SDcjs.SnapshotSignal) {
         error2.toolCall = {
           name: tool.name,
           inputSchema: tool.input,
           outputSchema: tool.output,
           input
         };
-        error2.message = _chunkZUAFUOURcjs.Signals.serializeError(error2);
+        error2.message = _chunkJDABP4SDcjs.Signals.serializeError(error2);
       }
-      if (error2 instanceof _chunkZUAFUOURcjs.ThinkSignal) {
+      if (error2 instanceof _chunkJDABP4SDcjs.ThinkSignal) {
         traces.push({
           type: "think_signal",
           started_at: Date.now(),
@@ -985,7 +1040,9 @@ function wrapTool({ tool, traces, object }) {
       return false;
     };
     try {
-      const result = tool.execute(input);
+      const result = tool.execute(input, {
+        callId: toolCallId
+      });
       if (result instanceof Promise || (result == null ? void 0 : result.then) && (result == null ? void 0 : result.catch)) {
         return result.then((res) => {
           output = res;
@@ -1001,6 +1058,7 @@ function wrapTool({ tool, traces, object }) {
           cancelSlowTool();
           traces.push({
             type: "tool_call",
+            tool_call_id: toolCallId,
             started_at: toolStart,
             ended_at: Date.now(),
             tool_name: tool.name,
@@ -1023,6 +1081,7 @@ function wrapTool({ tool, traces, object }) {
     cancelSlowTool();
     traces.push({
       type: "tool_call",
+      tool_call_id: toolCallId,
       started_at: toolStart,
       ended_at: Date.now(),
       tool_name: tool.name,
@@ -1035,7 +1094,7 @@ function wrapTool({ tool, traces, object }) {
     if (!success) {
       throw error;
     }
-    if (output instanceof _chunkZUAFUOURcjs.VMSignal) {
+    if (output instanceof _chunkJDABP4SDcjs.VMSignal) {
       throw output;
     }
     return output;

package/dist/llmz.d.ts

@@ -19,9 +19,10 @@ export type ExecutionHooks = {
         trace: Trace;
         iteration: number;
     }) => void;
-    onExit?: (exit: Exit, value: unknown) => Promise<void> | void;
+    onExit?: <T = unknown>(exit: Exit<T>, value: T) => Promise<void> | void;
+    onBeforeExecution?: (iteration: Iteration) => Promise<void> | void;
 };
-type Options = Partial<Pick<Context, 'loop' | 'temperature' | 'model'>>;
+type Options = Partial<Pick<Context, 'loop' | 'temperature' | 'model' | 'timeout'>>;
 export type ExecutionProps = {
     instructions?: ValueOrGetter<string, Context>;
     components?: ValueOrGetter<Component[], Context>;

package/dist/snapshots.d.ts

@@ -51,8 +51,16 @@ export declare class Snapshot {
         stack: string;
         variables: Variable[];
         toolCall: ToolCall | undefined;
+        status: SnapshotStatus;
     };
-    static fromJSON(json: Snapshot): Snapshot;
+    static fromJSON(json: {
+        id: string;
+        reason?: string;
+        stack: string;
+        variables: Variable[];
+        toolCall?: ToolCall;
+        status: SnapshotStatus;
+    }): Snapshot;
     clone(): Snapshot;
     reset(): void;
     resolve(value: any): void;

package/dist/tool-LY77IWV2.js

@@ -0,0 +1,11 @@
+import {
+  Tool
+} from "./chunk-QBXIE6EY.js";
+import "./chunk-UNMKB2DA.js";
+import "./chunk-JKVVQN2P.js";
+import "./chunk-JQBT7UWN.js";
+import "./chunk-5TRUJES5.js";
+import "./chunk-7WRN4E42.js";
+export {
+  Tool
+};

package/dist/tool-SWJYOR2Z.cjs

@@ -0,0 +1,11 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+
+var _chunk4QTK5ALHcjs = require('./chunk-4QTK5ALH.cjs');
+require('./chunk-HYVKY3W6.cjs');
+require('./chunk-JDABP4SD.cjs');
+require('./chunk-IKSIOIIP.cjs');
+require('./chunk-P7J2WCBB.cjs');
+require('./chunk-UQOBUJIQ.cjs');
+
+
+exports.Tool = _chunk4QTK5ALHcjs.Tool;

package/dist/tool.d.ts

@@ -1,6 +1,17 @@
-import { type JSONSchema } from '@bpinternal/zui';
+import { type JSONSchema, TypeOf } from '@bpinternal/zui';
 import { ZuiType } from './types.js';
-export declare class Tool<I = unknown, O = unknown> {
+type ToolRetryInput<I> = {
+    input: I;
+    attempt: number;
+    error?: unknown;
+};
+export type ToolRetryFn<I> = (args: ToolRetryInput<I>) => boolean | Promise<boolean>;
+type IsObject<T> = T extends object ? (T extends Function ? false : true) : false;
+type SmartPartial<T> = IsObject<T> extends true ? Partial<T> : T;
+type ToolCallContext = {
+    callId: string;
+};
+export declare class Tool<I extends ZuiType = ZuiType, O extends ZuiType = ZuiType> {
     private _staticInputValues?;
     name: string;
     aliases: string[];
@@ -8,23 +19,37 @@ export declare class Tool<I = unknown, O = unknown> {
     metadata: Record<string, unknown>;
     input?: JSONSchema;
     output?: JSONSchema;
-    setStaticInputValues(values: Partial<I>): this;
+    retry?: ToolRetryFn<TypeOf<I>>;
+    MAX_RETRIES: number;
+    setStaticInputValues(values: SmartPartial<TypeOf<I>>): this;
     get zInput(): import("@bpinternal/zui").ZodTypeAny;
     get zOutput(): import("@bpinternal/zui").ZodTypeAny | import("@bpinternal/zui").ZodVoid;
     rename(name: string): this;
-    clone(): Tool<I, O>;
+    clone<IX extends ZuiType = I, OX extends ZuiType = O>(props?: Partial<{
+        name: string;
+        aliases?: string[];
+        description?: string;
+        metadata?: Record<string, unknown>;
+        input: IX | ((original: I | undefined) => IX);
+        output: OX | ((original: O | undefined) => OX);
+        staticInputValues?: SmartPartial<TypeOf<IX>>;
+        handler: (args: TypeOf<IX>, ctx: ToolCallContext) => Promise<TypeOf<OX>>;
+        retry: ToolRetryFn<TypeOf<IX>>;
+    }>): Tool<IX, OX>;
     private _handler;
     constructor(props: {
         name: string;
         aliases?: string[];
         description?: string;
         metadata?: Record<string, unknown>;
-        input?: ZuiType<I>;
-        output?: ZuiType<O>;
-        staticInputValues?: Partial<I>;
-        handler: (args: I) => Promise<O>;
+        input?: I;
+        output?: O;
+        staticInputValues?: Partial<TypeOf<I>>;
+        handler: (args: TypeOf<I>, ctx: ToolCallContext) => Promise<TypeOf<O>>;
+        retry?: ToolRetryFn<TypeOf<I>>;
     });
-    execute(input: I): Promise<O>;
+    execute(input: TypeOf<I>, ctx: ToolCallContext): Promise<TypeOf<O>>;
     getTypings(): Promise<string>;
     static withUniqueNames: (tools: Tool<any, any>[]) => Tool<any, any>[];
 }
+export {};