@mastra/memory 0.0.2-alpha.1 → 0.0.2-alpha.11

package/dist/memory.esm.js

@@ -1,6 +1,7 @@
 import { MastraMemory } from '@mastra/core';
 import crypto from 'crypto';
 import pg from 'pg';
+import { Redis } from '@upstash/redis';
 
 function _arrayLikeToArray(r, a) {
   (null == a || a > r.length) && (a = r.length);
@@ -381,215 +382,129 @@ var PgMemory = /*#__PURE__*/function (_MastraMemory) {
     var _this;
     _this = _MastraMemory.call(this) || this;
     _this.pool = void 0;
-    _this.MAX_CONTEXT_TOKENS = void 0;
+    _this.hasTables = false;
     _this.pool = new Pool({
       connectionString: config.connectionString
     });
     _this.MAX_CONTEXT_TOKENS = config.maxTokens;
     return _this;
   }
+  /**
+   * Threads
+   */
   _inheritsLoose(PgMemory, _MastraMemory);
   var _proto = PgMemory.prototype;
-  _proto.drop = /*#__PURE__*/function () {
-    var _drop = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var client;
+  _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.pool.connect();
-          case 2:
-            client = _context.sent;
+            threadId = _ref.threadId;
+            _context.next = 3;
+            return this.ensureTablesExist();
+          case 3:
             _context.next = 5;
-            return client.query('DELETE FROM mastra_messages');
+            return this.pool.connect();
           case 5:
-            _context.next = 7;
-            return client.query('DELETE FROM mastra_threads');
-          case 7:
+            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();
-            _context.next = 10;
-            return this.pool.end();
-          case 10:
+            return _context.finish(11);
+          case 14:
           case "end":
             return _context.stop();
         }
-      }, _callee, this);
+      }, _callee, this, [[6,, 11, 14]]);
     }));
-    function drop() {
-      return _drop.apply(this, arguments);
-    }
-    return drop;
-  }() // Simplified token estimation
-  ;
-  _proto.estimateTokens = function estimateTokens(text) {
-    return Math.ceil(text.split(' ').length * 1.3);
-  };
-  _proto.processMessages = function processMessages(messages) {
-    return messages.map(function (mssg) {
-      return _extends({}, mssg, {
-        content: typeof mssg.content === 'string' ? JSON.parse(mssg.content) : mssg.content
-      });
-    });
-  };
-  _proto.convertToUIMessages = function convertToUIMessages(messages) {
-    function addToolMessageToChat(_ref) {
-      var toolMessage = _ref.toolMessage,
-        messages = _ref.messages,
-        toolResultContents = _ref.toolResultContents;
-      var chatMessages = messages.map(function (message) {
-        if (message.toolInvocations) {
-          return _extends({}, message, {
-            toolInvocations: message.toolInvocations.map(function (toolInvocation) {
-              var toolResult = toolMessage.content.find(function (tool) {
-                return tool.toolCallId === toolInvocation.toolCallId;
-              });
-              if (toolResult) {
-                return _extends({}, toolInvocation, {
-                  state: 'result',
-                  result: toolResult.result
-                });
-              }
-              return toolInvocation;
-            })
-          });
-        }
-        return message;
-      });
-      var resultContents = [].concat(toolResultContents, toolMessage.content);
-      return {
-        chatMessages: chatMessages,
-        toolResultContents: resultContents
-      };
+    function getThreadById(_x) {
+      return _getThreadById.apply(this, arguments);
     }
-    var _messages$reduce = messages.reduce(function (obj, message) {
-        if (message.role === 'tool') {
-          return addToolMessageToChat({
-            toolMessage: message,
-            messages: obj.chatMessages,
-            toolResultContents: obj.toolResultContents
-          });
-        }
-        var textContent = '';
-        var toolInvocations = [];
-        if (typeof message.content === 'string') {
-          textContent = message.content;
-        } else if (Array.isArray(message.content)) {
-          var _loop = function _loop() {
-            var content = _step.value;
-            if (content.type === 'text') {
-              textContent += content.text;
-            } else if (content.type === 'tool-call') {
-              var toolResult = obj.toolResultContents.find(function (tool) {
-                return tool.toolCallId === content.toolCallId;
-              });
-              toolInvocations.push({
-                state: toolResult ? 'result' : 'call',
-                toolCallId: content.toolCallId,
-                toolName: content.toolName,
-                args: content.args,
-                result: toolResult == null ? void 0 : toolResult.result
-              });
-            }
-          };
-          for (var _iterator = _createForOfIteratorHelperLoose(message.content), _step; !(_step = _iterator()).done;) {
-            _loop();
-          }
-        }
-        obj.chatMessages.push({
-          id: message.id,
-          role: message.role,
-          content: textContent,
-          toolInvocations: toolInvocations
-        });
-        return obj;
-      }, {
-        chatMessages: [],
-        toolResultContents: []
-      }),
-      chatMessages = _messages$reduce.chatMessages;
-    return chatMessages;
-  };
-  _proto.ensureTablesExist = /*#__PURE__*/function () {
-    var _ensureTablesExist = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var client, _threadsResult$rows, _messagesResult$rows, threadsResult, messagesResult;
+    return getThreadById;
+  }();
+  _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:
-            _context2.next = 2;
+            resourceid = _ref2.resourceid;
+            _context2.next = 3;
+            return this.ensureTablesExist();
+          case 3:
+            _context2.next = 5;
             return this.pool.connect();
-          case 2:
+          case 5:
             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                        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 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                        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 16:
-            _context2.prev = 16;
+            _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(16);
-          case 19:
+            return _context2.finish(11);
+          case 14:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, this, [[3,, 16, 19]]);
+      }, _callee2, this, [[6,, 11, 14]]);
     }));
-    function ensureTablesExist() {
-      return _ensureTablesExist.apply(this, arguments);
+    function getThreadsByResourceId(_x2) {
+      return _getThreadsByResourceId.apply(this, arguments);
     }
-    return ensureTablesExist;
+    return getThreadsByResourceId;
   }();
-  _proto.updateThread = /*#__PURE__*/function () {
-    var _updateThread = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(id, title, metadata) {
-      var client, _result$rows, result;
+  _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:
-            _context3.next = 2;
+            thread = _ref3.thread;
+            _context3.next = 3;
+            return this.ensureTablesExist();
+          case 3:
+            _context3.next = 5;
             return this.pool.connect();
-          case 2:
+          case 5:
             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:
+            _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 8:
-            _context3.prev = 8;
+          case 12:
+            _context3.prev = 12;
             client.release();
-            return _context3.finish(8);
-          case 11:
+            return _context3.finish(12);
+          case 15:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, this, [[3,, 8, 11]]);
+      }, _callee3, this, [[6,, 12, 15]]);
     }));
-    function updateThread(_x, _x2, _x3) {
-      return _updateThread.apply(this, arguments);
+    function saveThread(_x3) {
+      return _saveThread.apply(this, arguments);
     }
-    return updateThread;
+    return saveThread;
   }();
-  _proto.deleteThread = /*#__PURE__*/function () {
-    var _deleteThread = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(id) {
-      var client;
+  _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:
@@ -599,10 +514,10 @@ var PgMemory = /*#__PURE__*/function (_MastraMemory) {
             client = _context4.sent;
             _context4.prev = 3;
             _context4.next = 6;
-            return client.query("\n                DELETE FROM mastra_messages\n                WHERE thread_id = $1\n                ", [id]);
+            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:
-            _context4.next = 8;
-            return client.query("\n                DELETE FROM mastra_threads\n                WHERE id = $1\n                ", [id]);
+            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();
@@ -613,13 +528,13 @@ var PgMemory = /*#__PURE__*/function (_MastraMemory) {
         }
       }, _callee4, this, [[3,, 8, 11]]);
     }));
-    function deleteThread(_x4) {
-      return _deleteThread.apply(this, arguments);
+    function updateThread(_x4, _x5, _x6) {
+      return _updateThread.apply(this, arguments);
     }
-    return deleteThread;
+    return updateThread;
   }();
-  _proto.deleteMessage = /*#__PURE__*/function () {
-    var _deleteMessage = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(id) {
+  _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) {
@@ -630,337 +545,272 @@ var PgMemory = /*#__PURE__*/function (_MastraMemory) {
             client = _context5.sent;
             _context5.prev = 3;
             _context5.next = 6;
-            return client.query("\n                DELETE FROM mastra_messages\n                WHERE id = $1\n                ", [id]);
+            return client.query("\n                DELETE FROM mastra_messages\n                WHERE thread_id = $1\n                ", [id]);
           case 6:
-            _context5.prev = 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(6);
-          case 9:
+            return _context5.finish(8);
+          case 11:
           case "end":
             return _context5.stop();
         }
-      }, _callee5, this, [[3,, 6, 9]]);
+      }, _callee5, this, [[3,, 8, 11]]);
     }));
-    function deleteMessage(_x5) {
-      return _deleteMessage.apply(this, arguments);
+    function deleteThread(_x7) {
+      return _deleteThread.apply(this, arguments);
     }
-    return deleteMessage;
-  }();
-  _proto.getThreadById = /*#__PURE__*/function () {
-    var _getThreadById = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref2) {
-      var threadId, client, result;
+    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:
-            threadId = _ref2.threadId;
-            console.log('getThreadById', threadId);
-            _context6.next = 4;
-            return this.ensureTablesExist();
-          case 4:
-            _context6.next = 6;
-            return this.pool.connect();
-          case 6:
-            client = _context6.sent;
-            _context6.prev = 7;
-            _context6.next = 10;
-            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 10:
-            result = _context6.sent;
-            return _context6.abrupt("return", result.rows[0] || null);
-          case 12:
-            _context6.prev = 12;
-            client.release();
-            return _context6.finish(12);
-          case 15:
-          case "end":
-            return _context6.stop();
-        }
-      }, _callee6, this, [[7,, 12, 15]]);
-    }));
-    function getThreadById(_x6) {
-      return _getThreadById.apply(this, arguments);
-    }
-    return getThreadById;
-  }();
-  _proto.getThreadsByResourceId = /*#__PURE__*/function () {
-    var _getThreadsByResourceId = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(_ref3) {
-      var resourceid, client, result;
-      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
-          case 0:
-            resourceid = _ref3.resourceid;
-            _context7.next = 3;
-            return this.ensureTablesExist();
-          case 3:
-            _context7.next = 5;
-            return this.pool.connect();
-          case 5:
-            client = _context7.sent;
-            _context7.prev = 6;
-            _context7.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 = _context7.sent;
-            return _context7.abrupt("return", result.rows);
-          case 11:
-            _context7.prev = 11;
-            client.release();
-            return _context7.finish(11);
-          case 14:
-          case "end":
-            return _context7.stop();
-        }
-      }, _callee7, this, [[6,, 11, 14]]);
-    }));
-    function getThreadsByResourceId(_x7) {
-      return _getThreadsByResourceId.apply(this, arguments);
-    }
-    return getThreadsByResourceId;
-  }();
-  _proto.saveThread = /*#__PURE__*/function () {
-    var _saveThread = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(_ref4) {
-      var thread, client, _result$rows2, id, title, createdAt, updatedAt, resourceid, metadata, result;
-      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
-          case 0:
-            thread = _ref4.thread;
-            _context8.next = 3;
-            return this.ensureTablesExist();
-          case 3:
-            _context8.next = 5;
-            return this.pool.connect();
-          case 5:
-            client = _context8.sent;
-            _context8.prev = 6;
-            id = thread.id, title = thread.title, createdAt = thread.createdAt, updatedAt = thread.updatedAt, resourceid = thread.resourceid, metadata = thread.metadata;
-            _context8.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 = _context8.sent;
-            return _context8.abrupt("return", result == null || (_result$rows2 = result.rows) == null ? void 0 : _result$rows2[0]);
-          case 12:
-            _context8.prev = 12;
-            client.release();
-            return _context8.finish(12);
-          case 15:
-          case "end":
-            return _context8.stop();
-        }
-      }, _callee8, this, [[6,, 12, 15]]);
-    }));
-    function saveThread(_x8) {
-      return _saveThread.apply(this, arguments);
-    }
-    return saveThread;
-  }();
-  _proto.checkIfValidArgExists = /*#__PURE__*/function () {
-    var _checkIfValidArgExists = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(_ref5) {
-      var hashedToolCallArgs, client, toolArgsResult;
-      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
-          case 0:
-            hashedToolCallArgs = _ref5.hashedToolCallArgs;
-            _context9.next = 3;
+            hashedArgs = _ref4.hashedArgs;
+            _context6.next = 3;
             return this.ensureTablesExist();
           case 3:
-            _context9.next = 5;
+            _context6.next = 5;
             return this.pool.connect();
           case 5:
-            client = _context9.sent;
-            _context9.prev = 6;
-            _context9.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([hashedToolCallArgs]), new Date().toISOString()]);
+            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 = _context9.sent;
-            return _context9.abrupt("return", toolArgsResult.rows.length > 0);
+            toolArgsResult = _context6.sent;
+            return _context6.abrupt("return", toolArgsResult.rows.length > 0);
           case 13:
-            _context9.prev = 13;
-            _context9.t0 = _context9["catch"](6);
-            console.log('error checking if valid arg exists====', _context9.t0);
-            return _context9.abrupt("return", false);
+            _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:
-            _context9.prev = 17;
+            _context6.prev = 17;
             client.release();
-            return _context9.finish(17);
+            return _context6.finish(17);
           case 20:
           case "end":
-            return _context9.stop();
+            return _context6.stop();
         }
-      }, _callee9, this, [[6, 13, 17, 20]]);
+      }, _callee6, this, [[6, 13, 17, 20]]);
     }));
-    function checkIfValidArgExists(_x9) {
-      return _checkIfValidArgExists.apply(this, arguments);
+    function validateToolCallArgs(_x8) {
+      return _validateToolCallArgs.apply(this, arguments);
     }
-    return checkIfValidArgExists;
+    return validateToolCallArgs;
   }();
-  _proto.getCachedToolResult = /*#__PURE__*/function () {
-    var _getCachedToolResult = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(_ref6) {
+  _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 _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            threadId = _ref6.threadId, toolArgs = _ref6.toolArgs, toolName = _ref6.toolName;
-            _context10.next = 3;
+            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));
-            _context10.next = 6;
+            _context7.next = 6;
             return this.pool.connect();
           case 6:
-            client = _context10.sent;
-            _context10.prev = 7;
+            client = _context7.sent;
+            _context7.prev = 7;
             hashedToolArgs = crypto.createHash('sha256').update(JSON.stringify({
               args: toolArgs,
               threadId: threadId,
               toolName: toolName
             })).digest('hex');
-            console.log('hashedToolArgs====', hashedToolArgs);
-            _context10.next = 12;
+            _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 12:
-            toolArgsResult = _context10.sent;
+          case 11:
+            toolArgsResult = _context7.sent;
             if (!(toolArgsResult.rows.length > 0)) {
-              _context10.next = 36;
+              _context7.next = 28;
               break;
             }
-            console.log('toolArgsResult====', JSON.stringify(toolArgsResult.rows[0], null, 2));
             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;
-            console.log('toolCallArgs====', JSON.stringify(toolCallArgs, null, 2));
-            console.log('toolCallIds====', JSON.stringify(toolCallIds, null, 2));
-            console.log('createdAt====', createdAt);
             toolCallArgsIndex = toolCallArgs.findIndex(function (arg) {
               return arg === hashedToolArgs;
             });
             correspondingToolCallId = toolCallIds[toolCallArgsIndex];
-            console.log('correspondingToolCallId====', {
-              correspondingToolCallId: correspondingToolCallId,
-              toolCallArgsIndex: toolCallArgsIndex
-            });
-            _context10.next = 26;
+            _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 26:
-            toolResult = _context10.sent;
-            console.log('called toolResult');
+          case 20:
+            toolResult = _context7.sent;
             if (!(toolResult.rows.length === 0)) {
-              _context10.next = 31;
+              _context7.next = 24;
               break;
             }
             console.log('no tool result found');
-            return _context10.abrupt("return", null);
-          case 31:
+            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;
             });
-            console.log('requiredToolResult====', JSON.stringify(requiredToolResult, null, 2));
             if (!requiredToolResult) {
-              _context10.next = 36;
+              _context7.next = 28;
               break;
             }
-            return _context10.abrupt("return", requiredToolResult.result);
-          case 36:
-            return _context10.abrupt("return", null);
-          case 39:
-            _context10.prev = 39;
-            _context10.t0 = _context10["catch"](7);
-            console.log('error getting cached tool result====', _context10.t0);
-            return _context10.abrupt("return", null);
-          case 43:
-            _context10.prev = 43;
+            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 _context10.finish(43);
-          case 46:
+            return _context7.finish(35);
+          case 38:
           case "end":
-            return _context10.stop();
+            return _context7.stop();
         }
-      }, _callee10, this, [[7, 39, 43, 46]]);
+      }, _callee7, this, [[7, 31, 35, 38]]);
     }));
-    function getCachedToolResult(_x10) {
-      return _getCachedToolResult.apply(this, arguments);
+    function getToolResult(_x9) {
+      return _getToolResult.apply(this, arguments);
     }
-    return getCachedToolResult;
+    return getToolResult;
   }();
   _proto.getContextWindow = /*#__PURE__*/function () {
-    var _getContextWindow = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(_ref7) {
-      var threadId, startDate, endDate, client, _result, result;
-      return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-        while (1) switch (_context11.prev = _context11.next) {
+    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:
-            threadId = _ref7.threadId, startDate = _ref7.startDate, endDate = _ref7.endDate;
-            _context11.next = 3;
+            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:
-            console.log('table exists');
-            _context11.next = 6;
+            _context8.next = 5;
             return this.pool.connect();
-          case 6:
-            client = _context11.sent;
-            _context11.prev = 7;
+          case 5:
+            client = _context8.sent;
+            _context8.prev = 6;
             if (!this.MAX_CONTEXT_TOKENS) {
-              _context11.next = 14;
+              _context8.next = 13;
               break;
             }
-            _context11.next = 11;
+            _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 11:
-            _result = _context11.sent;
-            console.log('result===', JSON.stringify(_result.rows, null, 2));
-            return _context11.abrupt("return", this.processMessages(_result.rows));
-          case 14:
-            _context11.next = 16;
+          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 16:
-            result = _context11.sent;
-            console.log('result===', JSON.stringify(result.rows, null, 2));
-            return _context11.abrupt("return", this.processMessages(result.rows));
-          case 21:
-            _context11.prev = 21;
-            _context11.t0 = _context11["catch"](7);
-            console.log('error getting context window====', _context11.t0);
-            return _context11.abrupt("return", []);
-          case 25:
-            _context11.prev = 25;
+          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 _context11.finish(25);
-          case 28:
+            return _context8.finish(24);
+          case 27:
           case "end":
-            return _context11.stop();
+            return _context8.stop();
         }
-      }, _callee11, this, [[7, 21, 25, 28]]);
+      }, _callee8, this, [[6, 20, 24, 27]]);
     }));
-    function getContextWindow(_x11) {
+    function getContextWindow(_x10) {
       return _getContextWindow.apply(this, arguments);
     }
     return getContextWindow;
-  }();
-  _proto.saveMessages = /*#__PURE__*/function () {
-    var _saveMessages = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(_ref8) {
-      var _this2 = this;
-      var messages, client, _loop2, _iterator2, _step2;
-      return _regeneratorRuntime().wrap(function _callee12$(_context13) {
-        while (1) switch (_context13.prev = _context13.next) {
+  }()
+  /**
+   * 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:
+            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 _context9.stop();
+        }
+      }, _callee9, this, [[6,, 13, 16]]);
+    }));
+    function getMessages(_x11) {
+      return _getMessages.apply(this, arguments);
+    }
+    return getMessages;
+  }();
+  _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:
             messages = _ref8.messages;
-            _context13.next = 3;
+            _context11.next = 3;
             return this.ensureTablesExist();
           case 3:
-            _context13.next = 5;
+            _context11.next = 5;
             return this.pool.connect();
           case 5:
-            client = _context13.sent;
-            _context13.prev = 6;
-            _context13.next = 9;
+            client = _context11.sent;
+            _context11.prev = 6;
+            _context11.next = 9;
             return client.query('BEGIN');
           case 9:
-            _loop2 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop2() {
+            _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 _loop2$(_context12) {
-                while (1) switch (_context12.prev = _context12.next) {
+              return _regeneratorRuntime().wrap(function _loop$(_context10) {
+                while (1) switch (_context10.prev = _context10.next) {
                   case 0:
-                    message = _step2.value;
-                    console.log('saving message====', JSON.stringify(message, null, 2));
+                    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') {
@@ -977,124 +827,748 @@ var PgMemory = /*#__PURE__*/function (_MastraMemory) {
                     }) : null;
                     validArgExists = false;
                     if (!(hashedToolCallArgs != null && hashedToolCallArgs.length)) {
-                      _context12.next = 20;
+                      _context10.next = 19;
                       break;
                     }
                     // Check all args sequentially
                     validArgExists = true; // Start true and set to false if any check fails
                     i = 0;
-                  case 10:
+                  case 9:
                     if (!(i < hashedToolCallArgs.length)) {
-                      _context12.next = 20;
+                      _context10.next = 19;
                       break;
                     }
-                    _context12.next = 13;
-                    return _this2.checkIfValidArgExists({
-                      hashedToolCallArgs: hashedToolCallArgs[i]
+                    _context10.next = 12;
+                    return _this2.validateToolCallArgs({
+                      hashedArgs: hashedToolCallArgs[i]
                     });
-                  case 13:
-                    isValid = _context12.sent;
+                  case 12:
+                    isValid = _context10.sent;
                     if (isValid) {
-                      _context12.next = 17;
+                      _context10.next = 16;
                       break;
                     }
                     validArgExists = false;
-                    return _context12.abrupt("break", 20);
-                  case 17:
+                    return _context10.abrupt("break", 19);
+                  case 16:
                     i++;
-                    _context12.next = 10;
+                    _context10.next = 9;
                     break;
-                  case 20:
+                  case 19:
                     toolCallArgsExpireAt = !toolCallArgs ? null : validArgExists ? createdAt : new Date(createdAt.getTime() + 5 * 60 * 1000); // 5 minutes
-                    console.log('just before query');
-                    _context12.next = 24;
+                    _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 24:
+                  case 22:
                   case "end":
-                    return _context12.stop();
+                    return _context10.stop();
                 }
-              }, _loop2);
+              }, _loop);
             });
-            _iterator2 = _createForOfIteratorHelperLoose(messages);
+            _iterator = _createForOfIteratorHelperLoose(messages);
           case 11:
-            if ((_step2 = _iterator2()).done) {
-              _context13.next = 15;
+            if ((_step = _iterator()).done) {
+              _context11.next = 15;
               break;
             }
-            return _context13.delegateYield(_loop2(), "t0", 13);
+            return _context11.delegateYield(_loop(), "t0", 13);
           case 13:
-            _context13.next = 11;
+            _context11.next = 11;
             break;
           case 15:
-            console.log('just after query');
-            _context13.next = 18;
+            _context11.next = 17;
             return client.query('COMMIT');
-          case 18:
-            return _context13.abrupt("return", messages);
-          case 21:
-            _context13.prev = 21;
-            _context13.t1 = _context13["catch"](6);
-            _context13.next = 25;
+          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:
-            throw _context13.t1;
-          case 26:
-            _context13.prev = 26;
+            _context11.prev = 25;
             client.release();
-            return _context13.finish(26);
-          case 29:
+            return _context11.finish(25);
+          case 28:
           case "end":
-            return _context13.stop();
+            return _context11.stop();
         }
-      }, _callee12, this, [[6, 21, 26, 29]]);
+      }, _callee10, this, [[6, 20, 25, 28]]);
     }));
     function saveMessages(_x12) {
       return _saveMessages.apply(this, arguments);
     }
     return saveMessages;
   }();
-  _proto.getMessages = /*#__PURE__*/function () {
-    var _getMessages = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(_ref9) {
-      var threadId, client, result, messages, uiMessages;
+  _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:
+            _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();
+        }
+      }, _callee11, this, [[3,, 6, 9]]);
+    }));
+    function deleteMessage(_x13) {
+      return _deleteMessage.apply(this, arguments);
+    }
+    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:
+            _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();
+        }
+      }, _callee12, this);
+    }));
+    function drop() {
+      return _drop.apply(this, arguments);
+    }
+    return drop;
+  }();
+  _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:
-            threadId = _ref9.threadId;
-            _context14.next = 3;
-            return this.ensureTablesExist();
-          case 3:
-            _context14.next = 5;
+            if (!this.hasTables) {
+              _context14.next = 2;
+              break;
+            }
+            return _context14.abrupt("return");
+          case 2:
+            _context14.next = 4;
             return this.pool.connect();
-          case 5:
+          case 4:
             client = _context14.sent;
-            _context14.prev = 6;
-            _context14.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]);
+            _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;
+            }
+            _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 _context14.stop();
+        }
+      }, _callee13, this, [[5,, 18, 22]]);
+    }));
+    function ensureTablesExist() {
+      return _ensureTablesExist.apply(this, arguments);
+    }
+    return ensureTablesExist;
+  }();
+  return PgMemory;
+}(MastraMemory);
+
+var UpstashKVMemory = /*#__PURE__*/function (_MastraMemory) {
+  function UpstashKVMemory(config) {
+    var _this;
+    _this = _MastraMemory.call(this) || this;
+    _this.prefix = void 0;
+    _this.kv = void 0;
+    _this.prefix = config.prefix || 'mastra';
+    _this.MAX_CONTEXT_TOKENS = config.maxTokens;
+    _this.kv = new Redis({
+      url: config.url,
+      token: config.token
+    });
+    return _this;
+  }
+  _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(_ref) {
+      var threadId, thread;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            threadId = _ref.threadId;
+            _context.next = 3;
+            return this.kv.get(this.getThreadKey(threadId));
+          case 3:
+            thread = _context.sent;
+            return _context.abrupt("return", thread ? this.parseThread(thread) : null);
+          case 5:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, this);
+    }));
+    function getThreadById(_x) {
+      return _getThreadById.apply(this, arguments);
+    }
+    return getThreadById;
+  }();
+  _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:
+            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:
-            result = _context14.sent;
-            messages = this.processMessages(result.rows);
-            uiMessages = this.convertToUIMessages(messages);
-            return _context14.abrupt("return", {
-              messages: messages,
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2, this);
+    }));
+    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.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:
+            key = this.getThreadKey(id);
+            _context4.next = 3;
+            return this.kv.get(key);
+          case 3:
+            thread = _context4.sent;
+            if (thread) {
+              _context4.next = 6;
+              break;
+            }
+            throw new Error("Thread " + id + " not found");
+          case 6:
+            updatedThread = _extends({}, thread, {
+              title: title,
+              metadata: metadata,
+              updatedAt: new Date().toISOString()
+            });
+            _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);
+    }));
+    function updateThread(_x4, _x5, _x6) {
+      return _updateThread.apply(this, arguments);
+    }
+    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:
+            _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 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 validateToolCallArgs;
+  }();
+  _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:
+            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:
+            cached = _context7.sent;
+            if (!(cached && new Date(cached.expireAt) > new Date())) {
+              _context7.next = 8;
+              break;
+            }
+            return _context7.abrupt("return", cached.result || null);
+          case 8:
+            return _context7.abrupt("return", null);
+          case 9:
+          case "end":
+            return _context7.stop();
+        }
+      }, _callee7, this);
+    }));
+    function getToolResult(_x9) {
+      return _getToolResult.apply(this, arguments);
+    }
+    return getToolResult;
+  }();
+  _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:
+            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 _context8.stop();
+        }
+      }, _callee8, this);
+    }));
+    function getContextWindow(_x10) {
+      return _getContextWindow.apply(this, arguments);
+    }
+    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:
+            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 13:
-            _context14.prev = 13;
-            client.release();
-            return _context14.finish(13);
-          case 16:
+          case 8:
           case "end":
-            return _context14.stop();
+            return _context9.stop();
         }
-      }, _callee13, this, [[6,, 13, 16]]);
+      }, _callee9, this);
     }));
-    function getMessages(_x13) {
+    function getMessages(_x11) {
       return _getMessages.apply(this, arguments);
     }
     return getMessages;
   }();
-  return PgMemory;
+  _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:
+            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);
+    }));
+    function saveMessages(_x12) {
+      return _saveMessages.apply(this, arguments);
+    }
+    return saveMessages;
+  }();
+  _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:
+            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 deleteMessage(_x13) {
+      return _deleteMessage.apply(this, arguments);
+    }
+    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:
+            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, this);
+    }));
+    function drop() {
+      return _drop.apply(this, arguments);
+    }
+    return drop;
+  }();
+  _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 UpstashKVMemory;
 }(MastraMemory);
 
-export { PgMemory };
+export { PgMemory, UpstashKVMemory };
 //# sourceMappingURL=memory.esm.js.map