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

package/dist/index.cjs

@@ -1,13 +1,13 @@
 'use strict';
 
 var error = require('@mastra/core/error');
+var storage = require('@mastra/core/storage');
 var utils = require('@mastra/core/utils');
 var vector = require('@mastra/core/vector');
 var asyncMutex = require('async-mutex');
 var pg = require('pg');
 var xxhash = require('xxhash-wasm');
 var filter = require('@mastra/core/vector/filter');
-var storage = require('@mastra/core/storage');
 var pgPromise = require('pg-promise');
 var agent = require('@mastra/core/agent');
 var evals = require('@mastra/core/evals');
@@ -576,7 +576,7 @@ var PgVector = class extends vector.MastraVector {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_INITIALIZATION_FAILED",
+          id: storage.createVectorErrorId("PG", "INITIALIZATION", "FAILED"),
           domain: error.ErrorDomain.MASTRA_VECTOR,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -622,9 +622,6 @@ var PgVector = class extends vector.MastraVector {
       if (this.vectorExtensionSchema === "pg_catalog") {
         return "vector";
       }
-      if (this.vectorExtensionSchema === (this.schema || "public")) {
-        return "vector";
-      }
       const validatedSchema = utils.parseSqlIdentifier(this.vectorExtensionSchema, "vector extension schema");
       return `${validatedSchema}.vector`;
     }
@@ -673,7 +670,7 @@ var PgVector = class extends vector.MastraVector {
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_QUERY_INVALID_INPUT",
+          id: storage.createVectorErrorId("PG", "QUERY", "INVALID_INPUT"),
           domain: error.ErrorDomain.MASTRA_VECTOR,
           category: error.ErrorCategory.USER,
           details: {
@@ -729,7 +726,7 @@ var PgVector = class extends vector.MastraVector {
       await client.query("ROLLBACK");
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_QUERY_FAILED",
+          id: storage.createVectorErrorId("PG", "QUERY", "FAILED"),
           domain: error.ErrorDomain.MASTRA_VECTOR,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -798,7 +795,7 @@ var PgVector = class extends vector.MastraVector {
           const [, expected, actual] = match;
           const mastraError2 = new error.MastraError(
             {
-              id: "MASTRA_STORAGE_PG_VECTOR_UPSERT_INVALID_INPUT",
+              id: storage.createVectorErrorId("PG", "UPSERT", "INVALID_INPUT"),
               domain: error.ErrorDomain.MASTRA_VECTOR,
               category: error.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.`,
@@ -816,7 +813,7 @@ var PgVector = class extends vector.MastraVector {
       }
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_UPSERT_FAILED",
+          id: storage.createVectorErrorId("PG", "UPSERT", "FAILED"),
           domain: error.ErrorDomain.MASTRA_VECTOR,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -904,7 +901,7 @@ var PgVector = class extends vector.MastraVector {
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_CREATE_INDEX_INVALID_INPUT",
+          id: storage.createVectorErrorId("PG", "CREATE_INDEX", "INVALID_INPUT"),
           domain: error.ErrorDomain.MASTRA_VECTOR,
           category: error.ErrorCategory.USER,
           details: {
@@ -954,7 +951,7 @@ var PgVector = class extends vector.MastraVector {
     }).catch((error$1) => {
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_CREATE_INDEX_FAILED",
+          id: storage.createVectorErrorId("PG", "CREATE_INDEX", "FAILED"),
           domain: error.ErrorDomain.MASTRA_VECTOR,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -974,7 +971,7 @@ var PgVector = class extends vector.MastraVector {
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_BUILD_INDEX_FAILED",
+          id: storage.createVectorErrorId("PG", "BUILD_INDEX", "FAILED"),
           domain: error.ErrorDomain.MASTRA_VECTOR,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1174,7 +1171,7 @@ var PgVector = class extends vector.MastraVector {
     } catch (e) {
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_LIST_INDEXES_FAILED",
+          id: storage.createVectorErrorId("PG", "LIST_INDEXES", "FAILED"),
           domain: error.ErrorDomain.MASTRA_VECTOR,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -1263,7 +1260,7 @@ var PgVector = class extends vector.MastraVector {
       await client.query("ROLLBACK");
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_DESCRIBE_INDEX_FAILED",
+          id: storage.createVectorErrorId("PG", "DESCRIBE_INDEX", "FAILED"),
           domain: error.ErrorDomain.MASTRA_VECTOR,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1288,7 +1285,7 @@ var PgVector = class extends vector.MastraVector {
       await client.query("ROLLBACK");
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_DELETE_INDEX_FAILED",
+          id: storage.createVectorErrorId("PG", "DELETE_INDEX", "FAILED"),
           domain: error.ErrorDomain.MASTRA_VECTOR,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1312,7 +1309,7 @@ var PgVector = class extends vector.MastraVector {
       await client.query("ROLLBACK");
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_TRUNCATE_INDEX_FAILED",
+          id: storage.createVectorErrorId("PG", "TRUNCATE_INDEX", "FAILED"),
           domain: error.ErrorDomain.MASTRA_VECTOR,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1354,7 +1351,7 @@ var PgVector = class extends vector.MastraVector {
       }
       if (!id && !filter) {
         throw new error.MastraError({
-          id: "MASTRA_STORAGE_PG_VECTOR_UPDATE_MISSING_PARAMS",
+          id: storage.createVectorErrorId("PG", "UPDATE_VECTOR", "NO_TARGET"),
           text: "Either id or filter must be provided",
           domain: error.ErrorDomain.MASTRA_VECTOR,
           category: error.ErrorCategory.USER,
@@ -1363,7 +1360,7 @@ var PgVector = class extends vector.MastraVector {
       }
       if (id && filter) {
         throw new error.MastraError({
-          id: "MASTRA_STORAGE_PG_VECTOR_UPDATE_CONFLICTING_PARAMS",
+          id: storage.createVectorErrorId("PG", "UPDATE_VECTOR", "MUTUALLY_EXCLUSIVE"),
           text: "Cannot provide both id and filter - they are mutually exclusive",
           domain: error.ErrorDomain.MASTRA_VECTOR,
           category: error.ErrorCategory.USER,
@@ -1397,7 +1394,7 @@ var PgVector = class extends vector.MastraVector {
       } else {
         if (!filter || Object.keys(filter).length === 0) {
           throw new error.MastraError({
-            id: "MASTRA_STORAGE_PG_VECTOR_UPDATE_EMPTY_FILTER",
+            id: storage.createVectorErrorId("PG", "UPDATE_VECTOR", "EMPTY_FILTER"),
             text: "Cannot update with empty filter",
             domain: error.ErrorDomain.MASTRA_VECTOR,
             category: error.ErrorCategory.USER,
@@ -1409,7 +1406,7 @@ var PgVector = class extends vector.MastraVector {
         whereClause = filterQuery.trim().replace(/^WHERE\s+/i, "");
         if (!whereClause) {
           throw new error.MastraError({
-            id: "MASTRA_STORAGE_PG_VECTOR_UPDATE_INVALID_FILTER",
+            id: storage.createVectorErrorId("PG", "UPDATE_VECTOR", "INVALID_FILTER"),
             text: "Filter produced empty WHERE clause",
             domain: error.ErrorDomain.MASTRA_VECTOR,
             category: error.ErrorCategory.USER,
@@ -1440,7 +1437,7 @@ var PgVector = class extends vector.MastraVector {
       }
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_UPDATE_VECTOR_FAILED",
+          id: storage.createVectorErrorId("PG", "UPDATE_VECTOR", "FAILED"),
           domain: error.ErrorDomain.MASTRA_VECTOR,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1477,7 +1474,7 @@ var PgVector = class extends vector.MastraVector {
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_DELETE_VECTOR_FAILED",
+          id: storage.createVectorErrorId("PG", "DELETE_VECTOR", "FAILED"),
           domain: error.ErrorDomain.MASTRA_VECTOR,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1507,7 +1504,7 @@ var PgVector = class extends vector.MastraVector {
       const { tableName } = this.getTableName(indexName);
       if (!filter && !ids) {
         throw new error.MastraError({
-          id: "MASTRA_STORAGE_PG_VECTOR_DELETE_MISSING_PARAMS",
+          id: storage.createVectorErrorId("PG", "DELETE_VECTORS", "NO_TARGET"),
           text: "Either filter or ids must be provided",
           domain: error.ErrorDomain.MASTRA_VECTOR,
           category: error.ErrorCategory.USER,
@@ -1516,7 +1513,7 @@ var PgVector = class extends vector.MastraVector {
       }
       if (filter && ids) {
         throw new error.MastraError({
-          id: "MASTRA_STORAGE_PG_VECTOR_DELETE_CONFLICTING_PARAMS",
+          id: storage.createVectorErrorId("PG", "DELETE_VECTORS", "MUTUALLY_EXCLUSIVE"),
           text: "Cannot provide both filter and ids - they are mutually exclusive",
           domain: error.ErrorDomain.MASTRA_VECTOR,
           category: error.ErrorCategory.USER,
@@ -1528,7 +1525,7 @@ var PgVector = class extends vector.MastraVector {
       if (ids) {
         if (ids.length === 0) {
           throw new error.MastraError({
-            id: "MASTRA_STORAGE_PG_VECTOR_DELETE_EMPTY_IDS",
+            id: storage.createVectorErrorId("PG", "DELETE_VECTORS", "EMPTY_IDS"),
             text: "Cannot delete with empty ids array",
             domain: error.ErrorDomain.MASTRA_VECTOR,
             category: error.ErrorCategory.USER,
@@ -1541,7 +1538,7 @@ var PgVector = class extends vector.MastraVector {
       } else {
         if (!filter || Object.keys(filter).length === 0) {
           throw new error.MastraError({
-            id: "MASTRA_STORAGE_PG_VECTOR_DELETE_EMPTY_FILTER",
+            id: storage.createVectorErrorId("PG", "DELETE_VECTORS", "EMPTY_FILTER"),
             text: "Cannot delete with empty filter. Use deleteIndex to delete all vectors.",
             domain: error.ErrorDomain.MASTRA_VECTOR,
             category: error.ErrorCategory.USER,
@@ -1553,7 +1550,7 @@ var PgVector = class extends vector.MastraVector {
         const whereClause = filterQuery.trim().replace(/^WHERE\s+/i, "");
         if (!whereClause) {
           throw new error.MastraError({
-            id: "MASTRA_STORAGE_PG_VECTOR_DELETE_INVALID_FILTER",
+            id: storage.createVectorErrorId("PG", "DELETE_VECTORS", "INVALID_FILTER"),
             text: "Filter produced empty WHERE clause",
             domain: error.ErrorDomain.MASTRA_VECTOR,
             category: error.ErrorCategory.USER,
@@ -1576,7 +1573,7 @@ var PgVector = class extends vector.MastraVector {
       }
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_VECTOR_DELETE_VECTORS_FAILED",
+          id: storage.createVectorErrorId("PG", "DELETE_VECTORS", "FAILED"),
           domain: error.ErrorDomain.MASTRA_VECTOR,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1716,7 +1713,7 @@ var MemoryPG = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_GET_THREAD_BY_ID_FAILED",
+          id: storage.createStorageErrorId("PG", "GET_THREAD_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1731,7 +1728,7 @@ var MemoryPG = class extends storage.MemoryStorage {
     const { resourceId, page = 0, perPage: perPageInput, orderBy } = args;
     if (page < 0) {
       throw new error.MastraError({
-        id: "MASTRA_STORAGE_PG_STORE_INVALID_PAGE",
+        id: storage.createStorageErrorId("PG", "LIST_THREADS_BY_RESOURCE_ID", "INVALID_PAGE"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.USER,
         text: "Page number must be non-negative",
@@ -1780,7 +1777,7 @@ var MemoryPG = class extends storage.MemoryStorage {
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_LIST_THREADS_BY_RESOURCE_ID_FAILED",
+          id: storage.createStorageErrorId("PG", "LIST_THREADS_BY_RESOURCE_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1838,7 +1835,7 @@ var MemoryPG = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_SAVE_THREAD_FAILED",
+          id: storage.createStorageErrorId("PG", "SAVE_THREAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1858,7 +1855,7 @@ var MemoryPG = class extends storage.MemoryStorage {
     const existingThread = await this.getThreadById({ threadId: id });
     if (!existingThread) {
       throw new error.MastraError({
-        id: "MASTRA_STORAGE_PG_STORE_UPDATE_THREAD_FAILED",
+        id: storage.createStorageErrorId("PG", "UPDATE_THREAD", "FAILED"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.USER,
         text: `Thread ${id} not found`,
@@ -1896,7 +1893,7 @@ var MemoryPG = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_UPDATE_THREAD_FAILED",
+          id: storage.createStorageErrorId("PG", "UPDATE_THREAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1914,12 +1911,26 @@ var MemoryPG = class extends storage.MemoryStorage {
       const threadTableName = getTableName({ indexName: storage.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$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_DELETE_THREAD_FAILED",
+          id: storage.createStorageErrorId("PG", "DELETE_THREAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1930,28 +1941,26 @@ var MemoryPG = class extends storage.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: storage.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,
@@ -1963,24 +1972,24 @@ var MemoryPG = class extends storage.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);
@@ -2028,7 +2037,7 @@ var MemoryPG = class extends storage.MemoryStorage {
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_LIST_MESSAGES_BY_ID_FAILED",
+          id: storage.createStorageErrorId("PG", "LIST_MESSAGES_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -2044,25 +2053,28 @@ var MemoryPG = class extends storage.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 error.MastraError(
         {
-          id: "STORAGE_PG_LIST_MESSAGES_INVALID_THREAD_ID",
+          id: storage.createStorageErrorId("PG", "LIST_MESSAGES", "INVALID_THREAD_ID"),
           domain: error.ErrorDomain.STORAGE,
           category: error.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 error.MastraError({
-        id: "MASTRA_STORAGE_PG_STORE_INVALID_PAGE",
+        id: storage.createStorageErrorId("PG", "LIST_MESSAGES", "INVALID_PAGE"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.USER,
         text: "Page number must be non-negative",
         details: {
-          threadId,
+          threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
           page
         }
       });
@@ -2074,9 +2086,10 @@ var MemoryPG = class extends storage.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: storage.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);
@@ -2108,7 +2121,7 @@ var MemoryPG = class extends storage.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)) {
@@ -2135,7 +2148,10 @@ var MemoryPG = class extends storage.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 {
@@ -2148,11 +2164,11 @@ var MemoryPG = class extends storage.MemoryStorage {
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_LIST_MESSAGES_FAILED",
+          id: storage.createStorageErrorId("PG", "LIST_MESSAGES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
-            threadId,
+            threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
             resourceId: resourceId ?? ""
           }
         },
@@ -2174,7 +2190,7 @@ var MemoryPG = class extends storage.MemoryStorage {
     const threadId = messages[0]?.threadId;
     if (!threadId) {
       throw new error.MastraError({
-        id: "MASTRA_STORAGE_PG_STORE_SAVE_MESSAGES_FAILED",
+        id: storage.createStorageErrorId("PG", "SAVE_MESSAGES", "FAILED"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.THIRD_PARTY,
         text: `Thread ID is required`
@@ -2183,7 +2199,7 @@ var MemoryPG = class extends storage.MemoryStorage {
     const thread = await this.getThreadById({ threadId });
     if (!thread) {
       throw new error.MastraError({
-        id: "MASTRA_STORAGE_PG_STORE_SAVE_MESSAGES_FAILED",
+        id: storage.createStorageErrorId("PG", "SAVE_MESSAGES", "FAILED"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.THIRD_PARTY,
         text: `Thread ${threadId} not found`,
@@ -2254,7 +2270,7 @@ var MemoryPG = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_SAVE_MESSAGES_FAILED",
+          id: storage.createStorageErrorId("PG", "SAVE_MESSAGES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -2383,7 +2399,7 @@ var MemoryPG = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "PG_STORE_DELETE_MESSAGES_FAILED",
+          id: storage.createStorageErrorId("PG", "DELETE_MESSAGES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { messageIds: messageIds.join(", ") }
@@ -2504,7 +2520,7 @@ var ObservabilityPG = class extends storage.ObservabilityStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "PG_STORE_CREATE_SPAN_FAILED",
+          id: storage.createStorageErrorId("PG", "CREATE_SPAN", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: {
@@ -2550,7 +2566,7 @@ var ObservabilityPG = class extends storage.ObservabilityStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "PG_STORE_GET_TRACE_FAILED",
+          id: storage.createStorageErrorId("PG", "GET_TRACE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: {
@@ -2582,7 +2598,7 @@ var ObservabilityPG = class extends storage.ObservabilityStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "PG_STORE_UPDATE_SPAN_FAILED",
+          id: storage.createStorageErrorId("PG", "UPDATE_SPAN", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: {
@@ -2618,7 +2634,7 @@ var ObservabilityPG = class extends storage.ObservabilityStorage {
         name = `agent run: '${entityId}'`;
       } else {
         const error$1 = new error.MastraError({
-          id: "PG_STORE_GET_TRACES_PAGINATED_FAILED",
+          id: storage.createStorageErrorId("PG", "GET_TRACES_PAGINATED", "INVALID_ENTITY_TYPE"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: {
@@ -2686,7 +2702,7 @@ var ObservabilityPG = class extends storage.ObservabilityStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "PG_STORE_GET_TRACES_PAGINATED_FAILED",
+          id: storage.createStorageErrorId("PG", "GET_TRACES_PAGINATED", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER
         },
@@ -2715,7 +2731,7 @@ var ObservabilityPG = class extends storage.ObservabilityStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "PG_STORE_BATCH_CREATE_SPANS_FAILED",
+          id: storage.createStorageErrorId("PG", "BATCH_CREATE_SPANS", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER
         },
@@ -2750,7 +2766,7 @@ var ObservabilityPG = class extends storage.ObservabilityStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "PG_STORE_BATCH_UPDATE_SPANS_FAILED",
+          id: storage.createStorageErrorId("PG", "BATCH_UPDATE_SPANS", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER
         },
@@ -2769,7 +2785,7 @@ var ObservabilityPG = class extends storage.ObservabilityStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "PG_STORE_BATCH_DELETE_TRACES_FAILED",
+          id: storage.createStorageErrorId("PG", "BATCH_DELETE_TRACES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER
         },
@@ -2899,7 +2915,7 @@ var StoreOperationsPG = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_INSERT_FAILED",
+          id: storage.createStorageErrorId("PG", "INSERT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -2918,7 +2934,7 @@ var StoreOperationsPG = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_CLEAR_TABLE_FAILED",
+          id: storage.createStorageErrorId("PG", "CLEAR_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -2991,7 +3007,7 @@ var StoreOperationsPG = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_CREATE_TABLE_FAILED",
+          id: storage.createStorageErrorId("PG", "CREATE_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -3078,7 +3094,7 @@ var StoreOperationsPG = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_ALTER_TABLE_FAILED",
+          id: storage.createStorageErrorId("PG", "ALTER_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -3112,7 +3128,7 @@ var StoreOperationsPG = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_LOAD_FAILED",
+          id: storage.createStorageErrorId("PG", "LOAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -3134,7 +3150,7 @@ var StoreOperationsPG = class extends storage.StoreOperations {
       await this.client.query("ROLLBACK");
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_BATCH_INSERT_FAILED",
+          id: storage.createStorageErrorId("PG", "BATCH_INSERT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -3154,7 +3170,7 @@ var StoreOperationsPG = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_DROP_TABLE_FAILED",
+          id: storage.createStorageErrorId("PG", "DROP_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -3227,7 +3243,7 @@ var StoreOperationsPG = class extends storage.StoreOperations {
       }
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_INDEX_CREATE_FAILED",
+          id: storage.createStorageErrorId("PG", "INDEX_CREATE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -3259,7 +3275,7 @@ var StoreOperationsPG = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_INDEX_DROP_FAILED",
+          id: storage.createStorageErrorId("PG", "INDEX_DROP", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -3335,7 +3351,7 @@ var StoreOperationsPG = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_INDEX_LIST_FAILED",
+          id: storage.createStorageErrorId("PG", "INDEX_LIST", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: tableName ? {
@@ -3417,7 +3433,7 @@ var StoreOperationsPG = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_CREATE_PERFORMANCE_INDEXES_FAILED",
+          id: storage.createStorageErrorId("PG", "CREATE_AUTOMATIC_INDEXES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -3479,7 +3495,7 @@ var StoreOperationsPG = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_INDEX_DESCRIBE_FAILED",
+          id: storage.createStorageErrorId("PG", "INDEX_DESCRIBE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -3524,7 +3540,7 @@ var StoreOperationsPG = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_UPDATE_FAILED",
+          id: storage.createStorageErrorId("PG", "UPDATE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -3552,7 +3568,7 @@ var StoreOperationsPG = class extends storage.StoreOperations {
       await this.client.query("ROLLBACK");
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_BATCH_UPDATE_FAILED",
+          id: storage.createStorageErrorId("PG", "BATCH_UPDATE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -3593,7 +3609,7 @@ var StoreOperationsPG = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_BATCH_DELETE_FAILED",
+          id: storage.createStorageErrorId("PG", "BATCH_DELETE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -3607,20 +3623,12 @@ var StoreOperationsPG = class extends storage.StoreOperations {
   }
 };
 function transformScoreRow(row) {
-  return {
-    ...row,
-    input: storage.safelyParseJSON(row.input),
-    scorer: storage.safelyParseJSON(row.scorer),
-    preprocessStepResult: storage.safelyParseJSON(row.preprocessStepResult),
-    analyzeStepResult: storage.safelyParseJSON(row.analyzeStepResult),
-    metadata: storage.safelyParseJSON(row.metadata),
-    output: storage.safelyParseJSON(row.output),
-    additionalContext: storage.safelyParseJSON(row.additionalContext),
-    requestContext: storage.safelyParseJSON(row.requestContext),
-    entity: storage.safelyParseJSON(row.entity),
-    createdAt: row.createdAtZ || row.createdAt,
-    updatedAt: row.updatedAtZ || row.updatedAt
-  };
+  return storage.transformScoreRow(row, {
+    preferredTimestampFields: {
+      createdAt: "createdAtZ",
+      updatedAt: "updatedAtZ"
+    }
+  });
 }
 var ScoresPG = class extends storage.ScoresStorage {
   client;
@@ -3646,7 +3654,7 @@ var ScoresPG = class extends storage.ScoresStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_GET_SCORE_BY_ID_FAILED",
+          id: storage.createStorageErrorId("PG", "GET_SCORE_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -3714,7 +3722,7 @@ var ScoresPG = class extends storage.ScoresStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_GET_SCORES_BY_SCORER_ID_FAILED",
+          id: storage.createStorageErrorId("PG", "GET_SCORES_BY_SCORER_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -3729,7 +3737,7 @@ var ScoresPG = class extends storage.ScoresStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_SAVE_SCORE_FAILED_INVALID_SCORE_PAYLOAD",
+          id: storage.createStorageErrorId("PG", "SAVE_SCORE", "INVALID_PAYLOAD"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: {
@@ -3767,8 +3775,6 @@ var ScoresPG = class extends storage.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(),
@@ -3780,7 +3786,7 @@ var ScoresPG = class extends storage.ScoresStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_SAVE_SCORE_FAILED",
+          id: storage.createStorageErrorId("PG", "SAVE_SCORE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -3829,7 +3835,7 @@ var ScoresPG = class extends storage.ScoresStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_GET_SCORES_BY_RUN_ID_FAILED",
+          id: storage.createStorageErrorId("PG", "GET_SCORES_BY_RUN_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -3879,7 +3885,7 @@ var ScoresPG = class extends storage.ScoresStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_GET_SCORES_BY_ENTITY_ID_FAILED",
+          id: storage.createStorageErrorId("PG", "GET_SCORES_BY_ENTITY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -3922,7 +3928,7 @@ var ScoresPG = class extends storage.ScoresStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_GET_SCORES_BY_SPAN_FAILED",
+          id: storage.createStorageErrorId("PG", "GET_SCORES_BY_SPAN", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -3997,7 +4003,7 @@ var WorkflowsPG = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_PERSIST_WORKFLOW_SNAPSHOT_FAILED",
+          id: storage.createStorageErrorId("PG", "PERSIST_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -4018,7 +4024,7 @@ var WorkflowsPG = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_LOAD_WORKFLOW_SNAPSHOT_FAILED",
+          id: storage.createStorageErrorId("PG", "LOAD_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -4059,7 +4065,7 @@ var WorkflowsPG = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_GET_WORKFLOW_RUN_BY_ID_FAILED",
+          id: storage.createStorageErrorId("PG", "GET_WORKFLOW_RUN_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -4141,7 +4147,7 @@ var WorkflowsPG = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_LIST_WORKFLOW_RUNS_FAILED",
+          id: storage.createStorageErrorId("PG", "LIST_WORKFLOW_RUNS", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -4165,7 +4171,7 @@ var PostgresStore = class extends storage.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 = {
@@ -4203,7 +4209,7 @@ var PostgresStore = class extends storage.MastraStorage {
     } catch (e) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_INITIALIZATION_FAILED",
+          id: storage.createStorageErrorId("PG", "INITIALIZATION", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER
         },
@@ -4241,7 +4247,7 @@ var PostgresStore = class extends storage.MastraStorage {
       this.isConnected = false;
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_POSTGRES_STORE_INIT_FAILED",
+          id: storage.createStorageErrorId("PG", "INIT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -4398,7 +4404,7 @@ var PostgresStore = class extends storage.MastraStorage {
   async createSpan(span) {
     if (!this.stores.observability) {
       throw new error.MastraError({
-        id: "PG_STORE_OBSERVABILITY_NOT_INITIALIZED",
+        id: storage.createStorageErrorId("PG", "OBSERVABILITY", "NOT_INITIALIZED"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.SYSTEM,
         text: "Observability storage is not initialized"
@@ -4413,7 +4419,7 @@ var PostgresStore = class extends storage.MastraStorage {
   }) {
     if (!this.stores.observability) {
       throw new error.MastraError({
-        id: "PG_STORE_OBSERVABILITY_NOT_INITIALIZED",
+        id: storage.createStorageErrorId("PG", "OBSERVABILITY", "NOT_INITIALIZED"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.SYSTEM,
         text: "Observability storage is not initialized"
@@ -4424,7 +4430,7 @@ var PostgresStore = class extends storage.MastraStorage {
   async getTrace(traceId) {
     if (!this.stores.observability) {
       throw new error.MastraError({
-        id: "PG_STORE_OBSERVABILITY_NOT_INITIALIZED",
+        id: storage.createStorageErrorId("PG", "OBSERVABILITY", "NOT_INITIALIZED"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.SYSTEM,
         text: "Observability storage is not initialized"
@@ -4435,7 +4441,7 @@ var PostgresStore = class extends storage.MastraStorage {
   async getTracesPaginated(args) {
     if (!this.stores.observability) {
       throw new error.MastraError({
-        id: "PG_STORE_OBSERVABILITY_NOT_INITIALIZED",
+        id: storage.createStorageErrorId("PG", "OBSERVABILITY", "NOT_INITIALIZED"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.SYSTEM,
         text: "Observability storage is not initialized"
@@ -4446,7 +4452,7 @@ var PostgresStore = class extends storage.MastraStorage {
   async batchCreateSpans(args) {
     if (!this.stores.observability) {
       throw new error.MastraError({
-        id: "PG_STORE_OBSERVABILITY_NOT_INITIALIZED",
+        id: storage.createStorageErrorId("PG", "OBSERVABILITY", "NOT_INITIALIZED"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.SYSTEM,
         text: "Observability storage is not initialized"
@@ -4457,7 +4463,7 @@ var PostgresStore = class extends storage.MastraStorage {
   async batchUpdateSpans(args) {
     if (!this.stores.observability) {
       throw new error.MastraError({
-        id: "PG_STORE_OBSERVABILITY_NOT_INITIALIZED",
+        id: storage.createStorageErrorId("PG", "OBSERVABILITY", "NOT_INITIALIZED"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.SYSTEM,
         text: "Observability storage is not initialized"
@@ -4468,7 +4474,7 @@ var PostgresStore = class extends storage.MastraStorage {
   async batchDeleteTraces(args) {
     if (!this.stores.observability) {
       throw new error.MastraError({
-        id: "PG_STORE_OBSERVABILITY_NOT_INITIALIZED",
+        id: storage.createStorageErrorId("PG", "OBSERVABILITY", "NOT_INITIALIZED"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.SYSTEM,
         text: "Observability storage is not initialized"