@mastra/pg 1.17.0 → 1.17.1

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @mastra/pg
 
+## 1.17.1
+
+### Patch Changes
+
+- Improved Factory work-item concurrency by replacing distributed advisory locks with atomic claims, idempotent replay, and serializable relationship transactions. ([#20135](https://github.com/mastra-ai/mastra/pull/20135))
+
+- Hardened distributed lock cleanup so clients are destroyed when transaction rollback fails. ([#20135](https://github.com/mastra-ai/mastra/pull/20135))
+
+- Updated dependencies [[`c8d8a01`](https://github.com/mastra-ai/mastra/commit/c8d8a010ee2efe2b7bf4d07707382c34c87b14e4), [`df6a9ce`](https://github.com/mastra-ai/mastra/commit/df6a9ce87214f7aadb2edfe62f67605fe998a0a4), [`73839cb`](https://github.com/mastra-ai/mastra/commit/73839cb58322679c170627d1015669ede5f619aa), [`371cf60`](https://github.com/mastra-ai/mastra/commit/371cf6075cef88ac6919a08d59a82e485397364a), [`8e4dc79`](https://github.com/mastra-ai/mastra/commit/8e4dc793dcf035ea506f9ce79f56d2d501a4be14), [`2db93cc`](https://github.com/mastra-ai/mastra/commit/2db93ccd0b872e4de7853a93383efe0647901df8), [`094ab61`](https://github.com/mastra-ai/mastra/commit/094ab6129a1a3ecf6eeb86decac17d5faea4e02a), [`fe80944`](https://github.com/mastra-ai/mastra/commit/fe80944f3ef6681fea6eae8200fce387b7bb3c2f), [`263d2ca`](https://github.com/mastra-ai/mastra/commit/263d2cac80ba3b03b9c0f008db6f1f1b9eb0278c), [`75f843d`](https://github.com/mastra-ai/mastra/commit/75f843d09f758223e6eeb321321bdcc5c7e779d0), [`e51e166`](https://github.com/mastra-ai/mastra/commit/e51e166c52e220abc9b64554ce37359dca8544b1)]:
+  - @mastra/core@1.53.0
+
+## 1.17.1-alpha.0
+
+### Patch Changes
+
+- Improved Factory work-item concurrency by replacing distributed advisory locks with atomic claims, idempotent replay, and serializable relationship transactions. ([#20135](https://github.com/mastra-ai/mastra/pull/20135))
+
+- Hardened distributed lock cleanup so clients are destroyed when transaction rollback fails. ([#20135](https://github.com/mastra-ai/mastra/pull/20135))
+
+- Updated dependencies [[`73839cb`](https://github.com/mastra-ai/mastra/commit/73839cb58322679c170627d1015669ede5f619aa), [`8e4dc79`](https://github.com/mastra-ai/mastra/commit/8e4dc793dcf035ea506f9ce79f56d2d501a4be14), [`2db93cc`](https://github.com/mastra-ai/mastra/commit/2db93ccd0b872e4de7853a93383efe0647901df8), [`094ab61`](https://github.com/mastra-ai/mastra/commit/094ab6129a1a3ecf6eeb86decac17d5faea4e02a), [`fe80944`](https://github.com/mastra-ai/mastra/commit/fe80944f3ef6681fea6eae8200fce387b7bb3c2f), [`e51e166`](https://github.com/mastra-ai/mastra/commit/e51e166c52e220abc9b64554ce37359dca8544b1)]:
+  - @mastra/core@1.53.0-alpha.4
+
 ## 1.17.0
 
 ### Minor Changes

package/dist/docs/SKILL.md

@@ -3,7 +3,7 @@ name: mastra-pg
 description: Documentation for @mastra/pg. Use when working with @mastra/pg APIs, configuration, or implementation.
 metadata:
   package: "@mastra/pg"
-  version: "1.17.0"
+  version: "1.17.1"
 ---
 
 ## When to use

package/dist/docs/assets/SOURCE_MAP.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.17.0",
+  "version": "1.17.1",
   "package": "@mastra/pg",
   "exports": {},
   "modules": {}

package/dist/docs/references/reference-memory-memory-class.md

@@ -47,7 +47,7 @@ export const agent = new Agent({
 
 **options.observationalMemory** (`boolean | ObservationalMemoryOptions`): Enable Observational Memory for long-context agentic memory. Set to true for defaults, or pass a config object to customize token budgets, models, and scope. See Observational Memory reference for configuration details.
 
-**options.generateTitle** (`boolean | { model: DynamicArgument<MastraLanguageModel>; instructions?: DynamicArgument<string> }`): Controls automatic thread title generation from the user's first message. Can be a boolean or an object with custom model and instructions.
+**options.generateTitle** (`boolean | { model: DynamicArgument<MastraLanguageModel>; instructions?: DynamicArgument<string> }`): Controls automatic thread title generation from the conversation transcript. Can be a boolean or an object with custom model and instructions.
 
 ## Returns
 

package/dist/index.cjs

@@ -9598,6 +9598,7 @@ var MemoryPG = class _MemoryPG extends storage.MemoryStorage {
     }
     const perPage = storage.normalizePerPage(perPageInput, 40);
     const { offset, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
+    const metadataFilter = storage.validateStorageMetadataFilter(filter?.metadata);
     try {
       const { field, direction } = this.parseOrderBy(orderBy, "ASC");
       const orderByStatement = `ORDER BY COALESCE("${field}Z", "${field}") ${direction}`;
@@ -9639,13 +9640,27 @@ var MemoryPG = class _MemoryPG extends storage.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) => storage.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: [],
@@ -9675,7 +9690,7 @@ var MemoryPG = class _MemoryPG extends storage.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,
@@ -9737,6 +9752,7 @@ var MemoryPG = class _MemoryPG extends storage.MemoryStorage {
     }
     const perPage = storage.normalizePerPage(perPageInput, 40);
     const { offset, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
+    const metadataFilter = storage.validateStorageMetadataFilter(filter?.metadata);
     try {
       const { field, direction } = this.parseOrderBy(orderBy, "ASC");
       const orderByStatement = `ORDER BY COALESCE("${field}Z", "${field}") ${direction}`;
@@ -9782,13 +9798,26 @@ var MemoryPG = class _MemoryPG extends storage.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) => storage.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: [],
@@ -20250,10 +20279,6 @@ function serializeDefault(value) {
   if (typeof value === "string") return `'${value.replace(/'/g, "''")}'`;
   return String(value);
 }
-function hashAdvisoryLockKey(key) {
-  const digest = crypto$1.createHash("sha256").update(key).digest();
-  return [digest.readInt32BE(0), digest.readInt32BE(4)];
-}
 var PgFactoryStorageOps = class {
   #queryable;
   #transactionClient;
@@ -20548,21 +20573,36 @@ var PgFactoryStorage = class extends storage.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) {
@@ -20580,30 +20620,6 @@ var PgFactoryStorage = class extends storage.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]}`;
@@ -21067,6 +21083,5 @@ exports.ToolProviderConnectionsPG = ToolProviderConnectionsPG;
 exports.WorkflowsPG = WorkflowsPG;
 exports.WorkspacesPG = WorkspacesPG;
 exports.exportSchemas = exportSchemas;
-exports.hashAdvisoryLockKey = hashAdvisoryLockKey;
 //# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map