@mastra/core 0.1.27-alpha.9 → 0.1.27-unstable.2

package/dist/core.cjs.development.js

@@ -18,7 +18,7 @@ var ai = require('ai');
 var zod = require('zod');
 var sift = require('sift');
 var xstate = require('xstate');
-var get = require('lodash/get');
+var get = require('lodash-es/get');
 
 function asyncGeneratorStep(n, t, e, r, o, a, c) {
   try {
@@ -847,6 +847,7 @@ var LLM = /*#__PURE__*/function () {
       COHERE: 'cohere',
       AZURE: 'azure',
       AMAZON: 'amazon',
+      //
       ANTHROPIC_VERTEX: 'anthropic-vertex'
     };
     var type = (_providerToType$model = providerToType[model.provider]) != null ? _providerToType$model : model.provider;
@@ -1003,16 +1004,79 @@ var LLM = /*#__PURE__*/function () {
     }
     return modelDef;
   };
-  _proto.getParams = /*#__PURE__*/function () {
-    var _getParams = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref3) {
-      var tools, resultTool, model, toolsConverted, answerTool, modelDef;
+  _proto.createEmbedding = /*#__PURE__*/function () {
+    var _createEmbedding = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref3) {
+      var model, value, maxRetries, embeddingModel, openai$1, cohere$1;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            tools = _ref3.tools, resultTool = _ref3.resultTool, model = _ref3.model;
-            toolsConverted = Object.entries(tools).reduce(function (memo, _ref4) {
-              var key = _ref4[0],
-                val = _ref4[1];
+            model = _ref3.model, value = _ref3.value, maxRetries = _ref3.maxRetries;
+            if (!(model.provider === 'OPEN_AI')) {
+              _context.next = 6;
+              break;
+            }
+            openai$1 = openai.createOpenAI({
+              apiKey: process.env.OPENAI_API_KEY
+            });
+            embeddingModel = openai$1.embedding(model.name);
+            _context.next = 12;
+            break;
+          case 6:
+            if (!(model.provider === 'COHERE')) {
+              _context.next = 11;
+              break;
+            }
+            cohere$1 = cohere.createCohere({
+              apiKey: process.env.COHERE_API_KEY
+            });
+            embeddingModel = cohere$1.embedding(model.name);
+            _context.next = 12;
+            break;
+          case 11:
+            throw new Error("Invalid embedding model");
+          case 12:
+            if (!(value instanceof Array)) {
+              _context.next = 16;
+              break;
+            }
+            _context.next = 15;
+            return ai.embedMany({
+              model: embeddingModel,
+              values: value,
+              maxRetries: maxRetries
+            });
+          case 15:
+            return _context.abrupt("return", _context.sent);
+          case 16:
+            _context.next = 18;
+            return ai.embed({
+              model: embeddingModel,
+              value: value,
+              maxRetries: maxRetries
+            });
+          case 18:
+            return _context.abrupt("return", _context.sent);
+          case 19:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    function createEmbedding(_x) {
+      return _createEmbedding.apply(this, arguments);
+    }
+    return createEmbedding;
+  }();
+  _proto.getParams = /*#__PURE__*/function () {
+    var _getParams = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref4) {
+      var tools, resultTool, model, toolsConverted, answerTool, modelDef;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            tools = _ref4.tools, resultTool = _ref4.resultTool, model = _ref4.model;
+            toolsConverted = Object.entries(tools).reduce(function (memo, _ref5) {
+              var key = _ref5[0],
+                val = _ref5[1];
               memo[key] = ai.tool(val);
               return memo;
             }, {});
@@ -1023,29 +1087,29 @@ var LLM = /*#__PURE__*/function () {
               };
             }
             if (!('type' in model)) {
-              _context.next = 8;
+              _context2.next = 8;
               break;
             }
             modelDef = this.createModelDef({
               model: model
             });
-            _context.next = 15;
+            _context2.next = 15;
             break;
           case 8:
             if (!(model.model instanceof Function)) {
-              _context.next = 14;
+              _context2.next = 14;
               break;
             }
-            _context.next = 11;
+            _context2.next = 11;
             return model.model();
           case 11:
-            modelDef = _context.sent;
-            _context.next = 15;
+            modelDef = _context2.sent;
+            _context2.next = 15;
             break;
           case 14:
             modelDef = model.model;
           case 15:
-            return _context.abrupt("return", {
+            return _context2.abrupt("return", {
               toolsConverted: toolsConverted,
               modelDef: modelDef,
               answerTool: answerTool,
@@ -1053,11 +1117,11 @@ var LLM = /*#__PURE__*/function () {
             });
           case 16:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee, this);
+      }, _callee2, this);
     }));
-    function getParams(_x) {
+    function getParams(_x2) {
       return _getParams.apply(this, arguments);
     }
     return getParams;
@@ -1082,14 +1146,59 @@ var LLM = /*#__PURE__*/function () {
     this.logger.debug("Converted tools for LLM", converted);
     return converted;
   };
+  _proto.isBaseOutputType = function isBaseOutputType(outputType) {
+    return outputType === 'string' || outputType === 'number' || outputType === 'boolean' || outputType === 'date';
+  };
+  _proto.baseOutputTypeSchema = function baseOutputTypeSchema(outputType) {
+    switch (outputType) {
+      case 'string':
+        return zod.z.string();
+      case 'number':
+        return zod.z.number();
+      case 'boolean':
+        return zod.z["boolean"]();
+      case 'date':
+        return zod.z.string().datetime();
+      default:
+        return zod.z.string();
+    }
+  };
+  _proto.createOutputSchema = function createOutputSchema(output) {
+    var _this2 = this;
+    var schema = Object.entries(output).reduce(function (memo, _ref6) {
+      var k = _ref6[0],
+        v = _ref6[1];
+      if (_this2.isBaseOutputType(v.type)) {
+        memo[k] = _this2.baseOutputTypeSchema(v.type);
+      }
+      if (v.type === 'object') {
+        var objectItem = v.items;
+        var objectItemSchema = _this2.createOutputSchema(objectItem);
+        memo[k] = objectItemSchema;
+      }
+      if (v.type === 'array') {
+        var arrayItem = v.items;
+        if (_this2.isBaseOutputType(arrayItem.type)) {
+          var itemSchema = _this2.baseOutputTypeSchema(arrayItem.type);
+          memo[k] = zod.z.array(itemSchema);
+        }
+        if (arrayItem.type === 'object') {
+          var objectInArrayItemSchema = _this2.createOutputSchema(arrayItem.items);
+          memo[k] = zod.z.array(objectInArrayItemSchema);
+        }
+      }
+      return memo;
+    }, {});
+    return zod.z.object(schema);
+  };
   _proto.text = /*#__PURE__*/function () {
-    var _text = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref5) {
-      var _this2 = this;
-      var model, messages, _onStepFinish, _ref5$maxSteps, maxSteps, enabledTools, modelToPass, params, argsForExecute;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+    var _text = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref7) {
+      var _this3 = this;
+      var model, messages, _onStepFinish, _ref7$maxSteps, maxSteps, enabledTools, modelToPass, params, argsForExecute;
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            model = _ref5.model, messages = _ref5.messages, _onStepFinish = _ref5.onStepFinish, _ref5$maxSteps = _ref5.maxSteps, maxSteps = _ref5$maxSteps === void 0 ? 5 : _ref5$maxSteps, enabledTools = _ref5.enabledTools;
+            model = _ref7.model, messages = _ref7.messages, _onStepFinish = _ref7.onStepFinish, _ref7$maxSteps = _ref7.maxSteps, maxSteps = _ref7$maxSteps === void 0 ? 5 : _ref7$maxSteps, enabledTools = _ref7.enabledTools;
             if ('name' in model) {
               modelToPass = {
                 type: this.getModelType(model),
@@ -1102,70 +1211,70 @@ var LLM = /*#__PURE__*/function () {
             } else {
               modelToPass = model;
             }
-            _context3.next = 4;
+            _context4.next = 4;
             return this.getParams({
               tools: this.convertTools(enabledTools || {}),
               model: modelToPass
             });
           case 4:
-            params = _context3.sent;
+            params = _context4.sent;
             argsForExecute = {
               model: params.modelDef,
               tools: _extends({}, params.toolsConverted, params.answerTool),
               toolChoice: params.toolChoice,
               maxSteps: maxSteps,
               onStepFinish: function () {
-                var _onStepFinish2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(props) {
+                var _onStepFinish2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(props) {
                   var _props$response, _props$response2;
-                  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-                    while (1) switch (_context2.prev = _context2.next) {
+                  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                    while (1) switch (_context3.prev = _context3.next) {
                       case 0:
                         _onStepFinish == null || _onStepFinish(JSON.stringify(props, null, 2));
                         if (!(props != null && (_props$response = props.response) != null && (_props$response = _props$response.headers) != null && _props$response['x-ratelimit-remaining-tokens'] && parseInt(props == null || (_props$response2 = props.response) == null || (_props$response2 = _props$response2.headers) == null ? void 0 : _props$response2['x-ratelimit-remaining-tokens'], 10) < 2000)) {
-                          _context2.next = 5;
+                          _context3.next = 5;
                           break;
                         }
-                        _this2.logger.warn('Rate limit approaching, waiting 10 seconds');
-                        _context2.next = 5;
+                        _this3.logger.warn('Rate limit approaching, waiting 10 seconds');
+                        _context3.next = 5;
                         return delay(10 * 1000);
                       case 5:
                       case "end":
-                        return _context2.stop();
+                        return _context3.stop();
                     }
-                  }, _callee2);
+                  }, _callee3);
                 }));
-                function onStepFinish(_x3) {
+                function onStepFinish(_x4) {
                   return _onStepFinish2.apply(this, arguments);
                 }
                 return onStepFinish;
               }()
             };
             this.logger.debug("Generating text with " + messages.length + " messages");
-            _context3.next = 9;
+            _context4.next = 9;
             return ai.generateText(_extends({
               messages: messages
             }, argsForExecute));
           case 9:
-            return _context3.abrupt("return", _context3.sent);
+            return _context4.abrupt("return", _context4.sent);
           case 10:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3, this);
+      }, _callee4, this);
     }));
-    function text(_x2) {
+    function text(_x3) {
       return _text.apply(this, arguments);
     }
     return text;
   }();
-  _proto.stream = /*#__PURE__*/function () {
-    var _stream = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref6) {
-      var _this3 = this;
-      var model, messages, _onStepFinish3, _onFinish, _ref6$maxSteps, maxSteps, enabledTools, modelToPass, params, argsForExecute;
+  _proto.textObject = /*#__PURE__*/function () {
+    var _textObject = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref8) {
+      var _this4 = this;
+      var model, messages, _onStepFinish3, _ref8$maxSteps, maxSteps, enabledTools, structuredOutput, modelToPass, params, argsForExecute, schema;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
-            model = _ref6.model, messages = _ref6.messages, _onStepFinish3 = _ref6.onStepFinish, _onFinish = _ref6.onFinish, _ref6$maxSteps = _ref6.maxSteps, maxSteps = _ref6$maxSteps === void 0 ? 5 : _ref6$maxSteps, enabledTools = _ref6.enabledTools;
+            model = _ref8.model, messages = _ref8.messages, _onStepFinish3 = _ref8.onStepFinish, _ref8$maxSteps = _ref8.maxSteps, maxSteps = _ref8$maxSteps === void 0 ? 5 : _ref8$maxSteps, enabledTools = _ref8.enabledTools, structuredOutput = _ref8.structuredOutput;
             if ('name' in model) {
               modelToPass = {
                 type: this.getModelType(model),
@@ -1180,7 +1289,7 @@ var LLM = /*#__PURE__*/function () {
             }
             _context6.next = 4;
             return this.getParams({
-              tools: this.convertTools(enabledTools),
+              tools: this.convertTools(enabledTools || {}),
               model: modelToPass
             });
           case 4:
@@ -1191,66 +1300,243 @@ var LLM = /*#__PURE__*/function () {
               toolChoice: params.toolChoice,
               maxSteps: maxSteps,
               onStepFinish: function () {
-                var _onStepFinish4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(props) {
+                var _onStepFinish4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(props) {
                   var _props$response3, _props$response4;
-                  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-                    while (1) switch (_context4.prev = _context4.next) {
+                  return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+                    while (1) switch (_context5.prev = _context5.next) {
                       case 0:
                         _onStepFinish3 == null || _onStepFinish3(JSON.stringify(props, null, 2));
                         if (!(props != null && (_props$response3 = props.response) != null && (_props$response3 = _props$response3.headers) != null && _props$response3['x-ratelimit-remaining-tokens'] && parseInt(props == null || (_props$response4 = props.response) == null || (_props$response4 = _props$response4.headers) == null ? void 0 : _props$response4['x-ratelimit-remaining-tokens'], 10) < 2000)) {
-                          _context4.next = 5;
+                          _context5.next = 5;
                           break;
                         }
-                        _this3.logger.warn('Rate limit approaching, waiting 10 seconds');
-                        _context4.next = 5;
+                        _this4.logger.warn('Rate limit approaching, waiting 10 seconds');
+                        _context5.next = 5;
                         return delay(10 * 1000);
                       case 5:
                       case "end":
-                        return _context4.stop();
+                        return _context5.stop();
                     }
-                  }, _callee4);
+                  }, _callee5);
                 }));
-                function onStepFinish(_x5) {
+                function onStepFinish(_x6) {
                   return _onStepFinish4.apply(this, arguments);
                 }
                 return onStepFinish;
+              }()
+            };
+            this.logger.debug("Generating text with " + messages.length + " messages");
+            schema = this.createOutputSchema(structuredOutput);
+            _context6.next = 10;
+            return ai.generateObject(_extends({
+              messages: messages
+            }, argsForExecute, {
+              output: 'object',
+              schema: schema
+            }));
+          case 10:
+            return _context6.abrupt("return", _context6.sent);
+          case 11:
+          case "end":
+            return _context6.stop();
+        }
+      }, _callee6, this);
+    }));
+    function textObject(_x5) {
+      return _textObject.apply(this, arguments);
+    }
+    return textObject;
+  }();
+  _proto.stream = /*#__PURE__*/function () {
+    var _stream = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(_ref9) {
+      var _this5 = this;
+      var model, messages, _onStepFinish5, _onFinish, _ref9$maxSteps, maxSteps, enabledTools, modelToPass, params, argsForExecute;
+      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
+          case 0:
+            model = _ref9.model, messages = _ref9.messages, _onStepFinish5 = _ref9.onStepFinish, _onFinish = _ref9.onFinish, _ref9$maxSteps = _ref9.maxSteps, maxSteps = _ref9$maxSteps === void 0 ? 5 : _ref9$maxSteps, enabledTools = _ref9.enabledTools;
+            if ('name' in model) {
+              modelToPass = {
+                type: this.getModelType(model),
+                name: model.name,
+                toolChoice: model.toolChoice,
+                apiKey: model.provider !== 'LM_STUDIO' ? model == null ? void 0 : model.apiKey : undefined,
+                baseURL: model.provider === 'LM_STUDIO' ? model.baseURL : undefined,
+                fetch: model.provider === 'BASETEN' ? model.fetch : undefined
+              };
+            } else {
+              modelToPass = model;
+            }
+            _context9.next = 4;
+            return this.getParams({
+              tools: this.convertTools(enabledTools),
+              model: modelToPass
+            });
+          case 4:
+            params = _context9.sent;
+            argsForExecute = {
+              model: params.modelDef,
+              tools: _extends({}, params.toolsConverted, params.answerTool),
+              toolChoice: params.toolChoice,
+              maxSteps: maxSteps,
+              onStepFinish: function () {
+                var _onStepFinish6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(props) {
+                  var _props$response5, _props$response6;
+                  return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+                    while (1) switch (_context7.prev = _context7.next) {
+                      case 0:
+                        _onStepFinish5 == null || _onStepFinish5(JSON.stringify(props, null, 2));
+                        if (!(props != null && (_props$response5 = props.response) != null && (_props$response5 = _props$response5.headers) != null && _props$response5['x-ratelimit-remaining-tokens'] && parseInt(props == null || (_props$response6 = props.response) == null || (_props$response6 = _props$response6.headers) == null ? void 0 : _props$response6['x-ratelimit-remaining-tokens'], 10) < 2000)) {
+                          _context7.next = 5;
+                          break;
+                        }
+                        _this5.logger.warn('Rate limit approaching, waiting 10 seconds');
+                        _context7.next = 5;
+                        return delay(10 * 1000);
+                      case 5:
+                      case "end":
+                        return _context7.stop();
+                    }
+                  }, _callee7);
+                }));
+                function onStepFinish(_x8) {
+                  return _onStepFinish6.apply(this, arguments);
+                }
+                return onStepFinish;
               }(),
               onFinish: function () {
-                var _onFinish2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(props) {
-                  return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-                    while (1) switch (_context5.prev = _context5.next) {
+                var _onFinish2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(props) {
+                  return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+                    while (1) switch (_context8.prev = _context8.next) {
                       case 0:
                         _onFinish == null || _onFinish(JSON.stringify(props, null, 2));
                       case 1:
                       case "end":
-                        return _context5.stop();
+                        return _context8.stop();
                     }
-                  }, _callee5);
+                  }, _callee8);
                 }));
-                function onFinish(_x6) {
+                function onFinish(_x9) {
                   return _onFinish2.apply(this, arguments);
                 }
                 return onFinish;
               }()
             };
             this.logger.debug("Streaming text with " + messages.length + " messages");
-            _context6.next = 9;
+            _context9.next = 9;
             return ai.streamText(_extends({
               messages: messages
             }, argsForExecute));
           case 9:
-            return _context6.abrupt("return", _context6.sent);
+            return _context9.abrupt("return", _context9.sent);
           case 10:
           case "end":
-            return _context6.stop();
+            return _context9.stop();
         }
-      }, _callee6, this);
+      }, _callee9, this);
     }));
-    function stream(_x4) {
+    function stream(_x7) {
       return _stream.apply(this, arguments);
     }
     return stream;
   }();
+  _proto.streamObject = /*#__PURE__*/function () {
+    var _streamObject2 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(_ref10) {
+      var _this6 = this;
+      var model, messages, _onStepFinish7, _onFinish3, _ref10$maxSteps, maxSteps, enabledTools, structuredOutput, modelToPass, params, argsForExecute, schema;
+      return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+        while (1) switch (_context12.prev = _context12.next) {
+          case 0:
+            model = _ref10.model, messages = _ref10.messages, _onStepFinish7 = _ref10.onStepFinish, _onFinish3 = _ref10.onFinish, _ref10$maxSteps = _ref10.maxSteps, maxSteps = _ref10$maxSteps === void 0 ? 5 : _ref10$maxSteps, enabledTools = _ref10.enabledTools, structuredOutput = _ref10.structuredOutput;
+            if ('name' in model) {
+              modelToPass = {
+                type: this.getModelType(model),
+                name: model.name,
+                toolChoice: model.toolChoice,
+                apiKey: model.provider !== 'LM_STUDIO' ? model == null ? void 0 : model.apiKey : undefined,
+                baseURL: model.provider === 'LM_STUDIO' ? model.baseURL : undefined,
+                fetch: model.provider === 'BASETEN' ? model.fetch : undefined
+              };
+            } else {
+              modelToPass = model;
+            }
+            _context12.next = 4;
+            return this.getParams({
+              tools: this.convertTools(enabledTools),
+              model: modelToPass
+            });
+          case 4:
+            params = _context12.sent;
+            argsForExecute = {
+              model: params.modelDef,
+              tools: _extends({}, params.toolsConverted, params.answerTool),
+              toolChoice: params.toolChoice,
+              maxSteps: maxSteps,
+              onStepFinish: function () {
+                var _onStepFinish8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(props) {
+                  var _props$response7, _props$response8;
+                  return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+                    while (1) switch (_context10.prev = _context10.next) {
+                      case 0:
+                        _onStepFinish7 == null || _onStepFinish7(JSON.stringify(props, null, 2));
+                        if (!(props != null && (_props$response7 = props.response) != null && (_props$response7 = _props$response7.headers) != null && _props$response7['x-ratelimit-remaining-tokens'] && parseInt(props == null || (_props$response8 = props.response) == null || (_props$response8 = _props$response8.headers) == null ? void 0 : _props$response8['x-ratelimit-remaining-tokens'], 10) < 2000)) {
+                          _context10.next = 5;
+                          break;
+                        }
+                        _this6.logger.warn('Rate limit approaching, waiting 10 seconds');
+                        _context10.next = 5;
+                        return delay(10 * 1000);
+                      case 5:
+                      case "end":
+                        return _context10.stop();
+                    }
+                  }, _callee10);
+                }));
+                function onStepFinish(_x11) {
+                  return _onStepFinish8.apply(this, arguments);
+                }
+                return onStepFinish;
+              }(),
+              onFinish: function () {
+                var _onFinish4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(props) {
+                  return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+                    while (1) switch (_context11.prev = _context11.next) {
+                      case 0:
+                        _onFinish3 == null || _onFinish3(JSON.stringify(props, null, 2));
+                      case 1:
+                      case "end":
+                        return _context11.stop();
+                    }
+                  }, _callee11);
+                }));
+                function onFinish(_x12) {
+                  return _onFinish4.apply(this, arguments);
+                }
+                return onFinish;
+              }()
+            };
+            this.logger.debug("Streaming text with " + messages.length + " messages");
+            schema = this.createOutputSchema(structuredOutput);
+            _context12.next = 10;
+            return ai.streamObject(_extends({
+              messages: messages
+            }, argsForExecute, {
+              output: 'object',
+              schema: schema
+            }));
+          case 10:
+            return _context12.abrupt("return", _context12.sent);
+          case 11:
+          case "end":
+            return _context12.stop();
+        }
+      }, _callee12, this);
+    }));
+    function streamObject(_x10) {
+      return _streamObject2.apply(this, arguments);
+    }
+    return streamObject;
+  }();
   return LLM;
 }();
 
@@ -1326,13 +1612,51 @@ var Agent = /*#__PURE__*/function () {
     }
     return text;
   }();
-  _proto.stream = /*#__PURE__*/function () {
-    var _stream = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
-      var messages, onStepFinish, onFinish, _ref2$maxSteps, maxSteps, systemMessage, userMessages, messageObjects;
+  _proto.textObject = /*#__PURE__*/function () {
+    var _textObject = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
+      var messages, structuredOutput, onStepFinish, _ref2$maxSteps, maxSteps, systemMessage, userMessages, messageObjects;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            messages = _ref2.messages, onStepFinish = _ref2.onStepFinish, onFinish = _ref2.onFinish, _ref2$maxSteps = _ref2.maxSteps, maxSteps = _ref2$maxSteps === void 0 ? 5 : _ref2$maxSteps;
+            messages = _ref2.messages, structuredOutput = _ref2.structuredOutput, onStepFinish = _ref2.onStepFinish, _ref2$maxSteps = _ref2.maxSteps, maxSteps = _ref2$maxSteps === void 0 ? 5 : _ref2$maxSteps;
+            this.logger.info("Starting text generation for agent " + this.name);
+            systemMessage = {
+              role: 'system',
+              content: this.instructions
+            };
+            userMessages = messages.map(function (content) {
+              return {
+                role: 'user',
+                content: content
+              };
+            });
+            messageObjects = [systemMessage].concat(userMessages);
+            return _context2.abrupt("return", this.llm.textObject({
+              model: this.model,
+              messages: messageObjects,
+              structuredOutput: structuredOutput,
+              enabledTools: this.enabledTools,
+              onStepFinish: onStepFinish,
+              maxSteps: maxSteps
+            }));
+          case 6:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2, this);
+    }));
+    function textObject(_x2) {
+      return _textObject.apply(this, arguments);
+    }
+    return textObject;
+  }();
+  _proto.stream = /*#__PURE__*/function () {
+    var _stream = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref3) {
+      var messages, onStepFinish, onFinish, _ref3$maxSteps, maxSteps, systemMessage, userMessages, messageObjects;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            messages = _ref3.messages, onStepFinish = _ref3.onStepFinish, onFinish = _ref3.onFinish, _ref3$maxSteps = _ref3.maxSteps, maxSteps = _ref3$maxSteps === void 0 ? 5 : _ref3$maxSteps;
             this.logger.info("Starting stream generation for agent " + this.name);
             systemMessage = {
               role: 'system',
@@ -1345,7 +1669,7 @@ var Agent = /*#__PURE__*/function () {
               };
             });
             messageObjects = [systemMessage].concat(userMessages);
-            return _context2.abrupt("return", this.llm.stream({
+            return _context3.abrupt("return", this.llm.stream({
               messages: messageObjects,
               model: this.model,
               enabledTools: this.enabledTools,
@@ -1355,19 +1679,57 @@ var Agent = /*#__PURE__*/function () {
             }));
           case 6:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2, this);
+      }, _callee3, this);
     }));
-    function stream(_x2) {
+    function stream(_x3) {
       return _stream.apply(this, arguments);
     }
     return stream;
   }();
+  _proto.streamObject = /*#__PURE__*/function () {
+    var _streamObject = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref4) {
+      var messages, structuredOutput, onStepFinish, onFinish, _ref4$maxSteps, maxSteps, systemMessage, userMessages, messageObjects;
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            messages = _ref4.messages, structuredOutput = _ref4.structuredOutput, onStepFinish = _ref4.onStepFinish, onFinish = _ref4.onFinish, _ref4$maxSteps = _ref4.maxSteps, maxSteps = _ref4$maxSteps === void 0 ? 5 : _ref4$maxSteps;
+            this.logger.info("Starting stream generation for agent " + this.name);
+            systemMessage = {
+              role: 'system',
+              content: this.instructions
+            };
+            userMessages = messages.map(function (content) {
+              return {
+                role: 'user',
+                content: content
+              };
+            });
+            messageObjects = [systemMessage].concat(userMessages);
+            return _context4.abrupt("return", this.llm.streamObject({
+              messages: messageObjects,
+              structuredOutput: structuredOutput,
+              model: this.model,
+              enabledTools: this.enabledTools,
+              onStepFinish: onStepFinish,
+              onFinish: onFinish,
+              maxSteps: maxSteps
+            }));
+          case 6:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4, this);
+    }));
+    function streamObject(_x4) {
+      return _streamObject.apply(this, arguments);
+    }
+    return streamObject;
+  }();
   return Agent;
 }();
 
-// TODO: Passing the In/out generics works but seems to break on plugin to mastra, fix.
 function createTool(opts) {
   return opts;
 }
@@ -1594,6 +1956,10 @@ function MastraEngine(config) {};
 
 var MastraVector = function MastraVector() {};
 
+function createSync(opts) {
+  return opts;
+}
+
 var Mastra = /*#__PURE__*/function () {
   function Mastra(config) {
     var _config$integrations,
@@ -1645,8 +2011,12 @@ var Mastra = /*#__PURE__*/function () {
       memo[key] = _extends({}, val, {
         executor: function executor(params) {
           return val.executor(_extends({}, params, {
-            getIntegration: function getIntegration(name) {
-              return _this.getIntegration(name);
+            integrationsRegistry: function integrationsRegistry() {
+              return {
+                get: function get(name) {
+                  return _this.getIntegration(name);
+                }
+              };
             },
             agents: _this.agents,
             llm: _this.llm,
@@ -1691,8 +2061,9 @@ var Mastra = /*#__PURE__*/function () {
   var _proto = Mastra.prototype;
   _proto.sync = /*#__PURE__*/function () {
     var _sync = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(key, params) {
-      var _this$syncs;
-      var syncFn;
+      var _this$syncs,
+        _this2 = this;
+      var sync, syncFn;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -1700,25 +2071,47 @@ var Mastra = /*#__PURE__*/function () {
               _context.next = 2;
               break;
             }
-            throw new Error("Sync function " + key + " not found");
+            throw new Error("Engine is required to run syncs");
           case 2:
-            syncFn = (_this$syncs = this.syncs) == null ? void 0 : _this$syncs[key];
-            if (syncFn) {
+            sync = (_this$syncs = this.syncs) == null ? void 0 : _this$syncs[key];
+            if (sync) {
               _context.next = 5;
               break;
             }
             throw new Error("Sync function " + key + " not found");
           case 5:
-            _context.next = 7;
+            syncFn = sync['executor'];
+            if (syncFn) {
+              _context.next = 8;
+              break;
+            }
+            throw new Error("Sync function " + key + " not found");
+          case 8:
+            _context.next = 10;
             return syncFn({
-              tools: this.tools,
-              params: params,
+              data: params,
               engine: this.engine,
               agents: this.agents,
               vectors: this.vectors,
-              llm: this.llm
+              llm: this.llm,
+              integrationsRegistry: function integrationsRegistry() {
+                return {
+                  get: function get(name) {
+                    return _this2.getIntegration(name);
+                  }
+                };
+              },
+              toolsRegistry: function toolsRegistry() {
+                return {
+                  get: function get(name) {
+                    return _this2.getTool(name);
+                  }
+                };
+              }
             });
-          case 7:
+          case 10:
+            return _context.abrupt("return", _context.sent);
+          case 11:
           case "end":
             return _context.stop();
         }
@@ -1745,7 +2138,7 @@ var Mastra = /*#__PURE__*/function () {
     return integration;
   };
   _proto.getTool = function getTool(name) {
-    var _this2 = this;
+    var _this3 = this;
     var tool = this.tools[name];
     if (!tool) {
       throw new Error("Tool with name " + String(name) + " not found");
@@ -1761,13 +2154,13 @@ var Mastra = /*#__PURE__*/function () {
                   integrationsRegistry: function integrationsRegistry() {
                     return {
                       get: function get(name) {
-                        return _this2.getIntegration(name);
+                        return _this3.getIntegration(name);
                       }
                     };
                   },
-                  agents: _this2.agents,
-                  llm: _this2.llm,
-                  engine: _this2.engine
+                  agents: _this3.agents,
+                  llm: _this3.llm,
+                  engine: _this3.engine
                 }));
               case 1:
               case "end":
@@ -1814,13 +2207,14 @@ function isTransitionEvent(stateEvent) {
 }
 
 var _logger = /*#__PURE__*/_classPrivateFieldLooseKey("logger");
+var _triggerSchema = /*#__PURE__*/_classPrivateFieldLooseKey("triggerSchema");
 var _steps = /*#__PURE__*/_classPrivateFieldLooseKey("steps");
+var _transitions = /*#__PURE__*/_classPrivateFieldLooseKey("transitions");
 var _machine = /*#__PURE__*/_classPrivateFieldLooseKey("machine");
 var _actor = /*#__PURE__*/_classPrivateFieldLooseKey("actor");
 var _log = /*#__PURE__*/_classPrivateFieldLooseKey("log");
 var _buildStateHierarchy = /*#__PURE__*/_classPrivateFieldLooseKey("buildStateHierarchy");
 var _isVariableReference = /*#__PURE__*/_classPrivateFieldLooseKey("isVariableReference");
-var _createStepId = /*#__PURE__*/_classPrivateFieldLooseKey("createStepId");
 var _resolveVariables = /*#__PURE__*/_classPrivateFieldLooseKey("resolveVariables");
 var _cleanup = /*#__PURE__*/_classPrivateFieldLooseKey("cleanup");
 var _evaluateCondition = /*#__PURE__*/_classPrivateFieldLooseKey("evaluateCondition");
@@ -1834,7 +2228,11 @@ var Workflow = /*#__PURE__*/function () {
    * @param name - Identifier for the workflow (not necessarily unique)
    * @param logger - Optional logger instance
    */
-  function Workflow(name, logger) {
+  function Workflow(_ref) {
+    var name = _ref.name,
+      logger = _ref.logger,
+      steps = _ref.steps,
+      triggerSchema = _ref.triggerSchema;
     /**
      * Detects unreachable steps in the workflow
      * @returns Array of ValidationError objects
@@ -1885,15 +2283,6 @@ var Workflow = /*#__PURE__*/function () {
     Object.defineProperty(this, _resolveVariables, {
       value: _resolveVariables2
     });
-    /**
-     * Creates a validated step ID, ensuring uniqueness within the workflow
-     * @param id - Proposed step ID
-     * @returns The validated and branded step ID
-     * @throws Error if ID is invalid or duplicate
-     */
-    Object.defineProperty(this, _createStepId, {
-      value: _createStepId2
-    });
     /**
      * Type guard to check if a value is a valid VariableReference
      * @param value - Value to check
@@ -1924,10 +2313,17 @@ var Workflow = /*#__PURE__*/function () {
       writable: true,
       value: void 0
     });
-    this.triggerSchema = void 0;
+    Object.defineProperty(this, _triggerSchema, {
+      writable: true,
+      value: void 0
+    });
     Object.defineProperty(this, _steps, {
       writable: true,
-      value: []
+      value: void 0
+    });
+    Object.defineProperty(this, _transitions, {
+      writable: true,
+      value: {}
     });
     /** XState machine instance that orchestrates the workflow execution */
     Object.defineProperty(this, _machine, {
@@ -1941,6 +2337,8 @@ var Workflow = /*#__PURE__*/function () {
     });
     this.name = name;
     _classPrivateFieldLooseBase(this, _logger)[_logger] = logger;
+    _classPrivateFieldLooseBase(this, _steps)[_steps] = steps;
+    _classPrivateFieldLooseBase(this, _triggerSchema)[_triggerSchema] = triggerSchema;
     this.initializeMachine();
   }
   var _proto = Workflow.prototype;
@@ -1957,10 +2355,10 @@ var Workflow = /*#__PURE__*/function () {
       types: {},
       actions: {
         updateStepResult: xstate.assign({
-          stepResults: function stepResults(_ref) {
+          stepResults: function stepResults(_ref2) {
             var _event$output, _event$output2;
-            var context = _ref.context,
-              event = _ref.event;
+            var context = _ref2.context,
+              event = _ref2.event;
             if (!isTransitionEvent(event)) return context.stepResults;
             var stepId = (_event$output = event.output) == null ? void 0 : _event$output.stepId;
             if (!stepId) return context.stepResults;
@@ -1970,9 +2368,7 @@ var Workflow = /*#__PURE__*/function () {
               var _extends2;
               var newResults = _extends({}, context.stepResults, (_extends2 = {}, _extends2[stepId] = result, _extends2));
               // Get the step configuration
-              var step = _classPrivateFieldLooseBase(_this, _steps)[_steps].find(function (s) {
-                return s.id === stepId;
-              });
+              var step = _classPrivateFieldLooseBase(_this, _transitions)[_transitions][stepId];
               // Evaluate transitions and send events
               if (step != null && step.transitions) {
                 var fullContext = _extends({}, context, {
@@ -1980,12 +2376,12 @@ var Workflow = /*#__PURE__*/function () {
                 });
                 var hasMatchingCondition = false;
                 _classPrivateFieldLooseBase(_this, _log)[_log](LogLevel.DEBUG, 'Evaluating transitions with context:', fullContext);
-                Object.entries(step.transitions).forEach(function (_ref2) {
-                  var targetId = _ref2[0],
-                    config = _ref2[1];
+                Object.entries(step.transitions).forEach(function (_ref3) {
+                  var targetId = _ref3[0],
+                    config = _ref3[1];
                   _classPrivateFieldLooseBase(_this, _log)[_log](LogLevel.DEBUG, "Checking transition to: " + targetId);
-                  _classPrivateFieldLooseBase(_this, _log)[_log](LogLevel.DEBUG, "With condition: " + config.condition);
-                  if (!config.condition || _classPrivateFieldLooseBase(_this, _evaluateCondition)[_evaluateCondition](config.condition, fullContext)) {
+                  _classPrivateFieldLooseBase(_this, _log)[_log](LogLevel.DEBUG, "With condition: " + (config == null ? void 0 : config.condition));
+                  if (!(config != null && config.condition) || _classPrivateFieldLooseBase(_this, _evaluateCondition)[_evaluateCondition](config == null ? void 0 : config.condition, fullContext)) {
                     hasMatchingCondition = true;
                     _classPrivateFieldLooseBase(_this, _log)[_log](LogLevel.DEBUG, 'Condition passed, sending transition to:', targetId);
                     Promise.resolve().then(function () {
@@ -2014,16 +2410,16 @@ var Workflow = /*#__PURE__*/function () {
           }
         }),
         setError: xstate.assign({
-          error: function error(_ref3) {
-            var event = _ref3.event;
+          error: function error(_ref4) {
+            var event = _ref4.event;
             if (!isErrorEvent(event)) return null;
             _classPrivateFieldLooseBase(_this, _log)[_log](LogLevel.ERROR, "Workflow error", event.error);
             return event.error;
           }
         }),
         initializeTriggerData: xstate.assign({
-          triggerData: function triggerData(_ref4) {
-            var context = _ref4.context;
+          triggerData: function triggerData(_ref5) {
+            var context = _ref5.context;
             _classPrivateFieldLooseBase(_this, _log)[_log](LogLevel.INFO, 'Workflow started', context == null ? void 0 : context.triggerData);
             return context == null ? void 0 : context.triggerData;
           }
@@ -2031,20 +2427,20 @@ var Workflow = /*#__PURE__*/function () {
       },
       actors: {
         resolverFunction: xstate.fromPromise(/*#__PURE__*/function () {
-          var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref5) {
-            var input, step, context, resolvedData, result;
+          var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref6) {
+            var input, step, context, stepId, resolvedData, result;
             return _regeneratorRuntime().wrap(function _callee$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
-                  input = _ref5.input;
-                  step = input.step, context = input.context;
+                  input = _ref6.input;
+                  step = input.step, context = input.context, stepId = input.stepId;
                   resolvedData = _classPrivateFieldLooseBase(_this, _resolveVariables)[_resolveVariables](step, context);
                   _context.next = 5;
                   return step.handler(resolvedData);
                 case 5:
                   result = _context.sent;
                   return _context.abrupt("return", {
-                    stepId: step.id,
+                    stepId: stepId,
                     result: result
                   });
                 case 7:
@@ -2054,15 +2450,15 @@ var Workflow = /*#__PURE__*/function () {
             }, _callee);
           }));
           return function (_x) {
-            return _ref6.apply(this, arguments);
+            return _ref7.apply(this, arguments);
           };
         }())
       }
     }).createMachine({
       id: this.name,
       initial: ((_classPrivateFieldLoo = _classPrivateFieldLooseBase(this, _steps)[_steps][0]) == null ? void 0 : _classPrivateFieldLoo.id) || 'idle',
-      context: function context(_ref7) {
-        var input = _ref7.input;
+      context: function context(_ref8) {
+        var input = _ref8.input;
         return _extends({}, input, {
           stepResults: {},
           error: null
@@ -2079,18 +2475,12 @@ var Workflow = /*#__PURE__*/function () {
    *
    * This is the last step of a workflow builder method chain
    * @throws Error if validation fails
+   *
+   * @returns this instance for method chaining
    */;
   _proto.commit = function commit() {
     _classPrivateFieldLooseBase(this, _validateWorkflow)[_validateWorkflow]();
     this.initializeMachine();
-  };
-  /**
-   * Sets the schema for validating trigger data
-   * @param schema - Zod schema for trigger data validation
-   * @returns this instance for method chaining
-   */
-  _proto.setTriggerSchema = function setTriggerSchema(schema) {
-    this.triggerSchema = schema;
     return this;
   };
   /**
@@ -2100,27 +2490,13 @@ var Workflow = /*#__PURE__*/function () {
    * @returns this instance for method chaining (builder pattern baybyyyy)
    * @throws Error if step ID is duplicate or variable resolution fails
    */
-  _proto.addStep = function addStep(id, config) {
+  _proto.step = function step(id, config) {
     var _this2 = this;
-    var stepId = _classPrivateFieldLooseBase(this, _createStepId)[_createStepId](id);
-    var action = config.action,
-      inputSchema = config.inputSchema,
-      _config$variables = config.variables,
-      variables = _config$variables === void 0 ? {} : _config$variables,
-      _config$payload = config.payload,
-      payload = _config$payload === void 0 ? {} : _config$payload,
-      transitions = config.transitions;
-    // Validate transitions reference existing steps
-    if (transitions) {
-      Object.keys(transitions).forEach(function (targetId) {
-        // Skip validation for steps that will be added later
-        if (!_classPrivateFieldLooseBase(_this2, _steps)[_steps].some(function (s) {
-          return s.id === targetId;
-        })) {
-          _classPrivateFieldLooseBase(_this2, _log)[_log](LogLevel.DEBUG, "Step " + targetId + " not found yet, will be validated when workflow starts");
-        }
-      });
-    }
+    var _ref9 = config || {},
+      _ref9$variables = _ref9.variables,
+      variables = _ref9$variables === void 0 ? {} : _ref9$variables,
+      _ref9$transitions = _ref9.transitions,
+      transitions = _ref9$transitions === void 0 ? undefined : _ref9$transitions;
     var requiredData = {};
     // Add valid variables to requiredData
     for (var _i = 0, _Object$entries = Object.entries(variables); _i < _Object$entries.length; _i++) {
@@ -2131,21 +2507,30 @@ var Workflow = /*#__PURE__*/function () {
         requiredData[key] = variable;
       }
     }
-    // Create step config
-    var stepConfig = {
-      id: stepId,
+    _classPrivateFieldLooseBase(this, _transitions)[_transitions][id] = {
+      transitions: transitions,
+      data: requiredData,
       handler: function () {
         var _handler = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(data) {
-          var mergedData, validatedData;
+          var step, inputSchema, payload, action, mergedData, validatedData;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
-                // Merge static payload with dynamically resolved variables
+                step = _classPrivateFieldLooseBase(_this2, _steps)[_steps].find(function (s) {
+                  return s.id === id;
+                });
+                if (step) {
+                  _context2.next = 3;
+                  break;
+                }
+                throw new Error("Step " + id + " not found");
+              case 3:
+                inputSchema = step.inputSchema, payload = step.payload, action = step.action; // Merge static payload with dynamically resolved variables
                 // Variables take precedence over payload values
                 mergedData = _extends({}, payload, data); // Validate complete input data
                 validatedData = inputSchema ? inputSchema.parse(mergedData) : mergedData;
-                return _context2.abrupt("return", action(validatedData));
-              case 3:
+                return _context2.abrupt("return", action ? action(validatedData) : {});
+              case 7:
               case "end":
                 return _context2.stop();
             }
@@ -2155,12 +2540,8 @@ var Workflow = /*#__PURE__*/function () {
           return _handler.apply(this, arguments);
         }
         return handler;
-      }(),
-      inputSchema: inputSchema,
-      requiredData: requiredData,
-      transitions: transitions
+      }()
     };
-    _classPrivateFieldLooseBase(this, _steps)[_steps].push(stepConfig);
     return this;
   };
   /**
@@ -2169,10 +2550,10 @@ var Workflow = /*#__PURE__*/function () {
    * @returns Promise resolving to workflow results or rejecting with error
    * @throws Error if trigger schema validation fails
    */
-  _proto.executeWorkflow =
+  _proto.execute =
   /*#__PURE__*/
   function () {
-    var _executeWorkflow = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(triggerData) {
+    var _execute = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(triggerData) {
       var _this3 = this;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -2182,12 +2563,12 @@ var Workflow = /*#__PURE__*/function () {
               triggerData: triggerData
             });
           case 2:
-            if (!this.triggerSchema) {
+            if (!_classPrivateFieldLooseBase(this, _triggerSchema)[_triggerSchema]) {
               _context3.next = 14;
               break;
             }
             _context3.prev = 3;
-            this.triggerSchema.parse(triggerData);
+            _classPrivateFieldLooseBase(this, _triggerSchema)[_triggerSchema].parse(triggerData);
             _context3.next = 7;
             return _classPrivateFieldLooseBase(this, _log)[_log](LogLevel.DEBUG, 'Trigger schema validation passed');
           case 7:
@@ -2244,10 +2625,10 @@ var Workflow = /*#__PURE__*/function () {
         }
       }, _callee3, this, [[3, 9]]);
     }));
-    function executeWorkflow(_x3) {
-      return _executeWorkflow.apply(this, arguments);
+    function execute(_x3) {
+      return _execute.apply(this, arguments);
     }
-    return executeWorkflow;
+    return execute;
   }();
   return Workflow;
 }();
@@ -2256,7 +2637,7 @@ function _log2(_x4, _x5, _x6, _x7) {
 }
 function _log3() {
   _log3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(level, message, data, stepId) {
-    var _classPrivateFieldLoo2, _classPrivateFieldLoo3;
+    var _classPrivateFieldLoo5, _classPrivateFieldLoo6;
     var logMessage, logMethod;
     return _regeneratorRuntime().wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
@@ -2277,7 +2658,7 @@ function _log3() {
           };
           logMethod = level.toLowerCase();
           _context4.next = 6;
-          return (_classPrivateFieldLoo2 = (_classPrivateFieldLoo3 = _classPrivateFieldLooseBase(this, _logger)[_logger])[logMethod]) == null ? void 0 : _classPrivateFieldLoo2.call(_classPrivateFieldLoo3, logMessage);
+          return (_classPrivateFieldLoo5 = (_classPrivateFieldLoo6 = _classPrivateFieldLooseBase(this, _logger)[_logger])[logMethod]) == null ? void 0 : _classPrivateFieldLoo5.call(_classPrivateFieldLoo6, logMessage);
         case 6:
         case "end":
           return _context4.stop();
@@ -2299,6 +2680,7 @@ function _buildStateHierarchy2() {
   };
   // Helper to build nested state structure
   var buildState = function buildState(currentStepId, visited) {
+    var _classPrivateFieldLoo2, _classPrivateFieldLoo3;
     if (visited.has(currentStepId)) return null;
     visited.add(currentStepId);
     var currentStep = _classPrivateFieldLooseBase(_this4, _steps)[_steps].find(function (s) {
@@ -2308,17 +2690,18 @@ function _buildStateHierarchy2() {
     var state = {
       invoke: {
         src: 'resolverFunction',
-        input: function input(_ref8) {
-          var context = _ref8.context;
+        input: function input(_ref10) {
+          var context = _ref10.context;
           return {
-            step: currentStep,
-            context: context
+            context: context,
+            stepId: currentStepId,
+            step: _classPrivateFieldLooseBase(_this4, _transitions)[_transitions][currentStepId]
           };
         },
         onDone: {
           actions: ['updateStepResult'],
           // If no transitions, go to success state
-          target: currentStep.transitions ? undefined : 'success'
+          target: (_classPrivateFieldLoo2 = _classPrivateFieldLooseBase(_this4, _transitions)[_transitions][currentStepId]) != null && _classPrivateFieldLoo2.transitions ? undefined : 'success'
         },
         onError: {
           target: 'failure',
@@ -2339,16 +2722,17 @@ function _buildStateHierarchy2() {
       }
     };
     // Handle transitions
-    if (currentStep.transitions) {
-      Object.entries(currentStep.transitions).forEach(function (_ref9) {
-        var targetId = _ref9[0],
-          config = _ref9[1];
+    if ((_classPrivateFieldLoo3 = _classPrivateFieldLooseBase(_this4, _transitions)[_transitions][currentStepId]) != null && _classPrivateFieldLoo3.transitions) {
+      var _classPrivateFieldLoo4;
+      Object.entries((_classPrivateFieldLoo4 = _classPrivateFieldLooseBase(_this4, _transitions)[_transitions][currentStepId]) == null ? void 0 : _classPrivateFieldLoo4.transitions).forEach(function (_ref11) {
+        var targetId = _ref11[0],
+          config = _ref11[1];
         // Create flat state structure with transitions
         state.on["TRANSITION_" + targetId] = {
           target: targetId,
-          guard: function guard(_ref10) {
-            var context = _ref10.context;
-            return !config.condition || _classPrivateFieldLooseBase(_this4, _evaluateCondition)[_evaluateCondition](config.condition, context);
+          guard: function guard(_ref12) {
+            var context = _ref12.context;
+            return !(config != null && config.condition) || _classPrivateFieldLooseBase(_this4, _evaluateCondition)[_evaluateCondition](config == null ? void 0 : config.condition, context);
           }
         };
       });
@@ -2368,18 +2752,9 @@ function _buildStateHierarchy2() {
 function _isVariableReference2(value) {
   return typeof value === 'object' && 'stepId' in value && 'path' in value;
 }
-function _createStepId2(id) {
-  // Check for duplicates
-  if (_classPrivateFieldLooseBase(this, _steps)[_steps].some(function (step) {
-    return step.id === id;
-  })) {
-    throw new Error("Step with ID \"" + id + "\" already exists in workflow \"" + this.name + "\"");
-  }
-  return id;
-}
 function _resolveVariables2(stepConfig, context) {
   var resolvedData = {};
-  for (var _i2 = 0, _Object$entries2 = Object.entries(stepConfig.requiredData); _i2 < _Object$entries2.length; _i2++) {
+  for (var _i2 = 0, _Object$entries2 = Object.entries(stepConfig.data); _i2 < _Object$entries2.length; _i2++) {
     var _Object$entries2$_i = _Object$entries2[_i2],
       key = _Object$entries2$_i[0],
       variable = _Object$entries2$_i[1];
@@ -2462,9 +2837,7 @@ function _detectCircularDependencies2() {
       return;
     }
     stack.push(stepId);
-    var step = _classPrivateFieldLooseBase(_this6, _steps)[_steps].find(function (s) {
-      return s.id === stepId;
-    });
+    var step = _classPrivateFieldLooseBase(_this6, _transitions)[_transitions][stepId];
     if (step != null && step.transitions) {
       Object.keys(step.transitions).forEach(function (targetId) {
         _dfs(targetId);
@@ -2490,9 +2863,7 @@ function _validateTerminalPaths2() {
     if (hasTerminalPath.has(stepId)) return true;
     if (visited.has(stepId) && !hasTerminalPath.has(stepId)) return false;
     visited.add(stepId);
-    var step = _classPrivateFieldLooseBase(_this7, _steps)[_steps].find(function (s) {
-      return s.id === stepId;
-    });
+    var step = _classPrivateFieldLooseBase(_this7, _transitions)[_transitions][stepId];
     if (!step) return false;
     // Terminal step
     if (!step.transitions) {
@@ -2535,9 +2906,7 @@ function _detectUnreachableSteps2() {
   var _dfs3 = function dfs(stepId) {
     if (reachableSteps.has(stepId)) return;
     reachableSteps.add(stepId);
-    var step = _classPrivateFieldLooseBase(_this8, _steps)[_steps].find(function (s) {
-      return s.id === stepId;
-    });
+    var step = _classPrivateFieldLooseBase(_this8, _transitions)[_transitions][stepId];
     if (step != null && step.transitions) {
       Object.keys(step.transitions).forEach(function (targetId) {
         _dfs3(targetId);
@@ -2563,6 +2932,24 @@ function _detectUnreachableSteps2() {
   return errors;
 }
 
+var Step = function Step(_ref) {
+  var id = _ref.id,
+    inputSchema = _ref.inputSchema,
+    outputSchema = _ref.outputSchema,
+    payload = _ref.payload,
+    action = _ref.action;
+  this.id = void 0;
+  this.inputSchema = void 0;
+  this.outputSchema = void 0;
+  this.payload = void 0;
+  this.action = void 0;
+  this.id = id;
+  this.inputSchema = inputSchema;
+  this.payload = payload;
+  this.outputSchema = outputSchema;
+  this.action = action;
+};
+
 exports.Agent = Agent;
 exports.BaseLogger = BaseLogger;
 exports.FieldTypePrimitiveMap = FieldTypePrimitiveMap;
@@ -2573,10 +2960,12 @@ exports.MastraEngine = MastraEngine;
 exports.MastraVector = MastraVector;
 exports.MultiLogger = MultiLogger;
 exports.RegisteredLogger = RegisteredLogger;
+exports.Step = Step;
 exports.Workflow = Workflow;
 exports.buildQueryString = buildQueryString;
 exports.createLogger = createLogger;
 exports.createMultiLogger = createMultiLogger;
+exports.createSync = createSync;
 exports.createTool = createTool;
 exports.filterQuerySchema = filterQuerySchema;
 exports.getJSONField = getJSONField;