@mastra/mysql 0.2.0 → 0.3.0-alpha.1

package/dist/index.js

@@ -1,5 +1,5 @@
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { StoreOperations, TABLE_CONFIGS, TABLE_WORKFLOW_SNAPSHOT, TABLE_SPANS, AgentsStorage, TABLE_AGENTS, TABLE_AGENT_VERSIONS, AGENTS_SCHEMA, AGENT_VERSIONS_SCHEMA, createStorageErrorId, normalizePerPage, calculatePagination, BlobStore, SKILL_BLOBS_SCHEMA, TABLE_SKILL_BLOBS, DatasetsStorage, TABLE_DATASETS, TABLE_DATASET_ITEMS, TABLE_DATASET_VERSIONS, DATASETS_SCHEMA, DATASET_ITEMS_SCHEMA, DATASET_VERSIONS_SCHEMA, ExperimentsStorage, TABLE_EXPERIMENTS, TABLE_EXPERIMENT_RESULTS, EXPERIMENTS_SCHEMA, EXPERIMENT_RESULTS_SCHEMA, MCPClientsStorage, TABLE_MCP_CLIENTS, TABLE_MCP_CLIENT_VERSIONS, MCP_CLIENTS_SCHEMA, MCP_CLIENT_VERSIONS_SCHEMA, MCPServersStorage, TABLE_MCP_SERVERS, TABLE_MCP_SERVER_VERSIONS, MCP_SERVERS_SCHEMA, MCP_SERVER_VERSIONS_SCHEMA, MemoryStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, TABLE_SCHEMAS, ObservabilityStorage, SPAN_SCHEMA, listTracesArgsSchema, TraceStatus, toTraceSpans, PromptBlocksStorage, TABLE_PROMPT_BLOCKS, TABLE_PROMPT_BLOCK_VERSIONS, PROMPT_BLOCKS_SCHEMA, PROMPT_BLOCK_VERSIONS_SCHEMA, ScorerDefinitionsStorage, TABLE_SCORER_DEFINITIONS, TABLE_SCORER_DEFINITION_VERSIONS, SCORER_DEFINITIONS_SCHEMA, SCORER_DEFINITION_VERSIONS_SCHEMA, ScoresStorage, TABLE_SCORERS, SCORERS_SCHEMA, SkillsStorage, TABLE_SKILLS, TABLE_SKILL_VERSIONS, SKILLS_SCHEMA, SKILL_VERSIONS_SCHEMA, WorkflowsStorage, WorkspacesStorage, TABLE_WORKSPACES, TABLE_WORKSPACE_VERSIONS, WORKSPACES_SCHEMA, WORKSPACE_VERSIONS_SCHEMA, MastraCompositeStore, TABLE_FAVORITES, BackgroundTasksStorage, TABLE_BACKGROUND_TASKS, ChannelsStorage, TABLE_CHANNEL_INSTALLATIONS, TABLE_CHANNEL_CONFIG, FavoritesStorage, FAVORITES_SCHEMA, SchedulesStorage, TABLE_SCHEDULES, TABLE_SCHEDULE_TRIGGERS, ToolProviderConnectionsStorage, TABLE_TOOL_PROVIDER_CONNECTIONS, TOOL_PROVIDER_CONNECTIONS_SCHEMA } from '@mastra/core/storage';
+import { StoreOperations, TABLE_CONFIGS, TABLE_WORKFLOW_SNAPSHOT, TABLE_SPANS, AgentsStorage, TABLE_AGENTS, TABLE_AGENT_VERSIONS, AGENTS_SCHEMA, AGENT_VERSIONS_SCHEMA, createStorageErrorId, normalizePerPage, calculatePagination, BlobStore, SKILL_BLOBS_SCHEMA, TABLE_SKILL_BLOBS, DatasetsStorage, TABLE_DATASETS, TABLE_DATASET_ITEMS, TABLE_DATASET_VERSIONS, DATASETS_SCHEMA, DATASET_ITEMS_SCHEMA, DATASET_VERSIONS_SCHEMA, ExperimentsStorage, TABLE_EXPERIMENTS, TABLE_EXPERIMENT_RESULTS, EXPERIMENTS_SCHEMA, EXPERIMENT_RESULTS_SCHEMA, MCPClientsStorage, TABLE_MCP_CLIENTS, TABLE_MCP_CLIENT_VERSIONS, MCP_CLIENTS_SCHEMA, MCP_CLIENT_VERSIONS_SCHEMA, MCPServersStorage, TABLE_MCP_SERVERS, TABLE_MCP_SERVER_VERSIONS, MCP_SERVERS_SCHEMA, MCP_SERVER_VERSIONS_SCHEMA, MemoryStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, TABLE_SCHEMAS, OBSERVATIONAL_MEMORY_TABLE_SCHEMA, ObservabilityStorage, SPAN_SCHEMA, listTracesArgsSchema, TraceStatus, toTraceSpans, PromptBlocksStorage, TABLE_PROMPT_BLOCKS, TABLE_PROMPT_BLOCK_VERSIONS, PROMPT_BLOCKS_SCHEMA, PROMPT_BLOCK_VERSIONS_SCHEMA, ScorerDefinitionsStorage, TABLE_SCORER_DEFINITIONS, TABLE_SCORER_DEFINITION_VERSIONS, SCORER_DEFINITIONS_SCHEMA, SCORER_DEFINITION_VERSIONS_SCHEMA, ScoresStorage, TABLE_SCORERS, SCORERS_SCHEMA, SkillsStorage, TABLE_SKILLS, TABLE_SKILL_VERSIONS, SKILLS_SCHEMA, SKILL_VERSIONS_SCHEMA, WorkflowsStorage, WorkspacesStorage, TABLE_WORKSPACES, TABLE_WORKSPACE_VERSIONS, WORKSPACES_SCHEMA, WORKSPACE_VERSIONS_SCHEMA, MastraCompositeStore, TABLE_FAVORITES, BackgroundTasksStorage, TABLE_BACKGROUND_TASKS, ChannelsStorage, TABLE_CHANNEL_INSTALLATIONS, TABLE_CHANNEL_CONFIG, FavoritesStorage, FAVORITES_SCHEMA, SchedulesStorage, TABLE_SCHEDULES, TABLE_SCHEDULE_TRIGGERS, ToolProviderConnectionsStorage, TABLE_TOOL_PROVIDER_CONNECTIONS, TOOL_PROVIDER_CONNECTIONS_SCHEMA } from '@mastra/core/storage';
 import { createPool } from 'mysql2/promise';
 import { parseSqlIdentifier } from '@mastra/core/utils';
 import { randomUUID } from 'crypto';
@@ -2056,6 +2056,21 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
   #indexes;
   /** Tables managed by this domain */
   static MANAGED_TABLES = [TABLE_DATASETS, TABLE_DATASET_ITEMS, 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 MastraError({
+        id: "MYSQL_DATASET_TOOL_MOCKS_UNSUPPORTED",
+        domain: ErrorDomain.STORAGE,
+        category: 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.
@@ -2115,6 +2130,16 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
     await this.operations.createTable({ tableName: TABLE_DATASETS, schema: DATASETS_SCHEMA });
     await this.operations.createTable({ tableName: TABLE_DATASET_ITEMS, schema: DATASET_ITEMS_SCHEMA });
     await this.operations.createTable({ tableName: TABLE_DATASET_VERSIONS, schema: DATASET_VERSIONS_SCHEMA });
+    await this.operations.alterTable({
+      tableName: TABLE_DATASETS,
+      schema: DATASETS_SCHEMA,
+      ifNotExists: ["organizationId", "projectId", "candidateKey", "candidateId"]
+    });
+    await this.operations.alterTable({
+      tableName: TABLE_DATASET_ITEMS,
+      schema: DATASET_ITEMS_SCHEMA,
+      ifNotExists: ["organizationId", "projectId"]
+    });
     await this.createDefaultIndexes();
     await this.createCustomIndexes();
   }
@@ -2133,6 +2158,10 @@ var DatasetsMySQL = class _DatasetsMySQL extends 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()
     };
@@ -2142,6 +2171,8 @@ var DatasetsMySQL = class _DatasetsMySQL extends 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,
@@ -2154,6 +2185,8 @@ var DatasetsMySQL = class _DatasetsMySQL extends 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),
@@ -2186,6 +2219,10 @@ var DatasetsMySQL = class _DatasetsMySQL extends 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
         }
@@ -2198,6 +2235,10 @@ var DatasetsMySQL = class _DatasetsMySQL extends 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
       };
@@ -2320,7 +2361,28 @@ var DatasetsMySQL = class _DatasetsMySQL extends 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: TABLE_DATASETS, whereClause });
       if (total === 0) {
         return {
@@ -2360,6 +2422,7 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
   }
   // --- SCD-2 item mutations ---
   async _doAddItem(args) {
+    this.#rejectToolMocks(args.toolMocks);
     const connection = await this.pool.getConnection();
     try {
       await connection.beginTransaction();
@@ -2372,17 +2435,22 @@ var DatasetsMySQL = class _DatasetsMySQL extends 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),
@@ -2399,6 +2467,8 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
         id,
         datasetId: args.datasetId,
         datasetVersion: newVersion,
+        organizationId: parentOrganizationId,
+        projectId: parentProjectId,
         input: args.input,
         groundTruth: args.groundTruth,
         metadata: args.metadata,
@@ -2421,6 +2491,7 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
     }
   }
   async _doUpdateItem(args) {
+    this.#rejectToolMocks(args.toolMocks);
     const existing = await this.getItemById({ id: args.id });
     if (!existing) {
       throw new MastraError({
@@ -2452,21 +2523,26 @@ var DatasetsMySQL = class _DatasetsMySQL extends 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),
@@ -2482,6 +2558,8 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
       return {
         ...existing,
         datasetVersion: newVersion,
+        organizationId: parentOrganizationId,
+        projectId: parentProjectId,
         input: mergedInput,
         groundTruth: mergedGroundTruth,
         metadata: mergedMetadata,
@@ -2524,21 +2602,26 @@ var DatasetsMySQL = class _DatasetsMySQL extends 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),
@@ -2647,6 +2730,14 @@ var DatasetsMySQL = class _DatasetsMySQL extends 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()}%`;
@@ -2763,6 +2854,9 @@ var DatasetsMySQL = class _DatasetsMySQL extends 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 MastraError({
@@ -2788,16 +2882,20 @@ var DatasetsMySQL = class _DatasetsMySQL extends 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 = 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),
@@ -2815,6 +2913,8 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
         id,
         datasetId: input.datasetId,
         datasetVersion: newVersion,
+        organizationId: parentOrganizationId,
+        projectId: parentProjectId,
         input: itemInput.input,
         groundTruth: itemInput.groundTruth,
         metadata: itemInput.metadata,
@@ -2870,17 +2970,21 @@ var DatasetsMySQL = class _DatasetsMySQL extends 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),
@@ -2932,10 +3036,22 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends ExperimentsStorage {
   static MANAGED_TABLES = [TABLE_EXPERIMENTS, 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: TABLE_EXPERIMENTS,
+        columns: ["organizationId", "projectId"]
+      },
+      {
+        name: "idx_experiment_results_org_project",
+        table: TABLE_EXPERIMENT_RESULTS,
+        columns: ["organizationId", "projectId"]
+      }
+    ];
   }
   /**
    * Exports DDL statements for all managed tables.
@@ -2966,10 +3082,12 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends ExperimentsStorage {
   }
   /**
    * 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.
@@ -2983,6 +3101,16 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends ExperimentsStorage {
   async init() {
     await this.operations.createTable({ tableName: TABLE_EXPERIMENTS, schema: EXPERIMENTS_SCHEMA });
     await this.operations.createTable({ tableName: TABLE_EXPERIMENT_RESULTS, schema: EXPERIMENT_RESULTS_SCHEMA });
+    await this.operations.alterTable({
+      tableName: TABLE_EXPERIMENTS,
+      schema: EXPERIMENTS_SCHEMA,
+      ifNotExists: ["organizationId", "projectId"]
+    });
+    await this.operations.alterTable({
+      tableName: TABLE_EXPERIMENT_RESULTS,
+      schema: EXPERIMENT_RESULTS_SCHEMA,
+      ifNotExists: ["organizationId", "projectId"]
+    });
     await this.createDefaultIndexes();
     await this.createCustomIndexes();
   }
@@ -2995,6 +3123,8 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends ExperimentsStorage {
       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,
@@ -3017,6 +3147,8 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends ExperimentsStorage {
       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,
@@ -3040,6 +3172,8 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends ExperimentsStorage {
           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,
@@ -3060,6 +3194,8 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends ExperimentsStorage {
         id,
         datasetId: input.datasetId,
         datasetVersion: input.datasetVersion,
+        organizationId: input.organizationId ?? null,
+        projectId: input.projectId ?? null,
         targetType: input.targetType,
         targetId: input.targetId,
         name: input.name,
@@ -3154,6 +3290,17 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends ExperimentsStorage {
         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
@@ -3239,6 +3386,14 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends ExperimentsStorage {
     }
   }
   async addExperimentResult(input) {
+    if (input.toolMockReport) {
+      throw new MastraError({
+        id: "MYSQL_EXPERIMENT_TOOL_MOCK_REPORT_UNSUPPORTED",
+        domain: ErrorDomain.STORAGE,
+        category: 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 ?? randomUUID();
       const now = /* @__PURE__ */ new Date();
@@ -3249,6 +3404,8 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends ExperimentsStorage {
           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,
@@ -3267,6 +3424,8 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends ExperimentsStorage {
         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,
@@ -3384,9 +3543,30 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends ExperimentsStorage {
   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: TABLE_EXPERIMENT_RESULTS, whereClause });
       if (total === 0) {
@@ -4792,12 +4972,7 @@ var MemoryMySQL = class _MemoryMySQL extends MemoryStorage {
     await this.operations.createTable({ tableName: TABLE_THREADS, schema: TABLE_SCHEMAS[TABLE_THREADS] });
     await this.operations.createTable({ tableName: TABLE_MESSAGES, schema: TABLE_SCHEMAS[TABLE_MESSAGES] });
     await this.operations.createTable({ tableName: TABLE_RESOURCES, schema: TABLE_SCHEMAS[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 = OBSERVATIONAL_MEMORY_TABLE_SCHEMA?.[OM_TABLE];
     if (omSchema) {
       await this.operations.createTable({
         tableName: OM_TABLE,