@mastra/spanner 1.2.0 → 1.2.1-alpha.1

package/CHANGELOG.md

@@ -1,5 +1,85 @@
 # @mastra/spanner
 
+## 1.2.1-alpha.1
+
+### 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.2.1-alpha.0
+
+### Patch Changes
+
+- 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 [[`65f255a`](https://github.com/mastra-ai/mastra/commit/65f255a38667beb6ceeadabfa9eb5059bfec8298), [`4a88c6e`](https://github.com/mastra-ai/mastra/commit/4a88c6e2bdce316f8d7551b4ec3449b0b06fc71c), [`87a17ef`](https://github.com/mastra-ai/mastra/commit/87a17efbd725aca6639febdc5e69e2abb3048689), [`e11ff30`](https://github.com/mastra-ai/mastra/commit/e11ff301408bf1731dca2fb7fbfcd8c819500a35), [`9d2c946`](https://github.com/mastra-ai/mastra/commit/9d2c946d0859e90ae4bcec5beeb1da7398d2ad1e), [`f1ec385`](https://github.com/mastra-ai/mastra/commit/f1ec385386f62b1a0847ec5353ae2bb169d1c3d9), [`e14986f`](https://github.com/mastra-ai/mastra/commit/e14986f6e5478d6384d04ff9a7f9a79a46a8b529), [`0be490f`](https://github.com/mastra-ai/mastra/commit/0be490fabb538c5a7de796ea0aff7d04a0bea1f3), [`0be490f`](https://github.com/mastra-ai/mastra/commit/0be490fabb538c5a7de796ea0aff7d04a0bea1f3), [`974f614`](https://github.com/mastra-ai/mastra/commit/974f614e083bd68278536f94453f7b320b86a3c7), [`31be1cf`](https://github.com/mastra-ai/mastra/commit/31be1cf5f2a7b5eef12f6123a40653b4d8115c16)]:
+  - @mastra/core@1.46.0-alpha.3
+
 ## 1.2.0
 
 ### Minor Changes

package/dist/docs/SKILL.md

@@ -3,7 +3,7 @@ name: mastra-spanner
 description: Documentation for @mastra/spanner. Use when working with @mastra/spanner APIs, configuration, or implementation.
 metadata:
   package: "@mastra/spanner"
-  version: "1.2.0"
+  version: "1.2.1-alpha.1"
 ---
 
 ## When to use

package/dist/docs/assets/SOURCE_MAP.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.0",
+  "version": "1.2.1-alpha.1",
   "package": "@mastra/spanner",
   "exports": {},
   "modules": {}

package/dist/index.cjs

@@ -2969,6 +2969,10 @@ function rowToDataset(row) {
     targetIds: t.targetIds ?? null,
     scorerIds: t.scorerIds ?? null,
     version: Number(t.version ?? 0),
+    organizationId: t.organizationId ?? null,
+    projectId: t.projectId ?? null,
+    candidateKey: t.candidateKey ?? null,
+    candidateId: t.candidateId ?? null,
     createdAt: toDate(t.createdAt),
     updatedAt: toDate(t.updatedAt)
   };
@@ -2979,9 +2983,12 @@ function rowToItem(row) {
     id: String(t.id),
     datasetId: String(t.datasetId),
     datasetVersion: Number(t.datasetVersion),
+    organizationId: t.organizationId ?? null,
+    projectId: t.projectId ?? null,
     input: t.input,
     groundTruth: t.groundTruth ?? void 0,
     expectedTrajectory: t.expectedTrajectory ?? void 0,
+    toolMocks: t.toolMocks ?? void 0,
     requestContext: t.requestContext ?? void 0,
     metadata: t.metadata ?? void 0,
     source: t.source ?? void 0,
@@ -3024,6 +3031,16 @@ var DatasetsSpanner = class _DatasetsSpanner extends storage.DatasetsStorage {
     await this.db.createTable({ tableName: storage.TABLE_DATASETS, schema: storage.TABLE_SCHEMAS[storage.TABLE_DATASETS] });
     await this.db.createTable({ tableName: storage.TABLE_DATASET_ITEMS, schema: storage.TABLE_SCHEMAS[storage.TABLE_DATASET_ITEMS] });
     await this.db.createTable({ tableName: storage.TABLE_DATASET_VERSIONS, schema: storage.TABLE_SCHEMAS[storage.TABLE_DATASET_VERSIONS] });
+    await this.db.alterTable({
+      tableName: storage.TABLE_DATASETS,
+      schema: storage.TABLE_SCHEMAS[storage.TABLE_DATASETS],
+      ifNotExists: ["organizationId", "projectId", "candidateKey", "candidateId"]
+    });
+    await this.db.alterTable({
+      tableName: storage.TABLE_DATASET_ITEMS,
+      schema: storage.TABLE_SCHEMAS[storage.TABLE_DATASET_ITEMS],
+      ifNotExists: ["organizationId", "projectId"]
+    });
     await this.createDefaultIndexes();
     await this.createCustomIndexes();
   }
@@ -3084,6 +3101,10 @@ var DatasetsSpanner = class _DatasetsSpanner 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
       };
@@ -3102,6 +3123,10 @@ var DatasetsSpanner = class _DatasetsSpanner extends storage.DatasetsStorage {
           targetIds: record.targetIds,
           scorerIds: record.scorerIds,
           version: 0,
+          organizationId: record.organizationId,
+          projectId: record.projectId,
+          candidateKey: record.candidateKey,
+          candidateId: record.candidateId,
           createdAt: now,
           updatedAt: now
         }
@@ -3231,8 +3256,28 @@ var DatasetsSpanner = class _DatasetsSpanner extends storage.DatasetsStorage {
     const { offset, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
     try {
       const tableName = quoteIdent(storage.TABLE_DATASETS, "table name");
+      const filterConditions = [];
+      const filterParams = {};
+      if (args.filters?.organizationId !== void 0) {
+        filterConditions.push(`${quoteIdent("organizationId", "column name")} = @organizationId`);
+        filterParams.organizationId = args.filters.organizationId;
+      }
+      if (args.filters?.projectId !== void 0) {
+        filterConditions.push(`${quoteIdent("projectId", "column name")} = @projectId`);
+        filterParams.projectId = args.filters.projectId;
+      }
+      if (args.filters?.candidateKey !== void 0) {
+        filterConditions.push(`${quoteIdent("candidateKey", "column name")} = @candidateKey`);
+        filterParams.candidateKey = args.filters.candidateKey;
+      }
+      if (args.filters?.candidateId !== void 0) {
+        filterConditions.push(`${quoteIdent("candidateId", "column name")} = @candidateId`);
+        filterParams.candidateId = args.filters.candidateId;
+      }
+      const whereClause = filterConditions.length > 0 ? `WHERE ${filterConditions.join(" AND ")}` : "";
       const [countRows] = await this.database.run({
-        sql: `SELECT COUNT(*) AS count FROM ${tableName}`,
+        sql: `SELECT COUNT(*) AS count FROM ${tableName} ${whereClause}`,
+        params: filterParams,
         json: true
       });
       const total = Number(countRows[0]?.count ?? 0);
@@ -3241,10 +3286,10 @@ var DatasetsSpanner = class _DatasetsSpanner extends storage.DatasetsStorage {
       }
       const limit = perPageInput === false ? total : perPage;
       const [rows] = await this.database.run({
-        sql: `SELECT * FROM ${tableName}
+        sql: `SELECT * FROM ${tableName} ${whereClause}
               ORDER BY ${quoteIdent("createdAt", "column name")} DESC, ${quoteIdent("id", "column name")} ASC
               LIMIT @limit OFFSET @offset`,
-        params: { limit, offset },
+        params: { ...filterParams, limit, offset },
         json: true
       });
       const datasets = rows.map(rowToDataset);
@@ -3271,10 +3316,13 @@ var DatasetsSpanner = class _DatasetsSpanner extends storage.DatasetsStorage {
   // ==========================================================================
   // SCD-2 helpers
   // ==========================================================================
-  /** Reads and increments the dataset version inside `tx`; throws if missing. */
+  /** Reads and increments the dataset version inside `tx`; throws if missing. Also returns parent tenancy. */
   async bumpVersion(tx, datasetId, now) {
     const [rows] = await tx.run({
-      sql: `SELECT ${quoteIdent("version", "column name")} AS version FROM ${quoteIdent(storage.TABLE_DATASETS, "table name")}
+      sql: `SELECT ${quoteIdent("version", "column name")} AS version,
+                   ${quoteIdent("organizationId", "column name")} AS organizationId,
+                   ${quoteIdent("projectId", "column name")} AS projectId
+            FROM ${quoteIdent(storage.TABLE_DATASETS, "table name")}
             WHERE ${quoteIdent("id", "column name")} = @id LIMIT 1`,
       params: { id: datasetId },
       json: true
@@ -3298,7 +3346,7 @@ var DatasetsSpanner = class _DatasetsSpanner extends storage.DatasetsStorage {
       params: { newVersion, now: now.toISOString(), id: datasetId },
       types: { now: "timestamp" }
     });
-    return newVersion;
+    return { version: newVersion, organizationId: row.organizationId ?? null, projectId: row.projectId ?? null };
   }
   /** Inserts a dataset version snapshot row inside `tx`. */
   async insertVersionRow(tx, datasetId, version, now) {
@@ -3343,18 +3391,21 @@ var DatasetsSpanner = class _DatasetsSpanner extends storage.DatasetsStorage {
       await this.db.runWithAbortRetry(
         () => this.database.runTransactionAsync(async (tx) => {
           try {
-            const newVersion = await this.bumpVersion(tx, args.datasetId, now);
+            const { version: newVersion, organizationId, projectId } = await this.bumpVersion(tx, args.datasetId, now);
             await this.db.insert({
               tableName: storage.TABLE_DATASET_ITEMS,
               record: {
                 id: itemId,
                 datasetId: args.datasetId,
                 datasetVersion: newVersion,
+                organizationId,
+                projectId,
                 validTo: null,
                 isDeleted: false,
                 input: args.input,
                 groundTruth: args.groundTruth ?? null,
                 expectedTrajectory: args.expectedTrajectory ?? null,
+                toolMocks: args.toolMocks ?? null,
                 requestContext: args.requestContext ?? null,
                 metadata: args.metadata ?? null,
                 source: args.source ?? null,
@@ -3369,9 +3420,12 @@ var DatasetsSpanner = class _DatasetsSpanner extends storage.DatasetsStorage {
               id: itemId,
               datasetId: args.datasetId,
               datasetVersion: newVersion,
+              organizationId,
+              projectId,
               input: args.input,
               groundTruth: args.groundTruth,
               expectedTrajectory: args.expectedTrajectory,
+              toolMocks: args.toolMocks,
               requestContext: args.requestContext,
               metadata: args.metadata,
               source: args.source,
@@ -3424,6 +3478,7 @@ var DatasetsSpanner = class _DatasetsSpanner extends storage.DatasetsStorage {
         input: args.input !== void 0 ? args.input : existing.input,
         groundTruth: args.groundTruth !== void 0 ? args.groundTruth : existing.groundTruth,
         expectedTrajectory: args.expectedTrajectory !== void 0 ? args.expectedTrajectory : existing.expectedTrajectory,
+        toolMocks: args.toolMocks !== void 0 ? args.toolMocks : existing.toolMocks,
         requestContext: args.requestContext !== void 0 ? args.requestContext : existing.requestContext,
         metadata: args.metadata !== void 0 ? args.metadata : existing.metadata,
         source: args.source !== void 0 ? args.source : existing.source
@@ -3433,7 +3488,7 @@ var DatasetsSpanner = class _DatasetsSpanner extends storage.DatasetsStorage {
       await this.db.runWithAbortRetry(
         () => this.database.runTransactionAsync(async (tx) => {
           try {
-            const newVersion = await this.bumpVersion(tx, args.datasetId, now);
+            const { version: newVersion, organizationId, projectId } = await this.bumpVersion(tx, args.datasetId, now);
             await this.closeCurrentRow(tx, args.id, newVersion);
             await this.db.insert({
               tableName: storage.TABLE_DATASET_ITEMS,
@@ -3441,11 +3496,14 @@ var DatasetsSpanner = class _DatasetsSpanner extends storage.DatasetsStorage {
                 id: args.id,
                 datasetId: args.datasetId,
                 datasetVersion: newVersion,
+                organizationId,
+                projectId,
                 validTo: null,
                 isDeleted: false,
                 input: merged.input,
                 groundTruth: merged.groundTruth ?? null,
                 expectedTrajectory: merged.expectedTrajectory ?? null,
+                toolMocks: merged.toolMocks ?? null,
                 requestContext: merged.requestContext ?? null,
                 metadata: merged.metadata ?? null,
                 source: merged.source ?? null,
@@ -3460,9 +3518,12 @@ var DatasetsSpanner = class _DatasetsSpanner extends storage.DatasetsStorage {
               id: args.id,
               datasetId: args.datasetId,
               datasetVersion: newVersion,
+              organizationId,
+              projectId,
               input: merged.input,
               groundTruth: merged.groundTruth,
               expectedTrajectory: merged.expectedTrajectory,
+              toolMocks: merged.toolMocks,
               requestContext: merged.requestContext,
               metadata: merged.metadata,
               source: merged.source,
@@ -3507,7 +3568,7 @@ var DatasetsSpanner = class _DatasetsSpanner extends storage.DatasetsStorage {
       await this.db.runWithAbortRetry(
         () => this.database.runTransactionAsync(async (tx) => {
           try {
-            const newVersion = await this.bumpVersion(tx, args.datasetId, now);
+            const { version: newVersion, organizationId, projectId } = await this.bumpVersion(tx, args.datasetId, now);
             await this.closeCurrentRow(tx, args.id, newVersion);
             await this.db.insert({
               tableName: storage.TABLE_DATASET_ITEMS,
@@ -3515,11 +3576,14 @@ var DatasetsSpanner = class _DatasetsSpanner extends storage.DatasetsStorage {
                 id: args.id,
                 datasetId: args.datasetId,
                 datasetVersion: newVersion,
+                organizationId,
+                projectId,
                 validTo: null,
                 isDeleted: true,
                 input: existing.input,
                 groundTruth: existing.groundTruth ?? null,
                 expectedTrajectory: existing.expectedTrajectory ?? null,
+                toolMocks: existing.toolMocks ?? null,
                 requestContext: existing.requestContext ?? null,
                 metadata: existing.metadata ?? null,
                 source: existing.source ?? null,
@@ -3557,6 +3621,14 @@ var DatasetsSpanner = class _DatasetsSpanner extends storage.DatasetsStorage {
     try {
       const conditions = [`${quoteIdent("datasetId", "column name")} = @datasetId`];
       const params = { datasetId: args.datasetId };
+      if (args.filters?.organizationId !== void 0) {
+        conditions.push(`${quoteIdent("organizationId", "column name")} = @organizationId`);
+        params.organizationId = args.filters.organizationId;
+      }
+      if (args.filters?.projectId !== void 0) {
+        conditions.push(`${quoteIdent("projectId", "column name")} = @projectId`);
+        params.projectId = args.filters.projectId;
+      }
       if (args.version !== void 0) {
         conditions.push(`${quoteIdent("datasetVersion", "column name")} <= @version`);
         conditions.push(
@@ -3778,7 +3850,7 @@ var DatasetsSpanner = class _DatasetsSpanner extends storage.DatasetsStorage {
       await this.db.runWithAbortRetry(
         () => this.database.runTransactionAsync(async (tx) => {
           try {
-            const newVersion = await this.bumpVersion(tx, input.datasetId, now);
+            const { version: newVersion, organizationId, projectId } = await this.bumpVersion(tx, input.datasetId, now);
             for (const { id, item } of prepared) {
               await this.db.insert({
                 tableName: storage.TABLE_DATASET_ITEMS,
@@ -3786,11 +3858,14 @@ var DatasetsSpanner = class _DatasetsSpanner extends storage.DatasetsStorage {
                   id,
                   datasetId: input.datasetId,
                   datasetVersion: newVersion,
+                  organizationId,
+                  projectId,
                   validTo: null,
                   isDeleted: false,
                   input: item.input,
                   groundTruth: item.groundTruth ?? null,
                   expectedTrajectory: item.expectedTrajectory ?? null,
+                  toolMocks: item.toolMocks ?? null,
                   requestContext: item.requestContext ?? null,
                   metadata: item.metadata ?? null,
                   source: item.source ?? null,
@@ -3806,9 +3881,12 @@ var DatasetsSpanner = class _DatasetsSpanner extends storage.DatasetsStorage {
               id,
               datasetId: input.datasetId,
               datasetVersion: newVersion,
+              organizationId,
+              projectId,
               input: item.input,
               groundTruth: item.groundTruth,
               expectedTrajectory: item.expectedTrajectory,
+              toolMocks: item.toolMocks,
               requestContext: item.requestContext,
               metadata: item.metadata,
               source: item.source,
@@ -3848,7 +3926,7 @@ var DatasetsSpanner = class _DatasetsSpanner extends storage.DatasetsStorage {
       await this.db.runWithAbortRetry(
         () => this.database.runTransactionAsync(async (tx) => {
           try {
-            const newVersion = await this.bumpVersion(tx, input.datasetId, now);
+            const { version: newVersion, organizationId, projectId } = await this.bumpVersion(tx, input.datasetId, now);
             for (const existing of current) {
               await this.closeCurrentRow(tx, existing.id, newVersion);
               await this.db.insert({
@@ -3857,11 +3935,14 @@ var DatasetsSpanner = class _DatasetsSpanner extends storage.DatasetsStorage {
                   id: existing.id,
                   datasetId: input.datasetId,
                   datasetVersion: newVersion,
+                  organizationId,
+                  projectId,
                   validTo: null,
                   isDeleted: true,
                   input: existing.input,
                   groundTruth: existing.groundTruth ?? null,
                   expectedTrajectory: existing.expectedTrajectory ?? null,
+                  toolMocks: existing.toolMocks ?? null,
                   requestContext: existing.requestContext ?? null,
                   metadata: existing.metadata ?? null,
                   source: existing.source ?? null,
@@ -3906,6 +3987,8 @@ function rowToExperiment(row) {
     metadata: t.metadata ?? void 0,
     datasetId: t.datasetId ?? null,
     datasetVersion: t.datasetVersion == null ? null : Number(t.datasetVersion),
+    organizationId: t.organizationId ?? null,
+    projectId: t.projectId ?? null,
     targetType: t.targetType,
     targetId: String(t.targetId),
     status: t.status,
@@ -3927,6 +4010,8 @@ function rowToExperimentResult(row) {
     experimentId: String(t.experimentId),
     itemId: String(t.itemId),
     itemDatasetVersion: t.itemDatasetVersion == null ? null : Number(t.itemDatasetVersion),
+    organizationId: t.organizationId ?? null,
+    projectId: t.projectId ?? null,
     input: t.input ?? null,
     output: t.output ?? null,
     groundTruth: t.groundTruth ?? null,
@@ -3937,6 +4022,7 @@ function rowToExperimentResult(row) {
     traceId: t.traceId ?? null,
     status: t.status ?? null,
     tags: t.tags ?? null,
+    toolMockReport: t.toolMockReport ?? null,
     createdAt: toDate2(t.createdAt)
   };
 }
@@ -3957,6 +4043,16 @@ var ExperimentsSpanner = class _ExperimentsSpanner extends storage.ExperimentsSt
   async init() {
     await this.db.createTable({ tableName: storage.TABLE_EXPERIMENTS, schema: storage.TABLE_SCHEMAS[storage.TABLE_EXPERIMENTS] });
     await this.db.createTable({ tableName: storage.TABLE_EXPERIMENT_RESULTS, schema: storage.TABLE_SCHEMAS[storage.TABLE_EXPERIMENT_RESULTS] });
+    await this.db.alterTable({
+      tableName: storage.TABLE_EXPERIMENTS,
+      schema: storage.TABLE_SCHEMAS[storage.TABLE_EXPERIMENTS],
+      ifNotExists: ["organizationId", "projectId"]
+    });
+    await this.db.alterTable({
+      tableName: storage.TABLE_EXPERIMENT_RESULTS,
+      schema: storage.TABLE_SCHEMAS[storage.TABLE_EXPERIMENT_RESULTS],
+      ifNotExists: ["organizationId", "projectId"]
+    });
     await this.createDefaultIndexes();
     await this.createCustomIndexes();
   }
@@ -3978,6 +4074,17 @@ var ExperimentsSpanner = class _ExperimentsSpanner extends storage.ExperimentsSt
         table: storage.TABLE_EXPERIMENT_RESULTS,
         columns: ["experimentId", "itemId"],
         unique: true
+      },
+      // Tenancy: leading-tenant indexes for multi-tenant scans (parity with datasets domain).
+      {
+        name: "mastra_experiments_org_project_idx",
+        table: storage.TABLE_EXPERIMENTS,
+        columns: ["organizationId", "projectId"]
+      },
+      {
+        name: "mastra_experiment_results_org_project_idx",
+        table: storage.TABLE_EXPERIMENT_RESULTS,
+        columns: ["organizationId", "projectId"]
       }
     ];
   }
@@ -4004,6 +4111,8 @@ var ExperimentsSpanner = class _ExperimentsSpanner extends storage.ExperimentsSt
         metadata: input.metadata ?? void 0,
         datasetId: input.datasetId ?? null,
         datasetVersion: input.datasetVersion ?? null,
+        organizationId: input.organizationId ?? null,
+        projectId: input.projectId ?? null,
         targetType: input.targetType,
         targetId: input.targetId,
         status: "pending",
@@ -4026,6 +4135,8 @@ var ExperimentsSpanner = class _ExperimentsSpanner extends storage.ExperimentsSt
           metadata: experiment.metadata ?? null,
           datasetId: experiment.datasetId,
           datasetVersion: experiment.datasetVersion,
+          organizationId: experiment.organizationId,
+          projectId: experiment.projectId,
           targetType: experiment.targetType,
           targetId: experiment.targetId,
           status: experiment.status,
@@ -4144,6 +4255,17 @@ var ExperimentsSpanner = class _ExperimentsSpanner extends storage.ExperimentsSt
         conditions.push(`${quoteIdent("status", "column name")} = @status`);
         params.status = args.status;
       }
+      if (args.filters) {
+        const { organizationId, projectId } = args.filters;
+        if (organizationId !== void 0) {
+          conditions.push(`${quoteIdent("organizationId", "column name")} = @organizationId`);
+          params.organizationId = organizationId;
+        }
+        if (projectId !== void 0) {
+          conditions.push(`${quoteIdent("projectId", "column name")} = @projectId`);
+          params.projectId = projectId;
+        }
+      }
       const whereSql = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
       const tableName = quoteIdent(storage.TABLE_EXPERIMENTS, "table name");
       const [countRows] = await this.database.run({
@@ -4228,6 +4350,8 @@ var ExperimentsSpanner = class _ExperimentsSpanner extends storage.ExperimentsSt
         experimentId: input.experimentId,
         itemId: input.itemId,
         itemDatasetVersion: input.itemDatasetVersion ?? null,
+        organizationId: input.organizationId ?? null,
+        projectId: input.projectId ?? null,
         input: input.input ?? null,
         output: input.output ?? null,
         groundTruth: input.groundTruth ?? null,
@@ -4238,6 +4362,7 @@ var ExperimentsSpanner = class _ExperimentsSpanner extends storage.ExperimentsSt
         traceId: input.traceId ?? null,
         status: input.status ?? null,
         tags: input.tags ?? null,
+        toolMockReport: input.toolMockReport ?? null,
         createdAt: now
       };
       await this.db.insert({
@@ -4247,6 +4372,8 @@ var ExperimentsSpanner = class _ExperimentsSpanner extends storage.ExperimentsSt
           experimentId: result.experimentId,
           itemId: result.itemId,
           itemDatasetVersion: result.itemDatasetVersion,
+          organizationId: result.organizationId,
+          projectId: result.projectId,
           input: result.input,
           output: result.output,
           groundTruth: result.groundTruth,
@@ -4257,6 +4384,7 @@ var ExperimentsSpanner = class _ExperimentsSpanner extends storage.ExperimentsSt
           traceId: result.traceId,
           status: result.status,
           tags: result.tags,
+          toolMockReport: result.toolMockReport,
           createdAt: now
         }
       });
@@ -4379,6 +4507,17 @@ var ExperimentsSpanner = class _ExperimentsSpanner extends storage.ExperimentsSt
         conditions.push(`${quoteIdent("status", "column name")} = @status`);
         params.status = args.status;
       }
+      if (args.filters) {
+        const { organizationId, projectId } = args.filters;
+        if (organizationId !== void 0) {
+          conditions.push(`${quoteIdent("organizationId", "column name")} = @organizationId`);
+          params.organizationId = organizationId;
+        }
+        if (projectId !== void 0) {
+          conditions.push(`${quoteIdent("projectId", "column name")} = @projectId`);
+          params.projectId = projectId;
+        }
+      }
       const whereSql = `WHERE ${conditions.join(" AND ")}`;
       const tableName = quoteIdent(storage.TABLE_EXPERIMENT_RESULTS, "table name");
       const [countRows] = await this.database.run({