@mastra/mongodb 1.10.1-alpha.0 → 1.11.0

package/dist/index.js

@@ -13,7 +13,7 @@ import { skillSnapshotFieldValuesEqual } from '@mastra/core/storage/domains/skil
 
 // package.json
 var package_default = {
-  version: "1.10.1-alpha.0"};
+  version: "1.11.0"};
 var MongoDBFilterTranslator = class extends BaseFilterTranslator {
   getSupportedOperators() {
     return {
@@ -1928,7 +1928,22 @@ var MongoDBDatasetsStorage = class extends DatasetsStorage {
     return [
       { collection: TABLE_DATASETS, keys: { id: 1 }, options: { name: "idx_datasets_id", unique: true } },
       { collection: TABLE_DATASETS, keys: { createdAt: -1, id: 1 }, options: { name: "idx_datasets_createdat_id" } },
+      {
+        collection: TABLE_DATASETS,
+        keys: { organizationId: 1, projectId: 1, createdAt: -1, id: 1 },
+        options: { name: "idx_datasets_tenancy_createdat_id" }
+      },
+      {
+        collection: TABLE_DATASETS,
+        keys: { organizationId: 1, projectId: 1, candidateKey: 1, candidateId: 1 },
+        options: { name: "idx_datasets_tenancy_candidate" }
+      },
       { collection: TABLE_DATASET_ITEMS, keys: { datasetId: 1 }, options: { name: "idx_dataset_items_datasetid" } },
+      {
+        collection: TABLE_DATASET_ITEMS,
+        keys: { organizationId: 1, projectId: 1, datasetId: 1, validTo: 1, isDeleted: 1 },
+        options: { name: "idx_dataset_items_tenancy_list" }
+      },
       {
         collection: TABLE_DATASET_ITEMS,
         keys: { datasetId: 1, validTo: 1 },
@@ -2006,6 +2021,10 @@ var MongoDBDatasetsStorage = class extends DatasetsStorage {
       targetIds: typeof row.targetIds === "string" ? safelyParseJSON(row.targetIds) : row.targetIds ?? void 0,
       scorerIds: typeof row.scorerIds === "string" ? safelyParseJSON(row.scorerIds) : row.scorerIds ?? void 0,
       version: row.version ?? 0,
+      organizationId: row.organizationId ?? null,
+      projectId: row.projectId ?? null,
+      candidateKey: row.candidateKey ?? null,
+      candidateId: row.candidateId ?? null,
       createdAt: ensureDate(row.createdAt),
       updatedAt: ensureDate(row.updatedAt)
     };
@@ -2015,6 +2034,8 @@ var MongoDBDatasetsStorage = class extends DatasetsStorage {
       id: row.id,
       datasetId: row.datasetId,
       datasetVersion: row.datasetVersion,
+      organizationId: row.organizationId ?? null,
+      projectId: row.projectId ?? null,
       input: typeof row.input === "string" ? safelyParseJSON(row.input) : row.input,
       groundTruth: typeof row.groundTruth === "string" ? safelyParseJSON(row.groundTruth) : row.groundTruth,
       expectedTrajectory: typeof row.expectedTrajectory === "string" ? safelyParseJSON(row.expectedTrajectory) : row.expectedTrajectory,
@@ -2059,6 +2080,10 @@ var MongoDBDatasetsStorage = class extends DatasetsStorage {
         targetIds: input.targetIds ?? null,
         scorerIds: input.scorerIds ?? null,
         version: 0,
+        organizationId: input.organizationId ?? null,
+        projectId: input.projectId ?? null,
+        candidateKey: input.candidateKey ?? null,
+        candidateId: input.candidateId ?? null,
         createdAt: now,
         updatedAt: now
       };
@@ -2169,7 +2194,12 @@ var MongoDBDatasetsStorage = class extends DatasetsStorage {
     try {
       const { page, perPage: perPageInput } = args.pagination;
       const collection = await this.getCollection(TABLE_DATASETS);
-      const total = await collection.countDocuments({});
+      const filter = {};
+      if (args.filters?.organizationId !== void 0) filter.organizationId = args.filters.organizationId;
+      if (args.filters?.projectId !== void 0) filter.projectId = args.filters.projectId;
+      if (args.filters?.candidateKey !== void 0) filter.candidateKey = args.filters.candidateKey;
+      if (args.filters?.candidateId !== void 0) filter.candidateId = args.filters.candidateId;
+      const total = await collection.countDocuments(filter);
       if (total === 0) {
         return { datasets: [], pagination: { total: 0, page, perPage: perPageInput, hasMore: false } };
       }
@@ -2179,7 +2209,7 @@ var MongoDBDatasetsStorage = class extends DatasetsStorage {
         return { datasets: [], pagination: { total, page, perPage: perPageForResponse, hasMore: total > 0 } };
       }
       const limitValue = perPageInput === false ? total : perPage;
-      const rows = await collection.find({}).sort({ createdAt: -1, id: 1 }).skip(offset).limit(limitValue).toArray();
+      const rows = await collection.find(filter).sort({ createdAt: -1, id: 1 }).skip(offset).limit(limitValue).toArray();
       return {
         datasets: rows.map((row) => this.transformDatasetRow(row)),
         pagination: {
@@ -2223,10 +2253,14 @@ var MongoDBDatasetsStorage = class extends DatasetsStorage {
         });
       }
       const newVersion = result.version;
+      const organizationId = result.organizationId ?? null;
+      const projectId = result.projectId ?? null;
       await itemsCollection.insertOne({
         id,
         datasetId: args.datasetId,
         datasetVersion: newVersion,
+        organizationId,
+        projectId,
         validTo: null,
         isDeleted: false,
         input: args.input,
@@ -2249,6 +2283,8 @@ var MongoDBDatasetsStorage = class extends DatasetsStorage {
         id,
         datasetId: args.datasetId,
         datasetVersion: newVersion,
+        organizationId,
+        projectId,
         input: args.input,
         groundTruth: args.groundTruth,
         expectedTrajectory: args.expectedTrajectory,
@@ -2320,6 +2356,8 @@ var MongoDBDatasetsStorage = class extends DatasetsStorage {
         });
       }
       const newVersion = result.version;
+      const parentOrganizationId = result.organizationId ?? null;
+      const parentProjectId = result.projectId ?? null;
       await itemsCollection.updateOne(
         { id: args.id, validTo: null, isDeleted: false },
         { $set: { validTo: newVersion } }
@@ -2328,6 +2366,8 @@ var MongoDBDatasetsStorage = class extends DatasetsStorage {
         id: args.id,
         datasetId: args.datasetId,
         datasetVersion: newVersion,
+        organizationId: parentOrganizationId,
+        projectId: parentProjectId,
         validTo: null,
         isDeleted: false,
         input: mergedInput,
@@ -2349,6 +2389,8 @@ var MongoDBDatasetsStorage = class extends DatasetsStorage {
       return {
         ...existing,
         datasetVersion: newVersion,
+        organizationId: parentOrganizationId,
+        projectId: parentProjectId,
         input: mergedInput,
         groundTruth: mergedGroundTruth,
         expectedTrajectory: mergedExpectedTrajectory,
@@ -2401,15 +2443,21 @@ var MongoDBDatasetsStorage = class extends DatasetsStorage {
         });
       }
       const newVersion = result.version;
+      const parentOrganizationId = result.organizationId ?? null;
+      const parentProjectId = result.projectId ?? null;
       await itemsCollection.updateOne({ id, validTo: null, isDeleted: false }, { $set: { validTo: newVersion } });
       await itemsCollection.insertOne({
         id,
         datasetId,
         datasetVersion: newVersion,
+        organizationId: parentOrganizationId,
+        projectId: parentProjectId,
         validTo: null,
         isDeleted: true,
         input: existing.input,
         groundTruth: existing.groundTruth,
+        expectedTrajectory: existing.expectedTrajectory ?? null,
+        toolMocks: existing.toolMocks ?? null,
         requestContext: existing.requestContext,
         metadata: existing.metadata,
         source: existing.source,
@@ -2472,11 +2520,15 @@ var MongoDBDatasetsStorage = class extends DatasetsStorage {
         });
       }
       const newVersion = result.version;
+      const organizationId = result.organizationId ?? null;
+      const projectId = result.projectId ?? null;
       if (itemsWithIds.length > 0) {
         const docs = itemsWithIds.map(({ generatedId, itemInput }) => ({
           id: generatedId,
           datasetId: input.datasetId,
           datasetVersion: newVersion,
+          organizationId,
+          projectId,
           validTo: null,
           isDeleted: false,
           input: itemInput.input,
@@ -2501,6 +2553,8 @@ var MongoDBDatasetsStorage = class extends DatasetsStorage {
         id: generatedId,
         datasetId: input.datasetId,
         datasetVersion: newVersion,
+        organizationId,
+        projectId,
         input: itemInput.input,
         groundTruth: itemInput.groundTruth,
         expectedTrajectory: itemInput.expectedTrajectory,
@@ -2561,6 +2615,8 @@ var MongoDBDatasetsStorage = class extends DatasetsStorage {
         });
       }
       const newVersion = result.version;
+      const parentOrganizationId = result.organizationId ?? null;
+      const parentProjectId = result.projectId ?? null;
       const currentIds = currentItems.map((i) => i.id);
       await itemsCollection.updateMany(
         { id: { $in: currentIds }, validTo: null, isDeleted: false },
@@ -2570,10 +2626,14 @@ var MongoDBDatasetsStorage = class extends DatasetsStorage {
         id: item.id,
         datasetId: input.datasetId,
         datasetVersion: newVersion,
+        organizationId: parentOrganizationId,
+        projectId: parentProjectId,
         validTo: null,
         isDeleted: true,
         input: item.input,
         groundTruth: item.groundTruth,
+        expectedTrajectory: item.expectedTrajectory ?? null,
+        toolMocks: item.toolMocks ?? null,
         requestContext: item.requestContext,
         metadata: item.metadata,
         source: item.source,
@@ -2675,6 +2735,8 @@ var MongoDBDatasetsStorage = class extends DatasetsStorage {
       const { page, perPage: perPageInput } = args.pagination;
       const collection = await this.getCollection(TABLE_DATASET_ITEMS);
       const filter = { datasetId: args.datasetId };
+      if (args.filters?.organizationId !== void 0) filter.organizationId = args.filters.organizationId;
+      if (args.filters?.projectId !== void 0) filter.projectId = args.filters.projectId;
       if (args.version !== void 0) {
         filter.datasetVersion = { $lte: args.version };
         filter.$or = [{ validTo: null }, { validTo: { $gt: args.version } }];
@@ -2829,6 +2891,8 @@ function transformExperimentRow(row) {
     metadata: parseJsonField(row.metadata) ?? void 0,
     datasetId: row.datasetId ?? null,
     datasetVersion: row.datasetVersion != null ? Number(row.datasetVersion) : null,
+    organizationId: row.organizationId ?? null,
+    projectId: row.projectId ?? null,
     targetType: row.targetType,
     targetId: row.targetId,
     status: row.status,
@@ -2849,6 +2913,8 @@ function transformExperimentResultRow(row) {
     experimentId: row.experimentId,
     itemId: row.itemId,
     itemDatasetVersion: row.itemDatasetVersion != null ? Number(row.itemDatasetVersion) : null,
+    organizationId: row.organizationId ?? null,
+    projectId: row.projectId ?? null,
     input: parseJsonField(row.input),
     output: parseJsonField(row.output) ?? null,
     groundTruth: parseJsonField(row.groundTruth) ?? null,
@@ -2887,11 +2953,14 @@ var MongoDBExperimentsStorage = class _MongoDBExperimentsStorage extends Experim
       { collection: TABLE_EXPERIMENTS, keys: { id: 1 }, options: { unique: true } },
       { collection: TABLE_EXPERIMENTS, keys: { datasetId: 1 } },
       { collection: TABLE_EXPERIMENTS, keys: { createdAt: -1, id: 1 } },
+      // Tenancy: leading-tenant indexes for multi-tenant scans (parity with datasets domain).
+      { collection: TABLE_EXPERIMENTS, keys: { organizationId: 1, projectId: 1 } },
       { collection: TABLE_EXPERIMENT_RESULTS, keys: { id: 1 }, options: { unique: true } },
       { collection: TABLE_EXPERIMENT_RESULTS, keys: { experimentId: 1 } },
       { collection: TABLE_EXPERIMENT_RESULTS, keys: { experimentId: 1, itemId: 1 }, options: { unique: true } },
       { collection: TABLE_EXPERIMENT_RESULTS, keys: { createdAt: -1 } },
-      { collection: TABLE_EXPERIMENT_RESULTS, keys: { experimentId: 1, startedAt: 1, id: 1 } }
+      { collection: TABLE_EXPERIMENT_RESULTS, keys: { experimentId: 1, startedAt: 1, id: 1 } },
+      { collection: TABLE_EXPERIMENT_RESULTS, keys: { organizationId: 1, projectId: 1 } }
     ];
   }
   async createDefaultIndexes() {
@@ -2933,6 +3002,8 @@ var MongoDBExperimentsStorage = class _MongoDBExperimentsStorage extends Experim
       metadata: input.metadata ?? null,
       datasetId: input.datasetId ?? null,
       datasetVersion: input.datasetVersion ?? null,
+      organizationId: input.organizationId ?? null,
+      projectId: input.projectId ?? null,
       targetType: input.targetType,
       targetId: input.targetId,
       status: "pending",
@@ -2956,6 +3027,8 @@ var MongoDBExperimentsStorage = class _MongoDBExperimentsStorage extends Experim
         metadata: input.metadata,
         datasetId: input.datasetId ?? null,
         datasetVersion: input.datasetVersion ?? null,
+        organizationId: input.organizationId ?? null,
+        projectId: input.projectId ?? null,
         targetType: input.targetType,
         targetId: input.targetId,
         status: "pending",
@@ -3057,6 +3130,15 @@ var MongoDBExperimentsStorage = class _MongoDBExperimentsStorage extends Experim
       if (args.status) {
         filter.status = args.status;
       }
+      if (args.filters) {
+        const { organizationId, projectId } = args.filters;
+        if (organizationId !== void 0) {
+          filter.organizationId = organizationId;
+        }
+        if (projectId !== void 0) {
+          filter.projectId = projectId;
+        }
+      }
       const total = await collection.countDocuments(filter);
       if (total === 0) {
         return { experiments: [], pagination: { total: 0, page, perPage: perPageInput, hasMore: false } };
@@ -3117,6 +3199,8 @@ var MongoDBExperimentsStorage = class _MongoDBExperimentsStorage extends Experim
       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,
@@ -3138,6 +3222,8 @@ var MongoDBExperimentsStorage = class _MongoDBExperimentsStorage extends Experim
         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,
@@ -3237,6 +3323,15 @@ var MongoDBExperimentsStorage = class _MongoDBExperimentsStorage extends Experim
       if (args.status) {
         filter.status = args.status;
       }
+      if (args.filters) {
+        const { organizationId, projectId } = args.filters;
+        if (organizationId !== void 0) {
+          filter.organizationId = organizationId;
+        }
+        if (projectId !== void 0) {
+          filter.projectId = projectId;
+        }
+      }
       const total = await collection.countDocuments(filter);
       if (total === 0) {
         return { results: [], pagination: { total: 0, page, perPage: perPageInput, hasMore: false } };
@@ -6874,17 +6969,39 @@ Note: This migration may take some time for large collections.
       supported: ["batch-with-updates", "insert-only"]
     };
   }
+  createDateRangeCondition(field, range) {
+    const dateFilter = {};
+    const stringFilter = {};
+    if (range.start) {
+      const operator = range.startExclusive ? "$gt" : "$gte";
+      const start = range.start instanceof Date ? range.start : new Date(range.start);
+      dateFilter[operator] = start;
+      stringFilter[operator] = start.toISOString();
+    }
+    if (range.end) {
+      const operator = range.endExclusive ? "$lt" : "$lte";
+      const end = range.end instanceof Date ? range.end : new Date(range.end);
+      dateFilter[operator] = end;
+      stringFilter[operator] = end.toISOString();
+    }
+    if (Object.keys(dateFilter).length === 0) {
+      return null;
+    }
+    return {
+      $or: [{ [field]: dateFilter }, { [field]: stringFilter }]
+    };
+  }
   async createSpan(args) {
     const { span } = args;
     try {
-      const startedAt = span.startedAt instanceof Date ? span.startedAt.toISOString() : span.startedAt;
-      const endedAt = span.endedAt instanceof Date ? span.endedAt.toISOString() : span.endedAt;
+      const startedAt = span.startedAt instanceof Date ? span.startedAt : new Date(span.startedAt);
+      const endedAt = span.endedAt == null ? span.endedAt : span.endedAt instanceof Date ? span.endedAt : new Date(span.endedAt);
       const record = {
         ...span,
         startedAt,
         endedAt,
-        createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+        createdAt: /* @__PURE__ */ new Date(),
+        updatedAt: /* @__PURE__ */ new Date()
       };
       const collection = await this.getCollection(TABLE_SPANS);
       await collection.insertOne(record);
@@ -7019,15 +7136,15 @@ Note: This migration may take some time for large collections.
     const { traceId, spanId, updates } = args;
     try {
       const data = { ...updates };
-      if (data.endedAt instanceof Date) {
-        data.endedAt = data.endedAt.toISOString();
+      if (data.endedAt != null && !(data.endedAt instanceof Date)) {
+        data.endedAt = new Date(data.endedAt);
       }
-      if (data.startedAt instanceof Date) {
-        data.startedAt = data.startedAt.toISOString();
+      if (data.startedAt != null && !(data.startedAt instanceof Date)) {
+        data.startedAt = new Date(data.startedAt);
       }
       const updateData = {
         ...data,
-        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+        updatedAt: /* @__PURE__ */ new Date()
       };
       const collection = await this.getCollection(TABLE_SPANS);
       await collection.updateOne({ spanId, traceId }, { $set: updateData });
@@ -7059,27 +7176,15 @@ Note: This migration may take some time for large collections.
       const andConditions = [];
       if (filters) {
         if (filters.startedAt) {
-          const startedAtFilter = {};
-          if (filters.startedAt.start) {
-            startedAtFilter.$gte = filters.startedAt.start.toISOString();
-          }
-          if (filters.startedAt.end) {
-            startedAtFilter.$lte = filters.startedAt.end.toISOString();
-          }
-          if (Object.keys(startedAtFilter).length > 0) {
-            mongoFilter.startedAt = startedAtFilter;
+          const startedAtCondition = this.createDateRangeCondition("startedAt", filters.startedAt);
+          if (startedAtCondition) {
+            andConditions.push(startedAtCondition);
           }
         }
         if (filters.endedAt) {
-          const endedAtFilter = {};
-          if (filters.endedAt.start) {
-            endedAtFilter.$gte = filters.endedAt.start.toISOString();
-          }
-          if (filters.endedAt.end) {
-            endedAtFilter.$lte = filters.endedAt.end.toISOString();
-          }
-          if (Object.keys(endedAtFilter).length > 0) {
-            andConditions.push({ endedAt: endedAtFilter });
+          const endedAtCondition = this.createDateRangeCondition("endedAt", filters.endedAt);
+          if (endedAtCondition) {
+            andConditions.push(endedAtCondition);
           }
         }
         if (filters.spanType !== void 0) {
@@ -7287,14 +7392,14 @@ Note: This migration may take some time for large collections.
   async batchCreateSpans(args) {
     try {
       const records = args.records.map((record) => {
-        const startedAt = record.startedAt instanceof Date ? record.startedAt.toISOString() : record.startedAt;
-        const endedAt = record.endedAt instanceof Date ? record.endedAt.toISOString() : record.endedAt;
+        const startedAt = record.startedAt instanceof Date ? record.startedAt : new Date(record.startedAt);
+        const endedAt = record.endedAt == null ? record.endedAt : record.endedAt instanceof Date ? record.endedAt : new Date(record.endedAt);
         return {
           ...record,
           startedAt,
           endedAt,
-          createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-          updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+          createdAt: /* @__PURE__ */ new Date(),
+          updatedAt: /* @__PURE__ */ new Date()
         };
       });
       if (records.length > 0) {
@@ -7319,15 +7424,15 @@ Note: This migration may take some time for large collections.
       }
       const bulkOps = args.records.map((record) => {
         const data = { ...record.updates };
-        if (data.endedAt instanceof Date) {
-          data.endedAt = data.endedAt.toISOString();
+        if (data.endedAt != null && !(data.endedAt instanceof Date)) {
+          data.endedAt = new Date(data.endedAt);
         }
-        if (data.startedAt instanceof Date) {
-          data.startedAt = data.startedAt.toISOString();
+        if (data.startedAt != null && !(data.startedAt instanceof Date)) {
+          data.startedAt = new Date(data.startedAt);
         }
         const updateData = {
           ...data,
-          updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+          updatedAt: /* @__PURE__ */ new Date()
         };
         return {
           updateOne: {