@mastra/pg 1.0.0-beta.2 → 1.0.0-beta.4

package/dist/index.js

@@ -1,11 +1,11 @@
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
+import { createVectorErrorId, MastraStorage, createStorageErrorId, StoreOperations, TABLE_SCHEMAS, TABLE_WORKFLOW_SNAPSHOT, TABLE_SPANS, TABLE_THREADS, TABLE_MESSAGES, TABLE_TRACES, TABLE_SCORERS, ScoresStorage, normalizePerPage, calculatePagination, WorkflowsStorage, MemoryStorage, TABLE_RESOURCES, ObservabilityStorage, transformScoreRow as transformScoreRow$1 } from '@mastra/core/storage';
 import { parseSqlIdentifier, parseFieldKey } from '@mastra/core/utils';
 import { MastraVector } from '@mastra/core/vector';
 import { Mutex } from 'async-mutex';
 import * as pg from 'pg';
 import xxhash from 'xxhash-wasm';
 import { BaseFilterTranslator } from '@mastra/core/vector/filter';
-import { MastraStorage, StoreOperations, TABLE_SCHEMAS, TABLE_WORKFLOW_SNAPSHOT, TABLE_SPANS, TABLE_THREADS, TABLE_MESSAGES, TABLE_TRACES, TABLE_SCORERS, ScoresStorage, normalizePerPage, calculatePagination, WorkflowsStorage, MemoryStorage, TABLE_RESOURCES, ObservabilityStorage, safelyParseJSON } from '@mastra/core/storage';
 import pgPromise from 'pg-promise';
 import { MessageList } from '@mastra/core/agent';
 import { saveScorePayloadSchema } from '@mastra/core/evals';
@@ -550,7 +550,7 @@ var PgVector = class extends MastraVector {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_INITIALIZATION_FAILED",
+          id: createVectorErrorId("PG", "INITIALIZATION", "FAILED"),
           domain: ErrorDomain.MASTRA_VECTOR,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -596,9 +596,6 @@ var PgVector = class extends MastraVector {
       if (this.vectorExtensionSchema === "pg_catalog") {
         return "vector";
       }
-      if (this.vectorExtensionSchema === (this.schema || "public")) {
-        return "vector";
-      }
       const validatedSchema = parseSqlIdentifier(this.vectorExtensionSchema, "vector extension schema");
       return `${validatedSchema}.vector`;
     }
@@ -647,7 +644,7 @@ var PgVector = class extends MastraVector {
     } catch (error) {
       const mastraError = new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_QUERY_INVALID_INPUT",
+          id: createVectorErrorId("PG", "QUERY", "INVALID_INPUT"),
           domain: ErrorDomain.MASTRA_VECTOR,
           category: ErrorCategory.USER,
           details: {
@@ -703,7 +700,7 @@ var PgVector = class extends MastraVector {
       await client.query("ROLLBACK");
       const mastraError = new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_QUERY_FAILED",
+          id: createVectorErrorId("PG", "QUERY", "FAILED"),
           domain: ErrorDomain.MASTRA_VECTOR,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -772,7 +769,7 @@ var PgVector = class extends MastraVector {
           const [, expected, actual] = match;
           const mastraError2 = new MastraError(
             {
-              id: "MASTRA_STORAGE_PG_VECTOR_UPSERT_INVALID_INPUT",
+              id: createVectorErrorId("PG", "UPSERT", "INVALID_INPUT"),
               domain: ErrorDomain.MASTRA_VECTOR,
               category: ErrorCategory.USER,
               text: `Vector dimension mismatch: Index "${indexName}" expects ${expected} dimensions but got ${actual} dimensions. Either use a matching embedding model or delete and recreate the index with the new dimension.`,
@@ -790,7 +787,7 @@ var PgVector = class extends MastraVector {
       }
       const mastraError = new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_UPSERT_FAILED",
+          id: createVectorErrorId("PG", "UPSERT", "FAILED"),
           domain: ErrorDomain.MASTRA_VECTOR,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -878,7 +875,7 @@ var PgVector = class extends MastraVector {
     } catch (error) {
       const mastraError = new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_CREATE_INDEX_INVALID_INPUT",
+          id: createVectorErrorId("PG", "CREATE_INDEX", "INVALID_INPUT"),
           domain: ErrorDomain.MASTRA_VECTOR,
           category: ErrorCategory.USER,
           details: {
@@ -928,7 +925,7 @@ var PgVector = class extends MastraVector {
     }).catch((error) => {
       const mastraError = new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_CREATE_INDEX_FAILED",
+          id: createVectorErrorId("PG", "CREATE_INDEX", "FAILED"),
           domain: ErrorDomain.MASTRA_VECTOR,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -948,7 +945,7 @@ var PgVector = class extends MastraVector {
     } catch (error) {
       const mastraError = new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_BUILD_INDEX_FAILED",
+          id: createVectorErrorId("PG", "BUILD_INDEX", "FAILED"),
           domain: ErrorDomain.MASTRA_VECTOR,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1148,7 +1145,7 @@ var PgVector = class extends MastraVector {
     } catch (e) {
       const mastraError = new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_LIST_INDEXES_FAILED",
+          id: createVectorErrorId("PG", "LIST_INDEXES", "FAILED"),
           domain: ErrorDomain.MASTRA_VECTOR,
           category: ErrorCategory.THIRD_PARTY
         },
@@ -1237,7 +1234,7 @@ var PgVector = class extends MastraVector {
       await client.query("ROLLBACK");
       const mastraError = new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_DESCRIBE_INDEX_FAILED",
+          id: createVectorErrorId("PG", "DESCRIBE_INDEX", "FAILED"),
           domain: ErrorDomain.MASTRA_VECTOR,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1262,7 +1259,7 @@ var PgVector = class extends MastraVector {
       await client.query("ROLLBACK");
       const mastraError = new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_DELETE_INDEX_FAILED",
+          id: createVectorErrorId("PG", "DELETE_INDEX", "FAILED"),
           domain: ErrorDomain.MASTRA_VECTOR,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1286,7 +1283,7 @@ var PgVector = class extends MastraVector {
       await client.query("ROLLBACK");
       const mastraError = new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_TRUNCATE_INDEX_FAILED",
+          id: createVectorErrorId("PG", "TRUNCATE_INDEX", "FAILED"),
           domain: ErrorDomain.MASTRA_VECTOR,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1328,7 +1325,7 @@ var PgVector = class extends MastraVector {
       }
       if (!id && !filter) {
         throw new MastraError({
-          id: "MASTRA_STORAGE_PG_VECTOR_UPDATE_MISSING_PARAMS",
+          id: createVectorErrorId("PG", "UPDATE_VECTOR", "NO_TARGET"),
           text: "Either id or filter must be provided",
           domain: ErrorDomain.MASTRA_VECTOR,
           category: ErrorCategory.USER,
@@ -1337,7 +1334,7 @@ var PgVector = class extends MastraVector {
       }
       if (id && filter) {
         throw new MastraError({
-          id: "MASTRA_STORAGE_PG_VECTOR_UPDATE_CONFLICTING_PARAMS",
+          id: createVectorErrorId("PG", "UPDATE_VECTOR", "MUTUALLY_EXCLUSIVE"),
           text: "Cannot provide both id and filter - they are mutually exclusive",
           domain: ErrorDomain.MASTRA_VECTOR,
           category: ErrorCategory.USER,
@@ -1371,7 +1368,7 @@ var PgVector = class extends MastraVector {
       } else {
         if (!filter || Object.keys(filter).length === 0) {
           throw new MastraError({
-            id: "MASTRA_STORAGE_PG_VECTOR_UPDATE_EMPTY_FILTER",
+            id: createVectorErrorId("PG", "UPDATE_VECTOR", "EMPTY_FILTER"),
             text: "Cannot update with empty filter",
             domain: ErrorDomain.MASTRA_VECTOR,
             category: ErrorCategory.USER,
@@ -1383,7 +1380,7 @@ var PgVector = class extends MastraVector {
         whereClause = filterQuery.trim().replace(/^WHERE\s+/i, "");
         if (!whereClause) {
           throw new MastraError({
-            id: "MASTRA_STORAGE_PG_VECTOR_UPDATE_INVALID_FILTER",
+            id: createVectorErrorId("PG", "UPDATE_VECTOR", "INVALID_FILTER"),
             text: "Filter produced empty WHERE clause",
             domain: ErrorDomain.MASTRA_VECTOR,
             category: ErrorCategory.USER,
@@ -1414,7 +1411,7 @@ var PgVector = class extends MastraVector {
       }
       const mastraError = new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_UPDATE_VECTOR_FAILED",
+          id: createVectorErrorId("PG", "UPDATE_VECTOR", "FAILED"),
           domain: ErrorDomain.MASTRA_VECTOR,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1451,7 +1448,7 @@ var PgVector = class extends MastraVector {
     } catch (error) {
       const mastraError = new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_DELETE_VECTOR_FAILED",
+          id: createVectorErrorId("PG", "DELETE_VECTOR", "FAILED"),
           domain: ErrorDomain.MASTRA_VECTOR,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1481,7 +1478,7 @@ var PgVector = class extends MastraVector {
       const { tableName } = this.getTableName(indexName);
       if (!filter && !ids) {
         throw new MastraError({
-          id: "MASTRA_STORAGE_PG_VECTOR_DELETE_MISSING_PARAMS",
+          id: createVectorErrorId("PG", "DELETE_VECTORS", "NO_TARGET"),
           text: "Either filter or ids must be provided",
           domain: ErrorDomain.MASTRA_VECTOR,
           category: ErrorCategory.USER,
@@ -1490,7 +1487,7 @@ var PgVector = class extends MastraVector {
       }
       if (filter && ids) {
         throw new MastraError({
-          id: "MASTRA_STORAGE_PG_VECTOR_DELETE_CONFLICTING_PARAMS",
+          id: createVectorErrorId("PG", "DELETE_VECTORS", "MUTUALLY_EXCLUSIVE"),
           text: "Cannot provide both filter and ids - they are mutually exclusive",
           domain: ErrorDomain.MASTRA_VECTOR,
           category: ErrorCategory.USER,
@@ -1502,7 +1499,7 @@ var PgVector = class extends MastraVector {
       if (ids) {
         if (ids.length === 0) {
           throw new MastraError({
-            id: "MASTRA_STORAGE_PG_VECTOR_DELETE_EMPTY_IDS",
+            id: createVectorErrorId("PG", "DELETE_VECTORS", "EMPTY_IDS"),
             text: "Cannot delete with empty ids array",
             domain: ErrorDomain.MASTRA_VECTOR,
             category: ErrorCategory.USER,
@@ -1515,7 +1512,7 @@ var PgVector = class extends MastraVector {
       } else {
         if (!filter || Object.keys(filter).length === 0) {
           throw new MastraError({
-            id: "MASTRA_STORAGE_PG_VECTOR_DELETE_EMPTY_FILTER",
+            id: createVectorErrorId("PG", "DELETE_VECTORS", "EMPTY_FILTER"),
             text: "Cannot delete with empty filter. Use deleteIndex to delete all vectors.",
             domain: ErrorDomain.MASTRA_VECTOR,
             category: ErrorCategory.USER,
@@ -1527,7 +1524,7 @@ var PgVector = class extends MastraVector {
         const whereClause = filterQuery.trim().replace(/^WHERE\s+/i, "");
         if (!whereClause) {
           throw new MastraError({
-            id: "MASTRA_STORAGE_PG_VECTOR_DELETE_INVALID_FILTER",
+            id: createVectorErrorId("PG", "DELETE_VECTORS", "INVALID_FILTER"),
             text: "Filter produced empty WHERE clause",
             domain: ErrorDomain.MASTRA_VECTOR,
             category: ErrorCategory.USER,
@@ -1550,7 +1547,7 @@ var PgVector = class extends MastraVector {
       }
       const mastraError = new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_DELETE_VECTORS_FAILED",
+          id: createVectorErrorId("PG", "DELETE_VECTORS", "FAILED"),
           domain: ErrorDomain.MASTRA_VECTOR,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1690,7 +1687,7 @@ var MemoryPG = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_GET_THREAD_BY_ID_FAILED",
+          id: createStorageErrorId("PG", "GET_THREAD_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1705,7 +1702,7 @@ var MemoryPG = class extends MemoryStorage {
     const { resourceId, page = 0, perPage: perPageInput, orderBy } = args;
     if (page < 0) {
       throw new MastraError({
-        id: "MASTRA_STORAGE_PG_STORE_INVALID_PAGE",
+        id: createStorageErrorId("PG", "LIST_THREADS_BY_RESOURCE_ID", "INVALID_PAGE"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
         text: "Page number must be non-negative",
@@ -1754,7 +1751,7 @@ var MemoryPG = class extends MemoryStorage {
     } catch (error) {
       const mastraError = new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_LIST_THREADS_BY_RESOURCE_ID_FAILED",
+          id: createStorageErrorId("PG", "LIST_THREADS_BY_RESOURCE_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1812,7 +1809,7 @@ var MemoryPG = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_SAVE_THREAD_FAILED",
+          id: createStorageErrorId("PG", "SAVE_THREAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1832,7 +1829,7 @@ var MemoryPG = class extends MemoryStorage {
     const existingThread = await this.getThreadById({ threadId: id });
     if (!existingThread) {
       throw new MastraError({
-        id: "MASTRA_STORAGE_PG_STORE_UPDATE_THREAD_FAILED",
+        id: createStorageErrorId("PG", "UPDATE_THREAD", "FAILED"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
         text: `Thread ${id} not found`,
@@ -1870,7 +1867,7 @@ var MemoryPG = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_UPDATE_THREAD_FAILED",
+          id: createStorageErrorId("PG", "UPDATE_THREAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1888,12 +1885,26 @@ var MemoryPG = class extends MemoryStorage {
       const threadTableName = getTableName({ indexName: TABLE_THREADS, schemaName: getSchemaName(this.schema) });
       await this.client.tx(async (t) => {
         await t.none(`DELETE FROM ${tableName} WHERE thread_id = $1`, [threadId]);
+        const schemaName = this.schema || "public";
+        const vectorTables = await t.manyOrNone(
+          `
+          SELECT tablename 
+          FROM pg_tables 
+          WHERE schemaname = $1 
+          AND (tablename = 'memory_messages' OR tablename LIKE 'memory_messages_%')
+        `,
+          [schemaName]
+        );
+        for (const { tablename } of vectorTables) {
+          const vectorTableName = getTableName({ indexName: tablename, schemaName: getSchemaName(this.schema) });
+          await t.none(`DELETE FROM ${vectorTableName} WHERE metadata->>'thread_id' = $1`, [threadId]);
+        }
         await t.none(`DELETE FROM ${threadTableName} WHERE id = $1`, [threadId]);
       });
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_DELETE_THREAD_FAILED",
+          id: createStorageErrorId("PG", "DELETE_THREAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1904,28 +1915,26 @@ var MemoryPG = class extends MemoryStorage {
       );
     }
   }
-  async _getIncludedMessages({
-    threadId,
-    include
-  }) {
-    if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
-    if (!include) return null;
+  async _getIncludedMessages({ include }) {
+    if (!include || include.length === 0) return null;
     const unionQueries = [];
     const params = [];
     let paramIdx = 1;
     const tableName = getTableName({ indexName: TABLE_MESSAGES, schemaName: getSchemaName(this.schema) });
     for (const inc of include) {
       const { id, withPreviousMessages = 0, withNextMessages = 0 } = inc;
-      const searchId = inc.threadId || threadId;
       unionQueries.push(
         `
             SELECT * FROM (
-              WITH ordered_messages AS (
+              WITH target_thread AS (
+                SELECT thread_id FROM ${tableName} WHERE id = $${paramIdx}
+              ),
+              ordered_messages AS (
                 SELECT 
                   *,
                   ROW_NUMBER() OVER (ORDER BY "createdAt" ASC) as row_num
                 FROM ${tableName}
-                WHERE thread_id = $${paramIdx}
+                WHERE thread_id = (SELECT thread_id FROM target_thread)
               )
               SELECT
                 m.id,
@@ -1937,24 +1946,24 @@ var MemoryPG = class extends MemoryStorage {
                 m.thread_id AS "threadId",
                 m."resourceId"
               FROM ordered_messages m
-              WHERE m.id = $${paramIdx + 1}
+              WHERE m.id = $${paramIdx}
               OR EXISTS (
                 SELECT 1 FROM ordered_messages target
-                WHERE target.id = $${paramIdx + 1}
+                WHERE target.id = $${paramIdx}
                 AND (
                   -- Get previous messages (messages that come BEFORE the target)
-                  (m.row_num < target.row_num AND m.row_num >= target.row_num - $${paramIdx + 2})
+                  (m.row_num < target.row_num AND m.row_num >= target.row_num - $${paramIdx + 1})
                   OR
                   -- Get next messages (messages that come AFTER the target)
-                  (m.row_num > target.row_num AND m.row_num <= target.row_num + $${paramIdx + 3})
+                  (m.row_num > target.row_num AND m.row_num <= target.row_num + $${paramIdx + 2})
                 )
               )
             ) AS query_${paramIdx}
             `
         // Keep ASC for final sorting after fetching context
       );
-      params.push(searchId, id, withPreviousMessages, withNextMessages);
-      paramIdx += 4;
+      params.push(id, withPreviousMessages, withNextMessages);
+      paramIdx += 3;
     }
     const finalQuery = unionQueries.join(" UNION ALL ") + ' ORDER BY "createdAt" ASC';
     const includedRows = await this.client.manyOrNone(finalQuery, params);
@@ -2002,7 +2011,7 @@ var MemoryPG = class extends MemoryStorage {
     } catch (error) {
       const mastraError = new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_LIST_MESSAGES_BY_ID_FAILED",
+          id: createStorageErrorId("PG", "LIST_MESSAGES_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -2018,25 +2027,28 @@ var MemoryPG = class extends MemoryStorage {
   }
   async listMessages(args) {
     const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
-    if (!threadId.trim()) {
+    const threadIds = (Array.isArray(threadId) ? threadId : [threadId]).filter(
+      (id) => typeof id === "string"
+    );
+    if (threadIds.length === 0 || threadIds.some((id) => !id.trim())) {
       throw new MastraError(
         {
-          id: "STORAGE_PG_LIST_MESSAGES_INVALID_THREAD_ID",
+          id: createStorageErrorId("PG", "LIST_MESSAGES", "INVALID_THREAD_ID"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { threadId }
+          details: { threadId: Array.isArray(threadId) ? String(threadId) : String(threadId) }
         },
-        new Error("threadId must be a non-empty string")
+        new Error("threadId must be a non-empty string or array of non-empty strings")
       );
     }
     if (page < 0) {
       throw new MastraError({
-        id: "MASTRA_STORAGE_PG_STORE_INVALID_PAGE",
+        id: createStorageErrorId("PG", "LIST_MESSAGES", "INVALID_PAGE"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
         text: "Page number must be non-negative",
         details: {
-          threadId,
+          threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
           page
         }
       });
@@ -2048,9 +2060,10 @@ var MemoryPG = class extends MemoryStorage {
       const orderByStatement = `ORDER BY "${field}" ${direction}`;
       const selectStatement = `SELECT id, content, role, type, "createdAt", "createdAtZ", thread_id AS "threadId", "resourceId"`;
       const tableName = getTableName({ indexName: TABLE_MESSAGES, schemaName: getSchemaName(this.schema) });
-      const conditions = [`thread_id = $1`];
-      const queryParams = [threadId];
-      let paramIndex = 2;
+      const threadPlaceholders = threadIds.map((_, i) => `$${i + 1}`).join(", ");
+      const conditions = [`thread_id IN (${threadPlaceholders})`];
+      const queryParams = [...threadIds];
+      let paramIndex = threadIds.length + 1;
       if (resourceId) {
         conditions.push(`"resourceId" = $${paramIndex++}`);
         queryParams.push(resourceId);
@@ -2082,7 +2095,7 @@ var MemoryPG = class extends MemoryStorage {
       }
       const messageIds = new Set(messages.map((m) => m.id));
       if (include && include.length > 0) {
-        const includeMessages = await this._getIncludedMessages({ threadId, include });
+        const includeMessages = await this._getIncludedMessages({ include });
         if (includeMessages) {
           for (const includeMsg of includeMessages) {
             if (!messageIds.has(includeMsg.id)) {
@@ -2109,7 +2122,10 @@ var MemoryPG = class extends MemoryStorage {
         }
         return direction === "ASC" ? String(aValue).localeCompare(String(bValue)) : String(bValue).localeCompare(String(aValue));
       });
-      const returnedThreadMessageIds = new Set(finalMessages.filter((m) => m.threadId === threadId).map((m) => m.id));
+      const threadIdSet = new Set(threadIds);
+      const returnedThreadMessageIds = new Set(
+        finalMessages.filter((m) => m.threadId && threadIdSet.has(m.threadId)).map((m) => m.id)
+      );
       const allThreadMessagesReturned = returnedThreadMessageIds.size >= total;
       const hasMore = perPageInput !== false && !allThreadMessagesReturned && offset + perPage < total;
       return {
@@ -2122,11 +2138,11 @@ var MemoryPG = class extends MemoryStorage {
     } catch (error) {
       const mastraError = new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_LIST_MESSAGES_FAILED",
+          id: createStorageErrorId("PG", "LIST_MESSAGES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
-            threadId,
+            threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
             resourceId: resourceId ?? ""
           }
         },
@@ -2148,7 +2164,7 @@ var MemoryPG = class extends MemoryStorage {
     const threadId = messages[0]?.threadId;
     if (!threadId) {
       throw new MastraError({
-        id: "MASTRA_STORAGE_PG_STORE_SAVE_MESSAGES_FAILED",
+        id: createStorageErrorId("PG", "SAVE_MESSAGES", "FAILED"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.THIRD_PARTY,
         text: `Thread ID is required`
@@ -2157,7 +2173,7 @@ var MemoryPG = class extends MemoryStorage {
     const thread = await this.getThreadById({ threadId });
     if (!thread) {
       throw new MastraError({
-        id: "MASTRA_STORAGE_PG_STORE_SAVE_MESSAGES_FAILED",
+        id: createStorageErrorId("PG", "SAVE_MESSAGES", "FAILED"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.THIRD_PARTY,
         text: `Thread ${threadId} not found`,
@@ -2228,7 +2244,7 @@ var MemoryPG = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_SAVE_MESSAGES_FAILED",
+          id: createStorageErrorId("PG", "SAVE_MESSAGES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -2357,7 +2373,7 @@ var MemoryPG = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "PG_STORE_DELETE_MESSAGES_FAILED",
+          id: createStorageErrorId("PG", "DELETE_MESSAGES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { messageIds: messageIds.join(", ") }
@@ -2478,7 +2494,7 @@ var ObservabilityPG = class extends ObservabilityStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "PG_STORE_CREATE_SPAN_FAILED",
+          id: createStorageErrorId("PG", "CREATE_SPAN", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
           details: {
@@ -2524,7 +2540,7 @@ var ObservabilityPG = class extends ObservabilityStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "PG_STORE_GET_TRACE_FAILED",
+          id: createStorageErrorId("PG", "GET_TRACE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
           details: {
@@ -2556,7 +2572,7 @@ var ObservabilityPG = class extends ObservabilityStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "PG_STORE_UPDATE_SPAN_FAILED",
+          id: createStorageErrorId("PG", "UPDATE_SPAN", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
           details: {
@@ -2592,7 +2608,7 @@ var ObservabilityPG = class extends ObservabilityStorage {
         name = `agent run: '${entityId}'`;
       } else {
         const error = new MastraError({
-          id: "PG_STORE_GET_TRACES_PAGINATED_FAILED",
+          id: createStorageErrorId("PG", "GET_TRACES_PAGINATED", "INVALID_ENTITY_TYPE"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
           details: {
@@ -2660,7 +2676,7 @@ var ObservabilityPG = class extends ObservabilityStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "PG_STORE_GET_TRACES_PAGINATED_FAILED",
+          id: createStorageErrorId("PG", "GET_TRACES_PAGINATED", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER
         },
@@ -2689,7 +2705,7 @@ var ObservabilityPG = class extends ObservabilityStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "PG_STORE_BATCH_CREATE_SPANS_FAILED",
+          id: createStorageErrorId("PG", "BATCH_CREATE_SPANS", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER
         },
@@ -2724,7 +2740,7 @@ var ObservabilityPG = class extends ObservabilityStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "PG_STORE_BATCH_UPDATE_SPANS_FAILED",
+          id: createStorageErrorId("PG", "BATCH_UPDATE_SPANS", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER
         },
@@ -2743,7 +2759,7 @@ var ObservabilityPG = class extends ObservabilityStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "PG_STORE_BATCH_DELETE_TRACES_FAILED",
+          id: createStorageErrorId("PG", "BATCH_DELETE_TRACES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER
         },
@@ -2873,7 +2889,7 @@ var StoreOperationsPG = class extends StoreOperations {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_INSERT_FAILED",
+          id: createStorageErrorId("PG", "INSERT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -2892,7 +2908,7 @@ var StoreOperationsPG = class extends StoreOperations {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_CLEAR_TABLE_FAILED",
+          id: createStorageErrorId("PG", "CLEAR_TABLE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -2965,7 +2981,7 @@ var StoreOperationsPG = class extends StoreOperations {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_CREATE_TABLE_FAILED",
+          id: createStorageErrorId("PG", "CREATE_TABLE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -3052,7 +3068,7 @@ var StoreOperationsPG = class extends StoreOperations {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_ALTER_TABLE_FAILED",
+          id: createStorageErrorId("PG", "ALTER_TABLE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -3086,7 +3102,7 @@ var StoreOperationsPG = class extends StoreOperations {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_LOAD_FAILED",
+          id: createStorageErrorId("PG", "LOAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -3108,7 +3124,7 @@ var StoreOperationsPG = class extends StoreOperations {
       await this.client.query("ROLLBACK");
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_BATCH_INSERT_FAILED",
+          id: createStorageErrorId("PG", "BATCH_INSERT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -3128,7 +3144,7 @@ var StoreOperationsPG = class extends StoreOperations {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_DROP_TABLE_FAILED",
+          id: createStorageErrorId("PG", "DROP_TABLE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -3201,7 +3217,7 @@ var StoreOperationsPG = class extends StoreOperations {
       }
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_INDEX_CREATE_FAILED",
+          id: createStorageErrorId("PG", "INDEX_CREATE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -3233,7 +3249,7 @@ var StoreOperationsPG = class extends StoreOperations {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_INDEX_DROP_FAILED",
+          id: createStorageErrorId("PG", "INDEX_DROP", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -3309,7 +3325,7 @@ var StoreOperationsPG = class extends StoreOperations {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_INDEX_LIST_FAILED",
+          id: createStorageErrorId("PG", "INDEX_LIST", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: tableName ? {
@@ -3391,7 +3407,7 @@ var StoreOperationsPG = class extends StoreOperations {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_CREATE_PERFORMANCE_INDEXES_FAILED",
+          id: createStorageErrorId("PG", "CREATE_AUTOMATIC_INDEXES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY
         },
@@ -3453,7 +3469,7 @@ var StoreOperationsPG = class extends StoreOperations {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_INDEX_DESCRIBE_FAILED",
+          id: createStorageErrorId("PG", "INDEX_DESCRIBE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -3498,7 +3514,7 @@ var StoreOperationsPG = class extends StoreOperations {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_UPDATE_FAILED",
+          id: createStorageErrorId("PG", "UPDATE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -3526,7 +3542,7 @@ var StoreOperationsPG = class extends StoreOperations {
       await this.client.query("ROLLBACK");
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_BATCH_UPDATE_FAILED",
+          id: createStorageErrorId("PG", "BATCH_UPDATE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -3567,7 +3583,7 @@ var StoreOperationsPG = class extends StoreOperations {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_BATCH_DELETE_FAILED",
+          id: createStorageErrorId("PG", "BATCH_DELETE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -3581,20 +3597,12 @@ var StoreOperationsPG = class extends StoreOperations {
   }
 };
 function transformScoreRow(row) {
-  return {
-    ...row,
-    input: safelyParseJSON(row.input),
-    scorer: safelyParseJSON(row.scorer),
-    preprocessStepResult: safelyParseJSON(row.preprocessStepResult),
-    analyzeStepResult: safelyParseJSON(row.analyzeStepResult),
-    metadata: safelyParseJSON(row.metadata),
-    output: safelyParseJSON(row.output),
-    additionalContext: safelyParseJSON(row.additionalContext),
-    requestContext: safelyParseJSON(row.requestContext),
-    entity: safelyParseJSON(row.entity),
-    createdAt: row.createdAtZ || row.createdAt,
-    updatedAt: row.updatedAtZ || row.updatedAt
-  };
+  return transformScoreRow$1(row, {
+    preferredTimestampFields: {
+      createdAt: "createdAtZ",
+      updatedAt: "updatedAtZ"
+    }
+  });
 }
 var ScoresPG = class extends ScoresStorage {
   client;
@@ -3620,7 +3628,7 @@ var ScoresPG = class extends ScoresStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_GET_SCORE_BY_ID_FAILED",
+          id: createStorageErrorId("PG", "GET_SCORE_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY
         },
@@ -3688,7 +3696,7 @@ var ScoresPG = class extends ScoresStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_GET_SCORES_BY_SCORER_ID_FAILED",
+          id: createStorageErrorId("PG", "GET_SCORES_BY_SCORER_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY
         },
@@ -3703,7 +3711,7 @@ var ScoresPG = class extends ScoresStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_SAVE_SCORE_FAILED_INVALID_SCORE_PAYLOAD",
+          id: createStorageErrorId("PG", "SAVE_SCORE", "INVALID_PAYLOAD"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
           details: {
@@ -3741,8 +3749,6 @@ var ScoresPG = class extends ScoresStorage {
           scorer: scorer ? JSON.stringify(scorer) : null,
           preprocessStepResult: preprocessStepResult ? JSON.stringify(preprocessStepResult) : null,
           analyzeStepResult: analyzeStepResult ? JSON.stringify(analyzeStepResult) : null,
-          metadata: metadata ? JSON.stringify(metadata) : null,
-          additionalContext: additionalContext ? JSON.stringify(additionalContext) : null,
           requestContext: requestContext ? JSON.stringify(requestContext) : null,
           entity: entity ? JSON.stringify(entity) : null,
           createdAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -3754,7 +3760,7 @@ var ScoresPG = class extends ScoresStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_SAVE_SCORE_FAILED",
+          id: createStorageErrorId("PG", "SAVE_SCORE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY
         },
@@ -3803,7 +3809,7 @@ var ScoresPG = class extends ScoresStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_GET_SCORES_BY_RUN_ID_FAILED",
+          id: createStorageErrorId("PG", "GET_SCORES_BY_RUN_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY
         },
@@ -3853,7 +3859,7 @@ var ScoresPG = class extends ScoresStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_GET_SCORES_BY_ENTITY_ID_FAILED",
+          id: createStorageErrorId("PG", "GET_SCORES_BY_ENTITY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY
         },
@@ -3896,7 +3902,7 @@ var ScoresPG = class extends ScoresStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_GET_SCORES_BY_SPAN_FAILED",
+          id: createStorageErrorId("PG", "GET_SCORES_BY_SPAN", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY
         },
@@ -3971,7 +3977,7 @@ var WorkflowsPG = class extends WorkflowsStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_PERSIST_WORKFLOW_SNAPSHOT_FAILED",
+          id: createStorageErrorId("PG", "PERSIST_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY
         },
@@ -3992,7 +3998,7 @@ var WorkflowsPG = class extends WorkflowsStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_LOAD_WORKFLOW_SNAPSHOT_FAILED",
+          id: createStorageErrorId("PG", "LOAD_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY
         },
@@ -4033,7 +4039,7 @@ var WorkflowsPG = class extends WorkflowsStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_GET_WORKFLOW_RUN_BY_ID_FAILED",
+          id: createStorageErrorId("PG", "GET_WORKFLOW_RUN_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -4115,7 +4121,7 @@ var WorkflowsPG = class extends WorkflowsStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_LIST_WORKFLOW_RUNS_FAILED",
+          id: createStorageErrorId("PG", "LIST_WORKFLOW_RUNS", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -4139,7 +4145,7 @@ var PostgresStore = class extends MastraStorage {
   constructor(config) {
     try {
       validateConfig("PostgresStore", config);
-      super({ id: config.id, name: "PostgresStore" });
+      super({ id: config.id, name: "PostgresStore", disableInit: config.disableInit });
       this.schema = config.schemaName || "public";
       if (isConnectionStringConfig(config)) {
         this.#config = {
@@ -4177,7 +4183,7 @@ var PostgresStore = class extends MastraStorage {
     } catch (e) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_INITIALIZATION_FAILED",
+          id: createStorageErrorId("PG", "INITIALIZATION", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER
         },
@@ -4215,7 +4221,7 @@ var PostgresStore = class extends MastraStorage {
       this.isConnected = false;
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_POSTGRES_STORE_INIT_FAILED",
+          id: createStorageErrorId("PG", "INIT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY
         },
@@ -4372,7 +4378,7 @@ var PostgresStore = class extends MastraStorage {
   async createSpan(span) {
     if (!this.stores.observability) {
       throw new MastraError({
-        id: "PG_STORE_OBSERVABILITY_NOT_INITIALIZED",
+        id: createStorageErrorId("PG", "OBSERVABILITY", "NOT_INITIALIZED"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.SYSTEM,
         text: "Observability storage is not initialized"
@@ -4387,7 +4393,7 @@ var PostgresStore = class extends MastraStorage {
   }) {
     if (!this.stores.observability) {
       throw new MastraError({
-        id: "PG_STORE_OBSERVABILITY_NOT_INITIALIZED",
+        id: createStorageErrorId("PG", "OBSERVABILITY", "NOT_INITIALIZED"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.SYSTEM,
         text: "Observability storage is not initialized"
@@ -4398,7 +4404,7 @@ var PostgresStore = class extends MastraStorage {
   async getTrace(traceId) {
     if (!this.stores.observability) {
       throw new MastraError({
-        id: "PG_STORE_OBSERVABILITY_NOT_INITIALIZED",
+        id: createStorageErrorId("PG", "OBSERVABILITY", "NOT_INITIALIZED"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.SYSTEM,
         text: "Observability storage is not initialized"
@@ -4409,7 +4415,7 @@ var PostgresStore = class extends MastraStorage {
   async getTracesPaginated(args) {
     if (!this.stores.observability) {
       throw new MastraError({
-        id: "PG_STORE_OBSERVABILITY_NOT_INITIALIZED",
+        id: createStorageErrorId("PG", "OBSERVABILITY", "NOT_INITIALIZED"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.SYSTEM,
         text: "Observability storage is not initialized"
@@ -4420,7 +4426,7 @@ var PostgresStore = class extends MastraStorage {
   async batchCreateSpans(args) {
     if (!this.stores.observability) {
       throw new MastraError({
-        id: "PG_STORE_OBSERVABILITY_NOT_INITIALIZED",
+        id: createStorageErrorId("PG", "OBSERVABILITY", "NOT_INITIALIZED"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.SYSTEM,
         text: "Observability storage is not initialized"
@@ -4431,7 +4437,7 @@ var PostgresStore = class extends MastraStorage {
   async batchUpdateSpans(args) {
     if (!this.stores.observability) {
       throw new MastraError({
-        id: "PG_STORE_OBSERVABILITY_NOT_INITIALIZED",
+        id: createStorageErrorId("PG", "OBSERVABILITY", "NOT_INITIALIZED"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.SYSTEM,
         text: "Observability storage is not initialized"
@@ -4442,7 +4448,7 @@ var PostgresStore = class extends MastraStorage {
   async batchDeleteTraces(args) {
     if (!this.stores.observability) {
       throw new MastraError({
-        id: "PG_STORE_OBSERVABILITY_NOT_INITIALIZED",
+        id: createStorageErrorId("PG", "OBSERVABILITY", "NOT_INITIALIZED"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.SYSTEM,
         text: "Observability storage is not initialized"