@mastra/mongodb 1.10.1-alpha.0 → 1.11.0

package/CHANGELOG.md

@@ -1,5 +1,157 @@
 # @mastra/mongodb
 
+## 1.11.0
+
+### Minor Changes
+
+- Fixed new observability span writes in MongoDB so `startedAt`, `endedAt`, `createdAt`, and `updatedAt` are stored as native BSON Date objects. Existing string-typed span dates remain readable and date filters support both old string values and new Date values. ([#18366](https://github.com/mastra-ai/mastra/pull/18366))
+
+### Patch Changes
+
+- Added multi-tenant scoping columns (`organizationId`, `projectId`) to the experiments domain so experiment records and per-item results inherit the tenancy bucket of their parent dataset. ([#18388](https://github.com/mastra-ai/mastra/pull/18388))
+
+  `Experiment`, `ExperimentResult`, `CreateExperimentInput`, and `AddExperimentResultInput` now carry optional `organizationId` / `projectId` fields. `ListExperimentsInput` and `ListExperimentResultsInput` gain a `filters: ExperimentTenancyFilters` block (mirrors `DatasetTenancyFilters`) for scoping queries within a `(organizationId, projectId)` bucket. Tenancy is hydrated from the parent dataset on `createExperiment` and denormalized onto each `ExperimentResult` for efficient tenancy-scoped queries.
+
+  The corresponding columns are also added to the `mastra_experiments` and `mastra_experiment_results` table schemas. Existing rows backfill to `null`, matching the rest of the dataset-tenancy surface.
+
+  This release also clarifies the `targetType` contract via JSDoc:
+  - `CreateDatasetInput.targetType` remains optional. Datasets without a `TargetType` are **not experiment-eligible** — the experiment runner requires a non-null `CreateExperimentInput.targetType` to resolve an executor.
+  - `Experiment.targetType` / `CreateExperimentInput.targetType` stay required. An experiment by definition replays inputs against a specific target.
+
+  No behavior change for existing OSS-created experiments; the new fields are additive and optional.
+
+  Example:
+
+  ```ts
+  // Create an experiment scoped to a tenancy bucket. When the parent dataset
+  // already carries `organizationId` / `projectId`, `runExperiment` hydrates
+  // these fields automatically from the dataset record.
+  const experiment = await storage.createExperiment({
+    name: 'qa-regression',
+    datasetId: 'ds_123',
+    datasetVersion: 1,
+    targetType: 'agent',
+    targetId: 'agent_qa',
+    totalItems: 10,
+    organizationId: 'org_123',
+    projectId: 'proj_123',
+  });
+
+  // List experiments within a tenancy bucket.
+  const experiments = await storage.listExperiments({
+    pagination: { page: 0, perPage: 20 },
+    filters: { organizationId: 'org_123', projectId: 'proj_123' },
+  });
+
+  // List per-item results within the same bucket.
+  const results = await storage.listExperimentResults({
+    experimentId: experiment.id,
+    pagination: { page: 0, perPage: 50 },
+    filters: { organizationId: 'org_123', projectId: 'proj_123' },
+  });
+  ```
+
+- Persist and filter dataset tenancy + candidate identity in storage adapters. ([#18314](https://github.com/mastra-ai/mastra/pull/18314))
+
+  `createDataset` now persists `organizationId`, `projectId`, `candidateKey`, and `candidateId`. `listDatasets` and `listItems` accept matching tenancy filters. Dataset items inherit `organizationId` / `projectId` from their parent dataset on insert, update, delete, and batch insert/delete — items are never settable per call (item tenancy follows dataset tenancy).
+
+  All new columns are nullable and added retroactively via each adapter's existing column-migration path; no breaking DDL. Existing rows continue to read and write fine; new writes can choose to stamp tenancy.
+
+  ```ts
+  await storage.createDataset({
+    name: 'candidates/missing-tool-call/incident-123',
+    organizationId: 'org_abc',
+    projectId: 'project_xyz',
+    candidateKey: 'missing-tool-call',
+    candidateId: 'incident-123',
+  });
+
+  await storage.listDatasets({
+    pagination: { page: 0, perPage: 20 },
+    filters: { organizationId: 'org_abc', projectId: 'project_xyz' },
+  });
+  ```
+
+- Added storage for item-level tool mocks. Dataset items persist their `toolMocks` and experiment results persist their `toolMockReport`, so mocks and run diagnostics survive across sessions. ([#18036](https://github.com/mastra-ai/mastra/pull/18036))
+
+- Updated dependencies [[`5bd72d2`](https://github.com/mastra-ai/mastra/commit/5bd72d255f45b5ea8ab342643bd463814a980a24), [`1cc9ee1`](https://github.com/mastra-ai/mastra/commit/1cc9ee1ba51db53020a735626d33017a60b4b5b3), [`417baae`](https://github.com/mastra-ai/mastra/commit/417baae40b995db5819c845036947f0c27dc1c00), [`65f255a`](https://github.com/mastra-ai/mastra/commit/65f255a38667beb6ceeadabfa9eb5059bfec8298), [`74955f9`](https://github.com/mastra-ai/mastra/commit/74955f9120cde8b1d8ce4399232b4033236be858), [`30ebaf0`](https://github.com/mastra-ai/mastra/commit/30ebaf07bed5f4d30f2f257836c15d1bf7e40aae), [`5704634`](https://github.com/mastra-ai/mastra/commit/5704634b22133167dea337a942a34f57aaa3fa14), [`5c4e9a4`](https://github.com/mastra-ai/mastra/commit/5c4e9a4cfb2216bb3ea7f8988ad3727f3b92bb3a), [`4a88c6e`](https://github.com/mastra-ai/mastra/commit/4a88c6e2bdce316f8d7551b4ec3449b0b06fc71c), [`417baae`](https://github.com/mastra-ai/mastra/commit/417baae40b995db5819c845036947f0c27dc1c00), [`74955f9`](https://github.com/mastra-ai/mastra/commit/74955f9120cde8b1d8ce4399232b4033236be858), [`74955f9`](https://github.com/mastra-ai/mastra/commit/74955f9120cde8b1d8ce4399232b4033236be858), [`25961e3`](https://github.com/mastra-ai/mastra/commit/25961e3260ff3b1464637af8fcdb36210551c39f), [`6a1428a`](https://github.com/mastra-ai/mastra/commit/6a1428a23133fc070fc6c1caa08d28f3ba4fe5ff), [`87a17ef`](https://github.com/mastra-ai/mastra/commit/87a17efbd725aca6639febdc5e69e2abb3048689), [`e11ff30`](https://github.com/mastra-ai/mastra/commit/e11ff301408bf1731dca2fb7fbfcd8c819500a35), [`7794d71`](https://github.com/mastra-ai/mastra/commit/7794d71872c68733a30e028dfb7b1705daf6c5d2), [`9d2c946`](https://github.com/mastra-ai/mastra/commit/9d2c946d0859e90ae4bcec5beeb1da7398d2ad1e), [`c0eda2b`](https://github.com/mastra-ai/mastra/commit/c0eda2bcd91a228427314b12c91d8b147f3a739f), [`7b29f33`](https://github.com/mastra-ai/mastra/commit/7b29f332a357a83e555f29e718e5f2fab9979943), [`c0eda2b`](https://github.com/mastra-ai/mastra/commit/c0eda2bcd91a228427314b12c91d8b147f3a739f), [`b13925b`](https://github.com/mastra-ai/mastra/commit/b13925bfa91aa8700f56fa54a9ce707ee7e4ba62), [`f1ec385`](https://github.com/mastra-ai/mastra/commit/f1ec385386f62b1a0847ec5353ae2bb169d1c3d9), [`e14986f`](https://github.com/mastra-ai/mastra/commit/e14986f6e5478d6384d04ff9a7f9a79a46a8b529), [`24912b1`](https://github.com/mastra-ai/mastra/commit/24912b1f855d29ec36af4ef4bde1f7417e20cdf5), [`bf94ec6`](https://github.com/mastra-ai/mastra/commit/bf94ec68192d9f16e46ef7e5ac36370aeeddf35d), [`a29f371`](https://github.com/mastra-ai/mastra/commit/a29f371aef629ac8562661524a497127e93b5131), [`7686216`](https://github.com/mastra-ai/mastra/commit/7686216f37e74568feddec17cef3c3d24e10e60a), [`74955f9`](https://github.com/mastra-ai/mastra/commit/74955f9120cde8b1d8ce4399232b4033236be858), [`073f910`](https://github.com/mastra-ai/mastra/commit/073f910481e7d94b95ba3830f96531774ae95d33), [`0be490f`](https://github.com/mastra-ai/mastra/commit/0be490fabb538c5a7de796ea0aff7d04a0bea1f3), [`0be490f`](https://github.com/mastra-ai/mastra/commit/0be490fabb538c5a7de796ea0aff7d04a0bea1f3), [`ebbe1d3`](https://github.com/mastra-ai/mastra/commit/ebbe1d31a965a3adb0e728758f326b8122b4b55f), [`974f614`](https://github.com/mastra-ai/mastra/commit/974f614e083bd68278536f94453f7b320b86a3c7), [`3818814`](https://github.com/mastra-ai/mastra/commit/38188149ce454c4403fe9fcbdf73b735c68d36be), [`975c59a`](https://github.com/mastra-ai/mastra/commit/975c59ae363ee275fc55062392e1ffd2cbccbd53), [`1f97ce5`](https://github.com/mastra-ai/mastra/commit/1f97ce5695463bebb4eaacf501da6fb403e20885), [`74955f9`](https://github.com/mastra-ai/mastra/commit/74955f9120cde8b1d8ce4399232b4033236be858), [`7f51548`](https://github.com/mastra-ai/mastra/commit/7f515481213780be7047cef00640b9d35f3d545c), [`64f58c0`](https://github.com/mastra-ai/mastra/commit/64f58c04e78b40137497d47f781e897e416f22a5), [`74955f9`](https://github.com/mastra-ai/mastra/commit/74955f9120cde8b1d8ce4399232b4033236be858), [`ebbe1d3`](https://github.com/mastra-ai/mastra/commit/ebbe1d31a965a3adb0e728758f326b8122b4b55f), [`d95f394`](https://github.com/mastra-ai/mastra/commit/d95f394fd24c8411886930d727679c4d5252aa26), [`417baae`](https://github.com/mastra-ai/mastra/commit/417baae40b995db5819c845036947f0c27dc1c00), [`8e25a78`](https://github.com/mastra-ai/mastra/commit/8e25a78e0597575f0b0729bae8c5e190c84869b5), [`417baae`](https://github.com/mastra-ai/mastra/commit/417baae40b995db5819c845036947f0c27dc1c00), [`f3f0c9d`](https://github.com/mastra-ai/mastra/commit/f3f0c9d7c878db5a13177871ce3523a14f14b311), [`a5b22d3`](https://github.com/mastra-ai/mastra/commit/a5b22d314d62a68d801886a8d3d0eb6c089473db), [`31be1cf`](https://github.com/mastra-ai/mastra/commit/31be1cf5f2a7b5eef12f6123a40653b4d8115c16), [`417baae`](https://github.com/mastra-ai/mastra/commit/417baae40b995db5819c845036947f0c27dc1c00), [`74955f9`](https://github.com/mastra-ai/mastra/commit/74955f9120cde8b1d8ce4399232b4033236be858), [`74955f9`](https://github.com/mastra-ai/mastra/commit/74955f9120cde8b1d8ce4399232b4033236be858)]:
+  - @mastra/core@1.46.0
+
+## 1.11.0-alpha.1
+
+### Minor Changes
+
+- Fixed new observability span writes in MongoDB so `startedAt`, `endedAt`, `createdAt`, and `updatedAt` are stored as native BSON Date objects. Existing string-typed span dates remain readable and date filters support both old string values and new Date values. ([#18366](https://github.com/mastra-ai/mastra/pull/18366))
+
+### Patch Changes
+
+- Added multi-tenant scoping columns (`organizationId`, `projectId`) to the experiments domain so experiment records and per-item results inherit the tenancy bucket of their parent dataset. ([#18388](https://github.com/mastra-ai/mastra/pull/18388))
+
+  `Experiment`, `ExperimentResult`, `CreateExperimentInput`, and `AddExperimentResultInput` now carry optional `organizationId` / `projectId` fields. `ListExperimentsInput` and `ListExperimentResultsInput` gain a `filters: ExperimentTenancyFilters` block (mirrors `DatasetTenancyFilters`) for scoping queries within a `(organizationId, projectId)` bucket. Tenancy is hydrated from the parent dataset on `createExperiment` and denormalized onto each `ExperimentResult` for efficient tenancy-scoped queries.
+
+  The corresponding columns are also added to the `mastra_experiments` and `mastra_experiment_results` table schemas. Existing rows backfill to `null`, matching the rest of the dataset-tenancy surface.
+
+  This release also clarifies the `targetType` contract via JSDoc:
+  - `CreateDatasetInput.targetType` remains optional. Datasets without a `TargetType` are **not experiment-eligible** — the experiment runner requires a non-null `CreateExperimentInput.targetType` to resolve an executor.
+  - `Experiment.targetType` / `CreateExperimentInput.targetType` stay required. An experiment by definition replays inputs against a specific target.
+
+  No behavior change for existing OSS-created experiments; the new fields are additive and optional.
+
+  Example:
+
+  ```ts
+  // Create an experiment scoped to a tenancy bucket. When the parent dataset
+  // already carries `organizationId` / `projectId`, `runExperiment` hydrates
+  // these fields automatically from the dataset record.
+  const experiment = await storage.createExperiment({
+    name: 'qa-regression',
+    datasetId: 'ds_123',
+    datasetVersion: 1,
+    targetType: 'agent',
+    targetId: 'agent_qa',
+    totalItems: 10,
+    organizationId: 'org_123',
+    projectId: 'proj_123',
+  });
+
+  // List experiments within a tenancy bucket.
+  const experiments = await storage.listExperiments({
+    pagination: { page: 0, perPage: 20 },
+    filters: { organizationId: 'org_123', projectId: 'proj_123' },
+  });
+
+  // List per-item results within the same bucket.
+  const results = await storage.listExperimentResults({
+    experimentId: experiment.id,
+    pagination: { page: 0, perPage: 50 },
+    filters: { organizationId: 'org_123', projectId: 'proj_123' },
+  });
+  ```
+
+- Persist and filter dataset tenancy + candidate identity in storage adapters. ([#18314](https://github.com/mastra-ai/mastra/pull/18314))
+
+  `createDataset` now persists `organizationId`, `projectId`, `candidateKey`, and `candidateId`. `listDatasets` and `listItems` accept matching tenancy filters. Dataset items inherit `organizationId` / `projectId` from their parent dataset on insert, update, delete, and batch insert/delete — items are never settable per call (item tenancy follows dataset tenancy).
+
+  All new columns are nullable and added retroactively via each adapter's existing column-migration path; no breaking DDL. Existing rows continue to read and write fine; new writes can choose to stamp tenancy.
+
+  ```ts
+  await storage.createDataset({
+    name: 'candidates/missing-tool-call/incident-123',
+    organizationId: 'org_abc',
+    projectId: 'project_xyz',
+    candidateKey: 'missing-tool-call',
+    candidateId: 'incident-123',
+  });
+
+  await storage.listDatasets({
+    pagination: { page: 0, perPage: 20 },
+    filters: { organizationId: 'org_abc', projectId: 'project_xyz' },
+  });
+  ```
+
+- Updated dependencies [[`5c4e9a4`](https://github.com/mastra-ai/mastra/commit/5c4e9a4cfb2216bb3ea7f8988ad3727f3b92bb3a), [`25961e3`](https://github.com/mastra-ai/mastra/commit/25961e3260ff3b1464637af8fcdb36210551c39f), [`7b29f33`](https://github.com/mastra-ai/mastra/commit/7b29f332a357a83e555f29e718e5f2fab9979943), [`24912b1`](https://github.com/mastra-ai/mastra/commit/24912b1f855d29ec36af4ef4bde1f7417e20cdf5), [`7686216`](https://github.com/mastra-ai/mastra/commit/7686216f37e74568feddec17cef3c3d24e10e60a), [`975c59a`](https://github.com/mastra-ai/mastra/commit/975c59ae363ee275fc55062392e1ffd2cbccbd53), [`d95f394`](https://github.com/mastra-ai/mastra/commit/d95f394fd24c8411886930d727679c4d5252aa26), [`f3f0c9d`](https://github.com/mastra-ai/mastra/commit/f3f0c9d7c878db5a13177871ce3523a14f14b311)]:
+  - @mastra/core@1.46.0-alpha.4
+
 ## 1.10.1-alpha.0
 
 ### Patch Changes

package/dist/docs/SKILL.md

@@ -3,7 +3,7 @@ name: mastra-mongodb
 description: Documentation for @mastra/mongodb. Use when working with @mastra/mongodb APIs, configuration, or implementation.
 metadata:
   package: "@mastra/mongodb"
-  version: "1.10.1-alpha.0"
+  version: "1.11.0"
 ---
 
 ## When to use

package/dist/docs/assets/SOURCE_MAP.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.10.1-alpha.0",
+  "version": "1.11.0",
   "package": "@mastra/mongodb",
   "exports": {},
   "modules": {}

package/dist/index.cjs

@@ -15,7 +15,7 @@ var skills = require('@mastra/core/storage/domains/skills');
 
 // package.json
 var package_default = {
-  version: "1.10.1-alpha.0"};
+  version: "1.11.0"};
 var MongoDBFilterTranslator = class extends filter.BaseFilterTranslator {
   getSupportedOperators() {
     return {
@@ -1930,7 +1930,22 @@ var MongoDBDatasetsStorage = class extends storage.DatasetsStorage {
     return [
       { collection: storage.TABLE_DATASETS, keys: { id: 1 }, options: { name: "idx_datasets_id", unique: true } },
       { collection: storage.TABLE_DATASETS, keys: { createdAt: -1, id: 1 }, options: { name: "idx_datasets_createdat_id" } },
+      {
+        collection: storage.TABLE_DATASETS,
+        keys: { organizationId: 1, projectId: 1, createdAt: -1, id: 1 },
+        options: { name: "idx_datasets_tenancy_createdat_id" }
+      },
+      {
+        collection: storage.TABLE_DATASETS,
+        keys: { organizationId: 1, projectId: 1, candidateKey: 1, candidateId: 1 },
+        options: { name: "idx_datasets_tenancy_candidate" }
+      },
       { collection: storage.TABLE_DATASET_ITEMS, keys: { datasetId: 1 }, options: { name: "idx_dataset_items_datasetid" } },
+      {
+        collection: storage.TABLE_DATASET_ITEMS,
+        keys: { organizationId: 1, projectId: 1, datasetId: 1, validTo: 1, isDeleted: 1 },
+        options: { name: "idx_dataset_items_tenancy_list" }
+      },
       {
         collection: storage.TABLE_DATASET_ITEMS,
         keys: { datasetId: 1, validTo: 1 },
@@ -2008,6 +2023,10 @@ var MongoDBDatasetsStorage = class extends storage.DatasetsStorage {
       targetIds: typeof row.targetIds === "string" ? storage.safelyParseJSON(row.targetIds) : row.targetIds ?? void 0,
       scorerIds: typeof row.scorerIds === "string" ? storage.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: storage.ensureDate(row.createdAt),
       updatedAt: storage.ensureDate(row.updatedAt)
     };
@@ -2017,6 +2036,8 @@ var MongoDBDatasetsStorage = class extends storage.DatasetsStorage {
       id: row.id,
       datasetId: row.datasetId,
       datasetVersion: row.datasetVersion,
+      organizationId: row.organizationId ?? null,
+      projectId: row.projectId ?? null,
       input: typeof row.input === "string" ? storage.safelyParseJSON(row.input) : row.input,
       groundTruth: typeof row.groundTruth === "string" ? storage.safelyParseJSON(row.groundTruth) : row.groundTruth,
       expectedTrajectory: typeof row.expectedTrajectory === "string" ? storage.safelyParseJSON(row.expectedTrajectory) : row.expectedTrajectory,
@@ -2061,6 +2082,10 @@ var MongoDBDatasetsStorage = class extends storage.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
       };
@@ -2171,7 +2196,12 @@ var MongoDBDatasetsStorage = class extends storage.DatasetsStorage {
     try {
       const { page, perPage: perPageInput } = args.pagination;
       const collection = await this.getCollection(storage.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 } };
       }
@@ -2181,7 +2211,7 @@ var MongoDBDatasetsStorage = class extends storage.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: {
@@ -2225,10 +2255,14 @@ var MongoDBDatasetsStorage = class extends storage.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,
@@ -2251,6 +2285,8 @@ var MongoDBDatasetsStorage = class extends storage.DatasetsStorage {
         id,
         datasetId: args.datasetId,
         datasetVersion: newVersion,
+        organizationId,
+        projectId,
         input: args.input,
         groundTruth: args.groundTruth,
         expectedTrajectory: args.expectedTrajectory,
@@ -2322,6 +2358,8 @@ var MongoDBDatasetsStorage = class extends storage.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 } }
@@ -2330,6 +2368,8 @@ var MongoDBDatasetsStorage = class extends storage.DatasetsStorage {
         id: args.id,
         datasetId: args.datasetId,
         datasetVersion: newVersion,
+        organizationId: parentOrganizationId,
+        projectId: parentProjectId,
         validTo: null,
         isDeleted: false,
         input: mergedInput,
@@ -2351,6 +2391,8 @@ var MongoDBDatasetsStorage = class extends storage.DatasetsStorage {
       return {
         ...existing,
         datasetVersion: newVersion,
+        organizationId: parentOrganizationId,
+        projectId: parentProjectId,
         input: mergedInput,
         groundTruth: mergedGroundTruth,
         expectedTrajectory: mergedExpectedTrajectory,
@@ -2403,15 +2445,21 @@ var MongoDBDatasetsStorage = class extends storage.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,
@@ -2474,11 +2522,15 @@ var MongoDBDatasetsStorage = class extends storage.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,
@@ -2503,6 +2555,8 @@ var MongoDBDatasetsStorage = class extends storage.DatasetsStorage {
         id: generatedId,
         datasetId: input.datasetId,
         datasetVersion: newVersion,
+        organizationId,
+        projectId,
         input: itemInput.input,
         groundTruth: itemInput.groundTruth,
         expectedTrajectory: itemInput.expectedTrajectory,
@@ -2563,6 +2617,8 @@ var MongoDBDatasetsStorage = class extends storage.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 },
@@ -2572,10 +2628,14 @@ var MongoDBDatasetsStorage = class extends storage.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,
@@ -2677,6 +2737,8 @@ var MongoDBDatasetsStorage = class extends storage.DatasetsStorage {
       const { page, perPage: perPageInput } = args.pagination;
       const collection = await this.getCollection(storage.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 } }];
@@ -2831,6 +2893,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,
@@ -2851,6 +2915,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,
@@ -2889,11 +2955,14 @@ var MongoDBExperimentsStorage = class _MongoDBExperimentsStorage extends storage
       { collection: storage.TABLE_EXPERIMENTS, keys: { id: 1 }, options: { unique: true } },
       { collection: storage.TABLE_EXPERIMENTS, keys: { datasetId: 1 } },
       { collection: storage.TABLE_EXPERIMENTS, keys: { createdAt: -1, id: 1 } },
+      // Tenancy: leading-tenant indexes for multi-tenant scans (parity with datasets domain).
+      { collection: storage.TABLE_EXPERIMENTS, keys: { organizationId: 1, projectId: 1 } },
       { collection: storage.TABLE_EXPERIMENT_RESULTS, keys: { id: 1 }, options: { unique: true } },
       { collection: storage.TABLE_EXPERIMENT_RESULTS, keys: { experimentId: 1 } },
       { collection: storage.TABLE_EXPERIMENT_RESULTS, keys: { experimentId: 1, itemId: 1 }, options: { unique: true } },
       { collection: storage.TABLE_EXPERIMENT_RESULTS, keys: { createdAt: -1 } },
-      { collection: storage.TABLE_EXPERIMENT_RESULTS, keys: { experimentId: 1, startedAt: 1, id: 1 } }
+      { collection: storage.TABLE_EXPERIMENT_RESULTS, keys: { experimentId: 1, startedAt: 1, id: 1 } },
+      { collection: storage.TABLE_EXPERIMENT_RESULTS, keys: { organizationId: 1, projectId: 1 } }
     ];
   }
   async createDefaultIndexes() {
@@ -2935,6 +3004,8 @@ var MongoDBExperimentsStorage = class _MongoDBExperimentsStorage extends storage
       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",
@@ -2958,6 +3029,8 @@ var MongoDBExperimentsStorage = class _MongoDBExperimentsStorage extends storage
         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",
@@ -3059,6 +3132,15 @@ var MongoDBExperimentsStorage = class _MongoDBExperimentsStorage extends storage
       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 } };
@@ -3119,6 +3201,8 @@ var MongoDBExperimentsStorage = class _MongoDBExperimentsStorage extends storage
       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,
@@ -3140,6 +3224,8 @@ var MongoDBExperimentsStorage = class _MongoDBExperimentsStorage extends storage
         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,
@@ -3239,6 +3325,15 @@ var MongoDBExperimentsStorage = class _MongoDBExperimentsStorage extends storage
       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 } };
@@ -6876,17 +6971,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(storage.TABLE_SPANS);
       await collection.insertOne(record);
@@ -7021,15 +7138,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(storage.TABLE_SPANS);
       await collection.updateOne({ spanId, traceId }, { $set: updateData });
@@ -7061,27 +7178,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) {
@@ -7289,14 +7394,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) {
@@ -7321,15 +7426,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: {