@mastra/mysql 0.3.4 → 0.4.0

package/CHANGELOG.md

@@ -1,5 +1,57 @@
 # @mastra/mysql
 
+## 0.4.0
+
+### Minor Changes
+
+- Added atomic caller-defined dataset IDs for idempotent dataset creation across built-in storage adapters. Supplying `id` to `mastra.datasets.create()` now creates the dataset once and resolves compatible retries to the persisted record; incompatible immutable identity fields throw `DATASET_ID_CONFLICT`. ([#19370](https://github.com/mastra-ai/mastra/pull/19370))
+
+- Added caller-defined dataset item identities for safe retries across all dataset storage adapters. ([#19384](https://github.com/mastra-ai/mastra/pull/19384))
+
+  Dataset items can now include an `externalId` when calling `addItem` or `addItems`:
+
+  ```ts
+  await dataset.addItem({
+    externalId: 'source-item-123',
+    input: { prompt: 'Hello' },
+  });
+  ```
+
+  Retrying with the same identity and payload returns the existing item. Reusing an identity with different content returns a typed conflict, including during concurrent writes. Updates and deletes preserve the identity, Spanner retries transactions without changing the outcome, and MySQL batch writes now preserve every supported dataset item field.
+
+### Patch Changes
+
+- Raised the `@mastra/core` peer dependency floor to `>=1.51.0-0` so the dataset item identity helpers used by the storage adapters are available at runtime. ([#19384](https://github.com/mastra-ai/mastra/pull/19384))
+
+- Updated dependencies [[`bd6d240`](https://github.com/mastra-ai/mastra/commit/bd6d2402db93dddaef0721667e7e8a030e7c6e16), [`0111486`](https://github.com/mastra-ai/mastra/commit/01114867612593eef5cfa2fda6a1194dfedda841), [`96a3749`](https://github.com/mastra-ai/mastra/commit/96a37492235f5b8076b3e3177d83ed5a5e44a640), [`fe1bda0`](https://github.com/mastra-ai/mastra/commit/fe1bda06f6af92a694a51712db747cda1e7185f0), [`25e7c12`](https://github.com/mastra-ai/mastra/commit/25e7c126a770069ae7fb7ecf1d2adb40e017b009), [`1ce5121`](https://github.com/mastra-ai/mastra/commit/1ce512155d122bb21f47d98383e82ffbf84b39e8), [`fb8aea3`](https://github.com/mastra-ai/mastra/commit/fb8aea384291e77311be3a64ee1717320d5c3c73), [`4adc391`](https://github.com/mastra-ai/mastra/commit/4adc3911075249c352bb4832d2471922826344de), [`a5c6337`](https://github.com/mastra-ai/mastra/commit/a5c6337d23c7686c81a32ce62f550f610543a240), [`3cfc47a`](https://github.com/mastra-ai/mastra/commit/3cfc47a6b89940aadd0f46fb01ae9624a73a865d), [`2bb7817`](https://github.com/mastra-ai/mastra/commit/2bb78176112fde628483de2830528f7eee911e56), [`51d9870`](https://github.com/mastra-ai/mastra/commit/51d987032c689c2855374d0f244f5d654da809d1), [`5cab274`](https://github.com/mastra-ai/mastra/commit/5cab2744250e22d12fefa7b32637dce224233cee), [`7fa27d3`](https://github.com/mastra-ai/mastra/commit/7fa27d3b6f5ed68cd34e454a4d3ad9c482a0cfbc), [`8b97958`](https://github.com/mastra-ai/mastra/commit/8b979589f9aa59ba67cac565949475f2ffeb4ac3), [`8410541`](https://github.com/mastra-ai/mastra/commit/84105412c60ecd3bb33a9838146f59c4b588228f), [`a58dcbb`](https://github.com/mastra-ai/mastra/commit/a58dcbb546d7e1d65ebdc1f39e55f0908fcd9391), [`aa38805`](https://github.com/mastra-ai/mastra/commit/aa38805b878b827403be785eb90688d7172f5a40), [`153bd3b`](https://github.com/mastra-ai/mastra/commit/153bd3b396bdfed6b74cf43de12db8fd2d83c04a), [`45a8e65`](https://github.com/mastra-ai/mastra/commit/45a8e65e1556d1362cb3f25187023c36de26661d), [`e955965`](https://github.com/mastra-ai/mastra/commit/e955965dce575a903e37cf054d28ea99aa48785e), [`2d22570`](https://github.com/mastra-ai/mastra/commit/2d22570c7dfdd02123d0ecc529efb05ccba2d9fc), [`07bb863`](https://github.com/mastra-ai/mastra/commit/07bb8631919c6f7cf377dccd45b096e0f17fbed0), [`c8ed116`](https://github.com/mastra-ai/mastra/commit/c8ed11699f62bcac70102ab4ec84d80d20541da6), [`01b338c`](https://github.com/mastra-ai/mastra/commit/01b338c56271f0219606710e3e8b26dee27ac6c2), [`a99eae8`](https://github.com/mastra-ai/mastra/commit/a99eae8908e500c1b2d12f9d277be616b98617a5), [`860ef7e`](https://github.com/mastra-ai/mastra/commit/860ef7e77d92b63469cbe5857aa1e626197e43e9), [`17e818c`](https://github.com/mastra-ai/mastra/commit/17e818c51a958ba90641b1a959dc38faf8c034e9), [`edce8d2`](https://github.com/mastra-ai/mastra/commit/edce8d2769f19e27a05737c627af2d765472a4f8), [`8a586ec`](https://github.com/mastra-ai/mastra/commit/8a586eca9a4914f31dff6140d0d45ac375b00669), [`4451dfe`](https://github.com/mastra-ai/mastra/commit/4451dfe857428e7abcc0261a507a2e186dae6d47), [`8b7361d`](https://github.com/mastra-ai/mastra/commit/8b7361d35de68b80d05d30a74e0c69e7218fd612), [`1d39058`](https://github.com/mastra-ai/mastra/commit/1d39058e548efd691799985d5c8af2737f1c3bd2), [`3927473`](https://github.com/mastra-ai/mastra/commit/392747323ddb10c643d12be7b9ae913159dfaeed), [`dce50dc`](https://github.com/mastra-ai/mastra/commit/dce50dc9a1c1fcd0f427bb5f6250ec74910cb04b), [`fd13f8e`](https://github.com/mastra-ai/mastra/commit/fd13f8e21990f9904c3eedba3a626bb4a929cdb8), [`634caff`](https://github.com/mastra-ai/mastra/commit/634caff29a9200ad058b67d53f96d9e5832fb8a2), [`f703f87`](https://github.com/mastra-ai/mastra/commit/f703f878de072d51fda557f9c50867d8252bef05), [`3e26c87`](https://github.com/mastra-ai/mastra/commit/3e26c87de0c5bc2583b795ce6ca5889b6b161acb), [`33f2b88`](https://github.com/mastra-ai/mastra/commit/33f2b88842c09a567f906fac4cb61cd5277ced59), [`177010f`](https://github.com/mastra-ai/mastra/commit/177010ff096d2e4b28d89803be5b1a4cad2a0d6b), [`0ad646f`](https://github.com/mastra-ai/mastra/commit/0ad646f71a530f2454664299e5e01bfd13fa12e5), [`b486abf`](https://github.com/mastra-ai/mastra/commit/b486abfa2a7528c6f527e4015c819ea9fa54aaad), [`54a51e0`](https://github.com/mastra-ai/mastra/commit/54a51e0a484fe1ebad3fb1f7ef5282a075709eb7), [`c43f3a9`](https://github.com/mastra-ai/mastra/commit/c43f3a9d1efde99b38789364ba4d0ba670f430e3), [`a5008f2`](https://github.com/mastra-ai/mastra/commit/a5008f22ae710ad9402ea9f2547d8c02f74d384b), [`e2d5f37`](https://github.com/mastra-ai/mastra/commit/e2d5f373bd289be534d5f8694d34465010533df6), [`4ce0163`](https://github.com/mastra-ai/mastra/commit/4ce0163dc86e675a86809685c8ce6c49f1aeb87e), [`4378341`](https://github.com/mastra-ai/mastra/commit/43783412df5ea3dd35f5b1f6e4851e79c346fc89)]:
+  - @mastra/core@1.51.0
+
+## 0.4.0-alpha.0
+
+### Minor Changes
+
+- Added atomic caller-defined dataset IDs for idempotent dataset creation across built-in storage adapters. Supplying `id` to `mastra.datasets.create()` now creates the dataset once and resolves compatible retries to the persisted record; incompatible immutable identity fields throw `DATASET_ID_CONFLICT`. ([#19370](https://github.com/mastra-ai/mastra/pull/19370))
+
+- Added caller-defined dataset item identities for safe retries across all dataset storage adapters. ([#19384](https://github.com/mastra-ai/mastra/pull/19384))
+
+  Dataset items can now include an `externalId` when calling `addItem` or `addItems`:
+
+  ```ts
+  await dataset.addItem({
+    externalId: 'source-item-123',
+    input: { prompt: 'Hello' },
+  });
+  ```
+
+  Retrying with the same identity and payload returns the existing item. Reusing an identity with different content returns a typed conflict, including during concurrent writes. Updates and deletes preserve the identity, Spanner retries transactions without changing the outcome, and MySQL batch writes now preserve every supported dataset item field.
+
+### Patch Changes
+
+- Raised the `@mastra/core` peer dependency floor to `>=1.51.0-0` so the dataset item identity helpers used by the storage adapters are available at runtime. ([#19384](https://github.com/mastra-ai/mastra/pull/19384))
+
+- Updated dependencies [[`a99eae8`](https://github.com/mastra-ai/mastra/commit/a99eae8908e500c1b2d12f9d277be616b98617a5), [`fd13f8e`](https://github.com/mastra-ai/mastra/commit/fd13f8e21990f9904c3eedba3a626bb4a929cdb8), [`f703f87`](https://github.com/mastra-ai/mastra/commit/f703f878de072d51fda557f9c50867d8252bef05), [`0ad646f`](https://github.com/mastra-ai/mastra/commit/0ad646f71a530f2454664299e5e01bfd13fa12e5)]:
+  - @mastra/core@1.51.0-alpha.13
+
 ## 0.3.4
 
 ### Patch Changes

package/dist/index.cjs

@@ -85,7 +85,7 @@ function transformToSqlValue(value) {
   }
   return value;
 }
-function prepareStatement({
+function prepareInsertOnlyStatement({
   tableName,
   record,
   database
@@ -98,11 +98,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({
@@ -470,6 +481,22 @@ var StoreOperationsMySQL = class extends storage.StoreOperations {
       );
     }
   }
+  async insertOnly({ tableName, record }) {
+    try {
+      const statement = prepareInsertOnlyStatement({ tableName, record, database: this.database });
+      await this.pool.execute(statement.sql, statement.args);
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: "MYSQL_STORE_INSERT_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: { tableName }
+        },
+        error$1
+      );
+    }
+  }
   async batchInsert({ tableName, records }) {
     if (records.length === 0) return;
     try {
@@ -2087,8 +2114,14 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.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: storage.TABLE_DATASET_ITEMS,
+        columns: ["datasetId", "externalId", "datasetVersion"]
+      }
+    ];
   }
   /**
    * Exports DDL statements for all managed tables.
@@ -2128,6 +2161,9 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.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.
@@ -2160,7 +2196,15 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
     await this.operations.alterTable({
       tableName: storage.TABLE_DATASET_ITEMS,
       schema: storage.DATASET_ITEMS_SCHEMA,
-      ifNotExists: ["organizationId", "projectId"]
+      ifNotExists: [
+        "organizationId",
+        "projectId",
+        "requestContext",
+        "source",
+        "expectedTrajectory",
+        "toolMocks",
+        "externalId"
+      ]
     });
     await this.createDefaultIndexes();
     await this.createCustomIndexes();
@@ -2211,11 +2255,16 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.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()
     };
@@ -2225,13 +2274,18 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.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()
     };
@@ -2247,9 +2301,11 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
   // --- Dataset CRUD ---
   async createDataset(input) {
     try {
-      const id = crypto$1.randomUUID();
+      const id = input.id ?? crypto$1.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: storage.TABLE_DATASETS,
         record: {
           id,
@@ -2291,6 +2347,11 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
         updatedAt: now
       };
     } catch (error$1) {
+      if (input.id !== void 0 && storage.hasErrorCode(error$1, /* @__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$1 instanceof error.MastraError) throw error$1;
       throw new error.MastraError(
         {
           id: "MYSQL_CREATE_DATASET_FAILED",
@@ -2619,7 +2680,11 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
       const tableVersionsName = formatTableName(storage.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
       ]);
@@ -2636,16 +2701,21 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.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)
         ]
@@ -2662,7 +2732,11 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
         projectId: parentProjectId,
         input: mergedInput,
         groundTruth: mergedGroundTruth,
+        expectedTrajectory: mergedExpectedTrajectory,
+        toolMocks: mergedToolMocks,
+        requestContext: mergedRequestContext,
         metadata: mergedMetadata,
+        source: mergedSource,
         updatedAt: now
       };
     } catch (error$1) {
@@ -2715,16 +2789,21 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.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)
         ]
@@ -2957,70 +3036,89 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.DatasetsStorage {
     for (const item of input.items) {
       this.#rejectToolMocks(item.toolMocks);
     }
-    const dataset = await this.getDatasetById({ id: input.datasetId });
-    if (!dataset) {
-      throw new error.MastraError({
-        id: "MYSQL_BULK_ADD_ITEMS_DATASET_NOT_FOUND",
-        domain: error.ErrorDomain.STORAGE,
-        category: error.ErrorCategory.USER,
-        details: { datasetId: input.datasetId }
-      });
-    }
     const connection = await this.pool.getConnection();
     try {
       await connection.beginTransaction();
-      const now = /* @__PURE__ */ new Date();
-      const versionId = crypto$1.randomUUID();
       const tableDatasetsName = formatTableName(storage.TABLE_DATASETS);
       const tableItemsName = formatTableName(storage.TABLE_DATASET_ITEMS);
       const tableVersionsName = formatTableName(storage.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 = crypto$1.randomUUID();
-        items.push({ id, itemInput });
+      const dataset = datasetRows[0];
+      if (!dataset) {
+        throw new error.MastraError({
+          id: "MYSQL_BULK_ADD_ITEMS_DATASET_NOT_FOUND",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.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, crypto$1.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)]
+        [crypto$1.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$1) {
       await connection.rollback();
       if (error$1 instanceof error.MastraError) throw error$1;
@@ -3078,16 +3176,21 @@ var DatasetsMySQL = class _DatasetsMySQL extends storage.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)
           ]