@mastra/memory 0.0.2-alpha.0 → 0.0.2-alpha.10

package/dist/memory.cjs.development.js

@@ -3,10 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var core = require('@mastra/core');
-var crypto$1 = require('crypto');
+var crypto = require('crypto');
 var pg = require('pg');
 var redis = require('@upstash/redis');
-var redis$1 = require('redis');
 
 function _arrayLikeToArray(r, a) {
   (null == a || a > r.length) && (a = r.length);
@@ -381,1573 +380,689 @@ function _unsupportedIterableToArray(r, a) {
   }
 }
 
-var CloudflareKVProvider = /*#__PURE__*/function () {
-  function CloudflareKVProvider(namespace) {
-    this.namespace = void 0;
-    this.namespace = namespace;
-  }
-  var _proto2 = CloudflareKVProvider.prototype;
-  _proto2.get = /*#__PURE__*/function () {
-    var _get2 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(key) {
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
-          case 0:
-            return _context5.abrupt("return", this.namespace.get(key, 'json'));
-          case 1:
-          case "end":
-            return _context5.stop();
-        }
-      }, _callee5, this);
-    }));
-    function get(_x7) {
-      return _get2.apply(this, arguments);
-    }
-    return get;
-  }();
-  _proto2.set = /*#__PURE__*/function () {
-    var _set = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(key, value) {
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
-          case 0:
-            _context6.next = 2;
-            return this.namespace.put(key, JSON.stringify(value));
-          case 2:
-          case "end":
-            return _context6.stop();
-        }
-      }, _callee6, this);
-    }));
-    function set(_x8, _x9) {
-      return _set.apply(this, arguments);
-    }
-    return set;
-  }();
-  _proto2.del = /*#__PURE__*/function () {
-    var _del = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(key) {
-      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
-          case 0:
-            _context7.next = 2;
-            return this.namespace["delete"](key);
-          case 2:
-          case "end":
-            return _context7.stop();
-        }
-      }, _callee7, this);
-    }));
-    function del(_x10) {
-      return _del.apply(this, arguments);
-    }
-    return del;
-  }();
-  _proto2.sadd = /*#__PURE__*/function () {
-    var _sadd = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(key, value) {
-      var set;
-      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
-          case 0:
-            _context8.next = 2;
-            return this.get(key);
-          case 2:
-            _context8.t0 = _context8.sent;
-            if (_context8.t0) {
-              _context8.next = 5;
-              break;
-            }
-            _context8.t0 = [];
-          case 5:
-            set = _context8.t0;
-            if (set.includes(value)) {
-              _context8.next = 11;
-              break;
-            }
-            set.push(value);
-            _context8.next = 10;
-            return this.set(key, set);
-          case 10:
-            return _context8.abrupt("return", 1);
-          case 11:
-            return _context8.abrupt("return", 0);
-          case 12:
-          case "end":
-            return _context8.stop();
-        }
-      }, _callee8, this);
-    }));
-    function sadd(_x11, _x12) {
-      return _sadd.apply(this, arguments);
-    }
-    return sadd;
-  }();
-  _proto2.srem = /*#__PURE__*/function () {
-    var _srem = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(key, value) {
-      var set, index;
-      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
-          case 0:
-            _context9.next = 2;
-            return this.get(key);
-          case 2:
-            _context9.t0 = _context9.sent;
-            if (_context9.t0) {
-              _context9.next = 5;
-              break;
-            }
-            _context9.t0 = [];
-          case 5:
-            set = _context9.t0;
-            index = set.indexOf(value);
-            if (!(index !== -1)) {
-              _context9.next = 12;
-              break;
-            }
-            set.splice(index, 1);
-            _context9.next = 11;
-            return this.set(key, set);
-          case 11:
-            return _context9.abrupt("return", 1);
-          case 12:
-            return _context9.abrupt("return", 0);
-          case 13:
-          case "end":
-            return _context9.stop();
-        }
-      }, _callee9, this);
-    }));
-    function srem(_x13, _x14) {
-      return _srem.apply(this, arguments);
-    }
-    return srem;
-  }();
-  _proto2.smembers = /*#__PURE__*/function () {
-    var _smembers = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(key) {
-      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
-          case 0:
-            _context10.next = 2;
-            return this.get(key);
-          case 2:
-            _context10.t0 = _context10.sent;
-            if (_context10.t0) {
-              _context10.next = 5;
-              break;
-            }
-            _context10.t0 = [];
-          case 5:
-            return _context10.abrupt("return", _context10.t0);
-          case 6:
-          case "end":
-            return _context10.stop();
-        }
-      }, _callee10, this);
-    }));
-    function smembers(_x15) {
-      return _smembers.apply(this, arguments);
-    }
-    return smembers;
-  }();
-  _proto2.flushall = /*#__PURE__*/function () {
-    var _flushall = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
-      var _this = this;
-      var cursor, result;
-      return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-        while (1) switch (_context11.prev = _context11.next) {
-          case 0:
-            _context11.next = 2;
-            return this.namespace.list({
-              cursor: cursor
-            });
-          case 2:
-            result = _context11.sent;
-            _context11.next = 5;
-            return Promise.all(result.keys.map(function (key) {
-              return _this.namespace["delete"](key.name);
-            }));
-          case 5:
-            cursor = result.cursor;
-          case 6:
-            if (cursor) {
-              _context11.next = 0;
-              break;
-            }
-          case 7:
-          case "end":
-            return _context11.stop();
-        }
-      }, _callee11, this);
-    }));
-    function flushall() {
-      return _flushall.apply(this, arguments);
-    }
-    return flushall;
-  }();
-  _proto2.getWithVersion = /*#__PURE__*/function () {
-    var _getWithVersion = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(key) {
-      var versionKey, _yield$Promise$all, data, version;
-      return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-        while (1) switch (_context12.prev = _context12.next) {
-          case 0:
-            versionKey = key + ":version";
-            _context12.next = 3;
-            return Promise.all([this.get(key), this.get(versionKey).then(function (v) {
-              return v || 0;
-            })]);
-          case 3:
-            _yield$Promise$all = _context12.sent;
-            data = _yield$Promise$all[0];
-            version = _yield$Promise$all[1];
-            return _context12.abrupt("return", {
-              data: data,
-              version: version
-            });
-          case 7:
-          case "end":
-            return _context12.stop();
-        }
-      }, _callee12, this);
-    }));
-    function getWithVersion(_x16) {
-      return _getWithVersion.apply(this, arguments);
-    }
-    return getWithVersion;
-  }();
-  _proto2.setWithVersion = /*#__PURE__*/function () {
-    var _setWithVersion = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(key, value, expectedVersion) {
-      var versionKey, currentVersion;
-      return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-        while (1) switch (_context13.prev = _context13.next) {
-          case 0:
-            versionKey = key + ":version";
-            _context13.next = 3;
-            return this.get(versionKey);
-          case 3:
-            _context13.t0 = _context13.sent;
-            if (_context13.t0) {
-              _context13.next = 6;
-              break;
-            }
-            _context13.t0 = 0;
-          case 6:
-            currentVersion = _context13.t0;
-            if (!(currentVersion !== expectedVersion)) {
-              _context13.next = 9;
-              break;
-            }
-            return _context13.abrupt("return", false);
-          case 9:
-            _context13.next = 11;
-            return Promise.all([this.set(key, value), this.set(versionKey, expectedVersion + 1)]);
-          case 11:
-            return _context13.abrupt("return", true);
-          case 12:
-          case "end":
-            return _context13.stop();
-        }
-      }, _callee13, this);
-    }));
-    function setWithVersion(_x17, _x18, _x19) {
-      return _setWithVersion.apply(this, arguments);
-    }
-    return setWithVersion;
-  }();
-  return CloudflareKVProvider;
-}();
-
-var CloudflareKVMemory = /*#__PURE__*/function (_MastraMemory) {
-  function CloudflareKVMemory(namespace) {
+var Pool = pg.Pool;
+var PgMemory = /*#__PURE__*/function (_MastraMemory) {
+  function PgMemory(config) {
     var _this;
     _this = _MastraMemory.call(this) || this;
-    _this.kv = void 0;
-    _this.threadPrefix = 'thread:';
-    _this.messagePrefix = 'messages:';
-    _this.kv = new CloudflareKVProvider(namespace);
+    _this.pool = void 0;
+    _this.hasTables = false;
+    _this.pool = new Pool({
+      connectionString: config.connectionString
+    });
+    _this.MAX_CONTEXT_TOKENS = config.maxTokens;
     return _this;
   }
-  _inheritsLoose(CloudflareKVMemory, _MastraMemory);
-  var _proto = CloudflareKVMemory.prototype;
-  _proto.getThreadById = /*#__PURE__*/function () {
-    var _getThreadById = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(threadId) {
-      var thread;
+  /**
+   * Threads
+   */
+  _inheritsLoose(PgMemory, _MastraMemory);
+  var _proto = PgMemory.prototype;
+  _proto.getThreadById =
+  /*#__PURE__*/
+  function () {
+    var _getThreadById = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+      var threadId, client, result;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 2;
-            return this.kv.get("" + this.threadPrefix + threadId);
-          case 2:
-            thread = _context.sent;
-            if (thread && typeof thread.createdAt === 'string') {
-              thread.createdAt = new Date(thread.createdAt);
-              thread.updatedAt = new Date(thread.updatedAt);
-            }
-            return _context.abrupt("return", thread);
-          case 5:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, this);
-    }));
-    function getThreadById(_x) {
-      return _getThreadById.apply(this, arguments);
-    }
-    return getThreadById;
-  }();
-  _proto.saveThread = /*#__PURE__*/function () {
-    var _saveThread = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(thread) {
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            thread.updatedAt = new Date();
-            _context2.next = 3;
-            return this.kv.set("" + this.threadPrefix + thread.id, thread);
-          case 3:
-            _context2.next = 5;
-            return this.kv.sadd('threads', thread.id);
-          case 5:
-            return _context2.abrupt("return", thread);
-          case 6:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2, this);
-    }));
-    function saveThread(_x2) {
-      return _saveThread.apply(this, arguments);
-    }
-    return saveThread;
-  }();
-  _proto.retryOperation = /*#__PURE__*/function () {
-    var _retryOperation = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(operation, maxRetries) {
-      var lastError, _loop, _ret, attempt;
-      return _regeneratorRuntime().wrap(function _callee3$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
-          case 0:
-            if (maxRetries === void 0) {
-              maxRetries = 5;
-            }
-            _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop(attempt) {
-              return _regeneratorRuntime().wrap(function _loop$(_context3) {
-                while (1) switch (_context3.prev = _context3.next) {
-                  case 0:
-                    _context3.prev = 0;
-                    _context3.next = 3;
-                    return operation();
-                  case 3:
-                    _context3.t0 = _context3.sent;
-                    return _context3.abrupt("return", {
-                      v: _context3.t0
-                    });
-                  case 7:
-                    _context3.prev = 7;
-                    _context3.t1 = _context3["catch"](0);
-                    lastError = _context3.t1;
-                    _context3.next = 12;
-                    return new Promise(function (resolve) {
-                      return setTimeout(resolve, Math.random() * 100 * Math.pow(2, attempt));
-                    });
-                  case 12:
-                  case "end":
-                    return _context3.stop();
-                }
-              }, _loop, null, [[0, 7]]);
-            });
-            attempt = 0;
-          case 3:
-            if (!(attempt < maxRetries)) {
-              _context4.next = 11;
-              break;
-            }
-            return _context4.delegateYield(_loop(attempt), "t0", 5);
-          case 5:
-            _ret = _context4.t0;
-            if (!_ret) {
-              _context4.next = 8;
-              break;
-            }
-            return _context4.abrupt("return", _ret.v);
-          case 8:
-            attempt++;
-            _context4.next = 3;
-            break;
-          case 11:
-            throw lastError || new Error("Operation failed after " + maxRetries + " attempts");
-          case 12:
-          case "end":
-            return _context4.stop();
-        }
-      }, _callee3);
-    }));
-    function retryOperation(_x3, _x4) {
-      return _retryOperation.apply(this, arguments);
-    }
-    return retryOperation;
-  }();
-  _proto.addMessage = /*#__PURE__*/function () {
-    var _addMessage = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(threadId, content, role) {
-      var _this2 = this;
-      var message;
-      return _regeneratorRuntime().wrap(function _callee5$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
-          case 0:
-            message = {
-              id: this.generateId(),
-              content: content,
-              role: role,
-              createdAt: new Date(),
-              threadId: threadId
-            };
-            _context6.next = 3;
-            return this.retryOperation(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-              var key, existingMessages, messageMap, updatedMessages;
-              return _regeneratorRuntime().wrap(function _callee4$(_context5) {
-                while (1) switch (_context5.prev = _context5.next) {
-                  case 0:
-                    key = "" + _this2.messagePrefix + threadId;
-                    _context5.next = 3;
-                    return _this2.kv.get(key);
-                  case 3:
-                    _context5.t0 = _context5.sent;
-                    if (_context5.t0) {
-                      _context5.next = 6;
-                      break;
-                    }
-                    _context5.t0 = [];
-                  case 6:
-                    existingMessages = _context5.t0;
-                    messageMap = new Map();
-                    existingMessages.forEach(function (msg) {
-                      messageMap.set(msg.id, _extends({}, msg, {
-                        createdAt: new Date(msg.createdAt)
-                      }));
-                    });
-                    messageMap.set(message.id, message);
-                    updatedMessages = Array.from(messageMap.values());
-                    updatedMessages.sort(function (a, b) {
-                      var timeCompare = a.createdAt.getTime() - b.createdAt.getTime();
-                      return timeCompare === 0 ? a.id.localeCompare(b.id) : timeCompare;
-                    });
-                    _context5.next = 14;
-                    return _this2.kv.set(key, updatedMessages);
-                  case 14:
-                  case "end":
-                    return _context5.stop();
-                }
-              }, _callee4);
-            })));
+            threadId = _ref.threadId;
+            _context.next = 3;
+            return this.ensureTablesExist();
           case 3:
-            return _context6.abrupt("return", message);
-          case 4:
-          case "end":
-            return _context6.stop();
-        }
-      }, _callee5, this);
-    }));
-    function addMessage(_x5, _x6, _x7) {
-      return _addMessage.apply(this, arguments);
-    }
-    return addMessage;
-  }();
-  _proto.saveMessages = /*#__PURE__*/function () {
-    var _saveMessages = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(messages) {
-      var _this3 = this;
-      var messagesByThread, _iterator, _step, message, key;
-      return _regeneratorRuntime().wrap(function _callee7$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
-          case 0:
-            if (messages.length) {
-              _context9.next = 2;
-              break;
-            }
-            return _context9.abrupt("return", []);
-          case 2:
-            messagesByThread = new Map();
-            for (_iterator = _createForOfIteratorHelperLoose(messages); !(_step = _iterator()).done;) {
-              message = _step.value;
-              key = "" + this.messagePrefix + message.threadId;
-              if (!messagesByThread.has(key)) {
-                messagesByThread.set(key, []);
-              }
-              messagesByThread.get(key).push(_extends({}, message, {
-                createdAt: new Date(message.createdAt)
-              }));
-            }
-            _context9.next = 6;
-            return Promise.all(Array.from(messagesByThread.entries()).map(function (_ref2) {
-              var key = _ref2[0],
-                threadMessages = _ref2[1];
-              return _this3.retryOperation(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-                var saved, _loop2;
-                return _regeneratorRuntime().wrap(function _callee6$(_context8) {
-                  while (1) switch (_context8.prev = _context8.next) {
-                    case 0:
-                      saved = false;
-                      _loop2 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop2() {
-                        var _yield$_this3$kv$getW, existingMessages, version, messageMap, updatedMessages;
-                        return _regeneratorRuntime().wrap(function _loop2$(_context7) {
-                          while (1) switch (_context7.prev = _context7.next) {
-                            case 0:
-                              _context7.next = 2;
-                              return _this3.kv.getWithVersion(key);
-                            case 2:
-                              _yield$_this3$kv$getW = _context7.sent;
-                              existingMessages = _yield$_this3$kv$getW.data;
-                              version = _yield$_this3$kv$getW.version;
-                              console.log('Read version:', version, 'Messages:', (existingMessages == null ? void 0 : existingMessages.length) || 0);
-                              messageMap = new Map();
-                              (existingMessages || []).forEach(function (msg) {
-                                messageMap.set(msg.id, _extends({}, msg, {
-                                  createdAt: new Date(msg.createdAt)
-                                }));
-                              });
-                              threadMessages.forEach(function (msg) {
-                                messageMap.set(msg.id, msg);
-                              });
-                              updatedMessages = Array.from(messageMap.values());
-                              updatedMessages.sort(function (a, b) {
-                                var timeCompare = a.createdAt.getTime() - b.createdAt.getTime();
-                                return timeCompare === 0 ? a.id.localeCompare(b.id) : timeCompare;
-                              });
-                              _context7.next = 13;
-                              return _this3.kv.setWithVersion(key, updatedMessages, version);
-                            case 13:
-                              saved = _context7.sent;
-                              console.log('Save attempt with version:', version, 'Success:', saved);
-                              if (saved) {
-                                _context7.next = 18;
-                                break;
-                              }
-                              _context7.next = 18;
-                              return new Promise(function (resolve) {
-                                return setTimeout(resolve, Math.random() * 50);
-                              });
-                            case 18:
-                            case "end":
-                              return _context7.stop();
-                          }
-                        }, _loop2);
-                      });
-                    case 2:
-                      if (saved) {
-                        _context8.next = 6;
-                        break;
-                      }
-                      return _context8.delegateYield(_loop2(), "t0", 4);
-                    case 4:
-                      _context8.next = 2;
-                      break;
-                    case 6:
-                    case "end":
-                      return _context8.stop();
-                  }
-                }, _callee6);
-              })));
-            }));
-          case 6:
-            return _context9.abrupt("return", messages);
-          case 7:
-          case "end":
-            return _context9.stop();
-        }
-      }, _callee7, this);
-    }));
-    function saveMessages(_x8) {
-      return _saveMessages.apply(this, arguments);
-    }
-    return saveMessages;
-  }();
-  _proto.getMessages = /*#__PURE__*/function () {
-    var _getMessages = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(threadId) {
-      var messages;
-      return _regeneratorRuntime().wrap(function _callee8$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
-          case 0:
-            _context10.next = 2;
-            return this.kv.get("" + this.messagePrefix + threadId);
-          case 2:
-            _context10.t0 = _context10.sent;
-            if (_context10.t0) {
-              _context10.next = 5;
-              break;
-            }
-            _context10.t0 = [];
-          case 5:
-            messages = _context10.t0;
-            return _context10.abrupt("return", messages.map(function (msg) {
-              return _extends({}, msg, {
-                createdAt: new Date(msg.createdAt)
-              });
-            }));
-          case 7:
-          case "end":
-            return _context10.stop();
-        }
-      }, _callee8, this);
-    }));
-    function getMessages(_x9) {
-      return _getMessages.apply(this, arguments);
-    }
-    return getMessages;
-  }();
-  _proto.getAllThreadIds = /*#__PURE__*/function () {
-    var _getAllThreadIds = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
-      return _regeneratorRuntime().wrap(function _callee9$(_context11) {
-        while (1) switch (_context11.prev = _context11.next) {
-          case 0:
-            return _context11.abrupt("return", this.kv.smembers('threads'));
-          case 1:
-          case "end":
-            return _context11.stop();
-        }
-      }, _callee9, this);
-    }));
-    function getAllThreadIds() {
-      return _getAllThreadIds.apply(this, arguments);
-    }
-    return getAllThreadIds;
-  }();
-  _proto.deleteThread = /*#__PURE__*/function () {
-    var _deleteThread = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(threadId) {
-      return _regeneratorRuntime().wrap(function _callee10$(_context12) {
-        while (1) switch (_context12.prev = _context12.next) {
-          case 0:
-            _context12.next = 2;
-            return Promise.all([this.kv.del("" + this.threadPrefix + threadId), this.kv.del("" + this.messagePrefix + threadId), this.kv.srem('threads', threadId)]);
-          case 2:
-          case "end":
-            return _context12.stop();
-        }
-      }, _callee10, this);
-    }));
-    function deleteThread(_x10) {
-      return _deleteThread.apply(this, arguments);
-    }
-    return deleteThread;
-  }();
-  _proto.getThreads = /*#__PURE__*/function () {
-    var _getThreads = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(threadIds) {
-      var _this4 = this;
-      var threads;
-      return _regeneratorRuntime().wrap(function _callee11$(_context13) {
-        while (1) switch (_context13.prev = _context13.next) {
-          case 0:
-            _context13.next = 2;
-            return Promise.all(threadIds.map(function (id) {
-              return _this4.getThreadById(id);
-            }));
-          case 2:
-            threads = _context13.sent;
-            return _context13.abrupt("return", threads.filter(function (t) {
-              return t !== null;
-            }));
-          case 4:
-          case "end":
-            return _context13.stop();
-        }
-      }, _callee11);
-    }));
-    function getThreads(_x11) {
-      return _getThreads.apply(this, arguments);
-    }
-    return getThreads;
-  }();
-  _proto.cleanup = /*#__PURE__*/function () {
-    var _cleanup = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
-      return _regeneratorRuntime().wrap(function _callee12$(_context14) {
-        while (1) switch (_context14.prev = _context14.next) {
-          case 0:
-            _context14.next = 2;
-            return this.kv.flushall();
-          case 2:
-          case "end":
-            return _context14.stop();
-        }
-      }, _callee12, this);
-    }));
-    function cleanup() {
-      return _cleanup.apply(this, arguments);
-    }
-    return cleanup;
-  }();
-  return CloudflareKVMemory;
-}(core.MastraMemory);
-
-var Pool = pg.Pool;
-var PgMemory = /*#__PURE__*/function (_MastraMemory) {
-  function PgMemory(connectionString) {
-    var _this;
-    _this = _MastraMemory.call(this) || this;
-    _this.pool = void 0;
-    _this.pool = new Pool({
-      connectionString: connectionString
-    });
-    return _this;
-  }
-  _inheritsLoose(PgMemory, _MastraMemory);
-  var _proto = PgMemory.prototype;
-  _proto.drop = /*#__PURE__*/function () {
-    var _drop = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var client;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return this.pool.connect();
-          case 2:
-            client = _context.sent;
             _context.next = 5;
-            return client.query('DELETE FROM mastra_messages');
-          case 5:
-            _context.next = 7;
-            return client.query('DELETE FROM mastra_threads');
-          case 7:
-            client.release();
-            _context.next = 10;
-            return this.pool.end();
-          case 10:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, this);
-    }));
-    function drop() {
-      return _drop.apply(this, arguments);
-    }
-    return drop;
-  }();
-  _proto.ensureTablesExist = /*#__PURE__*/function () {
-    var _ensureTablesExist = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var client, _threadsResult$rows, _messagesResult$rows, threadsResult, messagesResult;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            _context2.next = 2;
-            return this.pool.connect();
-          case 2:
-            client = _context2.sent;
-            _context2.prev = 3;
-            _context2.next = 6;
-            return client.query("\n                SELECT EXISTS (\n                    SELECT 1\n                    FROM information_schema.tables\n                    WHERE table_name = 'mastra_threads'\n                );\n            ");
-          case 6:
-            threadsResult = _context2.sent;
-            if (threadsResult != null && (_threadsResult$rows = threadsResult.rows) != null && (_threadsResult$rows = _threadsResult$rows[0]) != null && _threadsResult$rows.exists) {
-              _context2.next = 10;
-              break;
-            }
-            _context2.next = 10;
-            return client.query("\n                    CREATE TABLE IF NOT EXISTS mastra_threads (\n                        id UUID PRIMARY KEY,\n                        title TEXT,\n                        created_at TIMESTAMP WITH TIME ZONE NOT NULL,\n                        updated_at TIMESTAMP WITH TIME ZONE NOT NULL,\n                        metadata JSONB\n                    );\n                ");
-          case 10:
-            _context2.next = 12;
-            return client.query("\n                SELECT EXISTS (\n                    SELECT 1\n                    FROM information_schema.tables\n                    WHERE table_name = 'mastra_messages'\n                );\n            ");
-          case 12:
-            messagesResult = _context2.sent;
-            if (messagesResult != null && (_messagesResult$rows = messagesResult.rows) != null && (_messagesResult$rows = _messagesResult$rows[0]) != null && _messagesResult$rows.exists) {
-              _context2.next = 16;
-              break;
-            }
-            _context2.next = 16;
-            return client.query("\n                    CREATE TABLE IF NOT EXISTS mastra_messages (\n                        id UUID PRIMARY KEY,\n                        content TEXT NOT NULL,\n                        role VARCHAR(20) NOT NULL,\n                        created_at TIMESTAMP WITH TIME ZONE NOT NULL,\n                        thread_id UUID NOT NULL,\n                        FOREIGN KEY (thread_id) REFERENCES mastra_threads(id)\n                    );\n                ");
-          case 16:
-            _context2.prev = 16;
-            client.release();
-            return _context2.finish(16);
-          case 19:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2, this, [[3,, 16, 19]]);
-    }));
-    function ensureTablesExist() {
-      return _ensureTablesExist.apply(this, arguments);
-    }
-    return ensureTablesExist;
-  }();
-  _proto.updateThread = /*#__PURE__*/function () {
-    var _updateThread = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(id, title, metadata) {
-      var client, _result$rows, result;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            _context3.next = 2;
-            return this.pool.connect();
-          case 2:
-            client = _context3.sent;
-            _context3.prev = 3;
-            _context3.next = 6;
-            return client.query("\n                UPDATE mastra_threads\n                SET title = $1, metadata = $2, updated_at = NOW()\n                WHERE id = $3\n                RETURNING *\n                ", [title, JSON.stringify(metadata), id]);
-          case 6:
-            result = _context3.sent;
-            return _context3.abrupt("return", result == null || (_result$rows = result.rows) == null ? void 0 : _result$rows[0]);
-          case 8:
-            _context3.prev = 8;
-            client.release();
-            return _context3.finish(8);
-          case 11:
-          case "end":
-            return _context3.stop();
-        }
-      }, _callee3, this, [[3,, 8, 11]]);
-    }));
-    function updateThread(_x, _x2, _x3) {
-      return _updateThread.apply(this, arguments);
-    }
-    return updateThread;
-  }();
-  _proto.deleteThread = /*#__PURE__*/function () {
-    var _deleteThread = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(id) {
-      var client;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
-          case 0:
-            _context4.next = 2;
-            return this.pool.connect();
-          case 2:
-            client = _context4.sent;
-            _context4.prev = 3;
-            _context4.next = 6;
-            return client.query("\n                DELETE FROM mastra_messages\n                WHERE thread_id = $1\n                ", [id]);
-          case 6:
-            _context4.next = 8;
-            return client.query("\n                DELETE FROM mastra_threads\n                WHERE id = $1\n                ", [id]);
-          case 8:
-            _context4.prev = 8;
-            client.release();
-            return _context4.finish(8);
-          case 11:
-          case "end":
-            return _context4.stop();
-        }
-      }, _callee4, this, [[3,, 8, 11]]);
-    }));
-    function deleteThread(_x4) {
-      return _deleteThread.apply(this, arguments);
-    }
-    return deleteThread;
-  }();
-  _proto.deleteMessage = /*#__PURE__*/function () {
-    var _deleteMessage = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(id) {
-      var client;
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
-          case 0:
-            _context5.next = 2;
-            return this.pool.connect();
-          case 2:
-            client = _context5.sent;
-            _context5.prev = 3;
-            _context5.next = 6;
-            return client.query("\n                DELETE FROM mastra_messages\n                WHERE id = $1\n                ", [id]);
-          case 6:
-            _context5.prev = 6;
-            client.release();
-            return _context5.finish(6);
-          case 9:
-          case "end":
-            return _context5.stop();
-        }
-      }, _callee5, this, [[3,, 6, 9]]);
-    }));
-    function deleteMessage(_x5) {
-      return _deleteMessage.apply(this, arguments);
-    }
-    return deleteMessage;
-  }();
-  _proto.getThreadById = /*#__PURE__*/function () {
-    var _getThreadById = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(threadId) {
-      var client, result;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
-          case 0:
-            _context6.next = 2;
-            return this.ensureTablesExist();
-          case 2:
-            _context6.next = 4;
-            return this.pool.connect();
-          case 4:
-            client = _context6.sent;
-            _context6.prev = 5;
-            _context6.next = 8;
-            return client.query("\n                SELECT id, title, created_at AS createdAt, updated_at AS updatedAt, metadata\n                FROM mastra_threads\n                WHERE id = $1\n            ", [threadId]);
-          case 8:
-            result = _context6.sent;
-            return _context6.abrupt("return", result.rows[0] || null);
-          case 10:
-            _context6.prev = 10;
-            client.release();
-            return _context6.finish(10);
-          case 13:
-          case "end":
-            return _context6.stop();
-        }
-      }, _callee6, this, [[5,, 10, 13]]);
-    }));
-    function getThreadById(_x6) {
-      return _getThreadById.apply(this, arguments);
-    }
-    return getThreadById;
-  }();
-  _proto.saveThread = /*#__PURE__*/function () {
-    var _saveThread = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(thread) {
-      var client, _result$rows2, id, title, createdAt, updatedAt, metadata, result;
-      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
-          case 0:
-            _context7.next = 2;
-            return this.ensureTablesExist();
-          case 2:
-            _context7.next = 4;
-            return this.pool.connect();
-          case 4:
-            client = _context7.sent;
-            _context7.prev = 5;
-            id = thread.id, title = thread.title, createdAt = thread.createdAt, updatedAt = thread.updatedAt, metadata = thread.metadata;
-            _context7.next = 9;
-            return client.query("\n                INSERT INTO mastra_threads (id, title, created_at, updated_at, metadata)\n                VALUES ($1, $2, $3, $4, $5)\n                ON CONFLICT (id) DO UPDATE SET title = $2, updated_at = $4, metadata = $5\n                RETURNING id, title, created_at AS createdAt, updated_at AS updatedAt, metadata\n            ", [id, title, createdAt, updatedAt, JSON.stringify(metadata)]);
-          case 9:
-            result = _context7.sent;
-            return _context7.abrupt("return", result == null || (_result$rows2 = result.rows) == null ? void 0 : _result$rows2[0]);
-          case 11:
-            _context7.prev = 11;
-            client.release();
-            return _context7.finish(11);
-          case 14:
-          case "end":
-            return _context7.stop();
-        }
-      }, _callee7, this, [[5,, 11, 14]]);
-    }));
-    function saveThread(_x7) {
-      return _saveThread.apply(this, arguments);
-    }
-    return saveThread;
-  }();
-  _proto.saveMessages = /*#__PURE__*/function () {
-    var _saveMessages = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(messages) {
-      var client, _iterator, _step, message, id, content, role, createdAt, threadId;
-      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
-          case 0:
-            _context8.next = 2;
-            return this.ensureTablesExist();
-          case 2:
-            _context8.next = 4;
-            return this.pool.connect();
-          case 4:
-            client = _context8.sent;
-            _context8.prev = 5;
-            _context8.next = 8;
-            return client.query('BEGIN');
-          case 8:
-            _iterator = _createForOfIteratorHelperLoose(messages);
-          case 9:
-            if ((_step = _iterator()).done) {
-              _context8.next = 16;
-              break;
-            }
-            message = _step.value;
-            id = message.id, content = message.content, role = message.role, createdAt = message.createdAt, threadId = message.threadId;
-            _context8.next = 14;
-            return client.query("\n                    INSERT INTO mastra_messages (id, content, role, created_at, thread_id)\n                    VALUES ($1, $2, $3, $4, $5)\n                ", [id, content, role, createdAt.toISOString(), threadId]);
-          case 14:
-            _context8.next = 9;
-            break;
-          case 16:
-            _context8.next = 18;
-            return client.query('COMMIT');
-          case 18:
-            return _context8.abrupt("return", messages);
-          case 21:
-            _context8.prev = 21;
-            _context8.t0 = _context8["catch"](5);
-            _context8.next = 25;
-            return client.query('ROLLBACK');
-          case 25:
-            throw _context8.t0;
-          case 26:
-            _context8.prev = 26;
-            client.release();
-            return _context8.finish(26);
-          case 29:
-          case "end":
-            return _context8.stop();
-        }
-      }, _callee8, this, [[5, 21, 26, 29]]);
-    }));
-    function saveMessages(_x8) {
-      return _saveMessages.apply(this, arguments);
-    }
-    return saveMessages;
-  }();
-  _proto.getMessages = /*#__PURE__*/function () {
-    var _getMessages = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(threadId) {
-      var client, result;
-      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
-          case 0:
-            _context9.next = 2;
-            return this.ensureTablesExist();
-          case 2:
-            _context9.next = 4;
             return this.pool.connect();
-          case 4:
-            client = _context9.sent;
-            _context9.prev = 5;
-            _context9.next = 8;
-            return client.query("\n                SELECT \n                    id, \n                    content, \n                    role, \n                    created_at AS createdAt, \n                    thread_id AS threadId\n                FROM mastra_messages\n                WHERE thread_id = $1\n                ORDER BY created_at ASC\n            ", [threadId]);
-          case 8:
-            result = _context9.sent;
-            return _context9.abrupt("return", result.rows);
-          case 10:
-            _context9.prev = 10;
-            client.release();
-            return _context9.finish(10);
-          case 13:
-          case "end":
-            return _context9.stop();
-        }
-      }, _callee9, this, [[5,, 10, 13]]);
-    }));
-    function getMessages(_x9) {
-      return _getMessages.apply(this, arguments);
-    }
-    return getMessages;
-  }();
-  _proto.createThread = /*#__PURE__*/function () {
-    var _createThread = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(title, metadata) {
-      var id, now, thread;
-      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
-          case 0:
-            _context10.next = 2;
-            return this.ensureTablesExist();
-          case 2:
-            id = crypto$1.randomUUID();
-            now = new Date();
-            thread = {
-              id: id,
-              title: title,
-              createdAt: now,
-              updatedAt: now,
-              metadata: metadata
-            };
-            return _context10.abrupt("return", this.saveThread(thread));
-          case 6:
-          case "end":
-            return _context10.stop();
-        }
-      }, _callee10, this);
-    }));
-    function createThread(_x10, _x11) {
-      return _createThread.apply(this, arguments);
-    }
-    return createThread;
-  }();
-  _proto.addMessage = /*#__PURE__*/function () {
-    var _addMessage = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(threadId, content, role) {
-      var thread, id, message, _yield$this$saveMessa, savedMessage;
-      return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-        while (1) switch (_context11.prev = _context11.next) {
-          case 0:
-            _context11.next = 2;
-            return this.ensureTablesExist();
-          case 2:
-            _context11.next = 4;
-            return this.getThreadById(threadId);
-          case 4:
-            thread = _context11.sent;
-            if (thread) {
-              _context11.next = 7;
-              break;
-            }
-            throw new Error("Thread with ID " + threadId + " does not exist.");
-          case 7:
-            id = crypto$1.randomUUID();
-            message = {
-              id: id,
-              content: content,
-              role: role,
-              createdAt: new Date(),
-              threadId: threadId
-            };
-            _context11.next = 11;
-            return this.saveMessages([message]);
-          case 11:
-            _yield$this$saveMessa = _context11.sent;
-            savedMessage = _yield$this$saveMessa[0];
-            return _context11.abrupt("return", savedMessage);
-          case 14:
-          case "end":
-            return _context11.stop();
-        }
-      }, _callee11, this);
-    }));
-    function addMessage(_x12, _x13, _x14) {
-      return _addMessage.apply(this, arguments);
-    }
-    return addMessage;
-  }();
-  return PgMemory;
-}(core.MastraMemory);
-
-// Helper functions for date handling
-function serializeData(data) {
-  if (data === null || data === undefined) return data;
-  if (data instanceof Date) {
-    return {
-      __type: 'Date',
-      value: data.toISOString()
-    };
-  }
-  if (Array.isArray(data)) {
-    return data.map(function (item) {
-      return serializeData(item);
-    });
-  }
-  if (typeof data === 'object') {
-    return Object.keys(data).reduce(function (acc, key) {
-      acc[key] = serializeData(data[key]);
-      return acc;
-    }, {});
-  }
-  return data;
-}
-function deserializeData(data) {
-  if (data === null || data === undefined) return data;
-  if (typeof data === 'object' && data.__type === 'Date') {
-    return new Date(data.value);
-  }
-  if (Array.isArray(data)) {
-    return data.map(function (item) {
-      return deserializeData(item);
-    });
-  }
-  if (typeof data === 'object') {
-    return Object.keys(data).reduce(function (acc, key) {
-      acc[key] = deserializeData(data[key]);
-      return acc;
-    }, {});
-  }
-  return data;
-}
-// Provider for Upstash/Vercel KV
-var UpstashProvider = /*#__PURE__*/function () {
-  function UpstashProvider(url, token) {
-    this.client = void 0;
-    this.client = new redis.Redis({
-      url: url,
-      token: token
-    });
-  }
-  var _proto = UpstashProvider.prototype;
-  _proto.get = /*#__PURE__*/function () {
-    var _get = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(key) {
-      var data;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return this.client.get(key);
-          case 2:
-            data = _context.sent;
-            return _context.abrupt("return", deserializeData(data));
-          case 4:
+          case 5:
+            client = _context.sent;
+            _context.prev = 6;
+            _context.next = 9;
+            return client.query("\n                SELECT id, title, created_at AS createdAt, updated_at AS updatedAt, resourceid, metadata\n                FROM mastra_threads\n                WHERE id = $1\n            ", [threadId]);
+          case 9:
+            result = _context.sent;
+            return _context.abrupt("return", result.rows[0] || null);
+          case 11:
+            _context.prev = 11;
+            client.release();
+            return _context.finish(11);
+          case 14:
           case "end":
             return _context.stop();
         }
-      }, _callee, this);
+      }, _callee, this, [[6,, 11, 14]]);
     }));
-    function get(_x) {
-      return _get.apply(this, arguments);
+    function getThreadById(_x) {
+      return _getThreadById.apply(this, arguments);
     }
-    return get;
+    return getThreadById;
   }();
-  _proto.set = /*#__PURE__*/function () {
-    var _set = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(key, value) {
+  _proto.getThreadsByResourceId = /*#__PURE__*/function () {
+    var _getThreadsByResourceId = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
+      var resourceid, client, result;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            return _context2.abrupt("return", this.client.set(key, serializeData(value)));
-          case 1:
+            resourceid = _ref2.resourceid;
+            _context2.next = 3;
+            return this.ensureTablesExist();
+          case 3:
+            _context2.next = 5;
+            return this.pool.connect();
+          case 5:
+            client = _context2.sent;
+            _context2.prev = 6;
+            _context2.next = 9;
+            return client.query("\n                SELECT id, title, resourceid, created_at AS createdAt, updated_at AS updatedAt, metadata\n                FROM mastra_threads\n                WHERE resourceid = $1\n            ", [resourceid]);
+          case 9:
+            result = _context2.sent;
+            return _context2.abrupt("return", result.rows);
+          case 11:
+            _context2.prev = 11;
+            client.release();
+            return _context2.finish(11);
+          case 14:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, this);
+      }, _callee2, this, [[6,, 11, 14]]);
     }));
-    function set(_x2, _x3) {
-      return _set.apply(this, arguments);
+    function getThreadsByResourceId(_x2) {
+      return _getThreadsByResourceId.apply(this, arguments);
     }
-    return set;
+    return getThreadsByResourceId;
   }();
-  _proto.del = /*#__PURE__*/function () {
-    var _del = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(key) {
+  _proto.saveThread = /*#__PURE__*/function () {
+    var _saveThread = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref3) {
+      var thread, client, _result$rows, id, title, createdAt, updatedAt, resourceid, metadata, result;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            return _context3.abrupt("return", this.client.del(key));
-          case 1:
+            thread = _ref3.thread;
+            _context3.next = 3;
+            return this.ensureTablesExist();
+          case 3:
+            _context3.next = 5;
+            return this.pool.connect();
+          case 5:
+            client = _context3.sent;
+            _context3.prev = 6;
+            id = thread.id, title = thread.title, createdAt = thread.createdAt, updatedAt = thread.updatedAt, resourceid = thread.resourceid, metadata = thread.metadata;
+            _context3.next = 10;
+            return client.query("\n                INSERT INTO mastra_threads (id, title, created_at, updated_at, resourceid, metadata)\n                VALUES ($1, $2, $3, $4, $5, $6)\n                ON CONFLICT (id) DO UPDATE SET title = $2, updated_at = $4, resourceid = $5, metadata = $6\n                RETURNING id, title, created_at AS createdAt, updated_at AS updatedAt, resourceid, metadata\n            ", [id, title, createdAt, updatedAt, resourceid, JSON.stringify(metadata)]);
+          case 10:
+            result = _context3.sent;
+            return _context3.abrupt("return", result == null || (_result$rows = result.rows) == null ? void 0 : _result$rows[0]);
+          case 12:
+            _context3.prev = 12;
+            client.release();
+            return _context3.finish(12);
+          case 15:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, this);
+      }, _callee3, this, [[6,, 12, 15]]);
     }));
-    function del(_x4) {
-      return _del.apply(this, arguments);
+    function saveThread(_x3) {
+      return _saveThread.apply(this, arguments);
     }
-    return del;
+    return saveThread;
   }();
-  _proto.sadd = /*#__PURE__*/function () {
-    var _sadd = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(key, value) {
+  _proto.updateThread = /*#__PURE__*/function () {
+    var _updateThread = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(id, title, metadata) {
+      var client, _result$rows2, result;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            return _context4.abrupt("return", this.client.sadd(key, value));
-          case 1:
+            _context4.next = 2;
+            return this.pool.connect();
+          case 2:
+            client = _context4.sent;
+            _context4.prev = 3;
+            _context4.next = 6;
+            return client.query("\n                UPDATE mastra_threads\n                SET title = $1, metadata = $2, updated_at = NOW()\n                WHERE id = $3\n                RETURNING *\n                ", [title, JSON.stringify(metadata), id]);
+          case 6:
+            result = _context4.sent;
+            return _context4.abrupt("return", result == null || (_result$rows2 = result.rows) == null ? void 0 : _result$rows2[0]);
+          case 8:
+            _context4.prev = 8;
+            client.release();
+            return _context4.finish(8);
+          case 11:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, this);
+      }, _callee4, this, [[3,, 8, 11]]);
     }));
-    function sadd(_x5, _x6) {
-      return _sadd.apply(this, arguments);
+    function updateThread(_x4, _x5, _x6) {
+      return _updateThread.apply(this, arguments);
     }
-    return sadd;
+    return updateThread;
   }();
-  _proto.srem = /*#__PURE__*/function () {
-    var _srem = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(key, value) {
+  _proto.deleteThread = /*#__PURE__*/function () {
+    var _deleteThread = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(id) {
+      var client;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            return _context5.abrupt("return", this.client.srem(key, value));
-          case 1:
+            _context5.next = 2;
+            return this.pool.connect();
+          case 2:
+            client = _context5.sent;
+            _context5.prev = 3;
+            _context5.next = 6;
+            return client.query("\n                DELETE FROM mastra_messages\n                WHERE thread_id = $1\n                ", [id]);
+          case 6:
+            _context5.next = 8;
+            return client.query("\n                DELETE FROM mastra_threads\n                WHERE id = $1\n                ", [id]);
+          case 8:
+            _context5.prev = 8;
+            client.release();
+            return _context5.finish(8);
+          case 11:
           case "end":
             return _context5.stop();
         }
-      }, _callee5, this);
+      }, _callee5, this, [[3,, 8, 11]]);
     }));
-    function srem(_x7, _x8) {
-      return _srem.apply(this, arguments);
+    function deleteThread(_x7) {
+      return _deleteThread.apply(this, arguments);
     }
-    return srem;
-  }();
-  _proto.smembers = /*#__PURE__*/function () {
-    var _smembers = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(key) {
+    return deleteThread;
+  }()
+  /**
+   * Tool Cache
+   */
+  ;
+  _proto.validateToolCallArgs =
+  /*#__PURE__*/
+  function () {
+    var _validateToolCallArgs = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref4) {
+      var hashedArgs, client, toolArgsResult;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
-            return _context6.abrupt("return", this.client.smembers(key));
-          case 1:
+            hashedArgs = _ref4.hashedArgs;
+            _context6.next = 3;
+            return this.ensureTablesExist();
+          case 3:
+            _context6.next = 5;
+            return this.pool.connect();
+          case 5:
+            client = _context6.sent;
+            _context6.prev = 6;
+            _context6.next = 9;
+            return client.query(" SELECT tool_call_ids as toolCallIds, \n                tool_call_args as toolCallArgs,\n                created_at AS createdAt\n         FROM mastra_messages\n         WHERE tool_call_args::jsonb @> $1\n         AND tool_call_args_expire_at > $2\n         ORDER BY created_at ASC\n         LIMIT 1", [JSON.stringify([hashedArgs]), new Date().toISOString()]);
+          case 9:
+            toolArgsResult = _context6.sent;
+            return _context6.abrupt("return", toolArgsResult.rows.length > 0);
+          case 13:
+            _context6.prev = 13;
+            _context6.t0 = _context6["catch"](6);
+            console.log('error checking if valid arg exists====', _context6.t0);
+            return _context6.abrupt("return", false);
+          case 17:
+            _context6.prev = 17;
+            client.release();
+            return _context6.finish(17);
+          case 20:
           case "end":
             return _context6.stop();
         }
-      }, _callee6, this);
+      }, _callee6, this, [[6, 13, 17, 20]]);
     }));
-    function smembers(_x9) {
-      return _smembers.apply(this, arguments);
+    function validateToolCallArgs(_x8) {
+      return _validateToolCallArgs.apply(this, arguments);
     }
-    return smembers;
+    return validateToolCallArgs;
   }();
-  _proto.flushall = /*#__PURE__*/function () {
-    var _flushall = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+  _proto.getToolResult = /*#__PURE__*/function () {
+    var _getToolResult = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(_ref5) {
+      var threadId, toolArgs, toolName, client, hashedToolArgs, toolArgsResult, _toolArgsResult$rows$, _toolArgsResult$rows$2, _toolArgsResult$rows$3, _toolResult$rows$, toolCallArgs, toolCallIds, createdAt, toolCallArgsIndex, correspondingToolCallId, toolResult, toolResultContent, requiredToolResult;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            return _context7.abrupt("return", this.client.flushall());
-          case 1:
+            threadId = _ref5.threadId, toolArgs = _ref5.toolArgs, toolName = _ref5.toolName;
+            _context7.next = 3;
+            return this.ensureTablesExist();
+          case 3:
+            console.log('checking for cached tool result====', JSON.stringify(toolArgs, null, 2));
+            _context7.next = 6;
+            return this.pool.connect();
+          case 6:
+            client = _context7.sent;
+            _context7.prev = 7;
+            hashedToolArgs = crypto.createHash('sha256').update(JSON.stringify({
+              args: toolArgs,
+              threadId: threadId,
+              toolName: toolName
+            })).digest('hex');
+            _context7.next = 11;
+            return client.query("SELECT tool_call_ids, \n                tool_call_args,\n                created_at\n         FROM mastra_messages\n         WHERE tool_call_args::jsonb @> $1\n         AND tool_call_args_expire_at > $2\n         ORDER BY created_at ASC\n         LIMIT 1", [JSON.stringify([hashedToolArgs]), new Date().toISOString()]);
+          case 11:
+            toolArgsResult = _context7.sent;
+            if (!(toolArgsResult.rows.length > 0)) {
+              _context7.next = 28;
+              break;
+            }
+            toolCallArgs = JSON.parse((_toolArgsResult$rows$ = toolArgsResult.rows[0]) == null ? void 0 : _toolArgsResult$rows$.tool_call_args);
+            toolCallIds = JSON.parse((_toolArgsResult$rows$2 = toolArgsResult.rows[0]) == null ? void 0 : _toolArgsResult$rows$2.tool_call_ids);
+            createdAt = (_toolArgsResult$rows$3 = toolArgsResult.rows[0]) == null ? void 0 : _toolArgsResult$rows$3.created_at;
+            toolCallArgsIndex = toolCallArgs.findIndex(function (arg) {
+              return arg === hashedToolArgs;
+            });
+            correspondingToolCallId = toolCallIds[toolCallArgsIndex];
+            _context7.next = 20;
+            return client.query("SELECT content \n         FROM mastra_messages \n         WHERE thread_id = $1\n         AND tool_call_ids ILIKE $2\n         AND type = 'tool-result'\n         AND created_at = $3\n         LIMIT 1", [threadId, "%" + correspondingToolCallId + "%", new Date(createdAt).toISOString()]);
+          case 20:
+            toolResult = _context7.sent;
+            if (!(toolResult.rows.length === 0)) {
+              _context7.next = 24;
+              break;
+            }
+            console.log('no tool result found');
+            return _context7.abrupt("return", null);
+          case 24:
+            toolResultContent = JSON.parse((_toolResult$rows$ = toolResult.rows[0]) == null ? void 0 : _toolResult$rows$.content);
+            requiredToolResult = toolResultContent.find(function (part) {
+              return part.toolCallId === correspondingToolCallId;
+            });
+            if (!requiredToolResult) {
+              _context7.next = 28;
+              break;
+            }
+            return _context7.abrupt("return", requiredToolResult.result);
+          case 28:
+            return _context7.abrupt("return", null);
+          case 31:
+            _context7.prev = 31;
+            _context7.t0 = _context7["catch"](7);
+            console.log('error getting cached tool result====', _context7.t0);
+            return _context7.abrupt("return", null);
+          case 35:
+            _context7.prev = 35;
+            client.release();
+            return _context7.finish(35);
+          case 38:
           case "end":
             return _context7.stop();
         }
-      }, _callee7, this);
+      }, _callee7, this, [[7, 31, 35, 38]]);
     }));
-    function flushall() {
-      return _flushall.apply(this, arguments);
+    function getToolResult(_x9) {
+      return _getToolResult.apply(this, arguments);
     }
-    return flushall;
+    return getToolResult;
   }();
-  _proto.pipeline = function pipeline() {
-    var multi = this.client.multi();
-    var pipeline = {
-      get: function get(key) {
-        multi.get(key);
-        return pipeline;
-      },
-      set: function set(key, value) {
-        multi.set(key, JSON.stringify(serializeData(value)));
-        return pipeline;
-      },
-      del: function del(key) {
-        multi.del(key);
-        return pipeline;
-      },
-      srem: function srem(key, value) {
-        multi.srem(key, value);
-        return pipeline;
-      },
-      exec: function () {
-        var _exec = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-          var results;
-          return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-            while (1) switch (_context8.prev = _context8.next) {
-              case 0:
-                _context8.next = 2;
-                return multi.exec();
-              case 2:
-                results = _context8.sent;
-                return _context8.abrupt("return", results.map(function (result) {
-                  try {
-                    // For get operations that return string data
-                    if (typeof result === 'string') {
-                      return deserializeData(JSON.parse(result));
-                    }
-                    // For array results (like from lists/sets)
-                    if (Array.isArray(result)) {
-                      return result.map(function (item) {
-                        try {
-                          return typeof item === 'string' ? deserializeData(JSON.parse(item)) : item;
-                        } catch (_unused) {
-                          return item;
-                        }
-                      });
-                    }
-                    return result;
-                  } catch (_unused2) {
-                    return result;
-                  }
-                }));
-              case 4:
-              case "end":
-                return _context8.stop();
-            }
-          }, _callee8);
-        }));
-        function exec() {
-          return _exec.apply(this, arguments);
-        }
-        return exec;
-      }()
-    };
-    return pipeline;
-  };
-  return UpstashProvider;
-}();
-var LocalRedisProvider = /*#__PURE__*/function () {
-  function LocalRedisProvider() {
-    this.client = void 0;
-    this.client = redis$1.createClient({
-      url: 'redis://localhost:6379'
-    });
-    this.client.connect();
-  }
-  var _proto2 = LocalRedisProvider.prototype;
-  _proto2.get = /*#__PURE__*/function () {
-    var _get2 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(key) {
-      var data;
-      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
+  _proto.getContextWindow = /*#__PURE__*/function () {
+    var _getContextWindow = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(_ref6) {
+      var threadId, startDate, endDate, _ref6$format, format, client, _result, result;
+      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
-            _context9.next = 2;
-            return this.client.get(key);
-          case 2:
-            data = _context9.sent;
-            return _context9.abrupt("return", data ? deserializeData(JSON.parse(data)) : null);
-          case 4:
+            threadId = _ref6.threadId, startDate = _ref6.startDate, endDate = _ref6.endDate, _ref6$format = _ref6.format, format = _ref6$format === void 0 ? 'raw' : _ref6$format;
+            _context8.next = 3;
+            return this.ensureTablesExist();
+          case 3:
+            _context8.next = 5;
+            return this.pool.connect();
+          case 5:
+            client = _context8.sent;
+            _context8.prev = 6;
+            if (!this.MAX_CONTEXT_TOKENS) {
+              _context8.next = 13;
+              break;
+            }
+            _context8.next = 10;
+            return client.query("WITH RankedMessages AS (\n             SELECT *,\n                    SUM(tokens) OVER (ORDER BY created_at DESC) as running_total\n             FROM mastra_messages\n             WHERE thread_id = $1\n             AND type = 'text'\n             " + (startDate ? "AND created_at >= '" + startDate.toISOString() + "'" : '') + "\n             " + (endDate ? "AND created_at <= '" + endDate.toISOString() + "'" : '') + "\n             ORDER BY created_at DESC\n           )\n           SELECT id, \n                  content, \n                  role, \n                  type,\n                  created_at AS createdAt, \n                  thread_id AS threadId\n           FROM RankedMessages\n           WHERE running_total <= $2\n           ORDER BY created_at ASC", [threadId, this.MAX_CONTEXT_TOKENS]);
+          case 10:
+            _result = _context8.sent;
+            console.log('Format', format);
+            return _context8.abrupt("return", this.parseMessages(_result.rows));
+          case 13:
+            _context8.next = 15;
+            return client.query("SELECT id, \n                content, \n                role, \n                type,\n                created_at AS createdAt, \n                thread_id AS threadId\n           FROM mastra_messages\n           WHERE thread_id = $1\n           AND type = 'text'\n           " + (startDate ? "AND created_at >= '" + startDate.toISOString() + "'" : '') + "\n           " + (endDate ? "AND created_at <= '" + endDate.toISOString() + "'" : '') + "\n           ORDER BY created_at ASC", [threadId]);
+          case 15:
+            result = _context8.sent;
+            console.log('Format', format);
+            return _context8.abrupt("return", this.parseMessages(result.rows));
+          case 20:
+            _context8.prev = 20;
+            _context8.t0 = _context8["catch"](6);
+            console.log('error getting context window====', _context8.t0);
+            return _context8.abrupt("return", []);
+          case 24:
+            _context8.prev = 24;
+            client.release();
+            return _context8.finish(24);
+          case 27:
           case "end":
-            return _context9.stop();
+            return _context8.stop();
         }
-      }, _callee9, this);
+      }, _callee8, this, [[6, 20, 24, 27]]);
     }));
-    function get(_x10) {
-      return _get2.apply(this, arguments);
+    function getContextWindow(_x10) {
+      return _getContextWindow.apply(this, arguments);
     }
-    return get;
-  }();
-  _proto2.set = /*#__PURE__*/function () {
-    var _set2 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(key, value) {
-      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
+    return getContextWindow;
+  }()
+  /**
+   * Messages
+   */
+  ;
+  _proto.getMessages =
+  /*#__PURE__*/
+  function () {
+    var _getMessages = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(_ref7) {
+      var threadId, client, result, messages, uiMessages;
+      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
           case 0:
-            return _context10.abrupt("return", this.client.set(key, JSON.stringify(serializeData(value))));
-          case 1:
+            threadId = _ref7.threadId;
+            _context9.next = 3;
+            return this.ensureTablesExist();
+          case 3:
+            _context9.next = 5;
+            return this.pool.connect();
+          case 5:
+            client = _context9.sent;
+            _context9.prev = 6;
+            _context9.next = 9;
+            return client.query("\n                SELECT \n                    id, \n                    content, \n                    role, \n                    type,\n                    created_at AS createdAt, \n                    thread_id AS threadId\n                FROM mastra_messages\n                WHERE thread_id = $1\n                ORDER BY created_at ASC\n            ", [threadId]);
+          case 9:
+            result = _context9.sent;
+            messages = this.parseMessages(result.rows);
+            uiMessages = this.convertToUIMessages(messages);
+            return _context9.abrupt("return", {
+              messages: messages,
+              uiMessages: uiMessages
+            });
+          case 13:
+            _context9.prev = 13;
+            client.release();
+            return _context9.finish(13);
+          case 16:
           case "end":
-            return _context10.stop();
+            return _context9.stop();
         }
-      }, _callee10, this);
+      }, _callee9, this, [[6,, 13, 16]]);
     }));
-    function set(_x11, _x12) {
-      return _set2.apply(this, arguments);
+    function getMessages(_x11) {
+      return _getMessages.apply(this, arguments);
     }
-    return set;
+    return getMessages;
   }();
-  _proto2.del = /*#__PURE__*/function () {
-    var _del2 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(key) {
-      return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+  _proto.saveMessages = /*#__PURE__*/function () {
+    var _saveMessages = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(_ref8) {
+      var _this2 = this;
+      var messages, client, _loop, _iterator, _step;
+      return _regeneratorRuntime().wrap(function _callee10$(_context11) {
         while (1) switch (_context11.prev = _context11.next) {
           case 0:
-            return _context11.abrupt("return", this.client.del(key));
-          case 1:
+            messages = _ref8.messages;
+            _context11.next = 3;
+            return this.ensureTablesExist();
+          case 3:
+            _context11.next = 5;
+            return this.pool.connect();
+          case 5:
+            client = _context11.sent;
+            _context11.prev = 6;
+            _context11.next = 9;
+            return client.query('BEGIN');
+          case 9:
+            _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
+              var message, id, content, role, createdAt, threadId, toolCallIds, toolCallArgs, type, toolNames, tokens, _content$, contentMssg, hashedToolCallArgs, validArgExists, i, isValid, toolCallArgsExpireAt;
+              return _regeneratorRuntime().wrap(function _loop$(_context10) {
+                while (1) switch (_context10.prev = _context10.next) {
+                  case 0:
+                    message = _step.value;
+                    id = message.id, content = message.content, role = message.role, createdAt = message.createdAt, threadId = message.threadId, toolCallIds = message.toolCallIds, toolCallArgs = message.toolCallArgs, type = message.type, toolNames = message.toolNames;
+                    tokens = null;
+                    if (type === 'text') {
+                      contentMssg = role === 'assistant' ? ((_content$ = content[0]) == null ? void 0 : _content$.text) || '' : content;
+                      tokens = _this2.estimateTokens(contentMssg);
+                    }
+                    // Hash the toolCallArgs if they exist
+                    hashedToolCallArgs = toolCallArgs ? toolCallArgs.map(function (args, index) {
+                      return crypto.createHash('sha256').update(JSON.stringify({
+                        args: args,
+                        threadId: threadId,
+                        toolName: toolNames == null ? void 0 : toolNames[index]
+                      })).digest('hex');
+                    }) : null;
+                    validArgExists = false;
+                    if (!(hashedToolCallArgs != null && hashedToolCallArgs.length)) {
+                      _context10.next = 19;
+                      break;
+                    }
+                    // Check all args sequentially
+                    validArgExists = true; // Start true and set to false if any check fails
+                    i = 0;
+                  case 9:
+                    if (!(i < hashedToolCallArgs.length)) {
+                      _context10.next = 19;
+                      break;
+                    }
+                    _context10.next = 12;
+                    return _this2.validateToolCallArgs({
+                      hashedArgs: hashedToolCallArgs[i]
+                    });
+                  case 12:
+                    isValid = _context10.sent;
+                    if (isValid) {
+                      _context10.next = 16;
+                      break;
+                    }
+                    validArgExists = false;
+                    return _context10.abrupt("break", 19);
+                  case 16:
+                    i++;
+                    _context10.next = 9;
+                    break;
+                  case 19:
+                    toolCallArgsExpireAt = !toolCallArgs ? null : validArgExists ? createdAt : new Date(createdAt.getTime() + 5 * 60 * 1000); // 5 minutes
+                    _context10.next = 22;
+                    return client.query("\n                    INSERT INTO mastra_messages (id, content, role, created_at, thread_id, tool_call_ids, tool_call_args, type, tokens, tool_call_args_expire_at)\n                    VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)\n                ", [id, JSON.stringify(content), role, createdAt.toISOString(), threadId, JSON.stringify(toolCallIds), JSON.stringify(hashedToolCallArgs), type, tokens, toolCallArgsExpireAt == null ? void 0 : toolCallArgsExpireAt.toISOString()]);
+                  case 22:
+                  case "end":
+                    return _context10.stop();
+                }
+              }, _loop);
+            });
+            _iterator = _createForOfIteratorHelperLoose(messages);
+          case 11:
+            if ((_step = _iterator()).done) {
+              _context11.next = 15;
+              break;
+            }
+            return _context11.delegateYield(_loop(), "t0", 13);
+          case 13:
+            _context11.next = 11;
+            break;
+          case 15:
+            _context11.next = 17;
+            return client.query('COMMIT');
+          case 17:
+            return _context11.abrupt("return", messages);
+          case 20:
+            _context11.prev = 20;
+            _context11.t1 = _context11["catch"](6);
+            _context11.next = 24;
+            return client.query('ROLLBACK');
+          case 24:
+            throw _context11.t1;
+          case 25:
+            _context11.prev = 25;
+            client.release();
+            return _context11.finish(25);
+          case 28:
           case "end":
             return _context11.stop();
         }
-      }, _callee11, this);
+      }, _callee10, this, [[6, 20, 25, 28]]);
     }));
-    function del(_x13) {
-      return _del2.apply(this, arguments);
+    function saveMessages(_x12) {
+      return _saveMessages.apply(this, arguments);
     }
-    return del;
+    return saveMessages;
   }();
-  _proto2.sadd = /*#__PURE__*/function () {
-    var _sadd2 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(key, value) {
-      return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+  _proto.deleteMessage = /*#__PURE__*/function () {
+    var _deleteMessage = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(id) {
+      var client;
+      return _regeneratorRuntime().wrap(function _callee11$(_context12) {
         while (1) switch (_context12.prev = _context12.next) {
           case 0:
-            return _context12.abrupt("return", this.client.sAdd(key, value));
-          case 1:
+            _context12.next = 2;
+            return this.pool.connect();
+          case 2:
+            client = _context12.sent;
+            _context12.prev = 3;
+            _context12.next = 6;
+            return client.query("\n                DELETE FROM mastra_messages\n                WHERE id = $1\n                ", [id]);
+          case 6:
+            _context12.prev = 6;
+            client.release();
+            return _context12.finish(6);
+          case 9:
           case "end":
             return _context12.stop();
         }
-      }, _callee12, this);
+      }, _callee11, this, [[3,, 6, 9]]);
     }));
-    function sadd(_x14, _x15) {
-      return _sadd2.apply(this, arguments);
+    function deleteMessage(_x13) {
+      return _deleteMessage.apply(this, arguments);
     }
-    return sadd;
-  }();
-  _proto2.srem = /*#__PURE__*/function () {
-    var _srem2 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(key, value) {
-      return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+    return deleteMessage;
+  }()
+  /**
+   * Table Management
+   */
+  ;
+  _proto.drop =
+  /*#__PURE__*/
+  function () {
+    var _drop = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+      var client;
+      return _regeneratorRuntime().wrap(function _callee12$(_context13) {
         while (1) switch (_context13.prev = _context13.next) {
           case 0:
-            return _context13.abrupt("return", this.client.sRem(key, value));
-          case 1:
+            _context13.next = 2;
+            return this.pool.connect();
+          case 2:
+            client = _context13.sent;
+            _context13.next = 5;
+            return client.query('DELETE FROM mastra_messages');
+          case 5:
+            _context13.next = 7;
+            return client.query('DELETE FROM mastra_threads');
+          case 7:
+            client.release();
+            _context13.next = 10;
+            return this.pool.end();
+          case 10:
           case "end":
             return _context13.stop();
         }
-      }, _callee13, this);
+      }, _callee12, this);
     }));
-    function srem(_x16, _x17) {
-      return _srem2.apply(this, arguments);
+    function drop() {
+      return _drop.apply(this, arguments);
     }
-    return srem;
+    return drop;
   }();
-  _proto2.smembers = /*#__PURE__*/function () {
-    var _smembers2 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee14(key) {
-      return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+  _proto.ensureTablesExist = /*#__PURE__*/function () {
+    var _ensureTablesExist = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+      var client, _threadsResult$rows, _messagesResult$rows, threadsResult, messagesResult;
+      return _regeneratorRuntime().wrap(function _callee13$(_context14) {
         while (1) switch (_context14.prev = _context14.next) {
           case 0:
-            return _context14.abrupt("return", this.client.sMembers(key));
-          case 1:
-          case "end":
-            return _context14.stop();
-        }
-      }, _callee14, this);
-    }));
-    function smembers(_x18) {
-      return _smembers2.apply(this, arguments);
-    }
-    return smembers;
-  }();
-  _proto2.flushall = /*#__PURE__*/function () {
-    var _flushall2 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
-      return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-        while (1) switch (_context15.prev = _context15.next) {
-          case 0:
-            return _context15.abrupt("return", this.client.flushAll());
-          case 1:
-          case "end":
-            return _context15.stop();
-        }
-      }, _callee15, this);
-    }));
-    function flushall() {
-      return _flushall2.apply(this, arguments);
-    }
-    return flushall;
-  }();
-  _proto2.pipeline = function pipeline() {
-    var multi = this.client.multi();
-    var pipeline = {
-      get: function get(key) {
-        multi.get(key);
-        return pipeline;
-      },
-      set: function set(key, value) {
-        multi.set(key, JSON.stringify(value));
-        return pipeline;
-      },
-      del: function del(key) {
-        multi.del(key);
-        return pipeline;
-      },
-      srem: function srem(key, value) {
-        multi.sRem(key, value);
-        return pipeline;
-      },
-      exec: function () {
-        var _exec2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
-          return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-            while (1) switch (_context16.prev = _context16.next) {
-              case 0:
-                return _context16.abrupt("return", multi.exec());
-              case 1:
-              case "end":
-                return _context16.stop();
+            if (!this.hasTables) {
+              _context14.next = 2;
+              break;
+            }
+            return _context14.abrupt("return");
+          case 2:
+            _context14.next = 4;
+            return this.pool.connect();
+          case 4:
+            client = _context14.sent;
+            _context14.prev = 5;
+            _context14.next = 8;
+            return client.query("\n                SELECT EXISTS (\n                    SELECT 1\n                    FROM information_schema.tables\n                    WHERE table_name = 'mastra_threads'\n                );\n            ");
+          case 8:
+            threadsResult = _context14.sent;
+            if (threadsResult != null && (_threadsResult$rows = threadsResult.rows) != null && (_threadsResult$rows = _threadsResult$rows[0]) != null && _threadsResult$rows.exists) {
+              _context14.next = 12;
+              break;
+            }
+            _context14.next = 12;
+            return client.query("\n                    CREATE TABLE IF NOT EXISTS mastra_threads (\n                        id UUID PRIMARY KEY,\n                        resourceid TEXT,\n                        title TEXT,\n                        created_at TIMESTAMP WITH TIME ZONE NOT NULL,\n                        updated_at TIMESTAMP WITH TIME ZONE NOT NULL,\n                        metadata JSONB\n                    );\n                ");
+          case 12:
+            _context14.next = 14;
+            return client.query("\n                SELECT EXISTS (\n                    SELECT 1\n                    FROM information_schema.tables\n                    WHERE table_name = 'mastra_messages'\n                );\n            ");
+          case 14:
+            messagesResult = _context14.sent;
+            if (messagesResult != null && (_messagesResult$rows = messagesResult.rows) != null && (_messagesResult$rows = _messagesResult$rows[0]) != null && _messagesResult$rows.exists) {
+              _context14.next = 18;
+              break;
             }
-          }, _callee16);
-        }));
-        function exec() {
-          return _exec2.apply(this, arguments);
-        }
-        return exec;
-      }()
-    };
-    return pipeline;
-  };
-  _proto2.quit = /*#__PURE__*/function () {
-    var _quit = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
-      return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-        while (1) switch (_context17.prev = _context17.next) {
-          case 0:
-            _context17.next = 2;
-            return this.client.quit();
-          case 2:
+            _context14.next = 18;
+            return client.query("\n                    CREATE TABLE IF NOT EXISTS mastra_messages (\n                        id UUID PRIMARY KEY,\n                        content TEXT NOT NULL,\n                        role VARCHAR(20) NOT NULL,\n                        created_at TIMESTAMP WITH TIME ZONE NOT NULL,\n                        tool_call_ids TEXT DEFAULT NULL,\n                        tool_call_args TEXT DEFAULT NULL,\n                        tool_call_args_expire_at TIMESTAMP WITH TIME ZONE DEFAULT NULL,\n                        type VARCHAR(20) NOT NULL,\n                        tokens INTEGER DEFAULT NULL,\n                        thread_id UUID NOT NULL,\n                        FOREIGN KEY (thread_id) REFERENCES mastra_threads(id)\n                    );\n                ");
+          case 18:
+            _context14.prev = 18;
+            client.release();
+            this.hasTables = true;
+            return _context14.finish(18);
+          case 22:
           case "end":
-            return _context17.stop();
+            return _context14.stop();
         }
-      }, _callee17, this);
+      }, _callee13, this, [[5,, 18, 22]]);
     }));
-    function quit() {
-      return _quit.apply(this, arguments);
+    function ensureTablesExist() {
+      return _ensureTablesExist.apply(this, arguments);
     }
-    return quit;
+    return ensureTablesExist;
   }();
-  return LocalRedisProvider;
-}();
+  return PgMemory;
+}(core.MastraMemory);
 
-var RedisMemory = /*#__PURE__*/function (_MastraMemory) {
-  function RedisMemory(redis) {
+var UpstashKVMemory = /*#__PURE__*/function (_MastraMemory) {
+  function UpstashKVMemory(config) {
     var _this;
     _this = _MastraMemory.call(this) || this;
-    _this.redis = void 0;
-    _this.threadPrefix = 'thread:';
-    _this.messagePrefix = 'messages:';
-    _this.lockTimeouts = new Map();
-    _this.redis = redis;
+    _this.prefix = void 0;
+    _this.kv = void 0;
+    _this.prefix = config.prefix || 'mastra';
+    _this.MAX_CONTEXT_TOKENS = config.maxTokens;
+    _this.kv = new redis.Redis({
+      url: config.url,
+      token: config.token
+    });
     return _this;
   }
-  _inheritsLoose(RedisMemory, _MastraMemory);
-  var _proto = RedisMemory.prototype;
+  _inheritsLoose(UpstashKVMemory, _MastraMemory);
+  var _proto = UpstashKVMemory.prototype;
+  _proto.getThreadKey = function getThreadKey(threadId) {
+    return this.prefix + ":thread:" + threadId;
+  };
+  _proto.getMessagesKey = function getMessagesKey(threadId) {
+    return this.prefix + ":messages:" + threadId;
+  };
+  _proto.getToolCacheKey = function getToolCacheKey(hashedArgs) {
+    return this.prefix + ":tool:" + hashedArgs;
+  };
   _proto.getThreadById = /*#__PURE__*/function () {
-    var _getThreadById = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(threadId) {
-      var thread;
+    var _getThreadById = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+      var threadId, thread;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 2;
-            return this.redis.get("" + this.threadPrefix + threadId);
-          case 2:
+            threadId = _ref.threadId;
+            _context.next = 3;
+            return this.kv.get(this.getThreadKey(threadId));
+          case 3:
             thread = _context.sent;
-            if (thread && typeof thread.createdAt === 'string') {
-              thread.createdAt = new Date(thread.createdAt);
-              thread.updatedAt = new Date(thread.updatedAt);
-            }
-            return _context.abrupt("return", thread);
+            return _context.abrupt("return", thread ? this.parseThread(thread) : null);
           case 5:
           case "end":
             return _context.stop();
@@ -1959,411 +1074,506 @@ var RedisMemory = /*#__PURE__*/function (_MastraMemory) {
     }
     return getThreadById;
   }();
-  _proto.saveThread = /*#__PURE__*/function () {
-    var _saveThread = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(thread) {
+  _proto.getThreadsByResourceId = /*#__PURE__*/function () {
+    var _getThreadsByResourceId = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
+      var _this2 = this;
+      var resourceid, pattern, keys, threads;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            thread.updatedAt = new Date();
-            _context2.next = 3;
-            return this.redis.set("" + this.threadPrefix + thread.id, thread);
-          case 3:
-            _context2.next = 5;
-            return this.redis.sadd('threads', thread.id);
-          case 5:
-            return _context2.abrupt("return", thread);
-          case 6:
+            resourceid = _ref2.resourceid;
+            pattern = this.prefix + ":thread:*";
+            _context2.next = 4;
+            return this.kv.keys(pattern);
+          case 4:
+            keys = _context2.sent;
+            _context2.next = 7;
+            return Promise.all(keys.map(function (key) {
+              return _this2.kv.get(key);
+            }));
+          case 7:
+            threads = _context2.sent;
+            return _context2.abrupt("return", threads.filter(function (thread) {
+              return (thread == null ? void 0 : thread.resourceid) === resourceid;
+            }).map(function (thread) {
+              return _this2.parseThread(thread);
+            }));
+          case 9:
           case "end":
             return _context2.stop();
         }
       }, _callee2, this);
     }));
-    function saveThread(_x2) {
+    function getThreadsByResourceId(_x2) {
+      return _getThreadsByResourceId.apply(this, arguments);
+    }
+    return getThreadsByResourceId;
+  }();
+  _proto.saveThread = /*#__PURE__*/function () {
+    var _saveThread = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref3) {
+      var thread, key, serializedThread;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            thread = _ref3.thread;
+            key = this.getThreadKey(thread.id);
+            serializedThread = _extends({}, thread, {
+              createdAt: thread.createdAt.toISOString(),
+              updatedAt: thread.updatedAt.toISOString()
+            });
+            _context3.next = 5;
+            return this.kv.set(key, serializedThread);
+          case 5:
+            return _context3.abrupt("return", thread);
+          case 6:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3, this);
+    }));
+    function saveThread(_x3) {
       return _saveThread.apply(this, arguments);
     }
     return saveThread;
   }();
-  _proto.withLock = /*#__PURE__*/function () {
-    var _withLock = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(key, operation) {
-      var _this2 = this;
-      var lockKey, lockTimeout, locked, timeoutId, i;
+  _proto.updateThread = /*#__PURE__*/function () {
+    var _updateThread = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(id, title, metadata) {
+      var key, thread, updatedThread;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            lockKey = "lock:" + key;
-            lockTimeout = 5000;
-            locked = false;
-            _context4.prev = 3;
-            i = 0;
-          case 5:
-            if (!(i < 3)) {
-              _context4.next = 16;
-              break;
-            }
-            _context4.next = 8;
-            return this.redis.sadd(lockKey, '1');
-          case 8:
-            locked = _context4.sent;
-            if (!locked) {
-              _context4.next = 11;
+            key = this.getThreadKey(id);
+            _context4.next = 3;
+            return this.kv.get(key);
+          case 3:
+            thread = _context4.sent;
+            if (thread) {
+              _context4.next = 6;
               break;
             }
-            return _context4.abrupt("break", 16);
-          case 11:
-            _context4.next = 13;
-            return new Promise(function (resolve) {
-              return setTimeout(resolve, Math.random() * 100);
+            throw new Error("Thread " + id + " not found");
+          case 6:
+            updatedThread = _extends({}, thread, {
+              title: title,
+              metadata: metadata,
+              updatedAt: new Date().toISOString()
             });
-          case 13:
-            i++;
-            _context4.next = 5;
-            break;
-          case 16:
-            if (locked) {
-              _context4.next = 18;
-              break;
-            }
-            throw new Error('Could not acquire lock');
-          case 18:
-            // Set lock timeout
-            timeoutId = setTimeout(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-              return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-                while (1) switch (_context3.prev = _context3.next) {
-                  case 0:
-                    _context3.prev = 0;
-                    _context3.next = 3;
-                    return _this2.redis.del(lockKey);
-                  case 3:
-                    _context3.next = 7;
-                    break;
-                  case 5:
-                    _context3.prev = 5;
-                    _context3.t0 = _context3["catch"](0);
-                  case 7:
-                    _this2.lockTimeouts["delete"](lockKey);
-                  case 8:
-                  case "end":
-                    return _context3.stop();
-                }
-              }, _callee3, null, [[0, 5]]);
-            })), lockTimeout);
-            this.lockTimeouts.set(lockKey, timeoutId);
-            // Execute operation
-            _context4.next = 22;
-            return operation();
-          case 22:
-            return _context4.abrupt("return", _context4.sent);
-          case 23:
-            _context4.prev = 23;
-            if (timeoutId !== undefined) {
-              clearTimeout(timeoutId);
-              this.lockTimeouts["delete"](lockKey);
-            }
-            if (!locked) {
-              _context4.next = 33;
-              break;
-            }
-            _context4.prev = 26;
-            _context4.next = 29;
-            return this.redis.del(lockKey);
-          case 29:
-            _context4.next = 33;
-            break;
-          case 31:
-            _context4.prev = 31;
-            _context4.t0 = _context4["catch"](26);
-          case 33:
-            return _context4.finish(23);
-          case 34:
+            _context4.next = 9;
+            return this.kv.set(key, updatedThread);
+          case 9:
+            return _context4.abrupt("return", this.parseThread(updatedThread));
+          case 10:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, this, [[3,, 23, 34], [26, 31]]);
+      }, _callee4, this);
     }));
-    function withLock(_x3, _x4) {
-      return _withLock.apply(this, arguments);
+    function updateThread(_x4, _x5, _x6) {
+      return _updateThread.apply(this, arguments);
     }
-    return withLock;
-  }() // Add cleanup method
-  ;
-  _proto.cleanup =
-  /*#__PURE__*/
-  function () {
-    var _cleanup = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-      var _iterator, _step, timeout;
+    return updateThread;
+  }();
+  _proto.deleteThread = /*#__PURE__*/function () {
+    var _deleteThread = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(id) {
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            // Clear all timeouts
-            for (_iterator = _createForOfIteratorHelperLoose(this.lockTimeouts.values()); !(_step = _iterator()).done;) {
-              timeout = _step.value;
-              clearTimeout(timeout);
-            }
-            this.lockTimeouts.clear();
+            _context5.next = 2;
+            return this.kv.del(this.getThreadKey(id));
           case 2:
+            _context5.next = 4;
+            return this.kv.del(this.getMessagesKey(id));
+          case 4:
           case "end":
             return _context5.stop();
         }
       }, _callee5, this);
     }));
-    function cleanup() {
-      return _cleanup.apply(this, arguments);
+    function deleteThread(_x7) {
+      return _deleteThread.apply(this, arguments);
+    }
+    return deleteThread;
+  }()
+  /**
+   * Tool Cache
+   */
+  ;
+  _proto.validateToolCallArgs =
+  /*#__PURE__*/
+  function () {
+    var _validateToolCallArgs = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref4) {
+      var hashedArgs, cacheKey, cached;
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
+          case 0:
+            hashedArgs = _ref4.hashedArgs;
+            cacheKey = this.getToolCacheKey(hashedArgs);
+            _context6.next = 4;
+            return this.kv.get(cacheKey);
+          case 4:
+            cached = _context6.sent;
+            return _context6.abrupt("return", !!cached && new Date(cached.expireAt) > new Date());
+          case 6:
+          case "end":
+            return _context6.stop();
+        }
+      }, _callee6, this);
+    }));
+    function validateToolCallArgs(_x8) {
+      return _validateToolCallArgs.apply(this, arguments);
     }
-    return cleanup;
+    return validateToolCallArgs;
   }();
-  _proto.saveMessages = /*#__PURE__*/function () {
-    var _saveMessages = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(messages) {
-      var _this3 = this;
-      var messagesByThread, _loop, _i, _Object$entries;
-      return _regeneratorRuntime().wrap(function _callee7$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+  _proto.getToolResult = /*#__PURE__*/function () {
+    var _getToolResult = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(_ref5) {
+      var threadId, toolArgs, toolName, hashedToolArgs, cacheKey, cached;
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            if (messages.length) {
-              _context8.next = 2;
-              break;
-            }
-            return _context8.abrupt("return", []);
-          case 2:
-            messagesByThread = messages.reduce(function (acc, message) {
-              var key = "" + _this3.messagePrefix + message.threadId;
-              if (!acc[key]) {
-                acc[key] = [];
-              }
-              acc[key].push(_extends({}, message, {
-                createdAt: new Date(message.createdAt)
-              }));
-              return acc;
-            }, {});
-            _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
-              var _Object$entries$_i, key, threadMessages;
-              return _regeneratorRuntime().wrap(function _loop$(_context7) {
-                while (1) switch (_context7.prev = _context7.next) {
-                  case 0:
-                    _Object$entries$_i = _Object$entries[_i], key = _Object$entries$_i[0], threadMessages = _Object$entries$_i[1];
-                    _context7.next = 3;
-                    return _this3.withLock(key, /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-                      var _threadMessages$;
-                      var existingMessages, messageMap, updatedMessages, _threadMessages$2, thread;
-                      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-                        while (1) switch (_context6.prev = _context6.next) {
-                          case 0:
-                            _context6.next = 2;
-                            return _this3.redis.get(key);
-                          case 2:
-                            _context6.t0 = _context6.sent;
-                            if (_context6.t0) {
-                              _context6.next = 5;
-                              break;
-                            }
-                            _context6.t0 = [];
-                          case 5:
-                            existingMessages = _context6.t0;
-                            messageMap = new Map(); // Process existing messages
-                            existingMessages.forEach(function (msg) {
-                              messageMap.set(msg.id, _extends({}, msg, {
-                                createdAt: new Date(msg.createdAt)
-                              }));
-                            });
-                            // Add new messages
-                            threadMessages.forEach(function (msg) {
-                              messageMap.set(msg.id, msg);
-                            });
-                            updatedMessages = Array.from(messageMap.values());
-                            updatedMessages.sort(function (a, b) {
-                              var timeCompare = a.createdAt.getTime() - b.createdAt.getTime();
-                              return timeCompare === 0 ? a.id.localeCompare(b.id) : timeCompare;
-                            });
-                            _context6.next = 13;
-                            return _this3.redis.set(key, updatedMessages);
-                          case 13:
-                            if (!(threadMessages != null && (_threadMessages$ = threadMessages[0]) != null && _threadMessages$.threadId)) {
-                              _context6.next = 21;
-                              break;
-                            }
-                            _context6.next = 16;
-                            return _this3.getThreadById(threadMessages == null || (_threadMessages$2 = threadMessages[0]) == null ? void 0 : _threadMessages$2.threadId);
-                          case 16:
-                            thread = _context6.sent;
-                            if (!thread) {
-                              _context6.next = 21;
-                              break;
-                            }
-                            thread.updatedAt = new Date();
-                            _context6.next = 21;
-                            return _this3.redis.set("" + _this3.threadPrefix + thread.id, thread);
-                          case 21:
-                          case "end":
-                            return _context6.stop();
-                        }
-                      }, _callee6);
-                    })));
-                  case 3:
-                  case "end":
-                    return _context7.stop();
-                }
-              }, _loop);
-            });
-            _i = 0, _Object$entries = Object.entries(messagesByThread);
+            threadId = _ref5.threadId, toolArgs = _ref5.toolArgs, toolName = _ref5.toolName;
+            hashedToolArgs = crypto.createHash('sha256').update(JSON.stringify({
+              args: toolArgs,
+              threadId: threadId,
+              toolName: toolName
+            })).digest('hex');
+            cacheKey = this.getToolCacheKey(hashedToolArgs);
+            _context7.next = 5;
+            return this.kv.get(cacheKey);
           case 5:
-            if (!(_i < _Object$entries.length)) {
-              _context8.next = 10;
+            cached = _context7.sent;
+            if (!(cached && new Date(cached.expireAt) > new Date())) {
+              _context7.next = 8;
               break;
             }
-            return _context8.delegateYield(_loop(), "t0", 7);
-          case 7:
-            _i++;
-            _context8.next = 5;
-            break;
-          case 10:
-            return _context8.abrupt("return", messages);
-          case 11:
+            return _context7.abrupt("return", cached.result || null);
+          case 8:
+            return _context7.abrupt("return", null);
+          case 9:
           case "end":
-            return _context8.stop();
+            return _context7.stop();
         }
-      }, _callee7);
+      }, _callee7, this);
     }));
-    function saveMessages(_x5) {
-      return _saveMessages.apply(this, arguments);
+    function getToolResult(_x9) {
+      return _getToolResult.apply(this, arguments);
     }
-    return saveMessages;
+    return getToolResult;
   }();
-  _proto.addMessage = /*#__PURE__*/function () {
-    var _addMessage = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(threadId, content, role) {
-      var message;
-      return _regeneratorRuntime().wrap(function _callee8$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
+  _proto.getContextWindow = /*#__PURE__*/function () {
+    var _getContextWindow = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(_ref6) {
+      var threadId, startDate, endDate, _ref6$format, format, messagesKey, messages, filteredMessages, totalTokens, messagesWithinTokenLimit, _iterator, _step, _message$content$, message, content, tokens;
+      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
-            message = {
-              id: this.generateId(),
-              content: content,
-              role: role,
-              createdAt: new Date(),
-              threadId: threadId
-            };
-            _context9.next = 3;
-            return this.saveMessages([message]);
-          case 3:
-            return _context9.abrupt("return", message);
+            threadId = _ref6.threadId, startDate = _ref6.startDate, endDate = _ref6.endDate, _ref6$format = _ref6.format, format = _ref6$format === void 0 ? 'raw' : _ref6$format;
+            messagesKey = this.getMessagesKey(threadId);
+            _context8.next = 4;
+            return this.kv.lrange(messagesKey, 0, -1);
           case 4:
+            messages = _context8.sent;
+            filteredMessages = messages.filter(function (msg) {
+              return msg.type === 'text';
+            });
+            if (startDate) {
+              filteredMessages = filteredMessages.filter(function (msg) {
+                return new Date(msg.createdAt) >= startDate;
+              });
+            }
+            if (endDate) {
+              filteredMessages = filteredMessages.filter(function (msg) {
+                return new Date(msg.createdAt) <= endDate;
+              });
+            }
+            if (!this.MAX_CONTEXT_TOKENS) {
+              _context8.next = 24;
+              break;
+            }
+            totalTokens = 0;
+            messagesWithinTokenLimit = []; // Process messages from newest to oldest
+            _iterator = _createForOfIteratorHelperLoose(filteredMessages.reverse());
+          case 12:
+            if ((_step = _iterator()).done) {
+              _context8.next = 22;
+              break;
+            }
+            message = _step.value;
+            content = message.role === 'assistant' ? ((_message$content$ = message.content[0]) == null ? void 0 : _message$content$.text) || '' : message.content; // Use a more aggressive token estimation
+            // Roughly estimate 1 token per 4 characters
+            tokens = Math.ceil(content.length / 4); // Check if adding this message would exceed the token limit
+            if (!(totalTokens + tokens > this.MAX_CONTEXT_TOKENS)) {
+              _context8.next = 18;
+              break;
+            }
+            return _context8.abrupt("break", 22);
+          case 18:
+            totalTokens += tokens;
+            messagesWithinTokenLimit.unshift(_extends({}, message, {
+              tokens: tokens
+            }));
+          case 20:
+            _context8.next = 12;
+            break;
+          case 22:
+            console.log('Format:', format);
+            // Return messages in chronological order
+            return _context8.abrupt("return", this.parseMessages(messagesWithinTokenLimit));
+          case 24:
+            return _context8.abrupt("return", this.parseMessages(filteredMessages));
+          case 25:
           case "end":
-            return _context9.stop();
+            return _context8.stop();
         }
       }, _callee8, this);
     }));
-    function addMessage(_x6, _x7, _x8) {
-      return _addMessage.apply(this, arguments);
+    function getContextWindow(_x10) {
+      return _getContextWindow.apply(this, arguments);
     }
-    return addMessage;
-  }();
-  _proto.getMessages = /*#__PURE__*/function () {
-    var _getMessages = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(threadId) {
-      var messages;
-      return _regeneratorRuntime().wrap(function _callee9$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
+    return getContextWindow;
+  }()
+  /**
+   * Messages
+   */
+  ;
+  _proto.getMessages =
+  /*#__PURE__*/
+  function () {
+    var _getMessages = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(_ref7) {
+      var threadId, messagesKey, messages, parsedMessages, uiMessages;
+      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
           case 0:
-            _context10.next = 2;
-            return this.redis.get("" + this.messagePrefix + threadId);
-          case 2:
-            _context10.t0 = _context10.sent;
-            if (_context10.t0) {
-              _context10.next = 5;
-              break;
-            }
-            _context10.t0 = [];
-          case 5:
-            messages = _context10.t0;
-            return _context10.abrupt("return", messages.map(function (msg) {
-              return _extends({}, msg, {
-                createdAt: new Date(msg.createdAt)
-              });
-            }));
-          case 7:
+            threadId = _ref7.threadId;
+            messagesKey = this.getMessagesKey(threadId);
+            _context9.next = 4;
+            return this.kv.lrange(messagesKey, 0, -1);
+          case 4:
+            messages = _context9.sent;
+            parsedMessages = this.parseMessages(messages);
+            uiMessages = this.convertToUIMessages(parsedMessages);
+            return _context9.abrupt("return", {
+              messages: parsedMessages,
+              uiMessages: uiMessages
+            });
+          case 8:
           case "end":
-            return _context10.stop();
+            return _context9.stop();
         }
       }, _callee9, this);
     }));
-    function getMessages(_x9) {
+    function getMessages(_x11) {
       return _getMessages.apply(this, arguments);
     }
     return getMessages;
   }();
-  _proto.getAllThreadIds = /*#__PURE__*/function () {
-    var _getAllThreadIds = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+  _proto.saveMessages = /*#__PURE__*/function () {
+    var _saveMessages = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(_ref8) {
+      var _this3 = this;
+      var messages, processedMessages, _loop, _iterator2, _step2;
       return _regeneratorRuntime().wrap(function _callee10$(_context11) {
         while (1) switch (_context11.prev = _context11.next) {
           case 0:
-            return _context11.abrupt("return", this.redis.smembers('threads'));
-          case 1:
+            messages = _ref8.messages;
+            processedMessages = [];
+            _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
+              var message, threadId, toolCallArgs, toolNames, createdAt, messagesKey, processedMessage, _message$content$2, content, hashedToolCallArgs, validArgExists, _iterator3, _step3, hashedArg, isValid, expireAt, _iterator4, _step4, _hashedArg, cacheKey;
+              return _regeneratorRuntime().wrap(function _loop$(_context10) {
+                while (1) switch (_context10.prev = _context10.next) {
+                  case 0:
+                    message = _step2.value;
+                    threadId = message.threadId, toolCallArgs = message.toolCallArgs, toolNames = message.toolNames, createdAt = message.createdAt;
+                    messagesKey = _this3.getMessagesKey(threadId);
+                    processedMessage = _extends({}, message);
+                    if (message.type === 'text') {
+                      content = message.role === 'assistant' ? ((_message$content$2 = message.content[0]) == null ? void 0 : _message$content$2.text) || '' : message.content;
+                      processedMessage.tokens = _this3.estimateTokens(content);
+                    }
+                    if (!(toolCallArgs != null && toolCallArgs.length)) {
+                      _context10.next = 28;
+                      break;
+                    }
+                    hashedToolCallArgs = toolCallArgs.map(function (args, index) {
+                      return crypto.createHash('sha256').update(JSON.stringify({
+                        args: args,
+                        threadId: threadId,
+                        toolName: toolNames == null ? void 0 : toolNames[index]
+                      })).digest('hex');
+                    });
+                    validArgExists = true;
+                    _iterator3 = _createForOfIteratorHelperLoose(hashedToolCallArgs);
+                  case 9:
+                    if ((_step3 = _iterator3()).done) {
+                      _context10.next = 19;
+                      break;
+                    }
+                    hashedArg = _step3.value;
+                    _context10.next = 13;
+                    return _this3.validateToolCallArgs({
+                      hashedArgs: hashedArg
+                    });
+                  case 13:
+                    isValid = _context10.sent;
+                    if (isValid) {
+                      _context10.next = 17;
+                      break;
+                    }
+                    validArgExists = false;
+                    return _context10.abrupt("break", 19);
+                  case 17:
+                    _context10.next = 9;
+                    break;
+                  case 19:
+                    expireAt = validArgExists ? createdAt : new Date(createdAt.getTime() + 5 * 60 * 1000); // 5 minutes
+                    _iterator4 = _createForOfIteratorHelperLoose(hashedToolCallArgs);
+                  case 21:
+                    if ((_step4 = _iterator4()).done) {
+                      _context10.next = 28;
+                      break;
+                    }
+                    _hashedArg = _step4.value;
+                    cacheKey = _this3.getToolCacheKey(_hashedArg);
+                    _context10.next = 26;
+                    return _this3.kv.set(cacheKey, {
+                      expireAt: expireAt.toISOString()
+                    });
+                  case 26:
+                    _context10.next = 21;
+                    break;
+                  case 28:
+                    _context10.next = 30;
+                    return _this3.kv.rpush(messagesKey, processedMessage);
+                  case 30:
+                    processedMessages.push(processedMessage);
+                  case 31:
+                  case "end":
+                    return _context10.stop();
+                }
+              }, _loop);
+            });
+            _iterator2 = _createForOfIteratorHelperLoose(messages);
+          case 4:
+            if ((_step2 = _iterator2()).done) {
+              _context11.next = 8;
+              break;
+            }
+            return _context11.delegateYield(_loop(), "t0", 6);
+          case 6:
+            _context11.next = 4;
+            break;
+          case 8:
+            return _context11.abrupt("return", processedMessages);
+          case 9:
           case "end":
             return _context11.stop();
         }
-      }, _callee10, this);
+      }, _callee10);
     }));
-    function getAllThreadIds() {
-      return _getAllThreadIds.apply(this, arguments);
+    function saveMessages(_x12) {
+      return _saveMessages.apply(this, arguments);
     }
-    return getAllThreadIds;
+    return saveMessages;
   }();
-  _proto.deleteThread = /*#__PURE__*/function () {
-    var _deleteThread = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(threadId) {
-      var pipeline;
+  _proto.deleteMessage = /*#__PURE__*/function () {
+    var _deleteMessage = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(id) {
+      var pattern, keys, _iterator5, _step5, key, messages, filteredMessages, _this$kv;
       return _regeneratorRuntime().wrap(function _callee11$(_context12) {
         while (1) switch (_context12.prev = _context12.next) {
           case 0:
-            pipeline = this.redis.pipeline();
-            pipeline.del("" + this.threadPrefix + threadId);
-            pipeline.del("" + this.messagePrefix + threadId);
-            pipeline.srem('threads', threadId);
-            _context12.next = 6;
-            return pipeline.exec();
-          case 6:
+            pattern = this.prefix + ":messages:*";
+            _context12.next = 3;
+            return this.kv.keys(pattern);
+          case 3:
+            keys = _context12.sent;
+            _iterator5 = _createForOfIteratorHelperLoose(keys);
+          case 5:
+            if ((_step5 = _iterator5()).done) {
+              _context12.next = 19;
+              break;
+            }
+            key = _step5.value;
+            _context12.next = 9;
+            return this.kv.lrange(key, 0, -1);
+          case 9:
+            messages = _context12.sent;
+            filteredMessages = messages.filter(function (msg) {
+              return msg.id !== id;
+            });
+            if (!(messages.length !== filteredMessages.length)) {
+              _context12.next = 17;
+              break;
+            }
+            _context12.next = 14;
+            return this.kv.del(key);
+          case 14:
+            if (!(filteredMessages.length > 0)) {
+              _context12.next = 17;
+              break;
+            }
+            _context12.next = 17;
+            return (_this$kv = this.kv).rpush.apply(_this$kv, [key].concat(filteredMessages));
+          case 17:
+            _context12.next = 5;
+            break;
+          case 19:
           case "end":
             return _context12.stop();
         }
       }, _callee11, this);
     }));
-    function deleteThread(_x10) {
-      return _deleteThread.apply(this, arguments);
+    function deleteMessage(_x13) {
+      return _deleteMessage.apply(this, arguments);
     }
-    return deleteThread;
-  }();
-  _proto.getThreads = /*#__PURE__*/function () {
-    var _getThreads = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(threadIds) {
-      var _this4 = this;
-      var threads;
+    return deleteMessage;
+  }()
+  /**
+   * Cleanup
+   */
+  ;
+  _proto.drop =
+  /*#__PURE__*/
+  function () {
+    var _drop = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+      var pattern, keys, _this$kv2;
       return _regeneratorRuntime().wrap(function _callee12$(_context13) {
         while (1) switch (_context13.prev = _context13.next) {
           case 0:
-            _context13.next = 2;
-            return Promise.all(threadIds.map(function (id) {
-              return _this4.getThreadById(id);
-            }));
-          case 2:
-            threads = _context13.sent;
-            return _context13.abrupt("return", threads.filter(function (t) {
-              return t !== null;
-            }));
-          case 4:
+            pattern = this.prefix + ":*";
+            _context13.next = 3;
+            return this.kv.keys(pattern);
+          case 3:
+            keys = _context13.sent;
+            if (!(keys.length > 0)) {
+              _context13.next = 7;
+              break;
+            }
+            _context13.next = 7;
+            return (_this$kv2 = this.kv).del.apply(_this$kv2, keys);
+          case 7:
           case "end":
             return _context13.stop();
         }
-      }, _callee12);
+      }, _callee12, this);
     }));
-    function getThreads(_x11) {
-      return _getThreads.apply(this, arguments);
+    function drop() {
+      return _drop.apply(this, arguments);
     }
-    return getThreads;
+    return drop;
   }();
-  _proto.generateId = function generateId() {
-    return crypto.randomUUID();
+  _proto.parseThread = function parseThread(thread) {
+    return _extends({}, thread, {
+      createdAt: new Date(thread.createdAt),
+      updatedAt: new Date(thread.updatedAt)
+    });
+  };
+  _proto.parseMessages = function parseMessages(messages) {
+    return messages.map(function (message) {
+      return _extends({}, message, {
+        createdAt: new Date(message.createdAt)
+      });
+    });
   };
-  return RedisMemory;
+  return UpstashKVMemory;
 }(core.MastraMemory);
 
-exports.CloudflareKVMemory = CloudflareKVMemory;
-exports.LocalRedisProvider = LocalRedisProvider;
 exports.PgMemory = PgMemory;
-exports.RedisMemory = RedisMemory;
-exports.UpstashProvider = UpstashProvider;
+exports.UpstashKVMemory = UpstashKVMemory;
 //# sourceMappingURL=memory.cjs.development.js.map