@mastra/pg 1.14.0 → 1.14.1-alpha.1

package/dist/index.cjs

@@ -5206,9 +5206,16 @@ var DatasetsPG = class _DatasetsPG extends storage.DatasetsStorage {
     await this.#addColumnIfNotExists(storage.TABLE_DATASETS, "targetType", "TEXT");
     await this.#addColumnIfNotExists(storage.TABLE_DATASETS, "targetIds", "JSONB");
     await this.#addColumnIfNotExists(storage.TABLE_DATASETS, "scorerIds", "JSONB");
+    await this.#addColumnIfNotExists(storage.TABLE_DATASETS, "organizationId", "TEXT");
+    await this.#addColumnIfNotExists(storage.TABLE_DATASETS, "projectId", "TEXT");
+    await this.#addColumnIfNotExists(storage.TABLE_DATASETS, "candidateKey", "TEXT");
+    await this.#addColumnIfNotExists(storage.TABLE_DATASETS, "candidateId", "TEXT");
     await this.#addColumnIfNotExists(storage.TABLE_DATASET_ITEMS, "requestContext", "JSONB");
     await this.#addColumnIfNotExists(storage.TABLE_DATASET_ITEMS, "source", "JSONB");
     await this.#addColumnIfNotExists(storage.TABLE_DATASET_ITEMS, "expectedTrajectory", "JSONB");
+    await this.#addColumnIfNotExists(storage.TABLE_DATASET_ITEMS, "organizationId", "TEXT");
+    await this.#addColumnIfNotExists(storage.TABLE_DATASET_ITEMS, "projectId", "TEXT");
+    await this.#addColumnIfNotExists(storage.TABLE_DATASET_ITEMS, "toolMocks", "JSONB");
     await this.createDefaultIndexes();
     await this.createCustomIndexes();
   }
@@ -5242,6 +5249,22 @@ var DatasetsPG = class _DatasetsPG extends storage.DatasetsStorage {
         table: storage.TABLE_DATASET_VERSIONS,
         columns: ["datasetId", "version"],
         unique: true
+      },
+      // Tenancy: leading-tenant indexes for multi-tenant scans (parity with observability storage).
+      {
+        name: "idx_datasets_org_project",
+        table: storage.TABLE_DATASETS,
+        columns: ["organizationId", "projectId"]
+      },
+      {
+        name: "idx_datasets_candidate",
+        table: storage.TABLE_DATASETS,
+        columns: ["candidateKey", "candidateId"]
+      },
+      {
+        name: "idx_dataset_items_org_project",
+        table: storage.TABLE_DATASET_ITEMS,
+        columns: ["organizationId", "projectId"]
       }
     ];
   }
@@ -5279,6 +5302,10 @@ var DatasetsPG = class _DatasetsPG extends storage.DatasetsStorage {
       targetType: row.targetType || null,
       targetIds: row.targetIds || null,
       scorerIds: row.scorerIds || null,
+      organizationId: row.organizationId ?? null,
+      projectId: row.projectId ?? null,
+      candidateKey: row.candidateKey ?? null,
+      candidateId: row.candidateId ?? null,
       version: row.version,
       createdAt: storage.ensureDate(row.createdAtZ || row.createdAt),
       updatedAt: storage.ensureDate(row.updatedAtZ || row.updatedAt)
@@ -5289,9 +5316,12 @@ var DatasetsPG = class _DatasetsPG extends storage.DatasetsStorage {
       id: row.id,
       datasetId: row.datasetId,
       datasetVersion: row.datasetVersion,
+      organizationId: row.organizationId ?? null,
+      projectId: row.projectId ?? null,
       input: storage.safelyParseJSON(row.input),
       groundTruth: row.groundTruth ? storage.safelyParseJSON(row.groundTruth) : void 0,
       expectedTrajectory: row.expectedTrajectory ? storage.safelyParseJSON(row.expectedTrajectory) : void 0,
+      toolMocks: row.toolMocks ? storage.safelyParseJSON(row.toolMocks) : void 0,
       requestContext: row.requestContext ? storage.safelyParseJSON(row.requestContext) : void 0,
       metadata: row.metadata ? storage.safelyParseJSON(row.metadata) : void 0,
       source: row.source ? storage.safelyParseJSON(row.source) : void 0,
@@ -5304,11 +5334,14 @@ var DatasetsPG = class _DatasetsPG extends storage.DatasetsStorage {
       id: row.id,
       datasetId: row.datasetId,
       datasetVersion: row.datasetVersion,
+      organizationId: row.organizationId ?? null,
+      projectId: row.projectId ?? null,
       validTo: row.validTo,
       isDeleted: Boolean(row.isDeleted),
       input: storage.safelyParseJSON(row.input),
       groundTruth: row.groundTruth ? storage.safelyParseJSON(row.groundTruth) : void 0,
       expectedTrajectory: row.expectedTrajectory ? storage.safelyParseJSON(row.expectedTrajectory) : void 0,
+      toolMocks: row.toolMocks ? storage.safelyParseJSON(row.toolMocks) : void 0,
       requestContext: row.requestContext ? storage.safelyParseJSON(row.requestContext) : void 0,
       metadata: row.metadata ? storage.safelyParseJSON(row.metadata) : void 0,
       source: row.source ? storage.safelyParseJSON(row.source) : void 0,
@@ -5343,6 +5376,10 @@ var DatasetsPG = class _DatasetsPG extends storage.DatasetsStorage {
           targetType: input.targetType ?? null,
           targetIds: input.targetIds !== void 0 ? JSON.stringify(input.targetIds) : null,
           scorerIds: input.scorerIds ? JSON.stringify(input.scorerIds) : null,
+          organizationId: input.organizationId ?? null,
+          projectId: input.projectId ?? null,
+          candidateKey: input.candidateKey ?? null,
+          candidateId: input.candidateId ?? null,
           version: 0,
           createdAt: nowIso,
           updatedAt: nowIso
@@ -5359,6 +5396,10 @@ var DatasetsPG = class _DatasetsPG extends storage.DatasetsStorage {
         targetType: input.targetType ?? null,
         targetIds: input.targetIds ?? null,
         scorerIds: input.scorerIds ?? null,
+        organizationId: input.organizationId ?? null,
+        projectId: input.projectId ?? null,
+        candidateKey: input.candidateKey ?? null,
+        candidateId: input.candidateId ?? null,
         version: 0,
         createdAt: now,
         updatedAt: now
@@ -5463,6 +5504,10 @@ var DatasetsPG = class _DatasetsPG extends storage.DatasetsStorage {
         targetType: (args.targetType !== void 0 ? args.targetType : existing.targetType) ?? null,
         targetIds: (args.targetIds !== void 0 ? args.targetIds : existing.targetIds) ?? null,
         scorerIds: (args.scorerIds !== void 0 ? args.scorerIds : existing.scorerIds) ?? null,
+        organizationId: existing.organizationId ?? null,
+        projectId: existing.projectId ?? null,
+        candidateKey: existing.candidateKey ?? null,
+        candidateId: existing.candidateId ?? null,
         updatedAt: new Date(now)
       };
     } catch (error$1) {
@@ -5525,7 +5570,33 @@ var DatasetsPG = class _DatasetsPG extends storage.DatasetsStorage {
     try {
       const { page, perPage: perPageInput } = args.pagination;
       const tableName = getTableName2({ indexName: storage.TABLE_DATASETS, schemaName: getSchemaName2(this.#schema) });
-      const countResult = await this.#db.client.one(`SELECT COUNT(*) as count FROM ${tableName}`);
+      const conditions = [];
+      const queryParams = [];
+      let paramIndex = 1;
+      if (args.filters) {
+        const { organizationId, projectId, candidateKey, candidateId } = args.filters;
+        if (organizationId !== void 0) {
+          conditions.push(`"organizationId" = $${paramIndex++}`);
+          queryParams.push(organizationId);
+        }
+        if (projectId !== void 0) {
+          conditions.push(`"projectId" = $${paramIndex++}`);
+          queryParams.push(projectId);
+        }
+        if (candidateKey !== void 0) {
+          conditions.push(`"candidateKey" = $${paramIndex++}`);
+          queryParams.push(candidateKey);
+        }
+        if (candidateId !== void 0) {
+          conditions.push(`"candidateId" = $${paramIndex++}`);
+          queryParams.push(candidateId);
+        }
+      }
+      const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
+      const countResult = await this.#db.client.one(
+        `SELECT COUNT(*) as count FROM ${tableName} ${whereClause}`,
+        queryParams
+      );
       const total = parseInt(countResult.count, 10);
       if (total === 0) {
         return { datasets: [], pagination: { total: 0, page, perPage: perPageInput, hasMore: false } };
@@ -5534,8 +5605,8 @@ var DatasetsPG = class _DatasetsPG extends storage.DatasetsStorage {
       const { offset, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
       const limitValue = perPageInput === false ? total : perPage;
       const rows = await this.#db.client.manyOrNone(
-        `SELECT * FROM ${tableName} ORDER BY "createdAt" DESC, "id" ASC LIMIT $1 OFFSET $2`,
-        [limitValue, offset]
+        `SELECT * FROM ${tableName} ${whereClause} ORDER BY "createdAt" DESC, "id" ASC LIMIT $${paramIndex} OFFSET $${paramIndex + 1}`,
+        [...queryParams, limitValue, offset]
       );
       return {
         datasets: (rows || []).map((row) => this.transformDatasetRow(row)),
@@ -5571,21 +5642,28 @@ var DatasetsPG = class _DatasetsPG extends storage.DatasetsStorage {
       const now = /* @__PURE__ */ new Date();
       const nowIso = now.toISOString();
       let newVersion;
+      let parentOrganizationId = null;
+      let parentProjectId = null;
       await this.#db.client.tx(async (t) => {
         const row = await t.one(
-          `UPDATE ${datasetsTable} SET "version" = "version" + 1 WHERE "id" = $1 RETURNING "version"`,
+          `UPDATE ${datasetsTable} SET "version" = "version" + 1 WHERE "id" = $1 RETURNING "version", "organizationId", "projectId"`,
           [args.datasetId]
         );
         newVersion = row.version;
+        parentOrganizationId = row.organizationId ?? null;
+        parentProjectId = row.projectId ?? null;
         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","organizationId","projectId","validTo","isDeleted","input","groundTruth","expectedTrajectory","toolMocks","requestContext","metadata","source","createdAt","createdAtZ","updatedAt","updatedAtZ") VALUES ($1,$2,$3,$4,$5,NULL,false,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16)`,
           [
             id,
             args.datasetId,
             newVersion,
+            parentOrganizationId,
+            parentProjectId,
             JSON.stringify(args.input),
             jsonbArg(args.groundTruth),
             jsonbArg(args.expectedTrajectory),
+            jsonbArg(args.toolMocks),
             jsonbArg(args.requestContext),
             jsonbArg(args.metadata),
             jsonbArg(args.source),
@@ -5604,9 +5682,12 @@ var DatasetsPG = class _DatasetsPG extends storage.DatasetsStorage {
         id,
         datasetId: args.datasetId,
         datasetVersion: newVersion,
+        organizationId: parentOrganizationId,
+        projectId: parentProjectId,
         input: args.input,
         groundTruth: args.groundTruth,
         expectedTrajectory: args.expectedTrajectory,
+        toolMocks: args.toolMocks,
         requestContext: args.requestContext,
         metadata: args.metadata,
         source: args.source,
@@ -5656,29 +5737,37 @@ var DatasetsPG = class _DatasetsPG extends storage.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;
       let newVersion;
+      let parentOrganizationId = null;
+      let parentProjectId = null;
       await this.#db.client.tx(async (t) => {
         const row = await t.one(
-          `UPDATE ${datasetsTable} SET "version" = "version" + 1 WHERE "id" = $1 RETURNING "version"`,
+          `UPDATE ${datasetsTable} SET "version" = "version" + 1 WHERE "id" = $1 RETURNING "version", "organizationId", "projectId"`,
           [args.datasetId]
         );
         newVersion = row.version;
+        parentOrganizationId = row.organizationId ?? null;
+        parentProjectId = row.projectId ?? null;
         await t.none(
           `UPDATE ${itemsTable} SET "validTo" = $1 WHERE "id" = $2 AND "validTo" IS NULL AND "isDeleted" = false`,
           [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","organizationId","projectId","validTo","isDeleted","input","groundTruth","expectedTrajectory","toolMocks","requestContext","metadata","source","createdAt","createdAtZ","updatedAt","updatedAtZ") VALUES ($1,$2,$3,$4,$5,NULL,false,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16)`,
           [
             args.id,
             args.datasetId,
             newVersion,
+            parentOrganizationId,
+            parentProjectId,
             JSON.stringify(mergedInput),
             jsonbArg(mergedGroundTruth),
             jsonbArg(mergedExpectedTrajectory),
+            jsonbArg(mergedToolMocks),
             jsonbArg(mergedRequestContext),
             jsonbArg(mergedMetadata),
             jsonbArg(mergedSource),
@@ -5696,9 +5785,12 @@ var DatasetsPG = class _DatasetsPG extends storage.DatasetsStorage {
       return {
         ...existing,
         datasetVersion: newVersion,
+        organizationId: parentOrganizationId,
+        projectId: parentProjectId,
         input: mergedInput,
         groundTruth: mergedGroundTruth,
         expectedTrajectory: mergedExpectedTrajectory,
+        toolMocks: mergedToolMocks,
         requestContext: mergedRequestContext,
         metadata: mergedMetadata,
         source: mergedSource,
@@ -5738,23 +5830,28 @@ var DatasetsPG = class _DatasetsPG extends storage.DatasetsStorage {
       const nowIso = (/* @__PURE__ */ new Date()).toISOString();
       await this.#db.client.tx(async (t) => {
         const row = await t.one(
-          `UPDATE ${datasetsTable} SET "version" = "version" + 1 WHERE "id" = $1 RETURNING "version"`,
+          `UPDATE ${datasetsTable} SET "version" = "version" + 1 WHERE "id" = $1 RETURNING "version", "organizationId", "projectId"`,
           [datasetId]
         );
         const newVersion = row.version;
+        const parentOrganizationId = row.organizationId ?? null;
+        const parentProjectId = row.projectId ?? null;
         await t.none(
           `UPDATE ${itemsTable} SET "validTo" = $1 WHERE "id" = $2 AND "validTo" IS NULL AND "isDeleted" = false`,
           [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","organizationId","projectId","validTo","isDeleted","input","groundTruth","expectedTrajectory","toolMocks","requestContext","metadata","source","createdAt","createdAtZ","updatedAt","updatedAtZ") VALUES ($1,$2,$3,$4,$5,NULL,true,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16)`,
           [
             id,
             datasetId,
             newVersion,
+            parentOrganizationId,
+            parentProjectId,
             JSON.stringify(existing.input),
             jsonbArg(existing.groundTruth),
             jsonbArg(existing.expectedTrajectory),
+            jsonbArg(existing.toolMocks),
             jsonbArg(existing.requestContext),
             jsonbArg(existing.metadata),
             jsonbArg(existing.source),
@@ -5802,6 +5899,8 @@ var DatasetsPG = class _DatasetsPG extends storage.DatasetsStorage {
       const nowIso = now.toISOString();
       const versionId = crypto.randomUUID();
       const itemsWithIds = input.items.map((itemInput) => ({ id: crypto.randomUUID(), input: itemInput }));
+      const parentOrganizationId = dataset.organizationId ?? null;
+      const parentProjectId = dataset.projectId ?? null;
       let newVersion;
       await this.#db.client.tx(async (t) => {
         const row = await t.one(
@@ -5811,14 +5910,17 @@ var DatasetsPG = class _DatasetsPG extends storage.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","organizationId","projectId","validTo","isDeleted","input","groundTruth","expectedTrajectory","toolMocks","requestContext","metadata","source","createdAt","createdAtZ","updatedAt","updatedAtZ") VALUES ($1,$2,$3,$4,$5,NULL,false,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16)`,
             [
               id,
               input.datasetId,
               newVersion,
+              parentOrganizationId,
+              parentProjectId,
               JSON.stringify(itemInput.input),
               jsonbArg(itemInput.groundTruth),
               jsonbArg(itemInput.expectedTrajectory),
+              jsonbArg(itemInput.toolMocks),
               jsonbArg(itemInput.requestContext),
               jsonbArg(itemInput.metadata),
               jsonbArg(itemInput.source),
@@ -5838,9 +5940,12 @@ var DatasetsPG = class _DatasetsPG extends storage.DatasetsStorage {
         id,
         datasetId: input.datasetId,
         datasetVersion: newVersion,
+        organizationId: parentOrganizationId,
+        projectId: parentProjectId,
         input: itemInput.input,
         groundTruth: itemInput.groundTruth,
         expectedTrajectory: itemInput.expectedTrajectory,
+        toolMocks: itemInput.toolMocks,
         requestContext: itemInput.requestContext,
         metadata: itemInput.metadata,
         source: itemInput.source,
@@ -5886,6 +5991,8 @@ var DatasetsPG = class _DatasetsPG extends storage.DatasetsStorage {
       });
       const nowIso = (/* @__PURE__ */ new Date()).toISOString();
       const versionId = crypto.randomUUID();
+      const parentOrganizationId = dataset.organizationId ?? null;
+      const parentProjectId = dataset.projectId ?? null;
       await this.#db.client.tx(async (t) => {
         const row = await t.one(
           `UPDATE ${datasetsTable} SET "version" = "version" + 1 WHERE "id" = $1 RETURNING "version"`,
@@ -5898,14 +6005,17 @@ var DatasetsPG = class _DatasetsPG extends storage.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","organizationId","projectId","validTo","isDeleted","input","groundTruth","expectedTrajectory","toolMocks","requestContext","metadata","source","createdAt","createdAtZ","updatedAt","updatedAtZ") VALUES ($1,$2,$3,$4,$5,NULL,true,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16)`,
             [
               item.id,
               input.datasetId,
               newVersion,
+              parentOrganizationId,
+              parentProjectId,
               JSON.stringify(item.input),
               jsonbArg(item.groundTruth),
               jsonbArg(item.expectedTrajectory),
+              jsonbArg(item.toolMocks),
               jsonbArg(item.requestContext),
               jsonbArg(item.metadata),
               jsonbArg(item.source),
@@ -6023,6 +6133,17 @@ var DatasetsPG = class _DatasetsPG extends storage.DatasetsStorage {
         queryParams.push(`%${args.search}%`);
         paramIndex++;
       }
+      if (args.filters) {
+        const { organizationId, projectId } = args.filters;
+        if (organizationId !== void 0) {
+          conditions.push(`"organizationId" = $${paramIndex++}`);
+          queryParams.push(organizationId);
+        }
+        if (projectId !== void 0) {
+          conditions.push(`"projectId" = $${paramIndex++}`);
+          queryParams.push(projectId);
+        }
+      }
       const whereClause = `WHERE ${conditions.join(" AND ")}`;
       const countResult = await this.#db.client.one(
         `SELECT COUNT(*) as count FROM ${tableName} ${whereClause}`,
@@ -6161,12 +6282,12 @@ var ExperimentsPG = class _ExperimentsPG extends storage.ExperimentsStorage {
     await this.#db.alterTable({
       tableName: storage.TABLE_EXPERIMENTS,
       schema: storage.EXPERIMENTS_SCHEMA,
-      ifNotExists: ["agentVersion"]
+      ifNotExists: ["agentVersion", "organizationId", "projectId"]
     });
     await this.#db.alterTable({
       tableName: storage.TABLE_EXPERIMENT_RESULTS,
       schema: storage.EXPERIMENT_RESULTS_SCHEMA,
-      ifNotExists: ["status", "tags"]
+      ifNotExists: ["status", "tags", "toolMockReport", "organizationId", "projectId"]
     });
     await this.createDefaultIndexes();
     await this.createCustomIndexes();
@@ -6180,6 +6301,17 @@ var ExperimentsPG = class _ExperimentsPG extends storage.ExperimentsStorage {
         table: storage.TABLE_EXPERIMENT_RESULTS,
         columns: ["experimentId", "itemId"],
         unique: true
+      },
+      // Tenancy: leading-tenant indexes for multi-tenant scans (parity with datasets domain).
+      {
+        name: "idx_experiments_org_project",
+        table: storage.TABLE_EXPERIMENTS,
+        columns: ["organizationId", "projectId"]
+      },
+      {
+        name: "idx_experiment_results_org_project",
+        table: storage.TABLE_EXPERIMENT_RESULTS,
+        columns: ["organizationId", "projectId"]
       }
     ];
   }
@@ -6213,6 +6345,8 @@ var ExperimentsPG = class _ExperimentsPG extends storage.ExperimentsStorage {
       datasetId: row.datasetId ?? null,
       datasetVersion: row.datasetVersion != null ? row.datasetVersion : null,
       agentVersion: row.agentVersion ?? null,
+      organizationId: row.organizationId ?? null,
+      projectId: row.projectId ?? null,
       targetType: row.targetType,
       targetId: row.targetId,
       status: row.status,
@@ -6232,6 +6366,8 @@ var ExperimentsPG = class _ExperimentsPG extends storage.ExperimentsStorage {
       experimentId: row.experimentId,
       itemId: row.itemId,
       itemDatasetVersion: row.itemDatasetVersion != null ? row.itemDatasetVersion : null,
+      organizationId: row.organizationId ?? null,
+      projectId: row.projectId ?? null,
       input: storage.safelyParseJSON(row.input),
       output: row.output ? storage.safelyParseJSON(row.output) : null,
       groundTruth: row.groundTruth ? storage.safelyParseJSON(row.groundTruth) : null,
@@ -6242,6 +6378,7 @@ var ExperimentsPG = class _ExperimentsPG extends storage.ExperimentsStorage {
       traceId: row.traceId ?? null,
       status: row.status ?? null,
       tags: row.tags ? storage.safelyParseJSON(row.tags) : null,
+      toolMockReport: row.toolMockReport ? storage.safelyParseJSON(row.toolMockReport) : null,
       createdAt: storage.ensureDate(row.createdAtZ || row.createdAt)
     };
   }
@@ -6261,6 +6398,8 @@ var ExperimentsPG = class _ExperimentsPG extends storage.ExperimentsStorage {
           datasetId: input.datasetId ?? null,
           datasetVersion: input.datasetVersion ?? null,
           agentVersion: input.agentVersion ?? null,
+          organizationId: input.organizationId ?? null,
+          projectId: input.projectId ?? null,
           targetType: input.targetType,
           targetId: input.targetId,
           status: "pending",
@@ -6282,6 +6421,8 @@ var ExperimentsPG = class _ExperimentsPG extends storage.ExperimentsStorage {
         datasetId: input.datasetId ?? null,
         datasetVersion: input.datasetVersion ?? null,
         agentVersion: input.agentVersion ?? null,
+        organizationId: input.organizationId ?? null,
+        projectId: input.projectId ?? null,
         targetType: input.targetType,
         targetId: input.targetId,
         status: "pending",
@@ -6423,6 +6564,17 @@ var ExperimentsPG = class _ExperimentsPG extends storage.ExperimentsStorage {
         conditions.push(`"status" = $${paramIndex++}`);
         queryParams.push(args.status);
       }
+      if (args.filters) {
+        const { organizationId, projectId } = args.filters;
+        if (organizationId !== void 0) {
+          conditions.push(`"organizationId" = $${paramIndex++}`);
+          queryParams.push(organizationId);
+        }
+        if (projectId !== void 0) {
+          conditions.push(`"projectId" = $${paramIndex++}`);
+          queryParams.push(projectId);
+        }
+      }
       const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
       const countResult = await this.#db.client.one(
         `SELECT COUNT(*) as count FROM ${tableName} ${whereClause}`,
@@ -6492,6 +6644,8 @@ var ExperimentsPG = class _ExperimentsPG extends storage.ExperimentsStorage {
           experimentId: input.experimentId,
           itemId: input.itemId,
           itemDatasetVersion: input.itemDatasetVersion ?? null,
+          organizationId: input.organizationId ?? null,
+          projectId: input.projectId ?? null,
           input: input.input,
           output: input.output ?? null,
           groundTruth: input.groundTruth ?? null,
@@ -6502,6 +6656,7 @@ var ExperimentsPG = class _ExperimentsPG extends storage.ExperimentsStorage {
           traceId: input.traceId ?? null,
           status: input.status ?? null,
           tags: input.tags ?? null,
+          toolMockReport: input.toolMockReport ?? null,
           createdAt: nowIso
         }
       });
@@ -6510,6 +6665,8 @@ var ExperimentsPG = class _ExperimentsPG extends storage.ExperimentsStorage {
         experimentId: input.experimentId,
         itemId: input.itemId,
         itemDatasetVersion: input.itemDatasetVersion ?? null,
+        organizationId: input.organizationId ?? null,
+        projectId: input.projectId ?? null,
         input: input.input,
         output: input.output ?? null,
         groundTruth: input.groundTruth ?? null,
@@ -6520,6 +6677,7 @@ var ExperimentsPG = class _ExperimentsPG extends storage.ExperimentsStorage {
         traceId: input.traceId ?? null,
         status: input.status ?? null,
         tags: input.tags ?? null,
+        toolMockReport: input.toolMockReport ?? null,
         createdAt: now
       };
     } catch (error$1) {
@@ -6622,6 +6780,17 @@ var ExperimentsPG = class _ExperimentsPG extends storage.ExperimentsStorage {
         conditions.push(`"status" = $${paramIndex++}`);
         queryParams.push(args.status);
       }
+      if (args.filters) {
+        const { organizationId, projectId } = args.filters;
+        if (organizationId !== void 0) {
+          conditions.push(`"organizationId" = $${paramIndex++}`);
+          queryParams.push(organizationId);
+        }
+        if (projectId !== void 0) {
+          conditions.push(`"projectId" = $${paramIndex++}`);
+          queryParams.push(projectId);
+        }
+      }
       const whereClause = `WHERE ${conditions.join(" AND ")}`;
       const countResult = await this.#db.client.one(
         `SELECT COUNT(*) as count FROM ${tableName} ${whereClause}`,
@@ -8309,12 +8478,7 @@ var MemoryPG = class _MemoryPG extends storage.MemoryStorage {
     await this.#db.createTable({ tableName: storage.TABLE_THREADS, schema: storage.TABLE_SCHEMAS[storage.TABLE_THREADS] });
     await this.#db.createTable({ tableName: storage.TABLE_MESSAGES, schema: storage.TABLE_SCHEMAS[storage.TABLE_MESSAGES] });
     await this.#db.createTable({ tableName: storage.TABLE_RESOURCES, schema: storage.TABLE_SCHEMAS[storage.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,
@@ -19172,6 +19336,9 @@ var PostgresStore = class extends storage.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 {
@@ -19238,16 +19405,25 @@ var PostgresStore = class extends storage.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$1) {
+      this.#initPromise = null;
       if (error$1 instanceof error.MastraError) {
         throw error$1;
       }
@@ -19260,8 +19436,10 @@ var PostgresStore = class extends storage.MastraCompositeStore {
         error$1
       );
     } finally {
-      this.#db.unpin();
-      pinnedClient.release();
+      if (pinnedClient) {
+        this.#db.unpin();
+        pinnedClient.release();
+      }
     }
   }
   /**