@mastra/mysql 0.2.0 → 0.3.0-alpha.1

package/CHANGELOG.md

@@ -1,5 +1,89 @@
 # @mastra/mysql
 
+## 0.3.0-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
+
+## 0.3.0-alpha.0
+
+### Minor Changes
+
+- The MySQL store now rejects item-level tool mocks with a clear error instead of silently dropping them. Tool mock persistence is not yet supported on MySQL, so saving a dataset item with `toolMocks` (or an experiment result with a `toolMockReport`) fails fast rather than discarding the data. ([#18036](https://github.com/mastra-ai/mastra/pull/18036))
+
+### Patch Changes
+
+- Fixed: `mastra build` output no longer hangs on the first storage-touching request when an app uses `LibSQLStore`, `PostgresStore`, or `MySQLStore` with observational memory. `mastra dev` was unaffected; only the bundled `mastra start` output deadlocked. No code changes or `bundler.externals` workaround required on the app side after upgrading. ([#18302](https://github.com/mastra-ai/mastra/pull/18302))
+
+- 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
+
 ## 0.2.0
 
 ### Minor Changes

package/dist/index.cjs

@@ -2058,6 +2058,21 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
   #indexes;
   /** Tables managed by this domain */
   static MANAGED_TABLES = [storage.TABLE_DATASETS, storage.TABLE_DATASET_ITEMS, storage.TABLE_DATASET_VERSIONS];
+  /**
+   * Item-level tool mocks are not persisted by the MySQL adapter. Reject writes
+   * that carry them so the feature fails loudly here instead of silently dropping
+   * the mocks and then running tools live during experiments.
+   */
+  #rejectToolMocks(toolMocks) {
+    if (Array.isArray(toolMocks) && toolMocks.length > 0) {
+      throw new error.MastraError({
+        id: "MYSQL_DATASET_TOOL_MOCKS_UNSUPPORTED",
+        domain: error.ErrorDomain.STORAGE,
+        category: error.ErrorCategory.USER,
+        text: "Tool mocks are not supported on the MySQL storage adapter. Use a supported adapter (LibSQL, PostgreSQL, MongoDB, or Spanner) to persist dataset item tool mocks."
+      });
+    }
+  }
   /**
    * Returns default index definitions for the datasets domain tables.
    * Currently no default indexes are defined for datasets.
@@ -2117,6 +2132,16 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
     await this.operations.createTable({ tableName: storage.TABLE_DATASETS, schema: storage.DATASETS_SCHEMA });
     await this.operations.createTable({ tableName: storage.TABLE_DATASET_ITEMS, schema: storage.DATASET_ITEMS_SCHEMA });
     await this.operations.createTable({ tableName: storage.TABLE_DATASET_VERSIONS, schema: storage.DATASET_VERSIONS_SCHEMA });
+    await this.operations.alterTable({
+      tableName: storage.TABLE_DATASETS,
+      schema: storage.DATASETS_SCHEMA,
+      ifNotExists: ["organizationId", "projectId", "candidateKey", "candidateId"]
+    });
+    await this.operations.alterTable({
+      tableName: storage.TABLE_DATASET_ITEMS,
+      schema: storage.DATASET_ITEMS_SCHEMA,
+      ifNotExists: ["organizationId", "projectId"]
+    });
     await this.createDefaultIndexes();
     await this.createCustomIndexes();
   }
@@ -2135,6 +2160,10 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
       inputSchema: parseJSON(row.inputSchema),
       groundTruthSchema: parseJSON(row.groundTruthSchema),
       version: row.version,
+      organizationId: row.organizationId ?? null,
+      projectId: row.projectId ?? null,
+      candidateKey: row.candidateKey ?? null,
+      candidateId: row.candidateId ?? null,
       createdAt: parseDateTime(row.createdAt) ?? /* @__PURE__ */ new Date(),
       updatedAt: parseDateTime(row.updatedAt) ?? /* @__PURE__ */ new Date()
     };
@@ -2144,6 +2173,8 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
       id: row.id,
       datasetId: row.datasetId,
       datasetVersion: row.datasetVersion,
+      organizationId: row.organizationId ?? null,
+      projectId: row.projectId ?? null,
       input: parseJSON(row.input),
       groundTruth: row.groundTruth ? parseJSON(row.groundTruth) : void 0,
       metadata: row.metadata ? parseJSON(row.metadata) : void 0,
@@ -2156,6 +2187,8 @@ var DatasetsMySQL = class _DatasetsMySQL 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: parseJSON(row.input),
@@ -2188,6 +2221,10 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
           inputSchema: jsonArg(input.inputSchema),
           groundTruthSchema: jsonArg(input.groundTruthSchema),
           version: 0,
+          organizationId: input.organizationId ?? null,
+          projectId: input.projectId ?? null,
+          candidateKey: input.candidateKey ?? null,
+          candidateId: input.candidateId ?? null,
           createdAt: now,
           updatedAt: now
         }
@@ -2200,6 +2237,10 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
         inputSchema: input.inputSchema ?? void 0,
         groundTruthSchema: input.groundTruthSchema ?? void 0,
         version: 0,
+        organizationId: input.organizationId ?? null,
+        projectId: input.projectId ?? null,
+        candidateKey: input.candidateKey ?? null,
+        candidateId: input.candidateId ?? null,
         createdAt: now,
         updatedAt: now
       };
@@ -2322,7 +2363,28 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
   async listDatasets(args) {
     try {
       const { page, perPage: perPageInput } = args.pagination;
-      const whereClause = { sql: "", args: [] };
+      const filterParts = [];
+      const filterArgs = [];
+      if (args.filters?.organizationId !== void 0) {
+        filterParts.push(`${quoteIdentifier("organizationId", "column name")} = ?`);
+        filterArgs.push(args.filters.organizationId);
+      }
+      if (args.filters?.projectId !== void 0) {
+        filterParts.push(`${quoteIdentifier("projectId", "column name")} = ?`);
+        filterArgs.push(args.filters.projectId);
+      }
+      if (args.filters?.candidateKey !== void 0) {
+        filterParts.push(`${quoteIdentifier("candidateKey", "column name")} = ?`);
+        filterArgs.push(args.filters.candidateKey);
+      }
+      if (args.filters?.candidateId !== void 0) {
+        filterParts.push(`${quoteIdentifier("candidateId", "column name")} = ?`);
+        filterArgs.push(args.filters.candidateId);
+      }
+      const whereClause = {
+        sql: filterParts.length > 0 ? `WHERE ${filterParts.join(" AND ")}` : "",
+        args: filterArgs
+      };
       const total = await this.operations.loadTotalCount({ tableName: storage.TABLE_DATASETS, whereClause });
       if (total === 0) {
         return {
@@ -2362,6 +2424,7 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
   }
   // --- SCD-2 item mutations ---
   async _doAddItem(args) {
+    this.#rejectToolMocks(args.toolMocks);
     const connection = await this.pool.getConnection();
     try {
       await connection.beginTransaction();
@@ -2374,17 +2437,22 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
       await connection.execute(`UPDATE ${tableDatasetsName} SET \`version\` = \`version\` + 1 WHERE id = ?`, [
         args.datasetId
       ]);
-      const [versionRows] = await connection.execute(
-        `SELECT \`version\` FROM ${tableDatasetsName} WHERE id = ?`,
+      const [datasetRows] = await connection.execute(
+        `SELECT \`version\`, \`organizationId\`, \`projectId\` FROM ${tableDatasetsName} WHERE id = ?`,
         [args.datasetId]
       );
-      const newVersion = versionRows[0]?.version;
+      const parentRow = datasetRows[0];
+      const newVersion = parentRow?.version;
+      const parentOrganizationId = parentRow?.organizationId ?? null;
+      const parentProjectId = parentRow?.projectId ?? null;
       await connection.execute(
-        `INSERT INTO ${tableItemsName} (\`id\`, \`datasetId\`, \`datasetVersion\`, \`validTo\`, \`isDeleted\`, \`input\`, \`groundTruth\`, \`metadata\`, \`createdAt\`, \`updatedAt\`) VALUES (?, ?, ?, NULL, 0, ?, ?, ?, ?, ?)`,
+        `INSERT INTO ${tableItemsName} (\`id\`, \`datasetId\`, \`datasetVersion\`, \`organizationId\`, \`projectId\`, \`validTo\`, \`isDeleted\`, \`input\`, \`groundTruth\`, \`metadata\`, \`createdAt\`, \`updatedAt\`) VALUES (?, ?, ?, ?, ?, NULL, 0, ?, ?, ?, ?, ?)`,
         [
           id,
           args.datasetId,
           newVersion,
+          parentOrganizationId,
+          parentProjectId,
           jsonArg(args.input),
           jsonArg(args.groundTruth),
           jsonArg(args.metadata),
@@ -2401,6 +2469,8 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
         id,
         datasetId: args.datasetId,
         datasetVersion: newVersion,
+        organizationId: parentOrganizationId,
+        projectId: parentProjectId,
         input: args.input,
         groundTruth: args.groundTruth,
         metadata: args.metadata,
@@ -2423,6 +2493,7 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
     }
   }
   async _doUpdateItem(args) {
+    this.#rejectToolMocks(args.toolMocks);
     const existing = await this.getItemById({ id: args.id });
     if (!existing) {
       throw new error.MastraError({
@@ -2454,21 +2525,26 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
       await connection.execute(`UPDATE ${tableDatasetsName} SET \`version\` = \`version\` + 1 WHERE id = ?`, [
         args.datasetId
       ]);
-      const [versionRows] = await connection.execute(
-        `SELECT \`version\` FROM ${tableDatasetsName} WHERE id = ?`,
+      const [datasetRows] = await connection.execute(
+        `SELECT \`version\`, \`organizationId\`, \`projectId\` FROM ${tableDatasetsName} WHERE id = ?`,
         [args.datasetId]
       );
-      const newVersion = versionRows[0]?.version;
+      const parentRow = datasetRows[0];
+      const newVersion = parentRow?.version;
+      const parentOrganizationId = parentRow?.organizationId ?? null;
+      const parentProjectId = parentRow?.projectId ?? null;
       await connection.execute(
         `UPDATE ${tableItemsName} SET \`validTo\` = ? WHERE \`id\` = ? AND \`validTo\` IS NULL AND \`isDeleted\` = 0`,
         [newVersion, args.id]
       );
       await connection.execute(
-        `INSERT INTO ${tableItemsName} (\`id\`, \`datasetId\`, \`datasetVersion\`, \`validTo\`, \`isDeleted\`, \`input\`, \`groundTruth\`, \`metadata\`, \`createdAt\`, \`updatedAt\`) VALUES (?, ?, ?, NULL, 0, ?, ?, ?, ?, ?)`,
+        `INSERT INTO ${tableItemsName} (\`id\`, \`datasetId\`, \`datasetVersion\`, \`organizationId\`, \`projectId\`, \`validTo\`, \`isDeleted\`, \`input\`, \`groundTruth\`, \`metadata\`, \`createdAt\`, \`updatedAt\`) VALUES (?, ?, ?, ?, ?, NULL, 0, ?, ?, ?, ?, ?)`,
         [
           args.id,
           args.datasetId,
           newVersion,
+          parentOrganizationId,
+          parentProjectId,
           jsonArg(mergedInput),
           jsonArg(mergedGroundTruth),
           jsonArg(mergedMetadata),
@@ -2484,6 +2560,8 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
       return {
         ...existing,
         datasetVersion: newVersion,
+        organizationId: parentOrganizationId,
+        projectId: parentProjectId,
         input: mergedInput,
         groundTruth: mergedGroundTruth,
         metadata: mergedMetadata,
@@ -2526,21 +2604,26 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
       await connection.execute(`UPDATE ${tableDatasetsName} SET \`version\` = \`version\` + 1 WHERE id = ?`, [
         datasetId
       ]);
-      const [versionRows] = await connection.execute(
-        `SELECT \`version\` FROM ${tableDatasetsName} WHERE id = ?`,
+      const [datasetRows] = await connection.execute(
+        `SELECT \`version\`, \`organizationId\`, \`projectId\` FROM ${tableDatasetsName} WHERE id = ?`,
         [datasetId]
       );
-      const newVersion = versionRows[0]?.version;
+      const parentRow = datasetRows[0];
+      const newVersion = parentRow?.version;
+      const parentOrganizationId = parentRow?.organizationId ?? null;
+      const parentProjectId = parentRow?.projectId ?? null;
       await connection.execute(
         `UPDATE ${tableItemsName} SET \`validTo\` = ? WHERE \`id\` = ? AND \`validTo\` IS NULL AND \`isDeleted\` = 0`,
         [newVersion, id]
       );
       await connection.execute(
-        `INSERT INTO ${tableItemsName} (\`id\`, \`datasetId\`, \`datasetVersion\`, \`validTo\`, \`isDeleted\`, \`input\`, \`groundTruth\`, \`metadata\`, \`createdAt\`, \`updatedAt\`) VALUES (?, ?, ?, NULL, 1, ?, ?, ?, ?, ?)`,
+        `INSERT INTO ${tableItemsName} (\`id\`, \`datasetId\`, \`datasetVersion\`, \`organizationId\`, \`projectId\`, \`validTo\`, \`isDeleted\`, \`input\`, \`groundTruth\`, \`metadata\`, \`createdAt\`, \`updatedAt\`) VALUES (?, ?, ?, ?, ?, NULL, 1, ?, ?, ?, ?, ?)`,
         [
           id,
           datasetId,
           newVersion,
+          parentOrganizationId,
+          parentProjectId,
           jsonArg(existing.input),
           jsonArg(existing.groundTruth),
           jsonArg(existing.metadata),
@@ -2649,6 +2732,14 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
         conditions.push(`\`validTo\` IS NULL`);
         conditions.push(`\`isDeleted\` = 0`);
       }
+      if (args.filters?.organizationId !== void 0) {
+        conditions.push(`\`organizationId\` = ?`);
+        params.push(args.filters.organizationId);
+      }
+      if (args.filters?.projectId !== void 0) {
+        conditions.push(`\`projectId\` = ?`);
+        params.push(args.filters.projectId);
+      }
       if (args.search) {
         conditions.push(`(LOWER(\`input\`) LIKE ? OR LOWER(COALESCE(\`groundTruth\`, '')) LIKE ?)`);
         const searchPattern = `%${args.search.toLowerCase()}%`;
@@ -2765,6 +2856,9 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
   }
   // --- Bulk operations (SCD-2 internally) ---
   async _doBatchInsertItems(input) {
+    for (const item of input.items) {
+      this.#rejectToolMocks(item.toolMocks);
+    }
     const dataset = await this.getDatasetById({ id: input.datasetId });
     if (!dataset) {
       throw new error.MastraError({
@@ -2790,16 +2884,20 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
         [input.datasetId]
       );
       const newVersion = versionRows[0]?.version;
+      const parentOrganizationId = dataset.organizationId ?? null;
+      const parentProjectId = dataset.projectId ?? null;
       const items = [];
       for (const itemInput of input.items) {
         const id = crypto$1.randomUUID();
         items.push({ id, itemInput });
         await connection.execute(
-          `INSERT INTO ${tableItemsName} (\`id\`, \`datasetId\`, \`datasetVersion\`, \`validTo\`, \`isDeleted\`, \`input\`, \`groundTruth\`, \`metadata\`, \`createdAt\`, \`updatedAt\`) VALUES (?, ?, ?, NULL, 0, ?, ?, ?, ?, ?)`,
+          `INSERT INTO ${tableItemsName} (\`id\`, \`datasetId\`, \`datasetVersion\`, \`organizationId\`, \`projectId\`, \`validTo\`, \`isDeleted\`, \`input\`, \`groundTruth\`, \`metadata\`, \`createdAt\`, \`updatedAt\`) VALUES (?, ?, ?, ?, ?, NULL, 0, ?, ?, ?, ?, ?)`,
           [
             id,
             input.datasetId,
             newVersion,
+            parentOrganizationId,
+            parentProjectId,
             jsonArg(itemInput.input),
             jsonArg(itemInput.groundTruth),
             jsonArg(itemInput.metadata),
@@ -2817,6 +2915,8 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
         id,
         datasetId: input.datasetId,
         datasetVersion: newVersion,
+        organizationId: parentOrganizationId,
+        projectId: parentProjectId,
         input: itemInput.input,
         groundTruth: itemInput.groundTruth,
         metadata: itemInput.metadata,
@@ -2872,17 +2972,21 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
         [input.datasetId]
       );
       const newVersion = versionRows[0]?.version;
+      const parentOrganizationId = dataset.organizationId ?? null;
+      const parentProjectId = dataset.projectId ?? null;
       for (const item of currentItems) {
         await connection.execute(
           `UPDATE ${tableItemsName} SET \`validTo\` = ? WHERE \`id\` = ? AND \`validTo\` IS NULL AND \`isDeleted\` = 0`,
           [newVersion, item.id]
         );
         await connection.execute(
-          `INSERT INTO ${tableItemsName} (\`id\`, \`datasetId\`, \`datasetVersion\`, \`validTo\`, \`isDeleted\`, \`input\`, \`groundTruth\`, \`metadata\`, \`createdAt\`, \`updatedAt\`) VALUES (?, ?, ?, NULL, 1, ?, ?, ?, ?, ?)`,
+          `INSERT INTO ${tableItemsName} (\`id\`, \`datasetId\`, \`datasetVersion\`, \`organizationId\`, \`projectId\`, \`validTo\`, \`isDeleted\`, \`input\`, \`groundTruth\`, \`metadata\`, \`createdAt\`, \`updatedAt\`) VALUES (?, ?, ?, ?, ?, NULL, 1, ?, ?, ?, ?, ?)`,
           [
             item.id,
             input.datasetId,
             newVersion,
+            parentOrganizationId,
+            parentProjectId,
             jsonArg(item.input),
             jsonArg(item.groundTruth),
             jsonArg(item.metadata),
@@ -2934,10 +3038,22 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends storage.ExperimentsStorag
   static MANAGED_TABLES = [storage.TABLE_EXPERIMENTS, storage.TABLE_EXPERIMENT_RESULTS];
   /**
    * Returns default index definitions for the experiments domain tables.
-   * Currently no default indexes are defined for experiments.
    */
   static getDefaultIndexDefs(_prefix = "") {
-    return [];
+    return [
+      // Tenancy: leading-tenant indexes for multi-tenant scans (parity with
+      // pg/libsql/spanner/mongodb experiments adapters).
+      {
+        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"]
+      }
+    ];
   }
   /**
    * Exports DDL statements for all managed tables.
@@ -2968,10 +3084,12 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends storage.ExperimentsStorag
   }
   /**
    * Creates default indexes for optimal query performance.
-   * Currently no default indexes are defined for experiments.
    */
   async createDefaultIndexes() {
     if (this.#skipDefaultIndexes) return;
+    for (const indexDef of this.getDefaultIndexDefinitions()) {
+      await this.operations.createIndex(indexDef);
+    }
   }
   /**
    * Creates custom user-defined indexes for this domain's tables.
@@ -2985,6 +3103,16 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends storage.ExperimentsStorag
   async init() {
     await this.operations.createTable({ tableName: storage.TABLE_EXPERIMENTS, schema: storage.EXPERIMENTS_SCHEMA });
     await this.operations.createTable({ tableName: storage.TABLE_EXPERIMENT_RESULTS, schema: storage.EXPERIMENT_RESULTS_SCHEMA });
+    await this.operations.alterTable({
+      tableName: storage.TABLE_EXPERIMENTS,
+      schema: storage.EXPERIMENTS_SCHEMA,
+      ifNotExists: ["organizationId", "projectId"]
+    });
+    await this.operations.alterTable({
+      tableName: storage.TABLE_EXPERIMENT_RESULTS,
+      schema: storage.EXPERIMENT_RESULTS_SCHEMA,
+      ifNotExists: ["organizationId", "projectId"]
+    });
     await this.createDefaultIndexes();
     await this.createCustomIndexes();
   }
@@ -2997,6 +3125,8 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends storage.ExperimentsStorag
       id: row.id,
       datasetId: row.datasetId ?? null,
       datasetVersion: row.datasetVersion ?? null,
+      organizationId: row.organizationId ?? null,
+      projectId: row.projectId ?? null,
       targetType: row.targetType,
       targetId: row.targetId,
       name: row.name ?? void 0,
@@ -3019,6 +3149,8 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends storage.ExperimentsStorag
       experimentId: row.experimentId,
       itemId: row.itemId,
       itemDatasetVersion: row.itemDatasetVersion ?? null,
+      organizationId: row.organizationId ?? null,
+      projectId: row.projectId ?? null,
       input: parseJSON2(row.input),
       output: row.output ? parseJSON2(row.output) : null,
       groundTruth: row.groundTruth ? parseJSON2(row.groundTruth) : null,
@@ -3042,6 +3174,8 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends storage.ExperimentsStorag
           id,
           datasetId: input.datasetId ?? null,
           datasetVersion: input.datasetVersion ?? null,
+          organizationId: input.organizationId ?? null,
+          projectId: input.projectId ?? null,
           targetType: input.targetType,
           targetId: input.targetId,
           name: input.name ?? null,
@@ -3062,6 +3196,8 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends storage.ExperimentsStorag
         id,
         datasetId: input.datasetId,
         datasetVersion: input.datasetVersion,
+        organizationId: input.organizationId ?? null,
+        projectId: input.projectId ?? null,
         targetType: input.targetType,
         targetId: input.targetId,
         name: input.name,
@@ -3156,6 +3292,17 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends storage.ExperimentsStorag
         conditions.push(`${quoteIdentifier("datasetId", "column name")} = ?`);
         params.push(args.datasetId);
       }
+      if (args.filters) {
+        const { organizationId, projectId } = args.filters;
+        if (organizationId !== void 0) {
+          conditions.push(`${quoteIdentifier("organizationId", "column name")} = ?`);
+          params.push(organizationId);
+        }
+        if (projectId !== void 0) {
+          conditions.push(`${quoteIdentifier("projectId", "column name")} = ?`);
+          params.push(projectId);
+        }
+      }
       const whereClause = {
         sql: conditions.length > 0 ? ` WHERE ${conditions.join(" AND ")}` : "",
         args: params
@@ -3241,6 +3388,14 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends storage.ExperimentsStorag
     }
   }
   async addExperimentResult(input) {
+    if (input.toolMockReport) {
+      throw new error.MastraError({
+        id: "MYSQL_EXPERIMENT_TOOL_MOCK_REPORT_UNSUPPORTED",
+        domain: error.ErrorDomain.STORAGE,
+        category: error.ErrorCategory.USER,
+        text: "Tool mock reports are not supported on the MySQL storage adapter. Use a supported adapter (LibSQL, PostgreSQL, MongoDB, or Spanner) to persist experiment tool mock reports."
+      });
+    }
     try {
       const id = input.id ?? crypto$1.randomUUID();
       const now = /* @__PURE__ */ new Date();
@@ -3251,6 +3406,8 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends storage.ExperimentsStorag
           experimentId: input.experimentId,
           itemId: input.itemId,
           itemDatasetVersion: input.itemDatasetVersion ?? null,
+          organizationId: input.organizationId ?? null,
+          projectId: input.projectId ?? null,
           input: JSON.stringify(input.input),
           output: input.output ? JSON.stringify(input.output) : null,
           groundTruth: input.groundTruth ? JSON.stringify(input.groundTruth) : null,
@@ -3269,6 +3426,8 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends storage.ExperimentsStorag
         experimentId: input.experimentId,
         itemId: input.itemId,
         itemDatasetVersion: input.itemDatasetVersion,
+        organizationId: input.organizationId ?? null,
+        projectId: input.projectId ?? null,
         input: input.input,
         output: input.output,
         groundTruth: input.groundTruth,
@@ -3386,9 +3545,30 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends storage.ExperimentsStorag
   async listExperimentResults(args) {
     try {
       const { page, perPage: perPageInput } = args.pagination;
+      const conditions = [`${quoteIdentifier("experimentId", "column name")} = ?`];
+      const params = [args.experimentId];
+      if (args.traceId) {
+        conditions.push(`${quoteIdentifier("traceId", "column name")} = ?`);
+        params.push(args.traceId);
+      }
+      if (args.status) {
+        conditions.push(`${quoteIdentifier("status", "column name")} = ?`);
+        params.push(args.status);
+      }
+      if (args.filters) {
+        const { organizationId, projectId } = args.filters;
+        if (organizationId !== void 0) {
+          conditions.push(`${quoteIdentifier("organizationId", "column name")} = ?`);
+          params.push(organizationId);
+        }
+        if (projectId !== void 0) {
+          conditions.push(`${quoteIdentifier("projectId", "column name")} = ?`);
+          params.push(projectId);
+        }
+      }
       const whereClause = {
-        sql: ` WHERE ${quoteIdentifier("experimentId", "column name")} = ?`,
-        args: [args.experimentId]
+        sql: ` WHERE ${conditions.join(" AND ")}`,
+        args: params
       };
       const total = await this.operations.loadTotalCount({ tableName: storage.TABLE_EXPERIMENT_RESULTS, whereClause });
       if (total === 0) {
@@ -4794,12 +4974,7 @@ var MemoryMySQL = class _MemoryMySQL extends storage.MemoryStorage {
     await this.operations.createTable({ tableName: storage.TABLE_THREADS, schema: storage.TABLE_SCHEMAS[storage.TABLE_THREADS] });
     await this.operations.createTable({ tableName: storage.TABLE_MESSAGES, schema: storage.TABLE_SCHEMAS[storage.TABLE_MESSAGES] });
     await this.operations.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 = storage.OBSERVATIONAL_MEMORY_TABLE_SCHEMA?.[OM_TABLE];
     if (omSchema) {
       await this.operations.createTable({
         tableName: OM_TABLE,