@mastra/pg 1.17.0 → 1.17.1

package/dist/index.js

@@ -1,5 +1,5 @@
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { BRANCH_SPAN_TYPES, createVectorErrorId, AgentsStorage, TABLE_AGENTS, TABLE_AGENT_VERSIONS, TABLE_SCHEMAS, createStorageErrorId, normalizePerPage, calculatePagination, BackgroundTasksStorage, TABLE_BACKGROUND_TASKS, BlobStore, TABLE_SKILL_BLOBS, ChannelsStorage, TABLE_CHANNEL_INSTALLATIONS, TABLE_CHANNEL_CONFIG, DatasetsStorage, TABLE_DATASETS, TABLE_DATASET_ITEMS, TABLE_DATASET_VERSIONS, DATASETS_SCHEMA, TABLE_CONFIGS, DATASET_ITEMS_SCHEMA, DATASET_VERSIONS_SCHEMA, ensureDate, safelyParseJSON, hasErrorCode, ExperimentsStorage, TABLE_EXPERIMENTS, TABLE_EXPERIMENT_RESULTS, EXPERIMENTS_SCHEMA, EXPERIMENT_RESULTS_SCHEMA, FavoritesStorage, TABLE_FAVORITES, MCPClientsStorage, TABLE_MCP_CLIENTS, TABLE_MCP_CLIENT_VERSIONS, MCPServersStorage, TABLE_MCP_SERVERS, TABLE_MCP_SERVER_VERSIONS, MemoryStorage, TABLE_THREADS, TABLE_RESOURCES, TABLE_MESSAGES, OBSERVATIONAL_MEMORY_TABLE_SCHEMA, NotificationsStorage, TABLE_NOTIFICATIONS, ObservabilityStorage, TABLE_SPANS, listTracesArgsSchema, toTraceSpans, PromptBlocksStorage, TABLE_PROMPT_BLOCKS, TABLE_PROMPT_BLOCK_VERSIONS, SchedulesStorage, TABLE_SCHEDULES, TABLE_SCHEDULE_TRIGGERS, ScorerDefinitionsStorage, TABLE_SCORER_DEFINITIONS, TABLE_SCORER_DEFINITION_VERSIONS, ScoresStorage, TABLE_SCORERS, SkillsStorage, TABLE_SKILLS, TABLE_SKILL_VERSIONS, ToolProviderConnectionsStorage, TABLE_TOOL_PROVIDER_CONNECTIONS, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, mergeWorkflowStepResult, WorkspacesStorage, TABLE_WORKSPACES, TABLE_WORKSPACE_VERSIONS, FactoryStorage, MastraCompositeStore, TraceStatus, getDefaultValue, parseDuration, listBranchesArgsSchema, listLogsArgsSchema, listMetricsArgsSchema, listScoresArgsSchema, listFeedbackArgsSchema, normalizeScheduleTarget, transformScoreRow as transformScoreRow$1, UniqueViolationError, getSqlType, EntityType, METRIC_DISTINCT_COLUMNS } from '@mastra/core/storage';
+import { BRANCH_SPAN_TYPES, createVectorErrorId, AgentsStorage, TABLE_AGENTS, TABLE_AGENT_VERSIONS, TABLE_SCHEMAS, createStorageErrorId, normalizePerPage, calculatePagination, BackgroundTasksStorage, TABLE_BACKGROUND_TASKS, BlobStore, TABLE_SKILL_BLOBS, ChannelsStorage, TABLE_CHANNEL_INSTALLATIONS, TABLE_CHANNEL_CONFIG, DatasetsStorage, TABLE_DATASETS, TABLE_DATASET_ITEMS, TABLE_DATASET_VERSIONS, DATASETS_SCHEMA, TABLE_CONFIGS, DATASET_ITEMS_SCHEMA, DATASET_VERSIONS_SCHEMA, ensureDate, safelyParseJSON, hasErrorCode, ExperimentsStorage, TABLE_EXPERIMENTS, TABLE_EXPERIMENT_RESULTS, EXPERIMENTS_SCHEMA, EXPERIMENT_RESULTS_SCHEMA, FavoritesStorage, TABLE_FAVORITES, MCPClientsStorage, TABLE_MCP_CLIENTS, TABLE_MCP_CLIENT_VERSIONS, MCPServersStorage, TABLE_MCP_SERVERS, TABLE_MCP_SERVER_VERSIONS, MemoryStorage, TABLE_THREADS, TABLE_RESOURCES, TABLE_MESSAGES, OBSERVATIONAL_MEMORY_TABLE_SCHEMA, validateStorageMetadataFilter, storageMessageMatchesMetadataFilter, NotificationsStorage, TABLE_NOTIFICATIONS, ObservabilityStorage, TABLE_SPANS, listTracesArgsSchema, toTraceSpans, PromptBlocksStorage, TABLE_PROMPT_BLOCKS, TABLE_PROMPT_BLOCK_VERSIONS, SchedulesStorage, TABLE_SCHEDULES, TABLE_SCHEDULE_TRIGGERS, ScorerDefinitionsStorage, TABLE_SCORER_DEFINITIONS, TABLE_SCORER_DEFINITION_VERSIONS, ScoresStorage, TABLE_SCORERS, SkillsStorage, TABLE_SKILLS, TABLE_SKILL_VERSIONS, ToolProviderConnectionsStorage, TABLE_TOOL_PROVIDER_CONNECTIONS, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, mergeWorkflowStepResult, WorkspacesStorage, TABLE_WORKSPACES, TABLE_WORKSPACE_VERSIONS, FactoryStorage, MastraCompositeStore, TraceStatus, getDefaultValue, parseDuration, listBranchesArgsSchema, listLogsArgsSchema, listMetricsArgsSchema, listScoresArgsSchema, listFeedbackArgsSchema, normalizeScheduleTarget, transformScoreRow as transformScoreRow$1, UniqueViolationError, getSqlType, EntityType, METRIC_DISTINCT_COLUMNS } from '@mastra/core/storage';
 import { parseSqlIdentifier, parseFieldKey } from '@mastra/core/utils';
 import { MastraVector, validateTopK, validateUpsertInput } from '@mastra/core/vector';
 import { Mutex } from 'async-mutex';
@@ -9,7 +9,7 @@ import xxhash from 'xxhash-wasm';
 import { parse } from 'pg-connection-string';
 import { BaseFilterTranslator } from '@mastra/core/vector/filter';
 import { MastraBase } from '@mastra/core/base';
-import { randomUUID, createHash } from 'crypto';
+import { randomUUID } from 'crypto';
 import { MessageList } from '@mastra/core/agent';
 import { coreFeatures } from '@mastra/core/features';
 import { saveScorePayloadSchema } from '@mastra/core/evals';
@@ -9574,6 +9574,7 @@ var MemoryPG = class _MemoryPG extends MemoryStorage {
     }
     const perPage = normalizePerPage(perPageInput, 40);
     const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+    const metadataFilter = validateStorageMetadataFilter(filter?.metadata);
     try {
       const { field, direction } = this.parseOrderBy(orderBy, "ASC");
       const orderByStatement = `ORDER BY COALESCE("${field}Z", "${field}") ${direction}`;
@@ -9615,13 +9616,27 @@ var MemoryPG = class _MemoryPG extends MemoryStorage {
           hasMore: false
         };
       }
-      const countQuery = `SELECT COUNT(*) FROM ${tableName} ${whereClause}`;
-      const countResult = await this.#db.client.one(countQuery, queryParams);
-      const total = parseInt(countResult.count, 10);
-      const limitValue = perPageInput === false ? total : perPage;
-      const dataQuery = `${selectStatement} FROM ${tableName} ${whereClause} ${orderByStatement} LIMIT $${paramIndex++} OFFSET $${paramIndex++}`;
-      const rows = await this.#db.client.manyOrNone(dataQuery, [...queryParams, limitValue, offset]);
-      const messages = [...rows || []];
+      let total;
+      let messages;
+      if (metadataFilter) {
+        const rows = await this.#db.client.manyOrNone(
+          `${selectStatement} FROM ${tableName} ${whereClause} ${orderByStatement}`,
+          queryParams
+        );
+        const filteredRows = (rows || []).filter(
+          (row) => storageMessageMatchesMetadataFilter(row.content, metadataFilter)
+        );
+        total = filteredRows.length;
+        messages = perPageInput === false ? filteredRows : filteredRows.slice(offset, offset + perPage);
+      } else {
+        const countResult = await this.#db.client.one(`SELECT COUNT(*) FROM ${tableName} ${whereClause}`, queryParams);
+        total = parseInt(countResult.count, 10);
+        const limitValue = perPageInput === false ? total : perPage;
+        const dataQuery = `${selectStatement} FROM ${tableName} ${whereClause} ${orderByStatement} LIMIT $${paramIndex++} OFFSET $${paramIndex++}`;
+        const rows = await this.#db.client.manyOrNone(dataQuery, [...queryParams, limitValue, offset]);
+        messages = [...rows || []];
+      }
+      const primaryPageCount = messages.length;
       if (total === 0 && messages.length === 0 && (!include || include.length === 0)) {
         return {
           messages: [],
@@ -9651,7 +9666,7 @@ var MemoryPG = class _MemoryPG extends MemoryStorage {
         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;
+      const hasMore = metadataFilter ? perPageInput !== false && offset + primaryPageCount < total : perPageInput !== false && !allThreadMessagesReturned && offset + perPage < total;
       return {
         messages: finalMessages,
         total,
@@ -9713,6 +9728,7 @@ var MemoryPG = class _MemoryPG extends MemoryStorage {
     }
     const perPage = normalizePerPage(perPageInput, 40);
     const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+    const metadataFilter = validateStorageMetadataFilter(filter?.metadata);
     try {
       const { field, direction } = this.parseOrderBy(orderBy, "ASC");
       const orderByStatement = `ORDER BY COALESCE("${field}Z", "${field}") ${direction}`;
@@ -9758,13 +9774,26 @@ var MemoryPG = class _MemoryPG extends MemoryStorage {
           hasMore: false
         };
       }
-      const countQuery = `SELECT COUNT(*) FROM ${tableName} ${whereClause}`;
-      const countResult = await this.#db.client.one(countQuery, queryParams);
-      const total = parseInt(countResult.count, 10);
-      const limitValue = perPageInput === false ? total : perPage;
-      const dataQuery = `${selectStatement} FROM ${tableName} ${whereClause} ${orderByStatement} LIMIT $${paramIndex++} OFFSET $${paramIndex++}`;
-      const rows = await this.#db.client.manyOrNone(dataQuery, [...queryParams, limitValue, offset]);
-      const messages = [...rows || []];
+      let total;
+      let messages;
+      if (metadataFilter) {
+        const rows = await this.#db.client.manyOrNone(
+          `${selectStatement} FROM ${tableName} ${whereClause} ${orderByStatement}`,
+          queryParams
+        );
+        const filteredRows = (rows || []).filter(
+          (row) => storageMessageMatchesMetadataFilter(row.content, metadataFilter)
+        );
+        total = filteredRows.length;
+        messages = perPageInput === false ? filteredRows : filteredRows.slice(offset, offset + perPage);
+      } else {
+        const countResult = await this.#db.client.one(`SELECT COUNT(*) FROM ${tableName} ${whereClause}`, queryParams);
+        total = parseInt(countResult.count, 10);
+        const limitValue = perPageInput === false ? total : perPage;
+        const dataQuery = `${selectStatement} FROM ${tableName} ${whereClause} ${orderByStatement} LIMIT $${paramIndex++} OFFSET $${paramIndex++}`;
+        const rows = await this.#db.client.manyOrNone(dataQuery, [...queryParams, limitValue, offset]);
+        messages = [...rows || []];
+      }
       if (total === 0 && messages.length === 0 && (!include || include.length === 0)) {
         return {
           messages: [],
@@ -20226,10 +20255,6 @@ function serializeDefault(value) {
   if (typeof value === "string") return `'${value.replace(/'/g, "''")}'`;
   return String(value);
 }
-function hashAdvisoryLockKey(key) {
-  const digest = createHash("sha256").update(key).digest();
-  return [digest.readInt32BE(0), digest.readInt32BE(4)];
-}
 var PgFactoryStorageOps = class {
   #queryable;
   #transactionClient;
@@ -20524,21 +20549,36 @@ var PgFactoryStorage = class extends FactoryStorage {
   async initStorage() {
     await this.#pool.query("SELECT 1");
   }
-  async withTransaction(fn) {
-    const client = await this.#pool.connect();
-    try {
-      await client.query("BEGIN");
+  async withTransaction(fn, options) {
+    const maxAttempts = options?.isolationLevel === "serializable" ? 3 : 1;
+    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+      const client = await this.#pool.connect();
+      let transactionOpen = false;
+      let releaseError;
       try {
+        await client.query(options?.isolationLevel === "serializable" ? "BEGIN ISOLATION LEVEL SERIALIZABLE" : "BEGIN");
+        transactionOpen = true;
         const result = await fn(new PgFactoryStorageOps(client, this.#schemas, client));
         await client.query("COMMIT");
+        transactionOpen = false;
         return result;
       } catch (error) {
-        await client.query("ROLLBACK");
-        throw error;
+        if (transactionOpen) {
+          try {
+            await client.query("ROLLBACK");
+            transactionOpen = false;
+          } catch (rollbackError) {
+            releaseError = rollbackError instanceof Error ? rollbackError : new Error(String(rollbackError));
+            throw new AggregateError([error, rollbackError], "Factory transaction and rollback both failed");
+          }
+        }
+        const serializationFailure = typeof error === "object" && error !== null && error.code === "40001";
+        if (!serializationFailure || attempt === maxAttempts) throw error;
+      } finally {
+        client.release(releaseError);
       }
-    } finally {
-      client.release();
     }
+    throw new Error("PgFactoryStorage: serializable transaction retry limit exceeded");
   }
   async ensureCollections(schemas) {
     for (const schema of schemas) {
@@ -20556,30 +20596,6 @@ var PgFactoryStorage = class extends FactoryStorage {
   authDatabase() {
     return { dialect: "postgres", pool: this.#pool };
   }
-  /**
-   * Run `fn` while holding a Postgres transaction-scoped advisory lock for
-   * `key`, serializing callers across replicas. The lock releases when the
-   * transaction ends (commit, rollback, or connection loss), so a crashed
-   * replica can never hold it forever.
-   */
-  async withDistributedLock(key, fn) {
-    const [k1, k2] = hashAdvisoryLockKey(key);
-    const client = await this.#pool.connect();
-    try {
-      await client.query("BEGIN");
-      await client.query("SELECT pg_advisory_xact_lock($1, $2)", [k1, k2]);
-      try {
-        const result = await fn();
-        await client.query("COMMIT");
-        return result;
-      } catch (error) {
-        await client.query("ROLLBACK");
-        throw error;
-      }
-    } finally {
-      client.release();
-    }
-  }
   #columnDdl(name, spec) {
     assertIdentifier("column", name);
     let ddl = `"${name}" ${COLUMN_DDL[spec.type]}`;
@@ -21015,6 +21031,6 @@ Example Complex Query:
   ]
 }`;
 
-export { AgentsPG, BackgroundTasksPG, BlobsPG, ChannelsPG, DatasetsPG, ExperimentsPG, FavoritesPG, MCPClientsPG, MCPServersPG, MemoryPG, NotificationsPG, ObservabilityPG, ObservabilityStoragePostgresVNext, PGVECTOR_PROMPT, PgFactoryStorage, PgVector, PoolAdapter, PostgresStore, PostgresStoreVNext, PromptBlocksPG, SchedulesPG, ScorerDefinitionsPG, ScoresPG, SkillsPG, ToolProviderConnectionsPG, WorkflowsPG, WorkspacesPG, exportSchemas, hashAdvisoryLockKey };
+export { AgentsPG, BackgroundTasksPG, BlobsPG, ChannelsPG, DatasetsPG, ExperimentsPG, FavoritesPG, MCPClientsPG, MCPServersPG, MemoryPG, NotificationsPG, ObservabilityPG, ObservabilityStoragePostgresVNext, PGVECTOR_PROMPT, PgFactoryStorage, PgVector, PoolAdapter, PostgresStore, PostgresStoreVNext, PromptBlocksPG, SchedulesPG, ScorerDefinitionsPG, ScoresPG, SkillsPG, ToolProviderConnectionsPG, WorkflowsPG, WorkspacesPG, exportSchemas };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map