@mastra/pg 1.34.0-alpha.0 → 1.34.0

package/dist/index.js

@@ -1080,42 +1080,43 @@ var PgVector = class extends MastraVector {
 			const scoreExpr = ops.scoreExpr(distanceExpr);
 			const filterClause = filterQuery.trim().replace(/^WHERE\s+/i, "");
 			const hasFilter = filterClause.length > 0;
-			const useIndexedOrder = indexInfo.type === "hnsw" && !hasFilter && minScore <= 0;
 			const namespaceParam = filterValues.length + 1;
-			const query = useIndexedOrder ? `
+			const queryValues = [...filterValues, namespace];
+			const selectColumns = `vector_id as id, ${scoreExpr} as score, metadata${includeVector ? ", embedding" : ""}`;
+			const whereClause = `WHERE namespace = $${namespaceParam}${filterClause ? ` AND (${filterClause})` : ""}`;
+			const useIndexedOrder = indexInfo.type === "hnsw" && (!hasFilter || this.supportsIterativeScan());
+			let rows;
+			if (useIndexedOrder) {
+				const indexedQuery = `
         WITH vector_scores AS (
-          SELECT
-            vector_id as id,
-            ${scoreExpr} as score,
-            metadata
-            ${includeVector ? ", embedding" : ""}
+          SELECT ${selectColumns}
           FROM ${tableName}
-          WHERE namespace = $${namespaceParam}
+          ${whereClause}
           ORDER BY ${distanceExpr}
           LIMIT $2
         )
-        SELECT *
+        SELECT *, score > $1 AS above_min_score
         FROM vector_scores
-        WHERE score > $1
-        ORDER BY score DESC` : `
+        ORDER BY score DESC`;
+				const candidates = (await client.query(indexedQuery, queryValues)).rows;
+				if (candidates.length >= topK) rows = candidates.filter((row) => row.above_min_score);
+			}
+			if (!rows) {
+				const exactQuery = `
         WITH vector_scores AS (
-          SELECT
-            vector_id as id,
-            ${scoreExpr} as score,
-            metadata
-            ${includeVector ? ", embedding" : ""}
+          SELECT ${selectColumns}
           FROM ${tableName}
-          WHERE namespace = $${namespaceParam}
-          ${filterClause ? `AND (${filterClause})` : ""}
+          ${whereClause}
         )
         SELECT *
         FROM vector_scores
         WHERE score > $1
         ORDER BY score DESC
         LIMIT $2`;
-			const result = await client.query(query, [...filterValues, namespace]);
+				rows = (await client.query(exactQuery, queryValues)).rows;
+			}
 			await client.query("COMMIT");
-			return result.rows.map(({ id, score, metadata, embedding }) => ({
+			return rows.map(({ id, score, metadata, embedding }) => ({
 				id,
 				score,
 				metadata,
@@ -1382,7 +1383,7 @@ var PgVector = class extends MastraVector {
 					indexConfig,
 					vectorType
 				}, client);
-				if (metadataIndexes?.length) await this.createMetadataIndexes(tableName, indexName, metadataIndexes);
+				if (metadataIndexes?.length) await this.createMetadataIndexes(client, tableName, indexName, metadataIndexes);
 			} catch (error) {
 				this.createdIndexes.delete(indexName);
 				this.namespaceReadyIndexes.delete(indexName);
@@ -1532,13 +1533,13 @@ var PgVector = class extends MastraVector {
 			await client.query(indexSQL);
 		});
 	}
-	async createMetadataIndexes(tableName, indexName, metadataFields) {
+	async createMetadataIndexes(client, tableName, indexName, metadataFields) {
 		const hasher = await this.hasher;
 		for (const field of metadataFields) {
 			const fieldHash = hasher.h32(field).toString(16);
 			const metadataIdxName = `"${indexName.slice(0, 55 - fieldHash.length)}_md_${fieldHash}_idx"`;
 			const escapedField = field.replace(/'/g, "''");
-			await this.pool.query(`
+			await client.query(`
         CREATE INDEX CONCURRENTLY IF NOT EXISTS ${metadataIdxName}
         ON ${tableName} ((metadata->>'${escapedField}'))
       `);
@@ -5262,6 +5263,7 @@ function rowToTask(row) {
 	const suspendedAt = row.suspendedAtZ || row.suspendedAt;
 	const completedAt = row.completedAtZ || row.completedAt;
 	const leaseExpiresAt = row.leaseExpiresAtZ || row.leaseExpiresAt;
+	const expiresAt = row.expiresAt != null ? row.expiresAtZ || row.expiresAt : void 0;
 	return {
 		id: row.id,
 		status: row.status,
@@ -5283,10 +5285,13 @@ function rowToTask(row) {
 		suspendedAt: suspendedAt ? suspendedAt instanceof Date ? suspendedAt : new Date(suspendedAt) : void 0,
 		completedAt: completedAt ? completedAt instanceof Date ? completedAt : new Date(completedAt) : void 0,
 		ownerId: row.ownerId ?? void 0,
-		leaseExpiresAt: leaseExpiresAt ? leaseExpiresAt instanceof Date ? leaseExpiresAt : new Date(leaseExpiresAt) : void 0
+		leaseExpiresAt: leaseExpiresAt ? leaseExpiresAt instanceof Date ? leaseExpiresAt : new Date(leaseExpiresAt) : void 0,
+		expiresAt: expiresAt ? expiresAt instanceof Date ? expiresAt : new Date(expiresAt) : void 0,
+		metadata: parseJson$2(row.metadata)
 	};
 }
 var BackgroundTasksPG = class BackgroundTasksPG extends BackgroundTasksStorage {
+	supportsTaskExpiry = true;
 	#db;
 	#schema;
 	#skipDefaultIndexes;
@@ -5327,7 +5332,9 @@ var BackgroundTasksPG = class BackgroundTasksPG extends BackgroundTasksStorage {
 				"suspend_payload",
 				"suspendedAt",
 				"ownerId",
-				"leaseExpiresAt"
+				"leaseExpiresAt",
+				"expiresAt",
+				"metadata"
 			]
 		});
 		await this.createDefaultIndexes();
@@ -5461,7 +5468,10 @@ var BackgroundTasksPG = class BackgroundTasksPG extends BackgroundTasksStorage {
 				completedAtZ: task.completedAt?.toISOString() ?? null,
 				ownerId: task.ownerId ?? null,
 				leaseExpiresAt: task.leaseExpiresAt?.toISOString() ?? null,
-				leaseExpiresAtZ: task.leaseExpiresAt?.toISOString() ?? null
+				leaseExpiresAtZ: task.leaseExpiresAt?.toISOString() ?? null,
+				expiresAt: task.expiresAt?.toISOString() ?? null,
+				expiresAtZ: task.expiresAt?.toISOString() ?? null,
+				metadata: serializeJson(task.metadata)
 			}
 		});
 	}
@@ -5517,6 +5527,16 @@ var BackgroundTasksPG = class BackgroundTasksPG extends BackgroundTasksStorage {
 			const val = update.leaseExpiresAt?.toISOString() ?? null;
 			params.push(val, val);
 		}
+		if ("expiresAt" in update) {
+			setClauses.push(`"expiresAt" = $${paramIdx++}`);
+			setClauses.push(`"expiresAtZ" = $${paramIdx++}`);
+			const val = update.expiresAt?.toISOString() ?? null;
+			params.push(val, val);
+		}
+		if ("metadata" in update) {
+			setClauses.push(`"metadata" = $${paramIdx++}`);
+			params.push(serializeJson(update.metadata));
+		}
 		if (setClauses.length === 0) return false;
 		const table = getTableName$4(getSchemaName$4(this.#schema));
 		params.push(taskId);
@@ -5539,6 +5559,13 @@ var BackgroundTasksPG = class BackgroundTasksPG extends BackgroundTasksStorage {
 				params.push(options.expectedLeaseExpiresAt.toISOString());
 			}
 		}
+		if (options?.expectedSuspendedAt !== void 0) {
+			if (options.expectedSuspendedAt === null) where += ` AND "suspendedAtZ" IS NULL`;
+			else {
+				where += ` AND "suspendedAtZ" = $${paramIdx++}`;
+				params.push(options.expectedSuspendedAt.toISOString());
+			}
+		}
 		return ((await this.#db.client.query(`UPDATE ${table} SET ${setClauses.join(", ")} WHERE ${where}`, params)).rowCount ?? 0) > 0;
 	}
 	async getTask(taskId) {
@@ -5581,7 +5608,9 @@ var BackgroundTasksPG = class BackgroundTasksPG extends BackgroundTasksStorage {
 			conditions.push(`"tool_call_id" = $${paramIdx++}`);
 			params.push(filter.toolCallId);
 		}
-		const dateCol = filter.dateFilterBy === "startedAt" ? "\"startedAt\"" : filter.dateFilterBy === "suspendedAt" ? "\"suspendedAt\"" : filter.dateFilterBy === "completedAt" ? "\"completedAt\"" : "\"createdAt\"";
+		const dateCol = filter.dateFilterBy === "startedAt" ? "\"startedAt\"" : filter.dateFilterBy === "suspendedAt" ? "\"suspendedAt\"" : filter.dateFilterBy === "completedAt" ? "\"completedAt\"" : filter.dateFilterBy === "expiresAt" ? "\"expiresAtZ\"" : "\"createdAt\"";
+		if (filter.hasExpiresAt !== void 0) conditions.push(filter.hasExpiresAt ? "\"expiresAt\" IS NOT NULL" : "\"expiresAt\" IS NULL");
+		if (filter.dateFilterBy === "expiresAt" && (filter.fromDate || filter.toDate)) conditions.push("\"expiresAt\" IS NOT NULL");
 		if (filter.fromDate) {
 			conditions.push(`${dateCol} >= $${paramIdx++}`);
 			params.push(filter.fromDate.toISOString());
@@ -5622,7 +5651,9 @@ var BackgroundTasksPG = class BackgroundTasksPG extends BackgroundTasksStorage {
 			conditions.push(`"status" IN (${placeholders.join(", ")})`);
 			params.push(...statuses);
 		}
-		const dateCol = filter.dateFilterBy === "startedAt" ? "\"startedAt\"" : filter.dateFilterBy === "suspendedAt" ? "\"suspendedAt\"" : filter.dateFilterBy === "completedAt" ? "\"completedAt\"" : "\"createdAt\"";
+		const dateCol = filter.dateFilterBy === "startedAt" ? "\"startedAt\"" : filter.dateFilterBy === "suspendedAt" ? "\"suspendedAt\"" : filter.dateFilterBy === "completedAt" ? "\"completedAt\"" : filter.dateFilterBy === "expiresAt" ? "\"expiresAtZ\"" : "\"createdAt\"";
+		if (filter.hasExpiresAt !== void 0) conditions.push(filter.hasExpiresAt ? "\"expiresAt\" IS NOT NULL" : "\"expiresAt\" IS NULL");
+		if (filter.dateFilterBy === "expiresAt" && (filter.fromDate || filter.toDate)) conditions.push("\"expiresAt\" IS NOT NULL");
 		if (filter.fromDate) {
 			conditions.push(`${dateCol} >= $${paramIdx++}`);
 			params.push(filter.fromDate.toISOString());
@@ -7238,6 +7269,19 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 };
 // src/storage/domains/experiments/index.ts
 const DEFAULT_PRUNE_BATCH_SIZE = 1e3;
+/**
+* Column list for reading experiment rows. Each `timestamp` column comes back
+* twice: as itself, and as its `*Z` mirror derived in the query with
+* `AT TIME ZONE 'UTC'`. A plain `timestamp` otherwise round-trips through the
+* session timezone, and reading the stored `*Z` column instead would return the
+* insert time for rows written before the mirrors were filled in. Deriving it
+* here makes legacy rows read correctly with no backfill to run at startup.
+*/
+function selectWithMirrors(schema) {
+	return Object.entries(schema).flatMap(([name, definition]) => definition.type === "timestamp" ? [`"${name}"`, `"${name}" AT TIME ZONE 'UTC' AS "${name}Z"`] : [`"${name}"`]).join(", ");
+}
+const EXPERIMENT_COLUMNS = selectWithMirrors(EXPERIMENTS_SCHEMA);
+const EXPERIMENT_RESULT_COLUMNS = selectWithMirrors(EXPERIMENT_RESULTS_SCHEMA);
 var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 	#db;
 	#schema;
@@ -7246,9 +7290,9 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 	static MANAGED_TABLES = [TABLE_EXPERIMENTS, TABLE_EXPERIMENT_RESULTS];
 	/**
 	* Experiments prune as whole units: an aged experiment and its result rows go
-	* together, mirroring `deleteExperiment`. Anchored on `completedAt` (not the
-	* `completedAtZ` mirror, which carries a `DEFAULT NOW()` this domain never
-	* overrides — it holds insert time even for running rows). `completedAt` is
+	* together, mirroring `deleteExperiment`. Anchored on `completedAt` rather
+	* than its `completedAtZ` mirror: both are written together, but
+	* `completedAt` is the column the retention index covers. `completedAt` is
 	* written as a UTC ISO string and stays NULL while running, so
 	* `completedAt < cutoff` is false for in-flight experiments.
 	*/
@@ -7568,7 +7612,11 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 					startedAt: null,
 					completedAt: null,
 					createdAt: nowIso,
-					updatedAt: nowIso
+					updatedAt: nowIso,
+					startedAtZ: null,
+					completedAtZ: null,
+					createdAtZ: nowIso,
+					updatedAtZ: nowIso
 				}
 			});
 			return {
@@ -7657,12 +7705,14 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 				values.push(input.skippedCount);
 			}
 			if (input.startedAt !== void 0) {
-				setClauses.push(`"startedAt" = $${paramIndex++}`);
-				values.push(input.startedAt?.toISOString() ?? null);
+				const iso = input.startedAt?.toISOString() ?? null;
+				setClauses.push(`"startedAt" = $${paramIndex++}`, `"startedAtZ" = $${paramIndex++}`);
+				values.push(iso, iso);
 			}
 			if (input.completedAt !== void 0) {
-				setClauses.push(`"completedAt" = $${paramIndex++}`);
-				values.push(input.completedAt?.toISOString() ?? null);
+				const iso = input.completedAt?.toISOString() ?? null;
+				setClauses.push(`"completedAt" = $${paramIndex++}`, `"completedAtZ" = $${paramIndex++}`);
+				values.push(iso, iso);
 			}
 			values.push(input.id);
 			await this.#db.client.none(`UPDATE ${tableName} SET ${setClauses.join(", ")} WHERE "id" = $${paramIndex}`, values);
@@ -7691,7 +7741,7 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 			});
 			const { conditions, params } = tenancyWhere(filters, 2);
 			const whereSql = ["\"id\" = $1", ...conditions].join(" AND ");
-			const result = await client.oneOrNone(`SELECT * FROM ${tableName} WHERE ${whereSql}`, [id, ...params]);
+			const result = await client.oneOrNone(`SELECT ${EXPERIMENT_COLUMNS} FROM ${tableName} WHERE ${whereSql}`, [id, ...params]);
 			return result ? this.transformExperimentRow(result) : null;
 		} catch (error) {
 			throw new MastraError({
@@ -7778,7 +7828,7 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 			const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
 			const limitValue = perPageInput === false ? total : perPage;
 			return {
-				experiments: (await this.#db.readClient.manyOrNone(`SELECT * FROM ${tableName} ${whereClause} ORDER BY "${orderBy.field}" ${orderBy.direction}, "id" ASC LIMIT $${paramIndex} OFFSET $${paramIndex + 1}`, [
+				experiments: (await this.#db.readClient.manyOrNone(`SELECT ${EXPERIMENT_COLUMNS} FROM ${tableName} ${whereClause} ORDER BY "${orderBy.field}" ${orderBy.direction}, "id" ASC LIMIT $${paramIndex} OFFSET $${paramIndex + 1}`, [
 					...queryParams,
 					limitValue,
 					offset
@@ -7856,9 +7906,11 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 				return t.one(`INSERT INTO ${resultsTable} (
             "id", "experimentId", "itemId", "itemDatasetVersion", "organizationId", "projectId",
             "input", "output", "groundTruth", "metadata", "error", "startedAt", "completedAt",
-            "retryCount", "attempt", "traceId", "status", "tags", "toolMockReport", "createdAt"
-          ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20)
-          RETURNING *`, [
+            "retryCount", "attempt", "traceId", "status", "tags", "toolMockReport", "createdAt",
+            "startedAtZ", "completedAtZ", "createdAtZ"
+          ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20,
+            $21, $22, $23)
+          RETURNING ${EXPERIMENT_RESULT_COLUMNS}`, [
 					id,
 					input.experimentId,
 					input.itemId,
@@ -7878,6 +7930,9 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 					input.status ?? null,
 					purgeMetadata || input.tags == null ? null : toPgJson(input.tags),
 					purgeMetadata || input.toolMockReport == null ? null : toPgJson(input.toolMockReport),
+					nowIso,
+					input.startedAt.toISOString(),
+					input.completedAt.toISOString(),
 					nowIso
 				]);
 			});
@@ -7904,6 +7959,7 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 			const row = await this.#db.client.tx(async (t) => {
 				const owner = await t.oneOrNone(`SELECT "datasetId" FROM ${experimentsTable} WHERE "id" = $1`, [input.experimentId]);
 				const purgeMetadata = await this.#resolvePurgeMetadata(t, owner?.datasetId, input.itemId);
+				const nowIso = (/* @__PURE__ */ new Date()).toISOString();
 				const existing = await t.oneOrNone(`SELECT "id" FROM ${tableName} WHERE "experimentId" = $1 AND "itemId" = $2 AND COALESCE("attempt", 0) = $3 FOR UPDATE`, [
 					input.experimentId,
 					input.itemId,
@@ -7914,9 +7970,11 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 					return t.one(`INSERT INTO ${tableName} (
               "id", "experimentId", "itemId", "itemDatasetVersion", "organizationId", "projectId",
               "input", "output", "groundTruth", "metadata", "error", "startedAt", "completedAt",
-              "retryCount", "attempt", "traceId", "status", "tags", "toolMockReport", "createdAt"
-            ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20)
-            RETURNING *`, [
+              "retryCount", "attempt", "traceId", "status", "tags", "toolMockReport", "createdAt",
+              "startedAtZ", "completedAtZ", "createdAtZ"
+            ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20,
+              $21, $22, $23)
+            RETURNING ${EXPERIMENT_RESULT_COLUMNS}`, [
 						id,
 						input.experimentId,
 						input.itemId,
@@ -7936,15 +7994,19 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 						input.status ?? null,
 						purgeMetadata || input.tags == null ? null : toPgJson(input.tags),
 						purgeMetadata || input.toolMockReport == null ? null : toPgJson(input.toolMockReport),
-						(/* @__PURE__ */ new Date()).toISOString()
+						nowIso,
+						input.startedAt.toISOString(),
+						input.completedAt.toISOString(),
+						nowIso
 					]);
 				}
 				return t.one(`UPDATE ${tableName} SET
             "itemDatasetVersion" = $2, "organizationId" = $3, "projectId" = $4,
             "input" = $5, "output" = $6, "groundTruth" = $7, "metadata" = $8, "error" = $9,
             "startedAt" = $10, "completedAt" = $11, "retryCount" = $12, "attempt" = $13,
-            "traceId" = $14, "status" = $15, "tags" = $16, "toolMockReport" = $17
-          WHERE "id" = $1 RETURNING *`, [
+            "traceId" = $14, "status" = $15, "tags" = $16, "toolMockReport" = $17,
+            "startedAtZ" = $18, "completedAtZ" = $19
+          WHERE "id" = $1 RETURNING ${EXPERIMENT_RESULT_COLUMNS}`, [
 					existing.id,
 					input.itemDatasetVersion ?? null,
 					input.organizationId ?? null,
@@ -7961,7 +8023,9 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 					input.traceId ?? null,
 					input.status ?? null,
 					purgeMetadata || input.tags == null ? null : toPgJson(input.tags),
-					purgeMetadata || input.toolMockReport == null ? null : toPgJson(input.toolMockReport)
+					purgeMetadata || input.toolMockReport == null ? null : toPgJson(input.toolMockReport),
+					input.startedAt.toISOString(),
+					input.completedAt.toISOString()
 				]);
 			});
 			return this.transformExperimentResultRow(row);
@@ -7995,7 +8059,7 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
                "tags" = CASE WHEN $4 THEN NULL WHEN $5 THEN $6::jsonb ELSE "tags" END,
                "comment" = CASE WHEN $4 THEN NULL WHEN $7 THEN $8 ELSE "comment" END
            WHERE "id" = $1${input.experimentId !== void 0 ? " AND \"experimentId\" = $9" : ""}
-           RETURNING *`, [
+           RETURNING ${EXPERIMENT_RESULT_COLUMNS}`, [
 					input.id,
 					input.status !== void 0,
 					input.status ?? null,
@@ -8038,7 +8102,7 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 			});
 			const { conditions, params } = tenancyWhere(filters, 2);
 			const whereSql = ["\"id\" = $1", ...conditions].join(" AND ");
-			const result = await client.oneOrNone(`SELECT * FROM ${tableName} WHERE ${whereSql}`, [id, ...params]);
+			const result = await client.oneOrNone(`SELECT ${EXPERIMENT_RESULT_COLUMNS} FROM ${tableName} WHERE ${whereSql}`, [id, ...params]);
 			return result ? this.transformExperimentResultRow(result) : null;
 		} catch (error) {
 			throw new MastraError({
@@ -8101,7 +8165,7 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 			const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
 			const limitValue = perPageInput === false ? total : perPage;
 			return {
-				results: (await this.#db.readClient.manyOrNone(`SELECT * FROM ${tableName} ${whereClause} ORDER BY "${orderBy.field}" ${orderBy.direction}, "id" ASC LIMIT $${paramIndex} OFFSET $${paramIndex + 1}`, [
+				results: (await this.#db.readClient.manyOrNone(`SELECT ${EXPERIMENT_RESULT_COLUMNS} FROM ${tableName} ${whereClause} ORDER BY "${orderBy.field}" ${orderBy.direction}, "id" ASC LIMIT $${paramIndex} OFFSET $${paramIndex + 1}`, [
 					...queryParams,
 					limitValue,
 					offset
@@ -19520,6 +19584,13 @@ const timeToFirstChunkSortSupported = coreStorage.TRACE_QUERY_ORDER_FIELDS?.incl
 /** Same rule for time to first token: returned and sorted only when core knows the field. */
 const timeToFirstTokenSupported = "timeToFirstTokenMs" in coreStorage.TRACE_QUERY_FIELD_REGISTRY.trace;
 const timeToFirstTokenSortSupported = coreStorage.TRACE_QUERY_ORDER_FIELDS?.includes("timeToFirstTokenMs") === true;
+/**
+* Outcome fields follow the same rule: core before them rejects their predicates and strict rows,
+* so they are only returned and declared when core knows them.
+*/
+const spanQueryOutcomeFieldsSupported = "outcome" in (coreStorage.SPAN_QUERY_FIELD_REGISTRY ?? {});
+const traceQueryOutcomeFieldsSupported = "outcome" in (coreStorage.TRACE_QUERY_FIELD_REGISTRY?.trace ?? {});
+const outcomeFeatures = [...spanQueryOutcomeFieldsSupported ? ["span-query-outcome-fields"] : [], ...traceQueryOutcomeFieldsSupported ? ["trace-query-outcome-fields"] : []];
 const timingFeatures = [
 	...timeToFirstChunkSupported ? ["trace-query-time-to-first-chunk"] : [],
 	...timeToFirstChunkSortSupported ? ["trace-query-time-to-first-chunk-sort"] : [],
@@ -19566,6 +19637,8 @@ const TRACE_FIELDS = {
 	spanType: "r.\"spanType\"",
 	environment: "r.\"environment\"",
 	status: TRACE_STATUS_SQL,
+	outcome: "r.\"outcome\"",
+	stopReason: "r.\"stopReason\"",
 	tags: "r.\"tags\""
 };
 const SPAN_FIELDS = {
@@ -19579,6 +19652,8 @@ const SPAN_FIELDS = {
 	timeToFirstChunkMs: "s.\"timeToFirstChunkMs\"",
 	timeToFirstTokenMs: "s.\"timeToFirstTokenMs\"",
 	status: "s.\"status\"",
+	outcome: "s.\"outcome\"",
+	stopReason: "s.\"stopReason\"",
 	error: "s.\"error\"",
 	entityType: "s.\"entityType\"",
 	entityId: "s.\"entityId\"",
@@ -19652,7 +19727,10 @@ const TRACE_SELECT = `
   r."entityName" AS "entityName",
   r."entityType" AS "entityType",
   r."environment" AS "environment",
-  ${TRACE_STATUS_SQL} AS "status"`;
+  ${TRACE_STATUS_SQL} AS "status",
+  r."outcome" AS "outcome",
+  r."stopReason" AS "stopReason",
+  r."stopReasonContext" AS "stopReasonContext"`;
 function fieldSql(registry, field) {
 	const sql = registry[field];
 	if (sql === void 0) throw new Error(`Unsupported trusted trace-query field: ${field}`);
@@ -20009,8 +20087,8 @@ function compilePostgresTraceScope(schema, selection, relationCollections, scope
       s."traceId",
       s."name",
       s."spanType",
-      CASE WHEN jsonb_typeof(s."attributes" -> 'model') = 'string' THEN s."attributes" ->> 'model' END AS "model",
-      CASE WHEN jsonb_typeof(s."attributes" -> 'provider') = 'string' THEN s."attributes" ->> 'provider' END AS "provider",
+      COALESCE(s."model", CASE WHEN jsonb_typeof(s."attributes" -> 'model') = 'string' THEN s."attributes" ->> 'model' END) AS "model",
+      COALESCE(s."provider", CASE WHEN jsonb_typeof(s."attributes" -> 'provider') = 'string' THEN s."attributes" ->> 'provider' END) AS "provider",
       s."startedAt",
       CASE WHEN s."isPending" THEN NULL ELSE s."endedAt" END AS "endedAt",
       CASE
@@ -20020,6 +20098,8 @@ function compilePostgresTraceScope(schema, selection, relationCollections, scope
       s."timeToFirstChunkMs",
       s."timeToFirstTokenMs",
       CASE WHEN s."error" IS NOT NULL THEN 'error' ELSE 'success' END AS "status",
+      s."outcome",
+      s."stopReason",
       s."error",
       s."entityType",
       s."entityId",
@@ -20397,7 +20477,12 @@ function traceRowToResult(row) {
 		entityName: row.entityName == null ? null : String(row.entityName),
 		entityType: row.entityType == null ? null : String(row.entityType),
 		environment: row.environment == null ? null : String(row.environment),
-		status: row.status
+		status: row.status,
+		...traceQueryOutcomeFieldsSupported && {
+			outcome: row.outcome == null ? null : String(row.outcome),
+			stopReason: row.stopReason == null ? null : String(row.stopReason),
+			stopReasonContext: row.stopReasonContext ?? null
+		}
 	};
 }
 async function queryTraces(client, schema, plan, timeoutMs) {
@@ -20550,7 +20635,9 @@ const fields = [
 	"environment",
 	"executionSource",
 	"timeToFirstChunkMs",
-	"timeToFirstTokenMs"
+	"timeToFirstTokenMs",
+	"outcome",
+	"stopReason"
 ];
 const identities = identityFields.map((field) => `"${field}"`).join(", ");
 const identityOrder = identityFields.map((field) => `"${field}" COLLATE "C" ASC NULLS LAST`).join(", ");
@@ -20600,8 +20687,6 @@ function compilePostgresSpanSelection(schema, plan) {
 	};
 	values.push(...predicate.values);
 	const table = qualifiedTable(schema, TABLE_SPAN_EVENTS);
-	const legacyModelFields = coreStorage.SPAN_QUERY_FIELD_REGISTRY ? "" : `CASE WHEN jsonb_typeof(attributes -> 'model') = 'string' THEN attributes ->> 'model' END AS model,
-       CASE WHEN jsonb_typeof(attributes -> 'provider') = 'string' THEN attributes ->> 'provider' END AS provider,`;
 	return {
 		ctes: [
 			`candidate_ids AS MATERIALIZED (
@@ -20612,7 +20697,7 @@ function compilePostgresSpanSelection(schema, plan) {
 			`current_spans AS MATERIALIZED (
     SELECT DISTINCT ON (${identities})
       ${fields.map((field) => `"${field}"`).join(", ")}, "startedAt", "endedAt", "cursorId"::text AS version,
-      ${legacyModelFields}
+      "model", "provider",
       (EXTRACT(EPOCH FROM ("endedAt" - "startedAt")) * 1000)::float8 AS "durationMs",
       CASE WHEN error IS NULL THEN 'success' ELSE 'error' END AS status,
       error IS NOT NULL AS "hasError"
@@ -20682,10 +20767,14 @@ async function querySpans(client, schema, plan, timeoutMs) {
 	return runWithPostgresTraceQueryTimeout(client, timeoutMs, async (tx) => {
 		const query = compilePostgresSpanQuery(schema, plan);
 		const rows = await tx.any(query.text, query.values);
-		const selected = rows.map(({ version: _version, startedAt, endedAt, timeToFirstChunkMs, timeToFirstTokenMs, ...row }) => ({
+		const selected = rows.map(({ version: _version, startedAt, endedAt, timeToFirstChunkMs, timeToFirstTokenMs, outcome, stopReason, ...row }) => ({
 			...row,
 			...timeToFirstChunkSupported && { timeToFirstChunkMs },
 			...timeToFirstTokenSupported && { timeToFirstTokenMs },
+			...spanQueryOutcomeFieldsSupported && {
+				outcome,
+				stopReason
+			},
 			startedAt: startedAt.toISOString(),
 			endedAt: endedAt.toISOString()
 		}));
@@ -20703,18 +20792,22 @@ async function querySpans(client, schema, plan, timeoutMs) {
 			payloadValues.push(row.version);
 			return `(${key} AND "cursorId" = $${payloadValues.length}::bigint)`;
 		}).join(" OR ");
-		const payloadRows = await tx.any(`SELECT ${identities},
-      CASE WHEN jsonb_typeof(attributes -> 'model') = 'string' THEN attributes ->> 'model' END AS model,
-      CASE WHEN jsonb_typeof(attributes -> 'provider') = 'string' THEN attributes ->> 'provider' END AS provider,
+		const payloadRows = await tx.any(`SELECT ${identities}, "stopReasonContext",
+      COALESCE("model", CASE WHEN jsonb_typeof(attributes -> 'model') = 'string' THEN attributes ->> 'model' END) AS model,
+      COALESCE("provider", CASE WHEN jsonb_typeof(attributes -> 'provider') = 'string' THEN attributes ->> 'provider' END) AS provider,
       ${PREVIEW_PAYLOADS$1.map(([preview, payload]) => `"${preview}", CASE WHEN ${missingPreviewSql(`"${preview}"`)} THEN "${payload}" END AS "${payload}"`).join(",\n      ")}
       FROM ${qualifiedTable(schema, TABLE_SPAN_EVENTS)} WHERE ${payloadWhere}`, payloadValues);
 		const payloads = payloadRows.map(toSpanQueryPayload);
 		const metadata = new Map(payloadRows.map((row) => [coreStorage.spanQueryIdentityKey(row), row]));
-		const hydrated = selected.map((row) => ({
-			...row,
-			model: metadata.get(coreStorage.spanQueryIdentityKey(row))?.model ?? null,
-			provider: metadata.get(coreStorage.spanQueryIdentityKey(row))?.provider ?? null
-		}));
+		const hydrated = selected.map((row) => {
+			const stored = metadata.get(coreStorage.spanQueryIdentityKey(row));
+			return {
+				...row,
+				model: stored?.model ?? null,
+				provider: stored?.provider ?? null,
+				...spanQueryOutcomeFieldsSupported && { stopReasonContext: stored?.stopReasonContext ?? null }
+			};
+		});
 		let metrics = [];
 		if (!coreStorage.SPAN_QUERY_FIELD_REGISTRY) {
 			await remaining();
@@ -20956,6 +21049,8 @@ const DIMENSION_SQL = {
 	entityId: "r.\"entityId\"",
 	environment: "r.\"environment\"",
 	status: TRACE_STATUS_SQL,
+	outcome: "r.\"outcome\"",
+	stopReason: "r.\"stopReason\"",
 	serviceName: "r.\"serviceName\"",
 	executionSource: "r.\"executionSource\"",
 	threadId: "r.\"threadId\"",
@@ -20978,6 +21073,8 @@ const SPAN_DIMENSION_SQL = Object.fromEntries([
 	"rootEntityName",
 	"environment",
 	"status",
+	"outcome",
+	"stopReason",
 	"serviceName",
 	"executionSource",
 	"threadId",
@@ -20985,7 +21082,9 @@ const SPAN_DIMENSION_SQL = Object.fromEntries([
 	"userId",
 	"sessionId",
 	"organizationId",
-	"experimentId"
+	"experimentId",
+	"model",
+	"provider"
 ].map((field) => [field, `r."${field}"`]));
 const PERCENTILES = {
 	"duration.p50": .5,
@@ -22038,8 +22137,12 @@ async function dangerouslyClearTracing(client, schema) {
 * application database — observability writes will degrade app performance.
 * Use it through `MastraCompositeStore` with a dedicated Postgres connection.
 */
-const spanQueryFeatures = typeof coreStorage.planSpanQuery === "function" ? ["span-query", "span-query-context-fields"] : [];
-const spanAggregateFeatures = typeof coreStorage.planSpanAggregate === "function" ? ["span-aggregate"] : [];
+const spanQueryFeatures = typeof coreStorage.planSpanQuery === "function" ? [
+	"span-query",
+	"span-query-context-fields",
+	..."model" in (coreStorage.SPAN_QUERY_FIELD_REGISTRY ?? {}) ? ["span-query-model-fields"] : []
+] : [];
+const spanAggregateFeatures = typeof coreStorage.planSpanAggregate === "function" ? ["span-aggregate", ..."model" in (coreStorage.SPAN_AGGREGATE_DIMENSION_REGISTRY ?? {}) ? ["span-aggregate-model-dimensions"] : []] : [];
 function wrapError(op, error, details) {
 	if (error instanceof MastraError || error instanceof coreStorage.TraceQueryCursorError || error instanceof coreStorage.TraceQueryExecutionError || error instanceof coreStorage.TraceQueryResourceLimitError) throw error;
 	throw new MastraError({
@@ -22251,6 +22354,7 @@ var ObservabilityStoragePostgresVNext = class ObservabilityStoragePostgresVNext
 			"feedback",
 			"trace-query-context-ids",
 			...timingFeatures,
+			...outcomeFeatures,
 			"trace-query-root-span-fields",
 			"trace-query-root-entity-id"
 		];
@@ -22276,6 +22380,7 @@ var ObservabilityStoragePostgresVNext = class ObservabilityStoragePostgresVNext
 			"feedback",
 			"trace-query-context-ids",
 			...timingFeatures,
+			...outcomeFeatures,
 			"trace-query-root-span-fields",
 			"trace-query-root-entity-id"
 		];