@mastra/pg 1.14.0-alpha.0 → 1.14.1-alpha.0

package/dist/index.js

@@ -5184,6 +5184,7 @@ var DatasetsPG = class _DatasetsPG extends DatasetsStorage {
     await this.#addColumnIfNotExists(TABLE_DATASET_ITEMS, "requestContext", "JSONB");
     await this.#addColumnIfNotExists(TABLE_DATASET_ITEMS, "source", "JSONB");
     await this.#addColumnIfNotExists(TABLE_DATASET_ITEMS, "expectedTrajectory", "JSONB");
+    await this.#addColumnIfNotExists(TABLE_DATASET_ITEMS, "toolMocks", "JSONB");
     await this.createDefaultIndexes();
     await this.createCustomIndexes();
   }
@@ -5267,6 +5268,7 @@ var DatasetsPG = class _DatasetsPG extends DatasetsStorage {
       input: safelyParseJSON(row.input),
       groundTruth: row.groundTruth ? safelyParseJSON(row.groundTruth) : void 0,
       expectedTrajectory: row.expectedTrajectory ? safelyParseJSON(row.expectedTrajectory) : void 0,
+      toolMocks: row.toolMocks ? safelyParseJSON(row.toolMocks) : void 0,
       requestContext: row.requestContext ? safelyParseJSON(row.requestContext) : void 0,
       metadata: row.metadata ? safelyParseJSON(row.metadata) : void 0,
       source: row.source ? safelyParseJSON(row.source) : void 0,
@@ -5284,6 +5286,7 @@ var DatasetsPG = class _DatasetsPG extends DatasetsStorage {
       input: safelyParseJSON(row.input),
       groundTruth: row.groundTruth ? safelyParseJSON(row.groundTruth) : void 0,
       expectedTrajectory: row.expectedTrajectory ? safelyParseJSON(row.expectedTrajectory) : void 0,
+      toolMocks: row.toolMocks ? safelyParseJSON(row.toolMocks) : void 0,
       requestContext: row.requestContext ? safelyParseJSON(row.requestContext) : void 0,
       metadata: row.metadata ? safelyParseJSON(row.metadata) : void 0,
       source: row.source ? safelyParseJSON(row.source) : void 0,
@@ -5553,7 +5556,7 @@ var DatasetsPG = class _DatasetsPG extends DatasetsStorage {
         );
         newVersion = row.version;
         await t.none(
-          `INSERT INTO ${itemsTable} ("id","datasetId","datasetVersion","validTo","isDeleted","input","groundTruth","expectedTrajectory","requestContext","metadata","source","createdAt","createdAtZ","updatedAt","updatedAtZ") VALUES ($1,$2,$3,NULL,false,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13)`,
+          `INSERT INTO ${itemsTable} ("id","datasetId","datasetVersion","validTo","isDeleted","input","groundTruth","expectedTrajectory","toolMocks","requestContext","metadata","source","createdAt","createdAtZ","updatedAt","updatedAtZ") VALUES ($1,$2,$3,NULL,false,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14)`,
           [
             id,
             args.datasetId,
@@ -5561,6 +5564,7 @@ var DatasetsPG = class _DatasetsPG extends DatasetsStorage {
             JSON.stringify(args.input),
             jsonbArg(args.groundTruth),
             jsonbArg(args.expectedTrajectory),
+            jsonbArg(args.toolMocks),
             jsonbArg(args.requestContext),
             jsonbArg(args.metadata),
             jsonbArg(args.source),
@@ -5582,6 +5586,7 @@ var DatasetsPG = class _DatasetsPG extends DatasetsStorage {
         input: args.input,
         groundTruth: args.groundTruth,
         expectedTrajectory: args.expectedTrajectory,
+        toolMocks: args.toolMocks,
         requestContext: args.requestContext,
         metadata: args.metadata,
         source: args.source,
@@ -5631,6 +5636,7 @@ var DatasetsPG = class _DatasetsPG extends DatasetsStorage {
       const mergedInput = args.input !== void 0 ? args.input : existing.input;
       const mergedGroundTruth = args.groundTruth !== void 0 ? args.groundTruth : existing.groundTruth;
       const mergedExpectedTrajectory = args.expectedTrajectory !== void 0 ? args.expectedTrajectory : existing.expectedTrajectory;
+      const mergedToolMocks = args.toolMocks !== void 0 ? args.toolMocks : existing.toolMocks;
       const mergedRequestContext = args.requestContext !== void 0 ? args.requestContext : existing.requestContext;
       const mergedMetadata = args.metadata !== void 0 ? args.metadata : existing.metadata;
       const mergedSource = args.source !== void 0 ? args.source : existing.source;
@@ -5646,7 +5652,7 @@ var DatasetsPG = class _DatasetsPG extends DatasetsStorage {
           [newVersion, args.id]
         );
         await t.none(
-          `INSERT INTO ${itemsTable} ("id","datasetId","datasetVersion","validTo","isDeleted","input","groundTruth","expectedTrajectory","requestContext","metadata","source","createdAt","createdAtZ","updatedAt","updatedAtZ") VALUES ($1,$2,$3,NULL,false,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13)`,
+          `INSERT INTO ${itemsTable} ("id","datasetId","datasetVersion","validTo","isDeleted","input","groundTruth","expectedTrajectory","toolMocks","requestContext","metadata","source","createdAt","createdAtZ","updatedAt","updatedAtZ") VALUES ($1,$2,$3,NULL,false,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14)`,
           [
             args.id,
             args.datasetId,
@@ -5654,6 +5660,7 @@ var DatasetsPG = class _DatasetsPG extends DatasetsStorage {
             JSON.stringify(mergedInput),
             jsonbArg(mergedGroundTruth),
             jsonbArg(mergedExpectedTrajectory),
+            jsonbArg(mergedToolMocks),
             jsonbArg(mergedRequestContext),
             jsonbArg(mergedMetadata),
             jsonbArg(mergedSource),
@@ -5674,6 +5681,7 @@ var DatasetsPG = class _DatasetsPG extends DatasetsStorage {
         input: mergedInput,
         groundTruth: mergedGroundTruth,
         expectedTrajectory: mergedExpectedTrajectory,
+        toolMocks: mergedToolMocks,
         requestContext: mergedRequestContext,
         metadata: mergedMetadata,
         source: mergedSource,
@@ -5722,7 +5730,7 @@ var DatasetsPG = class _DatasetsPG extends DatasetsStorage {
           [newVersion, id]
         );
         await t.none(
-          `INSERT INTO ${itemsTable} ("id","datasetId","datasetVersion","validTo","isDeleted","input","groundTruth","expectedTrajectory","requestContext","metadata","source","createdAt","createdAtZ","updatedAt","updatedAtZ") VALUES ($1,$2,$3,NULL,true,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13)`,
+          `INSERT INTO ${itemsTable} ("id","datasetId","datasetVersion","validTo","isDeleted","input","groundTruth","expectedTrajectory","toolMocks","requestContext","metadata","source","createdAt","createdAtZ","updatedAt","updatedAtZ") VALUES ($1,$2,$3,NULL,true,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14)`,
           [
             id,
             datasetId,
@@ -5730,6 +5738,7 @@ var DatasetsPG = class _DatasetsPG extends DatasetsStorage {
             JSON.stringify(existing.input),
             jsonbArg(existing.groundTruth),
             jsonbArg(existing.expectedTrajectory),
+            jsonbArg(existing.toolMocks),
             jsonbArg(existing.requestContext),
             jsonbArg(existing.metadata),
             jsonbArg(existing.source),
@@ -5786,7 +5795,7 @@ var DatasetsPG = class _DatasetsPG extends DatasetsStorage {
         newVersion = row.version;
         for (const { id, input: itemInput } of itemsWithIds) {
           await t.none(
-            `INSERT INTO ${itemsTable} ("id","datasetId","datasetVersion","validTo","isDeleted","input","groundTruth","expectedTrajectory","requestContext","metadata","source","createdAt","createdAtZ","updatedAt","updatedAtZ") VALUES ($1,$2,$3,NULL,false,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13)`,
+            `INSERT INTO ${itemsTable} ("id","datasetId","datasetVersion","validTo","isDeleted","input","groundTruth","expectedTrajectory","toolMocks","requestContext","metadata","source","createdAt","createdAtZ","updatedAt","updatedAtZ") VALUES ($1,$2,$3,NULL,false,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14)`,
             [
               id,
               input.datasetId,
@@ -5794,6 +5803,7 @@ var DatasetsPG = class _DatasetsPG extends DatasetsStorage {
               JSON.stringify(itemInput.input),
               jsonbArg(itemInput.groundTruth),
               jsonbArg(itemInput.expectedTrajectory),
+              jsonbArg(itemInput.toolMocks),
               jsonbArg(itemInput.requestContext),
               jsonbArg(itemInput.metadata),
               jsonbArg(itemInput.source),
@@ -5816,6 +5826,7 @@ var DatasetsPG = class _DatasetsPG extends DatasetsStorage {
         input: itemInput.input,
         groundTruth: itemInput.groundTruth,
         expectedTrajectory: itemInput.expectedTrajectory,
+        toolMocks: itemInput.toolMocks,
         requestContext: itemInput.requestContext,
         metadata: itemInput.metadata,
         source: itemInput.source,
@@ -5873,7 +5884,7 @@ var DatasetsPG = class _DatasetsPG extends DatasetsStorage {
             [newVersion, item.id]
           );
           await t.none(
-            `INSERT INTO ${itemsTable} ("id","datasetId","datasetVersion","validTo","isDeleted","input","groundTruth","expectedTrajectory","requestContext","metadata","source","createdAt","createdAtZ","updatedAt","updatedAtZ") VALUES ($1,$2,$3,NULL,true,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13)`,
+            `INSERT INTO ${itemsTable} ("id","datasetId","datasetVersion","validTo","isDeleted","input","groundTruth","expectedTrajectory","toolMocks","requestContext","metadata","source","createdAt","createdAtZ","updatedAt","updatedAtZ") VALUES ($1,$2,$3,NULL,true,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14)`,
             [
               item.id,
               input.datasetId,
@@ -5881,6 +5892,7 @@ var DatasetsPG = class _DatasetsPG extends DatasetsStorage {
               JSON.stringify(item.input),
               jsonbArg(item.groundTruth),
               jsonbArg(item.expectedTrajectory),
+              jsonbArg(item.toolMocks),
               jsonbArg(item.requestContext),
               jsonbArg(item.metadata),
               jsonbArg(item.source),
@@ -6141,7 +6153,7 @@ var ExperimentsPG = class _ExperimentsPG extends ExperimentsStorage {
     await this.#db.alterTable({
       tableName: TABLE_EXPERIMENT_RESULTS,
       schema: EXPERIMENT_RESULTS_SCHEMA,
-      ifNotExists: ["status", "tags"]
+      ifNotExists: ["status", "tags", "toolMockReport"]
     });
     await this.createDefaultIndexes();
     await this.createCustomIndexes();
@@ -6217,6 +6229,7 @@ var ExperimentsPG = class _ExperimentsPG extends ExperimentsStorage {
       traceId: row.traceId ?? null,
       status: row.status ?? null,
       tags: row.tags ? safelyParseJSON(row.tags) : null,
+      toolMockReport: row.toolMockReport ? safelyParseJSON(row.toolMockReport) : null,
       createdAt: ensureDate(row.createdAtZ || row.createdAt)
     };
   }
@@ -6477,6 +6490,7 @@ var ExperimentsPG = class _ExperimentsPG extends ExperimentsStorage {
           traceId: input.traceId ?? null,
           status: input.status ?? null,
           tags: input.tags ?? null,
+          toolMockReport: input.toolMockReport ?? null,
           createdAt: nowIso
         }
       });
@@ -6495,6 +6509,7 @@ var ExperimentsPG = class _ExperimentsPG extends ExperimentsStorage {
         traceId: input.traceId ?? null,
         status: input.status ?? null,
         tags: input.tags ?? null,
+        toolMockReport: input.toolMockReport ?? null,
         createdAt: now
       };
     } catch (error) {
@@ -8284,12 +8299,7 @@ var MemoryPG = class _MemoryPG extends MemoryStorage {
     await this.#db.createTable({ tableName: TABLE_THREADS, schema: TABLE_SCHEMAS[TABLE_THREADS] });
     await this.#db.createTable({ tableName: TABLE_MESSAGES, schema: TABLE_SCHEMAS[TABLE_MESSAGES] });
     await this.#db.createTable({ tableName: TABLE_RESOURCES, schema: TABLE_SCHEMAS[TABLE_RESOURCES] });
-    let omSchema;
-    try {
-      const { OBSERVATIONAL_MEMORY_TABLE_SCHEMA } = await import('@mastra/core/storage');
-      omSchema = OBSERVATIONAL_MEMORY_TABLE_SCHEMA?.[OM_TABLE];
-    } catch {
-    }
+    const omSchema = _omTableSchema?.[OM_TABLE];
     if (omSchema) {
       await this.#db.createTable({
         tableName: OM_TABLE,
@@ -19147,6 +19157,9 @@ var PostgresStore = class extends MastraCompositeStore {
   #poolClosed = false;
   schema;
   isInitialized = false;
+  // Caches the in-flight init() so concurrent callers share one initialization
+  // instead of each acquiring + pinning a client. See init() / issue #18282.
+  #initPromise = null;
   stores;
   constructor(config) {
     try {
@@ -19213,16 +19226,25 @@ var PostgresStore = class extends MastraCompositeStore {
     throw new Error("PostgresStore: invalid config");
   }
   async init() {
+    if (this.disableInit || process.env.MASTRA_DISABLE_STORAGE_INIT === "true") {
+      return;
+    }
     if (this.isInitialized) {
       return;
     }
-    const pinnedClient = await this.#pool.connect();
-    const pinned = new PinnedClientAdapter(this.#pool, pinnedClient);
+    this.#initPromise ??= this.#runPinnedInit();
+    await this.#initPromise;
+  }
+  async #runPinnedInit() {
+    let pinnedClient;
     try {
+      pinnedClient = await this.#pool.connect();
+      const pinned = new PinnedClientAdapter(this.#pool, pinnedClient);
       this.#db.pin(pinned);
       await super.init();
       this.isInitialized = true;
     } catch (error) {
+      this.#initPromise = null;
       if (error instanceof MastraError) {
         throw error;
       }
@@ -19235,8 +19257,10 @@ var PostgresStore = class extends MastraCompositeStore {
         error
       );
     } finally {
-      this.#db.unpin();
-      pinnedClient.release();
+      if (pinnedClient) {
+        this.#db.unpin();
+        pinnedClient.release();
+      }
     }
   }
   /**