@mastra/mysql 0.3.4 → 0.4.0

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, TABLE_EXPERIMENTS, TABLE_EXPERIMENT_RESULTS, ExperimentsStorage, 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, normalizeScheduleTarget } 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, TABLE_EXPERIMENTS, TABLE_EXPERIMENT_RESULTS, hasErrorCode, ExperimentsStorage, 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, normalizeScheduleTarget } from '@mastra/core/storage';
 import { createPool } from 'mysql2/promise';
 import { parseSqlIdentifier } from '@mastra/core/utils';
 import { randomUUID } from 'crypto';
@@ -83,7 +83,7 @@ function transformToSqlValue(value) {
   }
   return value;
 }
-function prepareStatement({
+function prepareInsertOnlyStatement({
   tableName,
   record,
   database
@@ -96,11 +96,22 @@ function prepareStatement({
   const columnIdentifiers = columns.map((column) => quoteIdentifier(column, "column name"));
   const values = columns.map((column) => transformToSqlValue(record[column]));
   const placeholders = columns.map(() => "?").join(", ");
-  const updateAssignments = columnIdentifiers.map((column) => `${column} = ?`).join(", ");
-  const sql = `INSERT INTO ${tableIdent} (${columnIdentifiers.join(", ")}) VALUES (${placeholders}) ON DUPLICATE KEY UPDATE ${updateAssignments}`;
   return {
-    sql,
-    args: [...values, ...values]
+    sql: `INSERT INTO ${tableIdent} (${columnIdentifiers.join(", ")}) VALUES (${placeholders})`,
+    args: values
+  };
+}
+function prepareStatement({
+  tableName,
+  record,
+  database
+}) {
+  const statement = prepareInsertOnlyStatement({ tableName, record, database });
+  const columns = Object.keys(record).map((column) => quoteIdentifier(column, "column name"));
+  const updateAssignments = columns.map((column) => `${column} = ?`).join(", ");
+  return {
+    sql: `${statement.sql} ON DUPLICATE KEY UPDATE ${updateAssignments}`,
+    args: [...statement.args, ...statement.args]
   };
 }
 function prepareUpdateStatement({
@@ -468,6 +479,22 @@ var StoreOperationsMySQL = class extends StoreOperations {
       );
     }
   }
+  async insertOnly({ tableName, record }) {
+    try {
+      const statement = prepareInsertOnlyStatement({ tableName, record, database: this.database });
+      await this.pool.execute(statement.sql, statement.args);
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "MYSQL_STORE_INSERT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName }
+        },
+        error
+      );
+    }
+  }
   async batchInsert({ tableName, records }) {
     if (records.length === 0) return;
     try {
@@ -2085,8 +2112,14 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
    * Returns default index definitions for the datasets domain tables.
    * Currently no default indexes are defined for datasets.
    */
-  static getDefaultIndexDefs(_prefix = "") {
-    return [];
+  static getDefaultIndexDefs(prefix = "") {
+    return [
+      {
+        name: `${prefix}idx_dataset_items_dataset_externalid_version`,
+        table: TABLE_DATASET_ITEMS,
+        columns: ["datasetId", "externalId", "datasetVersion"]
+      }
+    ];
   }
   /**
    * Exports DDL statements for all managed tables.
@@ -2126,6 +2159,9 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
    */
   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.
@@ -2158,7 +2194,15 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
     await this.operations.alterTable({
       tableName: TABLE_DATASET_ITEMS,
       schema: DATASET_ITEMS_SCHEMA,
-      ifNotExists: ["organizationId", "projectId"]
+      ifNotExists: [
+        "organizationId",
+        "projectId",
+        "requestContext",
+        "source",
+        "expectedTrajectory",
+        "toolMocks",
+        "externalId"
+      ]
     });
     await this.createDefaultIndexes();
     await this.createCustomIndexes();
@@ -2209,11 +2253,16 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
       id: row.id,
       datasetId: row.datasetId,
       datasetVersion: row.datasetVersion,
+      externalId: row.externalId ?? null,
       organizationId: row.organizationId ?? null,
       projectId: row.projectId ?? null,
       input: parseJSON(row.input),
       groundTruth: row.groundTruth ? parseJSON(row.groundTruth) : void 0,
+      expectedTrajectory: row.expectedTrajectory ? parseJSON(row.expectedTrajectory) : void 0,
+      toolMocks: row.toolMocks ? parseJSON(row.toolMocks) : void 0,
+      requestContext: row.requestContext ? parseJSON(row.requestContext) : void 0,
       metadata: row.metadata ? parseJSON(row.metadata) : void 0,
+      source: row.source ? parseJSON(row.source) : void 0,
       createdAt: parseDateTime(row.createdAt) ?? /* @__PURE__ */ new Date(),
       updatedAt: parseDateTime(row.updatedAt) ?? /* @__PURE__ */ new Date()
     };
@@ -2223,13 +2272,18 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
       id: row.id,
       datasetId: row.datasetId,
       datasetVersion: row.datasetVersion,
+      externalId: row.externalId ?? null,
       organizationId: row.organizationId ?? null,
       projectId: row.projectId ?? null,
       validTo: row.validTo,
       isDeleted: Boolean(row.isDeleted),
       input: parseJSON(row.input),
       groundTruth: row.groundTruth ? parseJSON(row.groundTruth) : void 0,
+      expectedTrajectory: row.expectedTrajectory ? parseJSON(row.expectedTrajectory) : void 0,
+      toolMocks: row.toolMocks ? parseJSON(row.toolMocks) : void 0,
+      requestContext: row.requestContext ? parseJSON(row.requestContext) : void 0,
       metadata: row.metadata ? parseJSON(row.metadata) : void 0,
+      source: row.source ? parseJSON(row.source) : void 0,
       createdAt: parseDateTime(row.createdAt) ?? /* @__PURE__ */ new Date(),
       updatedAt: parseDateTime(row.updatedAt) ?? /* @__PURE__ */ new Date()
     };
@@ -2245,9 +2299,11 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
   // --- Dataset CRUD ---
   async createDataset(input) {
     try {
-      const id = randomUUID();
+      const id = input.id ?? randomUUID();
+      if (input.id !== void 0) this.validateCallerDefinedDatasetId(input.id);
       const now = /* @__PURE__ */ new Date();
-      await this.operations.insert({
+      const insert = input.id === void 0 ? this.operations.insert.bind(this.operations) : this.operations.insertOnly.bind(this.operations);
+      await insert({
         tableName: TABLE_DATASETS,
         record: {
           id,
@@ -2289,6 +2345,11 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
         updatedAt: now
       };
     } catch (error) {
+      if (input.id !== void 0 && hasErrorCode(error, /* @__PURE__ */ new Set([1062, "ER_DUP_ENTRY"]))) {
+        const existing = await this.getDatasetById({ id: input.id });
+        if (existing) return this.resolveExistingDataset(existing, { ...input, id: input.id });
+      }
+      if (error instanceof MastraError) throw error;
       throw new MastraError(
         {
           id: "MYSQL_CREATE_DATASET_FAILED",
@@ -2617,7 +2678,11 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
       const tableVersionsName = formatTableName(TABLE_DATASET_VERSIONS);
       const mergedInput = args.input ?? existing.input;
       const mergedGroundTruth = args.groundTruth ?? existing.groundTruth;
+      const mergedExpectedTrajectory = args.expectedTrajectory ?? existing.expectedTrajectory;
+      const mergedToolMocks = args.toolMocks ?? existing.toolMocks;
+      const mergedRequestContext = args.requestContext ?? existing.requestContext;
       const mergedMetadata = args.metadata ?? existing.metadata;
+      const mergedSource = args.source ?? existing.source;
       await connection.execute(`UPDATE ${tableDatasetsName} SET \`version\` = \`version\` + 1 WHERE id = ?`, [
         args.datasetId
       ]);
@@ -2634,16 +2699,21 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
         [newVersion, args.id]
       );
       await connection.execute(
-        `INSERT INTO ${tableItemsName} (\`id\`, \`datasetId\`, \`datasetVersion\`, \`organizationId\`, \`projectId\`, \`validTo\`, \`isDeleted\`, \`input\`, \`groundTruth\`, \`metadata\`, \`createdAt\`, \`updatedAt\`) VALUES (?, ?, ?, ?, ?, NULL, 0, ?, ?, ?, ?, ?)`,
+        `INSERT INTO ${tableItemsName} (\`id\`, \`datasetId\`, \`datasetVersion\`, \`externalId\`, \`organizationId\`, \`projectId\`, \`validTo\`, \`isDeleted\`, \`input\`, \`groundTruth\`, \`expectedTrajectory\`, \`toolMocks\`, \`requestContext\`, \`metadata\`, \`source\`, \`createdAt\`, \`updatedAt\`) VALUES (?, ?, ?, ?, ?, ?, NULL, 0, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
         [
           args.id,
           args.datasetId,
           newVersion,
+          existing.externalId ?? null,
           parentOrganizationId,
           parentProjectId,
           jsonArg(mergedInput),
           jsonArg(mergedGroundTruth),
+          jsonArg(mergedExpectedTrajectory),
+          jsonArg(mergedToolMocks),
+          jsonArg(mergedRequestContext),
           jsonArg(mergedMetadata),
+          jsonArg(mergedSource),
           transformToSqlValue(existing.createdAt),
           transformToSqlValue(now)
         ]
@@ -2660,7 +2730,11 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
         projectId: parentProjectId,
         input: mergedInput,
         groundTruth: mergedGroundTruth,
+        expectedTrajectory: mergedExpectedTrajectory,
+        toolMocks: mergedToolMocks,
+        requestContext: mergedRequestContext,
         metadata: mergedMetadata,
+        source: mergedSource,
         updatedAt: now
       };
     } catch (error) {
@@ -2713,16 +2787,21 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
         [newVersion, id]
       );
       await connection.execute(
-        `INSERT INTO ${tableItemsName} (\`id\`, \`datasetId\`, \`datasetVersion\`, \`organizationId\`, \`projectId\`, \`validTo\`, \`isDeleted\`, \`input\`, \`groundTruth\`, \`metadata\`, \`createdAt\`, \`updatedAt\`) VALUES (?, ?, ?, ?, ?, NULL, 1, ?, ?, ?, ?, ?)`,
+        `INSERT INTO ${tableItemsName} (\`id\`, \`datasetId\`, \`datasetVersion\`, \`externalId\`, \`organizationId\`, \`projectId\`, \`validTo\`, \`isDeleted\`, \`input\`, \`groundTruth\`, \`expectedTrajectory\`, \`toolMocks\`, \`requestContext\`, \`metadata\`, \`source\`, \`createdAt\`, \`updatedAt\`) VALUES (?, ?, ?, ?, ?, ?, NULL, 1, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
         [
           id,
           datasetId,
           newVersion,
+          existing.externalId ?? null,
           parentOrganizationId,
           parentProjectId,
           jsonArg(existing.input),
           jsonArg(existing.groundTruth),
+          jsonArg(existing.expectedTrajectory),
+          jsonArg(existing.toolMocks),
+          jsonArg(existing.requestContext),
           jsonArg(existing.metadata),
+          jsonArg(existing.source),
           transformToSqlValue(existing.createdAt),
           transformToSqlValue(now)
         ]
@@ -2955,70 +3034,89 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
     for (const item of input.items) {
       this.#rejectToolMocks(item.toolMocks);
     }
-    const dataset = await this.getDatasetById({ id: input.datasetId });
-    if (!dataset) {
-      throw new MastraError({
-        id: "MYSQL_BULK_ADD_ITEMS_DATASET_NOT_FOUND",
-        domain: ErrorDomain.STORAGE,
-        category: ErrorCategory.USER,
-        details: { datasetId: input.datasetId }
-      });
-    }
     const connection = await this.pool.getConnection();
     try {
       await connection.beginTransaction();
-      const now = /* @__PURE__ */ new Date();
-      const versionId = randomUUID();
       const tableDatasetsName = formatTableName(TABLE_DATASETS);
       const tableItemsName = formatTableName(TABLE_DATASET_ITEMS);
       const tableVersionsName = formatTableName(TABLE_DATASET_VERSIONS);
-      await connection.execute(`UPDATE ${tableDatasetsName} SET \`version\` = \`version\` + 1 WHERE id = ?`, [
-        input.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 = ? FOR UPDATE`,
         [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 });
+      const dataset = datasetRows[0];
+      if (!dataset) {
+        throw new MastraError({
+          id: "MYSQL_BULK_ADD_ITEMS_DATASET_NOT_FOUND",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: { datasetId: input.datasetId }
+        });
+      }
+      const externalIds = [...new Set(input.items.flatMap((item) => item.externalId ? [item.externalId] : []))];
+      let historyRows = [];
+      if (externalIds.length > 0) {
+        const placeholders = externalIds.map(() => "?").join(", ");
+        const [rows] = await connection.execute(
+          `SELECT * FROM ${tableItemsName} WHERE \`datasetId\` = ? AND \`externalId\` IN (${placeholders}) ORDER BY \`datasetVersion\` ASC`,
+          [input.datasetId, ...externalIds]
+        );
+        historyRows = rows.map((row) => this.mapItemFull(row));
+      }
+      const plan = this.planDatasetItemBatch(input.items, historyRows, randomUUID);
+      const existingItems = new Map(
+        [...plan.existingCurrentItems].map(([id, row]) => [id, this.datasetItemFromRow(row)])
+      );
+      if (plan.inserts.length === 0) {
+        await connection.commit();
+        return plan.resolvedIds.map((id) => existingItems.get(id));
+      }
+      const now = /* @__PURE__ */ new Date();
+      const newVersion = Number(dataset.version) + 1;
+      await connection.execute(`UPDATE ${tableDatasetsName} SET \`version\` = ? WHERE id = ?`, [
+        newVersion,
+        input.datasetId
+      ]);
+      const inserted = /* @__PURE__ */ new Map();
+      for (const { id, item } of plan.inserts) {
         await connection.execute(
-          `INSERT INTO ${tableItemsName} (\`id\`, \`datasetId\`, \`datasetVersion\`, \`organizationId\`, \`projectId\`, \`validTo\`, \`isDeleted\`, \`input\`, \`groundTruth\`, \`metadata\`, \`createdAt\`, \`updatedAt\`) VALUES (?, ?, ?, ?, ?, NULL, 0, ?, ?, ?, ?, ?)`,
+          `INSERT INTO ${tableItemsName} (\`id\`, \`datasetId\`, \`datasetVersion\`, \`externalId\`, \`organizationId\`, \`projectId\`, \`validTo\`, \`isDeleted\`, \`input\`, \`groundTruth\`, \`expectedTrajectory\`, \`toolMocks\`, \`requestContext\`, \`metadata\`, \`source\`, \`createdAt\`, \`updatedAt\`) VALUES (?, ?, ?, ?, ?, ?, NULL, 0, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
           [
             id,
             input.datasetId,
             newVersion,
-            parentOrganizationId,
-            parentProjectId,
-            jsonArg(itemInput.input),
-            jsonArg(itemInput.groundTruth),
-            jsonArg(itemInput.metadata),
+            item.externalId ?? null,
+            dataset.organizationId ?? null,
+            dataset.projectId ?? null,
+            jsonArg(item.input),
+            jsonArg(item.groundTruth),
+            jsonArg(item.expectedTrajectory),
+            jsonArg(item.toolMocks),
+            jsonArg(item.requestContext),
+            jsonArg(item.metadata),
+            jsonArg(item.source),
             transformToSqlValue(now),
             transformToSqlValue(now)
           ]
         );
+        inserted.set(id, {
+          id,
+          datasetId: input.datasetId,
+          datasetVersion: newVersion,
+          externalId: item.externalId ?? null,
+          organizationId: dataset.organizationId ?? null,
+          projectId: dataset.projectId ?? null,
+          ...item,
+          createdAt: now,
+          updatedAt: now
+        });
       }
       await connection.execute(
         `INSERT INTO ${tableVersionsName} (\`id\`, \`datasetId\`, \`version\`, \`createdAt\`) VALUES (?, ?, ?, ?)`,
-        [versionId, input.datasetId, newVersion, transformToSqlValue(now)]
+        [randomUUID(), input.datasetId, newVersion, transformToSqlValue(now)]
       );
       await connection.commit();
-      return items.map(({ id, itemInput }) => ({
-        id,
-        datasetId: input.datasetId,
-        datasetVersion: newVersion,
-        organizationId: parentOrganizationId,
-        projectId: parentProjectId,
-        input: itemInput.input,
-        groundTruth: itemInput.groundTruth,
-        metadata: itemInput.metadata,
-        createdAt: now,
-        updatedAt: now
-      }));
+      return plan.resolvedIds.map((id) => inserted.get(id) ?? existingItems.get(id));
     } catch (error) {
       await connection.rollback();
       if (error instanceof MastraError) throw error;
@@ -3076,16 +3174,21 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
           [newVersion, item.id]
         );
         await connection.execute(
-          `INSERT INTO ${tableItemsName} (\`id\`, \`datasetId\`, \`datasetVersion\`, \`organizationId\`, \`projectId\`, \`validTo\`, \`isDeleted\`, \`input\`, \`groundTruth\`, \`metadata\`, \`createdAt\`, \`updatedAt\`) VALUES (?, ?, ?, ?, ?, NULL, 1, ?, ?, ?, ?, ?)`,
+          `INSERT INTO ${tableItemsName} (\`id\`, \`datasetId\`, \`datasetVersion\`, \`externalId\`, \`organizationId\`, \`projectId\`, \`validTo\`, \`isDeleted\`, \`input\`, \`groundTruth\`, \`expectedTrajectory\`, \`toolMocks\`, \`requestContext\`, \`metadata\`, \`source\`, \`createdAt\`, \`updatedAt\`) VALUES (?, ?, ?, ?, ?, ?, NULL, 1, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
           [
             item.id,
             input.datasetId,
             newVersion,
+            item.externalId ?? null,
             parentOrganizationId,
             parentProjectId,
             jsonArg(item.input),
             jsonArg(item.groundTruth),
+            jsonArg(item.expectedTrajectory),
+            jsonArg(item.toolMocks),
+            jsonArg(item.requestContext),
             jsonArg(item.metadata),
+            jsonArg(item.source),
             transformToSqlValue(item.createdAt),
             transformToSqlValue(now)
           ]