@mastra/spanner 1.5.0 → 1.6.0-alpha.1

package/dist/index.js

@@ -3970,6 +3970,12 @@ function rowToExperiment(row) {
 		name: t.name ?? void 0,
 		description: t.description ?? void 0,
 		metadata: t.metadata ?? void 0,
+		provenance: t.provenance ?? null,
+		runnerAttestation: t.runnerAttestation ?? null,
+		experimentSetId: t.experimentSetId ?? null,
+		comparisonId: t.comparisonId ?? null,
+		variantId: t.variantId ?? null,
+		trialIndex: t.trialIndex == null ? null : Number(t.trialIndex),
 		datasetId: t.datasetId ?? null,
 		datasetVersion: t.datasetVersion == null ? null : Number(t.datasetVersion),
 		organizationId: t.organizationId ?? null,
@@ -4050,7 +4056,17 @@ var ExperimentsSpanner = class ExperimentsSpanner extends ExperimentsStorage {
 		await this.db.alterTable({
 			tableName: TABLE_EXPERIMENTS,
 			schema: TABLE_SCHEMAS[TABLE_EXPERIMENTS],
-			ifNotExists: ["organizationId", "projectId"]
+			ifNotExists: [
+				"agentVersion",
+				"organizationId",
+				"projectId",
+				"provenance",
+				"runnerAttestation",
+				"experimentSetId",
+				"comparisonId",
+				"variantId",
+				"trialIndex"
+			]
 		});
 		await this.db.alterTable({
 			tableName: TABLE_EXPERIMENT_RESULTS,
@@ -4071,6 +4087,16 @@ var ExperimentsSpanner = class ExperimentsSpanner extends ExperimentsStorage {
 				table: TABLE_EXPERIMENTS,
 				columns: ["datasetId"]
 			},
+			{
+				name: "mastra_experiments_grouping_idx",
+				table: TABLE_EXPERIMENTS,
+				columns: [
+					"experimentSetId",
+					"comparisonId",
+					"variantId",
+					"trialIndex"
+				]
+			},
 			{
 				name: "mastra_experiment_results_experimentid_idx",
 				table: TABLE_EXPERIMENT_RESULTS,
@@ -4115,6 +4141,12 @@ var ExperimentsSpanner = class ExperimentsSpanner extends ExperimentsStorage {
 				name: input.name ?? void 0,
 				description: input.description ?? void 0,
 				metadata: input.metadata ?? void 0,
+				provenance: input.provenance ?? null,
+				runnerAttestation: input.runnerAttestation ?? null,
+				experimentSetId: input.experimentSetId ?? null,
+				comparisonId: input.comparisonId ?? null,
+				variantId: input.variantId ?? null,
+				trialIndex: input.trialIndex ?? null,
 				datasetId: input.datasetId ?? null,
 				datasetVersion: input.datasetVersion ?? null,
 				organizationId: input.organizationId ?? null,
@@ -4139,6 +4171,12 @@ var ExperimentsSpanner = class ExperimentsSpanner extends ExperimentsStorage {
 					name: experiment.name ?? null,
 					description: experiment.description ?? null,
 					metadata: experiment.metadata ?? null,
+					provenance: experiment.provenance,
+					runnerAttestation: experiment.runnerAttestation,
+					experimentSetId: experiment.experimentSetId,
+					comparisonId: experiment.comparisonId,
+					variantId: experiment.variantId,
+					trialIndex: experiment.trialIndex,
 					datasetId: experiment.datasetId,
 					datasetVersion: experiment.datasetVersion,
 					organizationId: experiment.organizationId,
@@ -4273,6 +4311,22 @@ var ExperimentsSpanner = class ExperimentsSpanner extends ExperimentsStorage {
 				conditions.push(`${quoteIdent("status", "column name")} = @status`);
 				params.status = args.status;
 			}
+			if (args.experimentSetId !== void 0) {
+				conditions.push(`${quoteIdent("experimentSetId", "column name")} = @experimentSetId`);
+				params.experimentSetId = args.experimentSetId;
+			}
+			if (args.comparisonId !== void 0) {
+				conditions.push(`${quoteIdent("comparisonId", "column name")} = @comparisonId`);
+				params.comparisonId = args.comparisonId;
+			}
+			if (args.variantId !== void 0) {
+				conditions.push(`${quoteIdent("variantId", "column name")} = @variantId`);
+				params.variantId = args.variantId;
+			}
+			if (args.trialIndex !== void 0) {
+				conditions.push(`${quoteIdent("trialIndex", "column name")} = @trialIndex`);
+				params.trialIndex = args.trialIndex;
+			}
 			if (args.filters) {
 				const { organizationId, projectId } = args.filters;
 				if (organizationId !== void 0) {
@@ -6680,15 +6734,23 @@ var MemorySpanner = class MemorySpanner extends MemoryStorage {
 			}, error);
 			this.logger?.error?.(mastraError.toString());
 			this.logger?.trackException?.(mastraError);
-			return { messages: [] };
+			throw mastraError;
 		}
 	}
-	/** Resolves the `include` clause: pinned messages plus their before/after windows. */
-	async getIncludedMessages({ include }) {
+	/**
+	* Resolves the `include` clause: pinned messages plus their before/after windows.
+	*
+	* @param include - Message ids to pin, each with an optional before/after window.
+	* @param resourceId - When set, restricts both the pinned messages and their context
+	* to that resource so an id from another resource returns nothing.
+	*/
+	async getIncludedMessages({ include, resourceId }) {
 		if (!include || include.length === 0) return null;
+		const resourceCondition = resourceId ? ` AND ${quoteIdent("resourceId", "column name")} = @scopedResourceId` : "";
+		const resourceParams = resourceId ? { scopedResourceId: resourceId } : {};
 		const ids = include.map((i) => i.id);
 		const placeholders = [];
-		const idParams = {};
+		const idParams = { ...resourceParams };
 		ids.forEach((id, i) => {
 			const name = `tid${i}`;
 			placeholders.push(`@${name}`);
@@ -6696,7 +6758,7 @@ var MemorySpanner = class MemorySpanner extends MemoryStorage {
 		});
 		const targetsSql = `SELECT id, content, role, type, ${quoteIdent("createdAt", "column name")}, ${quoteIdent("thread_id", "column name")} AS threadId, ${quoteIdent("resourceId", "column name")}
                         FROM ${quoteIdent(TABLE_MESSAGES, "table name")}
-                        WHERE id IN (${placeholders.join(", ")})`;
+                        WHERE id IN (${placeholders.join(", ")})${resourceCondition}`;
 		const [targetRows] = await this.database.run({
 			sql: targetsSql,
 			params: idParams,
@@ -6721,14 +6783,15 @@ var MemorySpanner = class MemorySpanner extends MemoryStorage {
 					sql: `SELECT id, content, role, type, ${quoteIdent("createdAt", "column name")}, ${quoteIdent("thread_id", "column name")} AS threadId, ${quoteIdent("resourceId", "column name")}
                 FROM ${quoteIdent(TABLE_MESSAGES, "table name")}
                 WHERE ${quoteIdent("thread_id", "column name")} = @threadId
-                  AND (${quoteIdent("createdAt", "column name")} < @ts OR (${quoteIdent("createdAt", "column name")} = @ts AND id < @id))
+                  AND (${quoteIdent("createdAt", "column name")} < @ts OR (${quoteIdent("createdAt", "column name")} = @ts AND id < @id))${resourceCondition}
                 ORDER BY ${quoteIdent("createdAt", "column name")} DESC, id DESC
                 LIMIT @lim`,
 					params: {
 						threadId,
 						ts: targetCreatedAt,
 						id: target.id,
-						lim: withPreviousMessages
+						lim: withPreviousMessages,
+						...resourceParams
 					},
 					json: true
 				});
@@ -6742,14 +6805,15 @@ var MemorySpanner = class MemorySpanner extends MemoryStorage {
 					sql: `SELECT id, content, role, type, ${quoteIdent("createdAt", "column name")}, ${quoteIdent("thread_id", "column name")} AS threadId, ${quoteIdent("resourceId", "column name")}
                 FROM ${quoteIdent(TABLE_MESSAGES, "table name")}
                 WHERE ${quoteIdent("thread_id", "column name")} = @threadId
-                  AND (${quoteIdent("createdAt", "column name")} > @ts OR (${quoteIdent("createdAt", "column name")} = @ts AND id > @id))
+                  AND (${quoteIdent("createdAt", "column name")} > @ts OR (${quoteIdent("createdAt", "column name")} = @ts AND id > @id))${resourceCondition}
                 ORDER BY ${quoteIdent("createdAt", "column name")} ASC, id ASC
                 LIMIT @lim`,
 					params: {
 						threadId,
 						ts: targetCreatedAt,
 						id: target.id,
-						lim: withNextMessages
+						lim: withNextMessages,
+						...resourceParams
 					},
 					json: true
 				});
@@ -6802,7 +6866,10 @@ var MemorySpanner = class MemorySpanner extends MemoryStorage {
 				hasMore: false
 			};
 			if (perPage === 0 && include && include.length > 0) {
-				const includeMessages = await this.getIncludedMessages({ include }) ?? [];
+				const includeMessages = await this.getIncludedMessages({
+					include,
+					resourceId
+				}) ?? [];
 				const parsedIncludes = this.parseAndFormatMessages(includeMessages, "v2");
 				const dirMul = direction === "ASC" ? 1 : -1;
 				return {
@@ -6860,7 +6927,10 @@ var MemorySpanner = class MemorySpanner extends MemoryStorage {
 			};
 			if (include?.length) {
 				const seen = new Set(messages.map((m) => m.id));
-				(await this.getIncludedMessages({ include }))?.forEach((msg) => {
+				(await this.getIncludedMessages({
+					include,
+					resourceId
+				}))?.forEach((msg) => {
 					if (!seen.has(msg.id)) {
 						messages.push(msg);
 						seen.add(msg.id);