@mastra/core 0.1.27-alpha.21 → 0.1.27-alpha.23

package/dist/core.esm.js

@@ -1,4 +1,6 @@
 import { __decorate, __metadata } from 'tslib';
+import { randomUUID } from 'crypto';
+import { z } from 'zod';
 import { createAmazonBedrock } from '@ai-sdk/amazon-bedrock';
 import { createAnthropic } from '@ai-sdk/anthropic';
 import { createAzure } from '@ai-sdk/azure';
@@ -9,7 +11,6 @@ import { createOpenAI } from '@ai-sdk/openai';
 import { createXai } from '@ai-sdk/xai';
 import { embed, embedMany, tool, generateText, generateObject, streamText, streamObject } from 'ai';
 import { createAnthropicVertex } from 'anthropic-vertex-ai';
-import { z } from 'zod';
 import { Redis } from '@upstash/redis';
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
 import path from 'path';
@@ -24,6 +25,11 @@ import { get } from 'radash';
 import sift from 'sift';
 import { setup, assign, fromPromise, createActor } from 'xstate';
 
+function _arrayLikeToArray(r, a) {
+  (null == a || a > r.length) && (a = r.length);
+  for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+  return n;
+}
 function asyncGeneratorStep(n, t, e, r, o, a, c) {
   try {
     var i = n[a](c),
@@ -68,6 +74,23 @@ function _createClass(e, r, t) {
     writable: !1
   }), e;
 }
+function _createForOfIteratorHelperLoose(r, e) {
+  var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
+  if (t) return (t = t.call(r)).next.bind(t);
+  if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) {
+    t && (r = t);
+    var o = 0;
+    return function () {
+      return o >= r.length ? {
+        done: !0
+      } : {
+        done: !1,
+        value: r[o++]
+      };
+    };
+  }
+  throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
 function _extends() {
   return _extends = Object.assign ? Object.assign.bind() : function (n) {
     for (var e = 1; e < arguments.length; e++) {
@@ -409,6 +432,13 @@ function _toPropertyKey(t) {
   var i = _toPrimitive(t, "string");
   return "symbol" == typeof i ? i : i + "";
 }
+function _unsupportedIterableToArray(r, a) {
+  if (r) {
+    if ("string" == typeof r) return _arrayLikeToArray(r, a);
+    var t = {}.toString.call(r).slice(8, -1);
+    return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
+  }
+}
 
 // Constants and Types
 var RegisteredLogger = {
@@ -1017,9 +1047,10 @@ var delay = function delay(ms) {
   });
 };
 
-var _tools, _logger$2, _telemetry$4, _log$2;
-var LLM = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2 = /*#__PURE__*/_classPrivateFieldLooseKey("logger"), _telemetry$4 = /*#__PURE__*/_classPrivateFieldLooseKey("telemetry"), _log$2 = /*#__PURE__*/_classPrivateFieldLooseKey("log"), /*#__PURE__*/function () {
-  function LLM() {
+var _model, _tools$1, _logger$2, _telemetry$4, _log$2;
+var LLM = (_model = /*#__PURE__*/_classPrivateFieldLooseKey("model"), _tools$1 = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2 = /*#__PURE__*/_classPrivateFieldLooseKey("logger"), _telemetry$4 = /*#__PURE__*/_classPrivateFieldLooseKey("telemetry"), _log$2 = /*#__PURE__*/_classPrivateFieldLooseKey("log"), /*#__PURE__*/function () {
+  function LLM(_ref) {
+    var model = _ref.model;
     /**
      * Internal logging helper that formats and sends logs to the configured logger
      * @param level - Severity level of the log
@@ -1029,7 +1060,11 @@ var LLM = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2
     Object.defineProperty(this, _log$2, {
       value: _log2$2
     });
-    Object.defineProperty(this, _tools, {
+    Object.defineProperty(this, _model, {
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, _tools$1, {
       writable: true,
       value: void 0
     });
@@ -1041,7 +1076,8 @@ var LLM = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2
       writable: true,
       value: void 0
     });
-    _classPrivateFieldLooseBase(this, _tools)[_tools] = {};
+    _classPrivateFieldLooseBase(this, _model)[_model] = model;
+    _classPrivateFieldLooseBase(this, _tools$1)[_tools$1] = {};
     _classPrivateFieldLooseBase(this, _logger$2)[_logger$2] = createLogger({
       type: 'CONSOLE'
     });
@@ -1052,7 +1088,7 @@ var LLM = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2
    * @param tools
    */
   _proto.__setTools = function __setTools(tools) {
-    _classPrivateFieldLooseBase(this, _tools)[_tools] = tools;
+    _classPrivateFieldLooseBase(this, _tools$1)[_tools$1] = tools;
     _classPrivateFieldLooseBase(this, _log$2)[_log$2](LogLevel.DEBUG, "Tools set for LLM");
   }
   /**
@@ -1074,8 +1110,9 @@ var LLM = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2
   /*
   get experimental_telemetry config
   */;
-  _proto.getModelType = function getModelType(model) {
+  _proto.getModelType = function getModelType() {
     var _providerToType$model;
+    var model = _classPrivateFieldLooseBase(this, _model)[_model];
     if (!('provider' in model)) {
       throw new Error('Model provider is required');
     }
@@ -1101,12 +1138,12 @@ var LLM = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2
     _classPrivateFieldLooseBase(this, _log$2)[_log$2](LogLevel.DEBUG, "Model type resolved to " + type + " for provider " + model.provider);
     return type;
   };
-  _proto.createOpenAICompatibleModel = function createOpenAICompatibleModel(_ref) {
-    var baseURL = _ref.baseURL,
-      apiKey = _ref.apiKey,
-      defaultModelName = _ref.defaultModelName,
-      modelName = _ref.modelName,
-      fetch = _ref.fetch;
+  _proto.createOpenAICompatibleModel = function createOpenAICompatibleModel(_ref2) {
+    var baseURL = _ref2.baseURL,
+      apiKey = _ref2.apiKey,
+      defaultModelName = _ref2.defaultModelName,
+      modelName = _ref2.modelName,
+      fetch = _ref2.fetch;
     _classPrivateFieldLooseBase(this, _log$2)[_log$2](LogLevel.DEBUG, "Creating OpenAI compatible model with baseURL: " + baseURL);
     var client = createOpenAI({
       baseURL: baseURL,
@@ -1115,8 +1152,8 @@ var LLM = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2
     });
     return client(modelName || defaultModelName);
   };
-  _proto.createModelDef = function createModelDef(_ref2) {
-    var model = _ref2.model;
+  _proto.createModelDef = function createModelDef(_ref3) {
+    var model = _ref3.model;
     var modelDef;
     if (model.type === 'openai') {
       _classPrivateFieldLooseBase(this, _log$2)[_log$2](LogLevel.INFO, "Initializing OpenAI model " + (model.name || 'gpt-4o-2024-08-06'));
@@ -1252,12 +1289,12 @@ var LLM = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2
     return modelDef;
   };
   _proto.createEmbedding = /*#__PURE__*/function () {
-    var _createEmbedding = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref3) {
+    var _createEmbedding = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref4) {
       var model, value, maxRetries, embeddingModel, openai, cohere;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            model = _ref3.model, value = _ref3.value, maxRetries = _ref3.maxRetries;
+            model = _ref4.model, value = _ref4.value, maxRetries = _ref4.maxRetries;
             if (!(model.provider === 'OPEN_AI')) {
               _context.next = 6;
               break;
@@ -1315,15 +1352,15 @@ var LLM = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2
     return createEmbedding;
   }();
   _proto.getParams = /*#__PURE__*/function () {
-    var _getParams = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref4) {
+    var _getParams = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
       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];
+            tools = _ref5.tools, resultTool = _ref5.resultTool, model = _ref5.model;
+            toolsConverted = Object.entries(tools).reduce(function (memo, _ref6) {
+              var key = _ref6[0],
+                val = _ref6[1];
               memo[key] = tool(val);
               return memo;
             }, {});
@@ -1360,7 +1397,7 @@ var LLM = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2
               toolsConverted: toolsConverted,
               modelDef: modelDef,
               answerTool: answerTool,
-              toolChoice: model.toolChoice || 'required'
+              toolChoice: model.toolChoice || 'auto'
             });
           case 16:
           case "end":
@@ -1378,7 +1415,7 @@ var LLM = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2
     var converted = Object.entries(enabledTools || {}).reduce(function (memo, value) {
       var k = value[0];
       var enabled = value[1];
-      var tool = _classPrivateFieldLooseBase(_this, _tools)[_tools][k];
+      var tool = _classPrivateFieldLooseBase(_this, _tools$1)[_tools$1][k];
       if (enabled && tool) {
         memo[k] = {
           description: tool.description,
@@ -1405,16 +1442,16 @@ var LLM = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2
       case 'boolean':
         return z["boolean"]();
       case 'date':
-        return z.string().datetime();
+        return z.string().describe('ISO 8601 date string');
       default:
         return 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];
+    var schema = Object.entries(output).reduce(function (memo, _ref7) {
+      var k = _ref7[0],
+        v = _ref7[1];
       if (_this2.isBaseOutputType(v.type)) {
         memo[k] = _this2.baseOutputTypeSchema(v.type);
       }
@@ -1438,18 +1475,108 @@ var LLM = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2
     }, {});
     return z.object(schema);
   };
-  _proto.text = /*#__PURE__*/function () {
-    var _text = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref7) {
+  _proto.generate = /*#__PURE__*/function () {
+    var _generate = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(messages, _temp) {
+      var _ref8, schema, stream, _ref8$maxSteps, maxSteps, onFinish, onStepFinish, enabledTools, convertedTools, runId, msgs;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _ref8 = _temp === void 0 ? {} : _temp, schema = _ref8.schema, stream = _ref8.stream, _ref8$maxSteps = _ref8.maxSteps, maxSteps = _ref8$maxSteps === void 0 ? 5 : _ref8$maxSteps, onFinish = _ref8.onFinish, onStepFinish = _ref8.onStepFinish, enabledTools = _ref8.enabledTools, convertedTools = _ref8.convertedTools, runId = _ref8.runId;
+            if (Array.isArray(messages)) {
+              msgs = messages;
+            } else {
+              msgs = [{
+                role: 'user',
+                content: messages
+              }];
+            }
+            if (!(stream && schema)) {
+              _context3.next = 6;
+              break;
+            }
+            _context3.next = 5;
+            return this.__streamObject({
+              messages: msgs,
+              structuredOutput: schema,
+              onStepFinish: onStepFinish,
+              onFinish: onFinish,
+              maxSteps: maxSteps,
+              enabledTools: enabledTools,
+              convertedTools: convertedTools,
+              runId: runId
+            });
+          case 5:
+            return _context3.abrupt("return", _context3.sent);
+          case 6:
+            if (!stream) {
+              _context3.next = 10;
+              break;
+            }
+            _context3.next = 9;
+            return this.__stream({
+              messages: msgs,
+              onStepFinish: onStepFinish,
+              onFinish: onFinish,
+              maxSteps: maxSteps,
+              enabledTools: enabledTools,
+              convertedTools: convertedTools,
+              runId: runId
+            });
+          case 9:
+            return _context3.abrupt("return", _context3.sent);
+          case 10:
+            if (!schema) {
+              _context3.next = 14;
+              break;
+            }
+            _context3.next = 13;
+            return this.__textObject({
+              messages: msgs,
+              structuredOutput: schema,
+              onStepFinish: onStepFinish,
+              maxSteps: maxSteps,
+              enabledTools: enabledTools,
+              convertedTools: convertedTools,
+              runId: runId
+            });
+          case 13:
+            return _context3.abrupt("return", _context3.sent);
+          case 14:
+            _context3.next = 16;
+            return this.__text({
+              messages: msgs,
+              onStepFinish: onStepFinish,
+              maxSteps: maxSteps,
+              enabledTools: enabledTools,
+              convertedTools: convertedTools,
+              runId: runId
+            });
+          case 16:
+            return _context3.abrupt("return", _context3.sent);
+          case 17:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3, this);
+    }));
+    function generate(_x3, _x4) {
+      return _generate.apply(this, arguments);
+    }
+    return generate;
+  }();
+  _proto.__text = /*#__PURE__*/function () {
+    var _text = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref9) {
       var _this3 = this;
-      var model, messages, _onStepFinish, _ref7$maxSteps, maxSteps, enabledTools, runId, modelToPass, params, argsForExecute;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      var messages, _onStepFinish, _ref9$maxSteps, maxSteps, enabledTools, runId, convertedTools, model, modelToPass, params, argsForExecute;
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            model = _ref7.model, messages = _ref7.messages, _onStepFinish = _ref7.onStepFinish, _ref7$maxSteps = _ref7.maxSteps, maxSteps = _ref7$maxSteps === void 0 ? 5 : _ref7$maxSteps, enabledTools = _ref7.enabledTools, runId = _ref7.runId;
+            messages = _ref9.messages, _onStepFinish = _ref9.onStepFinish, _ref9$maxSteps = _ref9.maxSteps, maxSteps = _ref9$maxSteps === void 0 ? 5 : _ref9$maxSteps, enabledTools = _ref9.enabledTools, runId = _ref9.runId, convertedTools = _ref9.convertedTools;
+            model = _classPrivateFieldLooseBase(this, _model)[_model];
             _classPrivateFieldLooseBase(this, _log$2)[_log$2](LogLevel.DEBUG, "Generating text with " + messages.length + " messages", runId);
             if ('name' in model) {
               modelToPass = {
-                type: this.getModelType(model),
+                type: this.getModelType(),
                 name: model.name,
                 toolChoice: model.toolChoice,
                 apiKey: model.provider !== 'LM_STUDIO' ? model == null ? void 0 : model.apiKey : undefined,
@@ -1459,75 +1586,76 @@ var LLM = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2
             } else {
               modelToPass = model;
             }
-            _context4.next = 5;
+            _context5.next = 6;
             return this.getParams({
-              tools: this.convertTools(enabledTools || {}),
+              tools: convertedTools || this.convertTools(enabledTools || {}),
               model: modelToPass
             });
-          case 5:
-            params = _context4.sent;
+          case 6:
+            params = _context5.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 _callee3(props) {
+                var _onStepFinish2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(props) {
                   var _props$response, _props$response2;
-                  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-                    while (1) switch (_context3.prev = _context3.next) {
+                  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+                    while (1) switch (_context4.prev = _context4.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)) {
-                          _context3.next = 5;
+                          _context4.next = 5;
                           break;
                         }
                         _classPrivateFieldLooseBase(_this3, _logger$2)[_logger$2].warn('Rate limit approaching, waiting 10 seconds');
-                        _context3.next = 5;
+                        _context4.next = 5;
                         return delay(10 * 1000);
                       case 5:
                       case "end":
-                        return _context3.stop();
+                        return _context4.stop();
                     }
-                  }, _callee3);
+                  }, _callee4);
                 }));
-                function onStepFinish(_x4) {
+                function onStepFinish(_x6) {
                   return _onStepFinish2.apply(this, arguments);
                 }
                 return onStepFinish;
               }()
             };
-            _context4.next = 9;
+            _context5.next = 10;
             return generateText(_extends({
               messages: messages
             }, argsForExecute, {
               experimental_telemetry: this.experimental_telemetry
             }));
-          case 9:
-            return _context4.abrupt("return", _context4.sent);
           case 10:
+            return _context5.abrupt("return", _context5.sent);
+          case 11:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4, this);
+      }, _callee5, this);
     }));
-    function text(_x3) {
+    function __text(_x5) {
       return _text.apply(this, arguments);
     }
-    return text;
+    return __text;
   }();
-  _proto.textObject = /*#__PURE__*/function () {
-    var _textObject = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref8) {
+  _proto.__textObject = /*#__PURE__*/function () {
+    var _textObject = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(_ref10) {
       var _this4 = this;
-      var model, messages, _onStepFinish3, _ref8$maxSteps, maxSteps, enabledTools, structuredOutput, runId, modelToPass, params, argsForExecute, schema, output;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      var messages, _onStepFinish3, _ref10$maxSteps, maxSteps, enabledTools, convertedTools, structuredOutput, runId, model, modelToPass, params, argsForExecute, schema, output;
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            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, runId = _ref8.runId;
+            messages = _ref10.messages, _onStepFinish3 = _ref10.onStepFinish, _ref10$maxSteps = _ref10.maxSteps, maxSteps = _ref10$maxSteps === void 0 ? 5 : _ref10$maxSteps, enabledTools = _ref10.enabledTools, convertedTools = _ref10.convertedTools, structuredOutput = _ref10.structuredOutput, runId = _ref10.runId;
+            model = _classPrivateFieldLooseBase(this, _model)[_model];
             _classPrivateFieldLooseBase(this, _log$2)[_log$2](LogLevel.DEBUG, "Generating text with " + messages.length + " messages", runId);
             if ('name' in model) {
               modelToPass = {
-                type: this.getModelType(model),
+                type: this.getModelType(),
                 name: model.name,
                 toolChoice: model.toolChoice,
                 apiKey: model.provider !== 'LM_STUDIO' ? model == null ? void 0 : model.apiKey : undefined,
@@ -1537,39 +1665,39 @@ var LLM = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2
             } else {
               modelToPass = model;
             }
-            _context6.next = 5;
+            _context7.next = 6;
             return this.getParams({
-              tools: this.convertTools(enabledTools || {}),
+              tools: convertedTools || this.convertTools(enabledTools || {}),
               model: modelToPass
             });
-          case 5:
-            params = _context6.sent;
+          case 6:
+            params = _context7.sent;
             argsForExecute = {
               model: params.modelDef,
               tools: _extends({}, params.toolsConverted, params.answerTool),
               toolChoice: params.toolChoice,
               maxSteps: maxSteps,
               onStepFinish: function () {
-                var _onStepFinish4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(props) {
+                var _onStepFinish4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(props) {
                   var _props$response3, _props$response4;
-                  return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-                    while (1) switch (_context5.prev = _context5.next) {
+                  return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+                    while (1) switch (_context6.prev = _context6.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)) {
-                          _context5.next = 5;
+                          _context6.next = 5;
                           break;
                         }
                         _classPrivateFieldLooseBase(_this4, _logger$2)[_logger$2].warn('Rate limit approaching, waiting 10 seconds', runId);
-                        _context5.next = 5;
+                        _context6.next = 5;
                         return delay(10 * 1000);
                       case 5:
                       case "end":
-                        return _context5.stop();
+                        return _context6.stop();
                     }
-                  }, _callee5);
+                  }, _callee6);
                 }));
-                function onStepFinish(_x6) {
+                function onStepFinish(_x8) {
                   return _onStepFinish4.apply(this, arguments);
                 }
                 return onStepFinish;
@@ -1585,7 +1713,7 @@ var LLM = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2
             } else {
               schema = this.createOutputSchema(structuredOutput);
             }
-            _context6.next = 11;
+            _context7.next = 12;
             return generateObject(_extends({
               messages: messages
             }, argsForExecute, {
@@ -1593,31 +1721,32 @@ var LLM = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2
               schema: schema,
               experimental_telemetry: this.experimental_telemetry
             }));
-          case 11:
-            return _context6.abrupt("return", _context6.sent);
           case 12:
+            return _context7.abrupt("return", _context7.sent);
+          case 13:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
-      }, _callee6, this);
+      }, _callee7, this);
     }));
-    function textObject(_x5) {
+    function __textObject(_x7) {
       return _textObject.apply(this, arguments);
     }
-    return textObject;
+    return __textObject;
   }();
-  _proto.stream = /*#__PURE__*/function () {
-    var _stream = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(_ref9) {
+  _proto.__stream = /*#__PURE__*/function () {
+    var _stream = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(_ref11) {
       var _this5 = this;
-      var model, messages, _onStepFinish5, _onFinish, _ref9$maxSteps, maxSteps, enabledTools, runId, modelToPass, params, argsForExecute;
-      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
+      var messages, _onStepFinish5, _onFinish, _ref11$maxSteps, maxSteps, enabledTools, runId, convertedTools, model, modelToPass, params, argsForExecute;
+      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+        while (1) switch (_context10.prev = _context10.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, runId = _ref9.runId;
+            messages = _ref11.messages, _onStepFinish5 = _ref11.onStepFinish, _onFinish = _ref11.onFinish, _ref11$maxSteps = _ref11.maxSteps, maxSteps = _ref11$maxSteps === void 0 ? 5 : _ref11$maxSteps, enabledTools = _ref11.enabledTools, runId = _ref11.runId, convertedTools = _ref11.convertedTools;
+            model = _classPrivateFieldLooseBase(this, _model)[_model];
             _classPrivateFieldLooseBase(this, _log$2)[_log$2](LogLevel.DEBUG, "Streaming text with " + messages.length + " messages", runId);
             if ('name' in model) {
               modelToPass = {
-                type: this.getModelType(model),
+                type: this.getModelType(),
                 name: model.name,
                 toolChoice: model.toolChoice,
                 apiKey: model.provider !== 'LM_STUDIO' ? model == null ? void 0 : model.apiKey : undefined,
@@ -1627,92 +1756,93 @@ var LLM = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2
             } else {
               modelToPass = model;
             }
-            _context9.next = 5;
+            _context10.next = 6;
             return this.getParams({
-              tools: this.convertTools(enabledTools),
+              tools: convertedTools || this.convertTools(enabledTools),
               model: modelToPass
             });
-          case 5:
-            params = _context9.sent;
+          case 6:
+            params = _context10.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 _onStepFinish6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(props) {
                   var _props$response5, _props$response6;
-                  return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-                    while (1) switch (_context7.prev = _context7.next) {
+                  return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+                    while (1) switch (_context8.prev = _context8.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;
+                          _context8.next = 5;
                           break;
                         }
                         _classPrivateFieldLooseBase(_this5, _logger$2)[_logger$2].warn('Rate limit approaching, waiting 10 seconds', runId);
-                        _context7.next = 5;
+                        _context8.next = 5;
                         return delay(10 * 1000);
                       case 5:
                       case "end":
-                        return _context7.stop();
+                        return _context8.stop();
                     }
-                  }, _callee7);
+                  }, _callee8);
                 }));
-                function onStepFinish(_x8) {
+                function onStepFinish(_x10) {
                   return _onStepFinish6.apply(this, arguments);
                 }
                 return onStepFinish;
               }(),
               onFinish: function () {
-                var _onFinish2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(props) {
-                  return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-                    while (1) switch (_context8.prev = _context8.next) {
+                var _onFinish2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(props) {
+                  return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+                    while (1) switch (_context9.prev = _context9.next) {
                       case 0:
                         _onFinish == null || _onFinish(JSON.stringify(props, null, 2));
                       case 1:
                       case "end":
-                        return _context8.stop();
+                        return _context9.stop();
                     }
-                  }, _callee8);
+                  }, _callee9);
                 }));
-                function onFinish(_x9) {
+                function onFinish(_x11) {
                   return _onFinish2.apply(this, arguments);
                 }
                 return onFinish;
               }()
             };
-            _context9.next = 9;
+            _context10.next = 10;
             return streamText(_extends({
               messages: messages
             }, argsForExecute, {
               experimental_telemetry: this.experimental_telemetry
             }));
-          case 9:
-            return _context9.abrupt("return", _context9.sent);
           case 10:
+            return _context10.abrupt("return", _context10.sent);
+          case 11:
           case "end":
-            return _context9.stop();
+            return _context10.stop();
         }
-      }, _callee9, this);
+      }, _callee10, this);
     }));
-    function stream(_x7) {
+    function __stream(_x9) {
       return _stream.apply(this, arguments);
     }
-    return stream;
+    return __stream;
   }();
-  _proto.streamObject = /*#__PURE__*/function () {
-    var _streamObject2 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(_ref10) {
+  _proto.__streamObject = /*#__PURE__*/function () {
+    var _streamObject = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(_ref12) {
       var _this6 = this;
-      var model, messages, _onStepFinish7, _onFinish3, _ref10$maxSteps, maxSteps, enabledTools, structuredOutput, runId, modelToPass, params, argsForExecute, schema, output;
-      return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-        while (1) switch (_context12.prev = _context12.next) {
+      var messages, _onStepFinish7, _onFinish3, _ref12$maxSteps, maxSteps, enabledTools, convertedTools, structuredOutput, runId, model, modelToPass, params, argsForExecute, schema, output;
+      return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+        while (1) switch (_context13.prev = _context13.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, runId = _ref10.runId;
+            messages = _ref12.messages, _onStepFinish7 = _ref12.onStepFinish, _onFinish3 = _ref12.onFinish, _ref12$maxSteps = _ref12.maxSteps, maxSteps = _ref12$maxSteps === void 0 ? 5 : _ref12$maxSteps, enabledTools = _ref12.enabledTools, convertedTools = _ref12.convertedTools, structuredOutput = _ref12.structuredOutput, runId = _ref12.runId;
+            model = _classPrivateFieldLooseBase(this, _model)[_model];
             _classPrivateFieldLooseBase(this, _log$2)[_log$2](LogLevel.DEBUG, "Streaming text with " + messages.length + " messages", runId);
             if ('name' in model) {
               modelToPass = {
-                type: this.getModelType(model),
+                type: this.getModelType(),
                 name: model.name,
                 toolChoice: model.toolChoice,
                 apiKey: model.provider !== 'LM_STUDIO' ? model == null ? void 0 : model.apiKey : undefined,
@@ -1722,56 +1852,56 @@ var LLM = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2
             } else {
               modelToPass = model;
             }
-            _context12.next = 5;
+            _context13.next = 6;
             return this.getParams({
-              tools: this.convertTools(enabledTools),
+              tools: convertedTools || this.convertTools(enabledTools),
               model: modelToPass
             });
-          case 5:
-            params = _context12.sent;
+          case 6:
+            params = _context13.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 _onStepFinish8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(props) {
                   var _props$response7, _props$response8;
-                  return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-                    while (1) switch (_context10.prev = _context10.next) {
+                  return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+                    while (1) switch (_context11.prev = _context11.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;
+                          _context11.next = 5;
                           break;
                         }
                         _classPrivateFieldLooseBase(_this6, _logger$2)[_logger$2].warn('Rate limit approaching, waiting 10 seconds', runId);
-                        _context10.next = 5;
+                        _context11.next = 5;
                         return delay(10 * 1000);
                       case 5:
                       case "end":
-                        return _context10.stop();
+                        return _context11.stop();
                     }
-                  }, _callee10);
+                  }, _callee11);
                 }));
-                function onStepFinish(_x11) {
+                function onStepFinish(_x13) {
                   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) {
+                var _onFinish4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(props) {
+                  return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+                    while (1) switch (_context12.prev = _context12.next) {
                       case 0:
                         _onFinish3 == null || _onFinish3(JSON.stringify(props, null, 2));
                       case 1:
                       case "end":
-                        return _context11.stop();
+                        return _context12.stop();
                     }
-                  }, _callee11);
+                  }, _callee12);
                 }));
-                function onFinish(_x12) {
+                function onFinish(_x14) {
                   return _onFinish4.apply(this, arguments);
                 }
                 return onFinish;
@@ -1787,7 +1917,7 @@ var LLM = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2
             } else {
               schema = this.createOutputSchema(structuredOutput);
             }
-            _context12.next = 11;
+            _context13.next = 12;
             return streamObject(_extends({
               messages: messages
             }, argsForExecute, {
@@ -1795,18 +1925,18 @@ var LLM = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$2
               schema: schema,
               experimental_telemetry: this.experimental_telemetry
             }));
-          case 11:
-            return _context12.abrupt("return", _context12.sent);
           case 12:
+            return _context13.abrupt("return", _context13.sent);
+          case 13:
           case "end":
-            return _context12.stop();
+            return _context13.stop();
         }
-      }, _callee12, this);
+      }, _callee13, this);
     }));
-    function streamObject$1(_x10) {
-      return _streamObject2.apply(this, arguments);
+    function __streamObject(_x12) {
+      return _streamObject.apply(this, arguments);
     }
-    return streamObject$1;
+    return __streamObject;
   }();
   return _createClass(LLM, [{
     key: "experimental_telemetry",
@@ -1833,7 +1963,7 @@ function _log2$2(level, message, runId) {
 LLM = /*#__PURE__*/__decorate([/*#__PURE__*/InstrumentClass({
   prefix: 'llm',
   excludeMethods: ['__setTools', '__setLogger', '__setTelemetry', '#log']
-}), /*#__PURE__*/__metadata("design:paramtypes", [])], LLM);
+}), /*#__PURE__*/__metadata("design:paramtypes", [Object])], LLM);
 
 // Store SDK instance outside the class to persist across HMR
 var sdkInstance = null;
@@ -2076,8 +2206,8 @@ var Telemetry = /*#__PURE__*/function () {
 }();
 Telemetry.isInitialized = false;
 
-var _logger$1, _telemetry$3, _log$1;
-var Agent = (_logger$1 = /*#__PURE__*/_classPrivateFieldLooseKey("logger"), _telemetry$3 = /*#__PURE__*/_classPrivateFieldLooseKey("telemetry"), _log$1 = /*#__PURE__*/_classPrivateFieldLooseKey("log"), /*#__PURE__*/function () {
+var _tools, _logger$1, _telemetry$3, _log$1;
+var Agent = (_tools = /*#__PURE__*/_classPrivateFieldLooseKey("tools"), _logger$1 = /*#__PURE__*/_classPrivateFieldLooseKey("logger"), _telemetry$3 = /*#__PURE__*/_classPrivateFieldLooseKey("telemetry"), _log$1 = /*#__PURE__*/_classPrivateFieldLooseKey("log"), /*#__PURE__*/function () {
   function Agent(config) {
     /**
      * Internal logging helper that formats and sends logs to the configured logger
@@ -2089,10 +2219,15 @@ var Agent = (_logger$1 = /*#__PURE__*/_classPrivateFieldLooseKey("logger"), _tel
       value: _log2$1
     });
     this.name = void 0;
+    this.memory = void 0;
     this.llm = void 0;
     this.instructions = void 0;
     this.model = void 0;
     this.enabledTools = void 0;
+    Object.defineProperty(this, _tools, {
+      writable: true,
+      value: void 0
+    });
     Object.defineProperty(this, _logger$1, {
       writable: true,
       value: void 0
@@ -2103,13 +2238,16 @@ var Agent = (_logger$1 = /*#__PURE__*/_classPrivateFieldLooseKey("logger"), _tel
     });
     this.name = config.name;
     this.instructions = config.instructions;
-    this.llm = new LLM();
+    this.llm = new LLM({
+      model: config.model
+    });
     this.model = config.model;
     this.enabledTools = config.enabledTools || {};
     _classPrivateFieldLooseBase(this, _logger$1)[_logger$1] = createLogger({
       type: 'CONSOLE'
     });
     _classPrivateFieldLooseBase(this, _logger$1)[_logger$1].info("Agent " + this.name + " initialized with model " + this.model.provider);
+    _classPrivateFieldLooseBase(this, _tools)[_tools] = {};
   }
   /**
    * Set the concrete tools for the agent
@@ -2118,6 +2256,7 @@ var Agent = (_logger$1 = /*#__PURE__*/_classPrivateFieldLooseKey("logger"), _tel
   var _proto = Agent.prototype;
   _proto.__setTools = function __setTools(tools) {
     this.llm.__setTools(tools);
+    _classPrivateFieldLooseBase(this, _tools)[_tools] = tools;
     _classPrivateFieldLooseBase(this, _log$1)[_log$1](LogLevel.DEBUG, "Tools set for agent " + this.name);
   }
   /**
@@ -2128,6 +2267,10 @@ var Agent = (_logger$1 = /*#__PURE__*/_classPrivateFieldLooseKey("logger"), _tel
     _classPrivateFieldLooseBase(this, _logger$1)[_logger$1] = logger;
     this.llm.__setLogger(logger);
     _classPrivateFieldLooseBase(this, _log$1)[_log$1](LogLevel.DEBUG, "Logger updated for agent " + this.name);
+  };
+  _proto.__setMemory = function __setMemory(memory) {
+    this.memory = memory;
+    _classPrivateFieldLooseBase(this, _log$1)[_log$1](LogLevel.DEBUG, "Memory set for agent " + this.name);
   }
   /**
    * Set the telemetry for the agent
@@ -2138,17 +2281,445 @@ var Agent = (_logger$1 = /*#__PURE__*/_classPrivateFieldLooseKey("logger"), _tel
     this.llm.__setTelemetry(_classPrivateFieldLooseBase(this, _telemetry$3)[_telemetry$3]);
     _classPrivateFieldLooseBase(this, _log$1)[_log$1](LogLevel.DEBUG, "Telemetry updated for agent " + this.name);
   };
-  _proto.text = /*#__PURE__*/function () {
-    var _text = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-      var messages, onStepFinish, _ref$maxSteps, maxSteps, runId, systemMessage, userMessages, messageObjects;
+  _proto.generateTitleFromUserMessage = /*#__PURE__*/function () {
+    var _generateTitleFromUserMessage = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+      var message, _yield$this$llm$__tex, title;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            messages = _ref.messages, onStepFinish = _ref.onStepFinish, _ref$maxSteps = _ref.maxSteps, maxSteps = _ref$maxSteps === void 0 ? 5 : _ref$maxSteps, runId = _ref.runId;
+            message = _ref.message;
+            _context.next = 3;
+            return this.llm.__text({
+              messages: [{
+                role: 'system',
+                content: "\n\n      - you will generate a short title based on the first message a user begins a conversation with\n      - ensure it is not more than 80 characters long\n      - the title should be a summary of the user's message\n      - do not use quotes or colons"
+              }, {
+                role: 'user',
+                content: JSON.stringify(message)
+              }]
+            });
+          case 3:
+            _yield$this$llm$__tex = _context.sent;
+            title = _yield$this$llm$__tex.text;
+            return _context.abrupt("return", title);
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, this);
+    }));
+    function generateTitleFromUserMessage(_x) {
+      return _generateTitleFromUserMessage.apply(this, arguments);
+    }
+    return generateTitleFromUserMessage;
+  }();
+  _proto.getMostRecentUserMessage = function getMostRecentUserMessage(messages) {
+    var userMessages = messages.filter(function (message) {
+      return message.role === 'user';
+    });
+    return userMessages.at(-1);
+  };
+  _proto.genTitle = /*#__PURE__*/function () {
+    var _genTitle = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(userMessage) {
+      var title;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            title = 'New Thread';
+            _context2.prev = 1;
+            if (!userMessage) {
+              _context2.next = 6;
+              break;
+            }
+            _context2.next = 5;
+            return this.generateTitleFromUserMessage({
+              message: userMessage
+            });
+          case 5:
+            title = _context2.sent;
+          case 6:
+            _context2.next = 11;
+            break;
+          case 8:
+            _context2.prev = 8;
+            _context2.t0 = _context2["catch"](1);
+            console.error('Error generating title:', _context2.t0);
+          case 11:
+            return _context2.abrupt("return", title);
+          case 12:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2, this, [[1, 8]]);
+    }));
+    function genTitle(_x2) {
+      return _genTitle.apply(this, arguments);
+    }
+    return genTitle;
+  }();
+  _proto.saveMemory = /*#__PURE__*/function () {
+    var _saveMemory = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref2) {
+      var _this = this;
+      var threadId, resourceid, userMessages, userMessage, _thread, thread, title, _title, newMessages, _context$object, messages, contextCallMessages, context, memoryMessages, _context$object2, _context$object3, _context$object4, _context$object5, contextWindowMessages, _contextWindowMessages;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            threadId = _ref2.threadId, resourceid = _ref2.resourceid, userMessages = _ref2.userMessages;
+            userMessage = this.getMostRecentUserMessage(userMessages);
+            if (!this.memory) {
+              _context3.next = 47;
+              break;
+            }
+            console.log({
+              threadId: threadId,
+              resourceid: resourceid
+            }, 'SAVING');
+            if (threadId) {
+              _context3.next = 13;
+              break;
+            }
+            _context3.next = 7;
+            return this.genTitle(userMessage);
+          case 7:
+            title = _context3.sent;
+            _context3.next = 10;
+            return this.memory.createThread({
+              threadId: threadId,
+              resourceid: resourceid,
+              title: title
+            });
+          case 10:
+            thread = _context3.sent;
+            _context3.next = 23;
+            break;
+          case 13:
+            _context3.next = 15;
+            return this.memory.getThreadById({
+              threadId: threadId
+            });
+          case 15:
+            thread = _context3.sent;
+            if (thread) {
+              _context3.next = 23;
+              break;
+            }
+            _context3.next = 19;
+            return this.genTitle(userMessage);
+          case 19:
+            _title = _context3.sent;
+            _context3.next = 22;
+            return this.memory.createThread({
+              threadId: threadId,
+              resourceid: resourceid,
+              title: _title
+            });
+          case 22:
+            thread = _context3.sent;
+          case 23:
+            console.log({
+              thread: thread
+            });
+            newMessages = userMessage ? [userMessage] : userMessages;
+            if (!thread) {
+              _context3.next = 46;
+              break;
+            }
+            messages = newMessages.map(function (u) {
+              var _this$memory;
+              return _extends({
+                id: (_this$memory = _this.memory) == null ? void 0 : _this$memory.generateId(),
+                createdAt: new Date(),
+                threadId: thread.id
+              }, u, {
+                content: u.content,
+                role: u.role,
+                type: 'text'
+              });
+            });
+            contextCallMessages = [{
+              role: 'system',
+              content: "Analyze this message to determine if the user is referring to a previous conversation with the LLM. Specifically, identify if the user wants to reference specific information from that chat or if they want the LLM to use the previous chat messages as context for the current conversation. Extract any date ranges mentioned in the user message that could help identify the previous chat. Return dates in ISO format. If no specific dates are mentioned but time periods are (like \"last week\" or \"past month\"), calculate the appropriate date range. For the end date, return the date 1 day after the end of the time period. Today's date is " + new Date().toISOString()
+            }].concat(newMessages);
+            _context3.next = 30;
+            return this.llm.__textObject({
+              messages: contextCallMessages,
+              structuredOutput: {
+                usesContext: {
+                  type: 'boolean'
+                },
+                startDate: {
+                  type: 'date'
+                },
+                endDate: {
+                  type: 'date'
+                }
+              }
+            });
+          case 30:
+            context = _context3.sent;
+            console.log('context object===', JSON.stringify(context.object, null, 2));
+            if (!((_context$object = context.object) != null && _context$object.usesContext)) {
+              _context3.next = 39;
+              break;
+            }
+            _context3.next = 35;
+            return this.memory.getContextWindow({
+              threadId: thread.id,
+              startDate: (_context$object2 = context.object) != null && _context$object2.startDate ? new Date((_context$object3 = context.object) == null ? void 0 : _context$object3.startDate) : undefined,
+              endDate: (_context$object4 = context.object) != null && _context$object4.endDate ? new Date((_context$object5 = context.object) == null ? void 0 : _context$object5.endDate) : undefined
+            });
+          case 35:
+            contextWindowMessages = _context3.sent;
+            memoryMessages = contextWindowMessages == null ? void 0 : contextWindowMessages.map(function (_ref3) {
+              var role = _ref3.role,
+                content = _ref3.content;
+              return {
+                role: role,
+                content: content
+              };
+            });
+            _context3.next = 43;
+            break;
+          case 39:
+            _context3.next = 41;
+            return this.memory.getContextWindow({
+              threadId: thread.id
+            });
+          case 41:
+            _contextWindowMessages = _context3.sent;
+            memoryMessages = _contextWindowMessages == null ? void 0 : _contextWindowMessages.map(function (_ref4) {
+              var role = _ref4.role,
+                content = _ref4.content;
+              return {
+                role: role,
+                content: content
+              };
+            });
+          case 43:
+            _context3.next = 45;
+            return this.memory.saveMessages({
+              messages: messages
+            });
+          case 45:
+            return _context3.abrupt("return", {
+              threadId: thread.id,
+              messages: [].concat(memoryMessages, newMessages)
+            });
+          case 46:
+            return _context3.abrupt("return", {
+              threadId: ((_thread = thread) == null ? void 0 : _thread.id) || threadId || '',
+              messages: userMessages
+            });
+          case 47:
+            return _context3.abrupt("return", {
+              threadId: threadId || '',
+              messages: userMessages
+            });
+          case 48:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3, this);
+    }));
+    function saveMemory(_x3) {
+      return _saveMemory.apply(this, arguments);
+    }
+    return saveMemory;
+  }();
+  _proto.saveMemoryOnFinish = /*#__PURE__*/function () {
+    var _saveMemoryOnFinish = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref5) {
+      var result, threadId, _ref6, response, ms, responseMessagesWithoutIncompleteToolCalls;
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            result = _ref5.result, threadId = _ref5.threadId;
+            _ref6 = JSON.parse(result) || {}, response = _ref6.response;
+            _context4.prev = 2;
+            if (!response.messages) {
+              _context4.next = 10;
+              break;
+            }
+            ms = Array.isArray(response.messages) ? response.messages : [response.messages];
+            responseMessagesWithoutIncompleteToolCalls = this.sanitizeResponseMessages(ms);
+            if (!this.memory) {
+              _context4.next = 10;
+              break;
+            }
+            console.log('saving memory on finish====', {
+              threadId: threadId
+            });
+            _context4.next = 10;
+            return this.memory.saveMessages({
+              messages: responseMessagesWithoutIncompleteToolCalls.map(function (message) {
+                var _toolCallIds, _toolCallArgs, _toolNames;
+                var messageId = randomUUID();
+                var toolCallIds;
+                var toolCallArgs;
+                var toolNames;
+                var type = 'text';
+                if (message.role === 'tool') {
+                  toolCallIds = message.content.map(function (content) {
+                    return content.toolCallId;
+                  });
+                  type = 'tool-result';
+                }
+                if (message.role === 'assistant') {
+                  var _assistantContent$map, _assistantContent$;
+                  var assistantContent = message.content;
+                  var assistantToolCalls = (_assistantContent$map = assistantContent.map(function (content) {
+                    if (content.type === 'tool-call') {
+                      return {
+                        toolCallId: content.toolCallId,
+                        toolArgs: content.args,
+                        toolName: content.toolName
+                      };
+                    }
+                    return undefined;
+                  })) == null ? void 0 : _assistantContent$map.filter(Boolean);
+                  toolCallIds = assistantToolCalls == null ? void 0 : assistantToolCalls.map(function (toolCall) {
+                    return toolCall.toolCallId;
+                  });
+                  toolCallArgs = assistantToolCalls == null ? void 0 : assistantToolCalls.map(function (toolCall) {
+                    return toolCall.toolArgs;
+                  });
+                  toolNames = assistantToolCalls == null ? void 0 : assistantToolCalls.map(function (toolCall) {
+                    return toolCall.toolName;
+                  });
+                  type = assistantContent == null || (_assistantContent$ = assistantContent[0]) == null ? void 0 : _assistantContent$.type;
+                }
+                return {
+                  id: messageId,
+                  threadId: threadId,
+                  role: message.role,
+                  content: message.content,
+                  createdAt: new Date(),
+                  toolCallIds: (_toolCallIds = toolCallIds) != null && _toolCallIds.length ? toolCallIds : undefined,
+                  toolCallArgs: (_toolCallArgs = toolCallArgs) != null && _toolCallArgs.length ? toolCallArgs : undefined,
+                  toolNames: (_toolNames = toolNames) != null && _toolNames.length ? toolNames : undefined,
+                  type: type
+                };
+              })
+            });
+          case 10:
+            _context4.next = 15;
+            break;
+          case 12:
+            _context4.prev = 12;
+            _context4.t0 = _context4["catch"](2);
+            console.error('Failed to save chat', _context4.t0);
+          case 15:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4, this, [[2, 12]]);
+    }));
+    function saveMemoryOnFinish(_x4) {
+      return _saveMemoryOnFinish.apply(this, arguments);
+    }
+    return saveMemoryOnFinish;
+  }();
+  _proto.sanitizeResponseMessages = function sanitizeResponseMessages(messages) {
+    var toolResultIds = [];
+    for (var _iterator = _createForOfIteratorHelperLoose(messages), _step; !(_step = _iterator()).done;) {
+      var message = _step.value;
+      console.log(message);
+      if (message.role === 'tool') {
+        for (var _iterator2 = _createForOfIteratorHelperLoose(message.content), _step2; !(_step2 = _iterator2()).done;) {
+          var content = _step2.value;
+          if (content.type === 'tool-result') {
+            toolResultIds.push(content.toolCallId);
+          }
+        }
+      }
+    }
+    var messagesBySanitizedContent = messages.map(function (message) {
+      if (message.role !== 'assistant') return message;
+      if (typeof message.content === 'string') return message;
+      var sanitizedContent = message.content.filter(function (content) {
+        return content.type === 'tool-call' ? toolResultIds.includes(content.toolCallId) : content.type === 'text' ? content.text.length > 0 : true;
+      });
+      return _extends({}, message, {
+        content: sanitizedContent
+      });
+    });
+    return messagesBySanitizedContent.filter(function (message) {
+      return message.content.length > 0;
+    });
+  };
+  _proto.convertTools = function convertTools(_ref7) {
+    var _this2 = this;
+    var enabledTools = _ref7.enabledTools,
+      threadId = _ref7.threadId,
+      runId = _ref7.runId;
+    var converted = Object.entries(enabledTools || {}).reduce(function (memo, value) {
+      var k = value[0];
+      var enabled = value[1];
+      var tool = _classPrivateFieldLooseBase(_this2, _tools)[_tools][k];
+      if (enabled && tool) {
+        memo[k] = {
+          description: tool.description,
+          parameters: z.object({
+            data: tool.schema
+          }),
+          execute: function () {
+            var _execute = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(args) {
+              var _this2$memory, cachedResult;
+              return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+                while (1) switch (_context5.prev = _context5.next) {
+                  case 0:
+                    console.log('args====', JSON.stringify(args, null, 2));
+                    console.log('tool name====', k);
+                    if (!tool.enableCache) {
+                      _context5.next = 10;
+                      break;
+                    }
+                    console.log('cache enabled,checking cache');
+                    _context5.next = 6;
+                    return (_this2$memory = _this2.memory) == null ? void 0 : _this2$memory.getCachedToolResult({
+                      threadId: threadId,
+                      toolArgs: args,
+                      toolName: k
+                    });
+                  case 6:
+                    cachedResult = _context5.sent;
+                    if (!cachedResult) {
+                      _context5.next = 10;
+                      break;
+                    }
+                    console.log('cachedResult====', JSON.stringify(cachedResult, null, 2));
+                    return _context5.abrupt("return", cachedResult);
+                  case 10:
+                    console.log('cache not found or not enabled, executing tool');
+                    return _context5.abrupt("return", tool.executor(args));
+                  case 12:
+                  case "end":
+                    return _context5.stop();
+                }
+              }, _callee5);
+            }));
+            function execute(_x5) {
+              return _execute.apply(this, arguments);
+            }
+            return execute;
+          }()
+        };
+      }
+      return memo;
+    }, {});
+    _classPrivateFieldLooseBase(this, _log$1)[_log$1](LogLevel.DEBUG, "Converted tools for Agent " + this.name, runId);
+    return converted;
+  };
+  _proto.text = /*#__PURE__*/function () {
+    var _text = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref8) {
+      var messages, onStepFinish, _ref8$maxSteps, maxSteps, threadId, resourceid, runId, systemMessage, userMessages, coreMessages, convertedTools, threadIdToUse, saveMessageResponse, messageObjects;
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
+          case 0:
+            messages = _ref8.messages, onStepFinish = _ref8.onStepFinish, _ref8$maxSteps = _ref8.maxSteps, maxSteps = _ref8$maxSteps === void 0 ? 5 : _ref8$maxSteps, threadId = _ref8.threadId, resourceid = _ref8.resourceid, runId = _ref8.runId;
             _classPrivateFieldLooseBase(this, _log$1)[_log$1](LogLevel.INFO, "Starting text generation for agent " + this.name, runId);
             systemMessage = {
               role: 'system',
-              content: this.instructions
+              content: this.instructions + ". Today's date is " + new Date().toISOString()
             };
             userMessages = messages.map(function (content) {
               return {
@@ -2156,37 +2727,61 @@ var Agent = (_logger$1 = /*#__PURE__*/_classPrivateFieldLooseKey("logger"), _tel
                 content: content
               };
             });
-            messageObjects = [systemMessage].concat(userMessages);
-            return _context.abrupt("return", this.llm.text({
-              model: this.model,
+            coreMessages = userMessages;
+            threadIdToUse = threadId;
+            if (!(this.memory && resourceid)) {
+              _context6.next = 15;
+              break;
+            }
+            _classPrivateFieldLooseBase(this, _log$1)[_log$1](LogLevel.INFO, "Saving user messages in memory for agent " + this.name, runId);
+            _context6.next = 10;
+            return this.saveMemory({
+              threadId: threadIdToUse,
+              resourceid: resourceid,
+              userMessages: userMessages
+            });
+          case 10:
+            saveMessageResponse = _context6.sent;
+            coreMessages = saveMessageResponse.messages;
+            threadIdToUse = saveMessageResponse.threadId;
+            convertedTools = this.convertTools({
+              enabledTools: this.enabledTools,
+              threadId: threadIdToUse,
+              runId: runId
+            });
+            console.log('convertedTools====', JSON.stringify(convertedTools, null, 2));
+          case 15:
+            messageObjects = [systemMessage].concat(coreMessages);
+            return _context6.abrupt("return", this.llm.__text({
               messages: messageObjects,
               enabledTools: this.enabledTools,
+              convertedTools: convertedTools,
               onStepFinish: onStepFinish,
               maxSteps: maxSteps,
               runId: runId
             }));
-          case 6:
+          case 17:
           case "end":
-            return _context.stop();
+            return _context6.stop();
         }
-      }, _callee, this);
+      }, _callee6, this);
     }));
-    function text(_x) {
+    function text(_x6) {
       return _text.apply(this, arguments);
     }
     return text;
   }();
   _proto.textObject = /*#__PURE__*/function () {
-    var _textObject = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
-      var messages, structuredOutput, onStepFinish, _ref2$maxSteps, maxSteps, runId, systemMessage, userMessages, messageObjects;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+    var _textObject = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(_ref9) {
+      var messages, structuredOutput, onStepFinish, _ref9$maxSteps, maxSteps, threadId, resourceid, runId, systemMessage, userMessages, coreMessages, convertedTools, threadIdToUse, saveMessageResponse, messageObjects;
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            messages = _ref2.messages, structuredOutput = _ref2.structuredOutput, onStepFinish = _ref2.onStepFinish, _ref2$maxSteps = _ref2.maxSteps, maxSteps = _ref2$maxSteps === void 0 ? 5 : _ref2$maxSteps, runId = _ref2.runId;
+            messages = _ref9.messages, structuredOutput = _ref9.structuredOutput, onStepFinish = _ref9.onStepFinish, _ref9$maxSteps = _ref9.maxSteps, maxSteps = _ref9$maxSteps === void 0 ? 5 : _ref9$maxSteps, threadId = _ref9.threadId, resourceid = _ref9.resourceid, runId = _ref9.runId;
             _classPrivateFieldLooseBase(this, _log$1)[_log$1](LogLevel.INFO, "Starting text generation for agent " + this.name, runId);
             systemMessage = {
               role: 'system',
-              content: this.instructions
+              content: this.instructions + ". Today's date is " + new Date().toISOString()
             };
             userMessages = messages.map(function (content) {
               return {
@@ -2194,38 +2789,63 @@ var Agent = (_logger$1 = /*#__PURE__*/_classPrivateFieldLooseKey("logger"), _tel
                 content: content
               };
             });
-            messageObjects = [systemMessage].concat(userMessages);
-            return _context2.abrupt("return", this.llm.textObject({
-              model: this.model,
+            coreMessages = userMessages;
+            threadIdToUse = threadId;
+            if (!(this.memory && resourceid)) {
+              _context7.next = 15;
+              break;
+            }
+            _classPrivateFieldLooseBase(this, _log$1)[_log$1](LogLevel.INFO, "Saving user messages in memory for agent " + this.name, runId);
+            _context7.next = 10;
+            return this.saveMemory({
+              threadId: threadIdToUse,
+              resourceid: resourceid,
+              userMessages: userMessages
+            });
+          case 10:
+            saveMessageResponse = _context7.sent;
+            coreMessages = saveMessageResponse.messages;
+            threadIdToUse = saveMessageResponse.threadId;
+            convertedTools = this.convertTools({
+              enabledTools: this.enabledTools,
+              threadId: threadIdToUse,
+              runId: runId
+            });
+            console.log('convertedTools====', JSON.stringify(convertedTools, null, 2));
+          case 15:
+            messageObjects = [systemMessage].concat(coreMessages);
+            return _context7.abrupt("return", this.llm.__textObject({
               messages: messageObjects,
               structuredOutput: structuredOutput,
               enabledTools: this.enabledTools,
+              convertedTools: convertedTools,
               onStepFinish: onStepFinish,
               maxSteps: maxSteps,
               runId: runId
             }));
-          case 6:
+          case 17:
           case "end":
-            return _context2.stop();
+            return _context7.stop();
         }
-      }, _callee2, this);
+      }, _callee7, this);
     }));
-    function textObject(_x2) {
+    function textObject(_x7) {
       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, runId, systemMessage, userMessages, messageObjects;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+    var _stream = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(_ref10) {
+      var _this3 = this;
+      var messages, onStepFinish, _onFinish, _ref10$maxSteps, maxSteps, threadId, resourceid, runId, systemMessage, userMessages, coreMessages, convertedTools, threadIdToUse, saveMessageResponse, messageObjects;
+      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
           case 0:
-            messages = _ref3.messages, onStepFinish = _ref3.onStepFinish, onFinish = _ref3.onFinish, _ref3$maxSteps = _ref3.maxSteps, maxSteps = _ref3$maxSteps === void 0 ? 5 : _ref3$maxSteps, runId = _ref3.runId;
+            messages = _ref10.messages, onStepFinish = _ref10.onStepFinish, _onFinish = _ref10.onFinish, _ref10$maxSteps = _ref10.maxSteps, maxSteps = _ref10$maxSteps === void 0 ? 5 : _ref10$maxSteps, threadId = _ref10.threadId, resourceid = _ref10.resourceid, runId = _ref10.runId;
             _classPrivateFieldLooseBase(this, _log$1)[_log$1](LogLevel.INFO, "Starting stream generation for agent " + this.name, runId);
             systemMessage = {
               role: 'system',
-              content: this.instructions
+              content: this.instructions + ". Today's date is " + new Date().toISOString()
             };
             userMessages = messages.map(function (content) {
               return {
@@ -2233,38 +2853,91 @@ var Agent = (_logger$1 = /*#__PURE__*/_classPrivateFieldLooseKey("logger"), _tel
                 content: content
               };
             });
-            messageObjects = [systemMessage].concat(userMessages);
-            return _context3.abrupt("return", this.llm.stream({
+            coreMessages = userMessages;
+            threadIdToUse = threadId;
+            if (!(this.memory && resourceid)) {
+              _context9.next = 14;
+              break;
+            }
+            _classPrivateFieldLooseBase(this, _log$1)[_log$1](LogLevel.INFO, "Saving user messages in memory for agent " + this.name, runId);
+            _context9.next = 10;
+            return this.saveMemory({
+              threadId: threadIdToUse,
+              resourceid: resourceid,
+              userMessages: userMessages
+            });
+          case 10:
+            saveMessageResponse = _context9.sent;
+            coreMessages = saveMessageResponse.messages;
+            threadIdToUse = saveMessageResponse.threadId;
+            convertedTools = this.convertTools({
+              enabledTools: this.enabledTools,
+              threadId: threadIdToUse,
+              runId: runId
+            });
+          case 14:
+            messageObjects = [systemMessage].concat(coreMessages);
+            console.log('start streaming in agent');
+            return _context9.abrupt("return", this.llm.__stream({
               messages: messageObjects,
-              model: this.model,
               enabledTools: this.enabledTools,
+              convertedTools: convertedTools,
               onStepFinish: onStepFinish,
-              onFinish: onFinish,
+              onFinish: function () {
+                var _onFinish2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(result) {
+                  return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+                    while (1) switch (_context8.prev = _context8.next) {
+                      case 0:
+                        console.log('onFinish====', result);
+                        if (!(_this3.memory && resourceid)) {
+                          _context8.next = 5;
+                          break;
+                        }
+                        _classPrivateFieldLooseBase(_this3, _log$1)[_log$1](LogLevel.INFO, "Saving assistant message in memory for agent " + _this3.name, runId);
+                        _context8.next = 5;
+                        return _this3.saveMemoryOnFinish({
+                          result: result,
+                          threadId: threadIdToUse
+                        });
+                      case 5:
+                        _onFinish == null || _onFinish(result);
+                      case 6:
+                      case "end":
+                        return _context8.stop();
+                    }
+                  }, _callee8);
+                }));
+                function onFinish(_x9) {
+                  return _onFinish2.apply(this, arguments);
+                }
+                return onFinish;
+              }(),
               maxSteps: maxSteps,
               runId: runId
             }));
-          case 6:
+          case 17:
           case "end":
-            return _context3.stop();
+            return _context9.stop();
         }
-      }, _callee3, this);
+      }, _callee9, this);
     }));
-    function stream(_x3) {
+    function stream(_x8) {
       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, runId, systemMessage, userMessages, messageObjects;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+    var _streamObject = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(_ref11) {
+      var _this4 = this;
+      var messages, structuredOutput, onStepFinish, _onFinish3, _ref11$maxSteps, maxSteps, threadId, resourceid, runId, systemMessage, userMessages, coreMessages, convertedTools, threadIdToUse, saveMessageResponse, messageObjects;
+      return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+        while (1) switch (_context11.prev = _context11.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, runId = _ref4.runId;
+            messages = _ref11.messages, structuredOutput = _ref11.structuredOutput, onStepFinish = _ref11.onStepFinish, _onFinish3 = _ref11.onFinish, _ref11$maxSteps = _ref11.maxSteps, maxSteps = _ref11$maxSteps === void 0 ? 5 : _ref11$maxSteps, threadId = _ref11.threadId, resourceid = _ref11.resourceid, runId = _ref11.runId;
             _classPrivateFieldLooseBase(this, _log$1)[_log$1](LogLevel.INFO, "Starting stream generation for agent " + this.name, runId);
             systemMessage = {
               role: 'system',
-              content: this.instructions
+              content: this.instructions + ". Today's date is " + new Date().toISOString()
             };
             userMessages = messages.map(function (content) {
               return {
@@ -2272,24 +2945,75 @@ var Agent = (_logger$1 = /*#__PURE__*/_classPrivateFieldLooseKey("logger"), _tel
                 content: content
               };
             });
-            messageObjects = [systemMessage].concat(userMessages);
-            return _context4.abrupt("return", this.llm.streamObject({
+            coreMessages = userMessages;
+            threadIdToUse = threadId;
+            if (!(this.memory && resourceid)) {
+              _context11.next = 15;
+              break;
+            }
+            _classPrivateFieldLooseBase(this, _log$1)[_log$1](LogLevel.INFO, "Saving user messages in memory for agent " + this.name, runId);
+            _context11.next = 10;
+            return this.saveMemory({
+              threadId: threadIdToUse,
+              resourceid: resourceid,
+              userMessages: userMessages
+            });
+          case 10:
+            saveMessageResponse = _context11.sent;
+            coreMessages = saveMessageResponse.messages;
+            threadIdToUse = saveMessageResponse.threadId;
+            convertedTools = this.convertTools({
+              enabledTools: this.enabledTools,
+              threadId: threadIdToUse,
+              runId: runId
+            });
+            console.log('convertedTools====', JSON.stringify(convertedTools, null, 2));
+          case 15:
+            messageObjects = [systemMessage].concat(coreMessages);
+            return _context11.abrupt("return", this.llm.__streamObject({
               messages: messageObjects,
               structuredOutput: structuredOutput,
-              model: this.model,
               enabledTools: this.enabledTools,
+              convertedTools: convertedTools,
               onStepFinish: onStepFinish,
-              onFinish: onFinish,
+              onFinish: function () {
+                var _onFinish4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(result) {
+                  return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+                    while (1) switch (_context10.prev = _context10.next) {
+                      case 0:
+                        if (!(_this4.memory && resourceid)) {
+                          _context10.next = 4;
+                          break;
+                        }
+                        _classPrivateFieldLooseBase(_this4, _log$1)[_log$1](LogLevel.INFO, "Saving assistant message in memory for agent " + _this4.name, runId);
+                        _context10.next = 4;
+                        return _this4.saveMemoryOnFinish({
+                          result: result,
+                          threadId: threadIdToUse
+                        });
+                      case 4:
+                        _onFinish3 == null || _onFinish3(result);
+                      case 5:
+                      case "end":
+                        return _context10.stop();
+                    }
+                  }, _callee10);
+                }));
+                function onFinish(_x11) {
+                  return _onFinish4.apply(this, arguments);
+                }
+                return onFinish;
+              }(),
               maxSteps: maxSteps,
               runId: runId
             }));
-          case 6:
+          case 17:
           case "end":
-            return _context4.stop();
+            return _context11.stop();
         }
-      }, _callee4, this);
+      }, _callee11, this);
     }));
-    function streamObject(_x4) {
+    function streamObject(_x10) {
       return _streamObject.apply(this, arguments);
     }
     return streamObject;
@@ -2523,11 +3247,11 @@ var Mastra = /*#__PURE__*/function () {
     this.vectors = void 0;
     this.tools = void 0;
     this.agents = void 0;
-    this.llm = void 0;
     this.integrations = void 0;
     this.logger = void 0;
     this.syncs = void 0;
     this.telemetry = void 0;
+    this.memory = void 0;
     /*
     Logger
     */
@@ -2612,7 +3336,7 @@ var Mastra = /*#__PURE__*/function () {
             };
           },
           agents: _this.agents,
-          llm: _this.llm,
+          llm: _this.LLM,
           engine: _this.engine,
           vectors: _this.vectors
         }));
@@ -2636,15 +3360,6 @@ var Mastra = /*#__PURE__*/function () {
     }
     this.syncs = config.syncs || {};
     /*
-    LLM
-    */
-    this.llm = new LLM();
-    this.llm.__setTools(this.tools);
-    if (this.telemetry) {
-      this.llm.__setTelemetry(this.telemetry);
-    }
-    this.llm.__setLogger(this.getLogger());
-    /*
     Agents
     */
     this.agents = new Map();
@@ -2658,9 +3373,34 @@ var Mastra = /*#__PURE__*/function () {
         agent.__setTelemetry(_this.telemetry);
       }
       agent.__setLogger(_this.getLogger());
+      if (config.memory) {
+        agent.__setMemory(config.memory);
+      }
     });
+    if (config.syncs && !config.engine) {
+      throw new Error('Engine is required to run syncs');
+    }
+    this.syncs = config.syncs || {};
+    if (config.engine) {
+      this.engine = config.engine;
+    }
+    if (config.vectors) {
+      this.vectors = config.vectors;
+    }
+    this.memory = config.memory;
   }
   var _proto = Mastra.prototype;
+  _proto.LLM = function LLM$1(modelConfig) {
+    var llm = new LLM({
+      model: modelConfig
+    });
+    llm.__setTools(this.tools);
+    if (this.telemetry) {
+      llm.__setTelemetry(this.telemetry);
+    }
+    llm.__setLogger(this.getLogger());
+    return llm;
+  };
   _proto.sync = /*#__PURE__*/function () {
     var _sync = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(key, params, runId) {
       var _this$syncs,
@@ -2696,7 +3436,7 @@ var Mastra = /*#__PURE__*/function () {
               engine: this.engine,
               agents: this.agents,
               vectors: this.vectors,
-              llm: this.llm,
+              llm: this.LLM,
               integrationsRegistry: function integrationsRegistry() {
                 return {
                   get: function get(name) {
@@ -2740,9 +3480,6 @@ var Mastra = /*#__PURE__*/function () {
     }
     return integration;
   };
-  _proto.getLLM = function getLLM() {
-    return this.llm;
-  };
   _proto.getTool = function getTool(name) {
     var _this3 = this;
     var tools = this.tools;
@@ -2766,7 +3503,7 @@ var Mastra = /*#__PURE__*/function () {
                   };
                 },
                 agents: _this3.agents,
-                llm: _this3.llm,
+                llm: _this3.LLM,
                 engine: _this3.engine,
                 vectors: _this3.vectors
               }));
@@ -3708,26 +4445,30 @@ var MastraMemory = /*#__PURE__*/function () {
   _proto.createThread =
   /*#__PURE__*/
   function () {
-    var _createThread = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(title, metadata) {
-      var thread;
+    var _createThread = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+      var threadId, resourceid, title, metadata, thread;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            threadId = _ref.threadId, resourceid = _ref.resourceid, title = _ref.title, metadata = _ref.metadata;
             thread = {
-              id: this.generateId(),
+              id: threadId || this.generateId(),
               title: title,
+              resourceid: resourceid,
               createdAt: new Date(),
               updatedAt: new Date(),
               metadata: metadata
             };
-            return _context.abrupt("return", this.saveThread(thread));
-          case 2:
+            return _context.abrupt("return", this.saveThread({
+              thread: thread
+            }));
+          case 3:
           case "end":
             return _context.stop();
         }
       }, _callee, this);
     }));
-    function createThread(_x, _x2) {
+    function createThread(_x) {
       return _createThread.apply(this, arguments);
     }
     return createThread;
@@ -3737,36 +4478,47 @@ var MastraMemory = /*#__PURE__*/function () {
    * @param threadId - The thread to add the message to
    * @param content - The message content
    * @param role - The role of the message sender
+   * @param type - The type of the message
+   * @param toolNames - Optional array of tool names that were called
+   * @param toolCallArgs - Optional array of tool call arguments
+   * @param toolCallIds - Optional array of tool call ids
    * @returns Promise resolving to the saved message
    */
   ;
   _proto.addMessage =
   /*#__PURE__*/
   function () {
-    var _addMessage = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(threadId, content, role) {
-      var message, savedMessages;
+    var _addMessage = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
+      var threadId, content, role, type, toolNames, toolCallArgs, toolCallIds, message, savedMessages;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
+            threadId = _ref2.threadId, content = _ref2.content, role = _ref2.role, type = _ref2.type, toolNames = _ref2.toolNames, toolCallArgs = _ref2.toolCallArgs, toolCallIds = _ref2.toolCallIds;
             message = {
               id: this.generateId(),
               content: content,
               role: role,
               createdAt: new Date(),
-              threadId: threadId
+              threadId: threadId,
+              type: type,
+              toolNames: toolNames,
+              toolCallArgs: toolCallArgs,
+              toolCallIds: toolCallIds
             };
-            _context2.next = 3;
-            return this.saveMessages([message]);
-          case 3:
+            _context2.next = 4;
+            return this.saveMessages({
+              messages: [message]
+            });
+          case 4:
             savedMessages = _context2.sent;
             return _context2.abrupt("return", savedMessages[0]);
-          case 5:
+          case 6:
           case "end":
             return _context2.stop();
         }
       }, _callee2, this);
     }));
-    function addMessage(_x3, _x4, _x5) {
+    function addMessage(_x2) {
       return _addMessage.apply(this, arguments);
     }
     return addMessage;