@mastra/pg 1.26.0-alpha.1 → 1.26.0-alpha.3

package/dist/index.js

@@ -1,7 +1,7 @@
 import { createHash, randomUUID } from "crypto";
 import { ErrorCategory, ErrorDomain, MastraError } from "@mastra/core/error";
 import * as coreStorage from "@mastra/core/storage";
-import { AgentsStorage, BRANCH_SPAN_TYPES, BackgroundTasksStorage, BlobStore, ChannelsStorage, DATASETS_SCHEMA, DATASET_ITEMS_SCHEMA, DATASET_VERSIONS_SCHEMA, DatasetsStorage, EXPERIMENTS_SCHEMA, EXPERIMENT_RESULTS_SCHEMA, EntityType, ExperimentsStorage, FactoryStorage, FavoritesStorage, KNOWLEDGE_ACTIVITY_SCHEMA, KNOWLEDGE_CURSORS_SCHEMA, KNOWLEDGE_MENTIONS_SCHEMA, KNOWLEDGE_NODES_SCHEMA, KNOWLEDGE_RECORDS_SCHEMA, KNOWLEDGE_SEMANTIC_OUTBOX_SCHEMA, KnowledgeConflictError, KnowledgeNotFoundError, KnowledgeStorage, MCPClientsStorage, MCPServersStorage, METRIC_DISTINCT_COLUMNS, MastraCompositeStore, MemoryStorage, NotificationsStorage, OBSERVATIONAL_MEMORY_TABLE_SCHEMA, ObservabilityStorage, PromptBlocksStorage, SchedulesStorage, ScorerDefinitionsStorage, ScoresStorage, SkillsStorage, TABLE_AGENTS, TABLE_AGENT_VERSIONS, TABLE_BACKGROUND_TASKS, TABLE_CHANNEL_CONFIG, TABLE_CHANNEL_INSTALLATIONS, TABLE_CONFIGS, TABLE_DATASETS, TABLE_DATASET_ITEMS, TABLE_DATASET_VERSIONS, TABLE_EXPERIMENTS, TABLE_EXPERIMENT_RESULTS, TABLE_FAVORITES, TABLE_KNOWLEDGE_ACTIVITY, TABLE_KNOWLEDGE_CURSORS, TABLE_KNOWLEDGE_MENTIONS, TABLE_KNOWLEDGE_NODES, TABLE_KNOWLEDGE_RECORDS, TABLE_KNOWLEDGE_SEMANTIC_OUTBOX, TABLE_MCP_CLIENTS, TABLE_MCP_CLIENT_VERSIONS, TABLE_MCP_SERVERS, TABLE_MCP_SERVER_VERSIONS, TABLE_MESSAGES, TABLE_NOTIFICATIONS, TABLE_PROMPT_BLOCKS, TABLE_PROMPT_BLOCK_VERSIONS, TABLE_RESOURCES, TABLE_SCHEDULES, TABLE_SCHEDULE_TRIGGERS, TABLE_SCHEMAS, TABLE_SCORERS, TABLE_SCORER_DEFINITIONS, TABLE_SCORER_DEFINITION_VERSIONS, TABLE_SKILLS, TABLE_SKILL_BLOBS, TABLE_SKILL_VERSIONS, TABLE_SPANS, TABLE_THREADS, TABLE_THREAD_STATE, TABLE_TOOL_PROVIDER_CONNECTIONS, TABLE_WORKFLOW_DEFINITIONS, TABLE_WORKFLOW_SNAPSHOT, TABLE_WORKSPACES, TABLE_WORKSPACE_VERSIONS, ThreadStateStorage, ToolProviderConnectionsStorage, TraceStatus, UniqueViolationError, WorkflowDefinitionsStorage, WorkflowsStorage, WorkspacesStorage, assertKnowledgeCeilingRaised, assertKnowledgeScopeWithinCeiling, calculatePagination, canonicalizeKnowledgeScope, createKnowledgeUlid, createStorageErrorId, createVectorErrorId, ensureDate, getDefaultValue, getSqlType, hasErrorCode, isKnowledgeScopeVisible, knowledgeScopeKey, knowledgeSemanticDocumentId, knowledgeSemanticIdempotencyKey, listBranchesArgsSchema, listFeedbackArgsSchema, listLogsArgsSchema, listMetricsArgsSchema, listScoresArgsSchema, listTracesArgsSchema, matchesExpectedWorkflowStatus, mergeWorkflowStepResult, normalizePerPage, normalizeScheduleTarget, parseDuration, parseKnowledgeNodeCursor, parseKnowledgeWikilinks, safelyParseJSON, storageMessageMatchesMetadataFilter, toTraceSpans, transformScoreRow, validateStorageMetadataFilter } from "@mastra/core/storage";
+import { AgentsStorage, BRANCH_SPAN_TYPES, BackgroundTasksStorage, BlobStore, ChannelsStorage, DATASETS_SCHEMA, DATASET_ITEMS_SCHEMA, DATASET_VERSIONS_SCHEMA, DatasetsStorage, EXPERIMENTS_SCHEMA, EXPERIMENT_RESULTS_SCHEMA, EntityType, ExperimentsStorage, FactoryStorage, FavoritesStorage, KNOWLEDGE_ACTIVITY_SCHEMA, KNOWLEDGE_CURSORS_SCHEMA, KNOWLEDGE_MENTIONS_SCHEMA, KNOWLEDGE_NODES_SCHEMA, KNOWLEDGE_RECORDS_SCHEMA, KNOWLEDGE_SEMANTIC_OUTBOX_SCHEMA, KnowledgeConflictError, KnowledgeNotFoundError, KnowledgeStorage, MCPClientsStorage, MCPServersStorage, METRIC_DISTINCT_COLUMNS, MastraCompositeStore, MemoryStorage, NotificationsStorage, OBSERVATIONAL_MEMORY_TABLE_SCHEMA, ObservabilityStorage, PromptBlocksStorage, SchedulesStorage, ScorerDefinitionsStorage, ScoresStorage, SkillsStorage, TABLE_AGENTS, TABLE_AGENT_VERSIONS, TABLE_BACKGROUND_TASKS, TABLE_CHANNEL_CONFIG, TABLE_CHANNEL_INSTALLATIONS, TABLE_CONFIGS, TABLE_DATASETS, TABLE_DATASET_ITEMS, TABLE_DATASET_VERSIONS, TABLE_EXPERIMENTS, TABLE_EXPERIMENT_RESULTS, TABLE_FAVORITES, TABLE_KNOWLEDGE_ACTIVITY, TABLE_KNOWLEDGE_CURSORS, TABLE_KNOWLEDGE_MENTIONS, TABLE_KNOWLEDGE_NODES, TABLE_KNOWLEDGE_RECORDS, TABLE_KNOWLEDGE_SEMANTIC_OUTBOX, TABLE_MCP_CLIENTS, TABLE_MCP_CLIENT_VERSIONS, TABLE_MCP_SERVERS, TABLE_MCP_SERVER_VERSIONS, TABLE_MESSAGES, TABLE_NOTIFICATIONS, TABLE_PROMPT_BLOCKS, TABLE_PROMPT_BLOCK_VERSIONS, TABLE_RESOURCES, TABLE_SCHEDULES, TABLE_SCHEDULE_TRIGGERS, TABLE_SCHEMAS, TABLE_SCORERS, TABLE_SCORER_DEFINITIONS, TABLE_SCORER_DEFINITION_VERSIONS, TABLE_SKILLS, TABLE_SKILL_BLOBS, TABLE_SKILL_VERSIONS, TABLE_SPANS, TABLE_THREADS, TABLE_THREAD_STATE, TABLE_TOOL_PROVIDER_CONNECTIONS, TABLE_WORKFLOW_DEFINITIONS, TABLE_WORKFLOW_SNAPSHOT, TABLE_WORKSPACES, TABLE_WORKSPACE_VERSIONS, ThreadStateStorage, ToolProviderConnectionsStorage, TraceStatus, UniqueViolationError, WorkflowDefinitionsStorage, WorkflowsStorage, WorkspacesStorage, assertKnowledgeCeilingRaised, assertKnowledgeScopeWithinCeiling, calculatePagination, canonicalizeKnowledgeScope, createKnowledgeUlid, createStorageErrorId, createVectorErrorId, ensureDate, executeRetentionPrune, getDefaultValue, getSqlType, hasErrorCode, isKnowledgeScopeVisible, knowledgeScopeKey, knowledgeSemanticDocumentId, knowledgeSemanticIdempotencyKey, listBranchesArgsSchema, listFeedbackArgsSchema, listLogsArgsSchema, listMetricsArgsSchema, listScoresArgsSchema, listTracesArgsSchema, matchesExpectedWorkflowStatus, mergeWorkflowStepResult, normalizePerPage, normalizeScheduleTarget, parseDuration, parseKnowledgeNodeCursor, parseKnowledgeWikilinks, resolveRetentionTargets, retentionCutoffMs, runRetentionBatches, safelyParseJSON, storageMessageMatchesMetadataFilter, toTraceSpans, transformScoreRow, validateStorageMetadataFilter } from "@mastra/core/storage";
 import { parseFieldKey, parseSqlIdentifier } from "@mastra/core/utils";
 import { MastraVector, validateTopK, validateUpsertInput } from "@mastra/core/vector";
 import { Mutex } from "async-mutex";
@@ -4903,137 +4903,31 @@ var AgentsPG = class AgentsPG extends AgentsStorage {
 };
 //#endregion
 //#region src/storage/retention.ts
-const DEFAULT_BATCH_SIZE = 1e3;
-async function sleep(ms, signal) {
-	if (ms <= 0 || signal?.aborted) return;
-	await new Promise((resolve) => {
-		const timer = setTimeout(() => {
-			signal?.removeEventListener("abort", onAbort);
-			resolve();
-		}, ms);
-		const onAbort = () => {
-			clearTimeout(timer);
-			resolve();
-		};
-		signal?.addEventListener("abort", onAbort, { once: true });
-	});
-}
-/**
-* Convert a policy's `maxAge` into a cutoff bound matching the anchor's storage
-* type: a `Date` for `timestamptz` columns (pg compares timezone-aware), or a
-* raw millisecond number for `bigint` epoch-ms columns.
-*/
 function cutoffFor(policy, anchorType, now = Date.now()) {
-	const cutoffMs = now - parseDuration(policy.maxAge);
+	const cutoffMs = retentionCutoffMs(policy, now);
 	return anchorType === "epoch-ms" ? cutoffMs : new Date(cutoffMs);
 }
-/**
-* Run the bounded/cancellable batched-delete loop for a single logical target,
-* delegating the actual delete of up to `limit` rows to `deleteBatch`. Returns
-* `{ deleted, done }`; `done: false` means the loop stopped on a bound or the
-* abort signal and eligible rows may remain.
-*/
-async function runBatchedDelete({ deleteBatch, batchSize, options }) {
-	if (!Number.isSafeInteger(batchSize) || batchSize <= 0) throw new Error(`retention batchSize must be a positive integer; received ${batchSize}`);
-	let deleted = 0;
-	let batches = 0;
-	while (true) {
-		if (options?.signal?.aborted) return {
-			deleted,
-			done: false
-		};
-		if (options?.maxBatches !== void 0 && batches >= options.maxBatches) return {
-			deleted,
-			done: false
-		};
-		let limit = batchSize;
-		if (options?.maxRows !== void 0) {
-			const remaining = options.maxRows - deleted;
-			if (remaining <= 0) return {
-				deleted,
-				done: false
-			};
-			limit = Math.min(limit, remaining);
-		}
-		const affected = await deleteBatch(limit);
-		deleted += affected;
-		batches += 1;
-		if (affected < limit) return {
-			deleted,
-			done: true
-		};
-		if (options?.pauseMs) await sleep(options.pauseMs, options.signal);
-	}
-}
-/**
-* Runs the bounded, batched, cancellable delete loop for a set of tables in the
-* given order (callers pass children before parents for cascade-safe pruning),
-* and returns one {@link PruneResult} per table.
-*
-* The loop:
-* - deletes in chunks of `batchSize` (default 1000), each its own statement;
-* - stops a table's loop when a batch deletes fewer rows than requested (drained),
-*   or when `maxBatches`/`maxRows` is hit, or the `signal` aborts — the latter
-*   three leave `done: false` so the caller can resume;
-* - pauses `pauseMs` between batches when set, to avoid starving live traffic.
-*
-* `prune()` only deletes rows; it never reclaims disk. PostgreSQL reuses freed
-* space (dead tuples) via autovacuum on subsequent writes, so tables stop
-* growing. Returning disk to the OS (e.g. `VACUUM FULL`) is left to the operator.
-*/
-async function runPrune({ db, domain, targets, options }) {
-	const results = [];
-	const now = Date.now();
-	for (const target of targets) {
-		if (options?.signal?.aborted) {
-			results.push({
-				domain,
-				table: target.table,
-				deleted: 0,
-				done: false
-			});
-			continue;
-		}
-		const cutoff = cutoffFor(target.policy, target.anchorType, now);
-		const { deleted, done } = await runBatchedDelete({
-			deleteBatch: (limit) => db.pruneBatch({
-				tableName: target.table,
-				column: target.column,
-				cutoff,
-				limit
-			}),
-			batchSize: target.policy.batchSize ?? DEFAULT_BATCH_SIZE,
-			options
-		});
-		results.push({
-			domain,
-			table: target.table,
-			deleted,
-			done
-		});
-	}
-	return results;
+const runBatchedDelete = runRetentionBatches;
+function runPrune({ db, domain, targets, options }) {
+	return executeRetentionPrune({
+		domain,
+		targets,
+		options,
+		cutoffFor: (target, now) => cutoffFor(target.policy, target.anchorType ?? "timestamp", now),
+		deleteBatch: (target, cutoff, limit) => db.pruneBatch({
+			tableName: target.table,
+			column: target.column,
+			cutoff,
+			limit
+		})
+	});
 }
-/**
-* Resolve a domain's `{ tableKey: policy }` map plus its descriptor into an
-* ordered list of {@link PruneTarget}s. `order` lists table keys children-first
-* so cascade-dependent rows are removed before their parents. Table keys not in
-* `policies` are skipped (unset = keep forever).
-*/
 function resolveTargets({ policies, descriptor, order }) {
-	const targets = [];
-	for (const key of order) {
-		const policy = policies[key];
-		const entry = descriptor[key];
-		if (!policy || !entry) continue;
-		targets.push({
-			table: entry.table,
-			column: entry.column,
-			anchorType: entry.anchorType ?? "timestamp",
-			policy
-		});
-	}
-	return targets;
+	return resolveRetentionTargets({
+		policies,
+		descriptor,
+		order
+	});
 }
 //#endregion
 //#region src/storage/domains/background-tasks/index.ts
@@ -10864,7 +10758,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 				hasMore: false
 			};
 			const limitValue = perPageInput === false ? total : perPage;
-			const dataQuery = `SELECT id, "resourceId", title, metadata, "createdAt", "createdAtZ", "updatedAt", "updatedAtZ" ${baseQuery} ORDER BY COALESCE("${field}Z", "${field}") ${direction} LIMIT $${paramIndex} OFFSET $${paramIndex + 1}`;
+			const dataQuery = `SELECT id, "resourceId", title, metadata, "createdAt", "createdAtZ", "updatedAt", "updatedAtZ" ${baseQuery} ORDER BY COALESCE("${field}Z", "${field}") ${direction}, "id" ${direction} LIMIT $${paramIndex} OFFSET $${paramIndex + 1}`;
 			return {
 				threads: (await this.#db.readClient.manyOrNone(dataQuery, [
 					...queryParams,
@@ -11057,10 +10951,11 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 		return messages.sort((a, b) => {
 			const aValue = field === "createdAt" ? new Date(a.createdAt).getTime() : a[field];
 			const bValue = field === "createdAt" ? new Date(b.createdAt).getTime() : b[field];
-			if (aValue == null && bValue == null) return a.id.localeCompare(b.id);
+			const idOrder = direction === "ASC" ? a.id.localeCompare(b.id) : b.id.localeCompare(a.id);
+			if (aValue == null && bValue == null) return idOrder;
 			if (aValue == null) return 1;
 			if (bValue == null) return -1;
-			if (aValue === bValue) return a.id.localeCompare(b.id);
+			if (aValue === bValue) return idOrder;
 			if (typeof aValue === "number" && typeof bValue === "number") return direction === "ASC" ? aValue - bValue : bValue - aValue;
 			return direction === "ASC" ? String(aValue).localeCompare(String(bValue)) : String(bValue).localeCompare(String(aValue));
 		});
@@ -11263,7 +11158,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 		const metadataFilter = validateStorageMetadataFilter(filter?.metadata);
 		try {
 			const { field, direction } = this.parseOrderBy(orderBy, "ASC");
-			const orderByStatement = `ORDER BY "${field}" ${direction}`;
+			const orderByStatement = `ORDER BY "${field}" ${direction}, "id" ${direction}`;
 			const selectStatement = `SELECT id, content, role, type, "createdAt", "createdAtZ", thread_id AS "threadId", "resourceId"`;
 			const tableName = getTableName$3({
 				indexName: TABLE_MESSAGES,
@@ -11418,7 +11313,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 		const metadataFilter = validateStorageMetadataFilter(filter?.metadata);
 		try {
 			const { field, direction } = this.parseOrderBy(orderBy, "ASC");
-			const orderByStatement = `ORDER BY "${field}" ${direction}`;
+			const orderByStatement = `ORDER BY "${field}" ${direction}, "id" ${direction}`;
 			const selectStatement = `SELECT id, content, role, type, "createdAt", "createdAtZ", thread_id AS "threadId", "resourceId"`;
 			const tableName = getTableName$3({
 				indexName: TABLE_MESSAGES,
@@ -14913,6 +14808,11 @@ function tableIndexes() {
 			columns: "(\"tags\")",
 			using: "gin"
 		},
+		{
+			name: "mastra_score_events_scoreid_cursor_idx",
+			table: TABLE_SCORE_EVENTS,
+			columns: "(\"scoreId\", \"cursorId\" DESC)"
+		},
 		{
 			name: "mastra_score_events_cursor_idx",
 			table: TABLE_SCORE_EVENTS,
@@ -17045,13 +16945,32 @@ function pushScoreIdentity(acc, scorerId, scoreSource) {
 		acc.params.push(scoreSource);
 	}
 }
+function scoreRewriteConflict(row) {
+	return `ON CONFLICT ("scoreId", "timestamp") DO UPDATE SET ${[
+		...Object.keys(row).filter((column) => column !== "scoreId" && column !== "timestamp").map((column) => `"${column}" = EXCLUDED."${column}"`),
+		"\"cursorId\" = EXCLUDED.\"cursorId\"",
+		"\"xactId\" = EXCLUDED.\"xactId\""
+	].join(", ")}`;
+}
+function collapseExactScoreConflicts(rows) {
+	const records = /* @__PURE__ */ new Map();
+	for (const row of rows) {
+		const timestamp = new Date(row.timestamp).toISOString();
+		const key = `${String(row.scoreId)}\u0000${timestamp}`;
+		records.delete(key);
+		records.set(key, row);
+	}
+	return [...records.values()];
+}
 async function createScore(client, schema, args) {
-	const insert = buildInsert(schema, TABLE_SCORE_EVENTS, [scoreRecordToRow(args.score)]);
+	const row = scoreRecordToRow(args.score);
+	const insert = buildInsert(schema, TABLE_SCORE_EVENTS, [row], scoreRewriteConflict(row));
 	if (insert) await client.query(insert.text, insert.values);
 }
 async function batchCreateScores(client, schema, args) {
 	if (args.scores.length === 0) return;
-	const insert = buildInsert(schema, TABLE_SCORE_EVENTS, args.scores.map(scoreRecordToRow));
+	const rows = collapseExactScoreConflicts(args.scores.map(scoreRecordToRow));
+	const insert = buildInsert(schema, TABLE_SCORE_EVENTS, rows, scoreRewriteConflict(rows[0]));
 	if (insert) await client.query(insert.text, insert.values);
 }
 /**
@@ -17074,6 +16993,16 @@ async function deleteScores(client, schema, args) {
 	}
 	await client.query(`DELETE FROM ${table} WHERE ${conditions.join(" AND ")}`, values);
 }
+function latestScorePredicate(table, alias = "s") {
+	return `NOT EXISTS (
+    SELECT 1 FROM ${table} newer
+    WHERE newer."scoreId" = ${alias}."scoreId"
+      AND newer."cursorId" > ${alias}."cursorId"
+  )`;
+}
+function applyLatestScorePredicate(acc, table) {
+	acc.conditions.push(latestScorePredicate(table));
+}
 async function listScores(client, schema, args) {
 	const { mode, filters, pagination, orderBy, after, limit } = listScoresArgsSchema.parse(args);
 	const table = qualifiedTable(schema, TABLE_SCORE_EVENTS);
@@ -17084,28 +17013,50 @@ async function listScores(client, schema, args) {
 	return listScoresPage(client, table, filters, pagination.page, pagination.perPage, orderBy.field, orderBy.direction);
 }
 async function getScoreById(client, schema, scoreId) {
+	const table = qualifiedTable(schema, TABLE_SCORE_EVENTS);
 	const row = await client.oneOrNone(`SELECT ${SCORE_SELECT_COLUMNS}
-     FROM ${qualifiedTable(schema, TABLE_SCORE_EVENTS)}
+     FROM ${table}
      WHERE "scoreId" = $1
-     ORDER BY "timestamp" DESC
+     ORDER BY "cursorId" DESC
      LIMIT 1`, [scoreId]);
 	return row ? rowToScoreRecord(row) : null;
 }
 async function listScoresPage(client, table, filters, page, perPage, orderField, orderDir) {
-	return listSignalPage({
+	const acc = newFilterAccumulator();
+	applyScoreFilters(acc, filters);
+	applyLatestScorePredicate(acc, table);
+	const whereClause = whereOrEmpty(acc);
+	const countRow = await client.oneOrNone(`SELECT COUNT(*)::text AS count FROM ${table} s ${whereClause}`, acc.params);
+	const total = Number(countRow?.count ?? 0);
+	let scores = [];
+	if (total > 0) {
+		const safeOrderField = parseSqlIdentifier(orderField, "order field");
+		scores = (await client.manyOrNone(`SELECT ${SCORE_SELECT_COLUMNS}
+       FROM ${table} s
+       ${whereClause}
+       ORDER BY "${safeOrderField}" ${orderDir}, "cursorId" ${orderDir}
+       LIMIT $${acc.next++} OFFSET $${acc.next++}`, [
+			...acc.params,
+			perPage,
+			page * perPage
+		])).map(rowToScoreRecord);
+	}
+	const deltaCursor = deltaPollingFeatureEnabled() ? await readSignalStreamHeadCursor({
 		client,
 		table,
 		filters,
-		page,
-		perPage,
-		orderField,
-		orderDir,
-		includeDeltaCursor: deltaPollingFeatureEnabled(),
-		selectColumns: SCORE_SELECT_COLUMNS,
-		responseKey: "scores",
-		applyFilters: applyScoreFilters,
-		mapRow: rowToScoreRecord
-	});
+		applyFilters: applyScoreFilters
+	}) : void 0;
+	return {
+		scores,
+		pagination: {
+			total,
+			page,
+			perPage,
+			hasMore: (page + 1) * perPage < total
+		},
+		...deltaCursor !== void 0 ? { deltaCursor } : {}
+	};
 }
 async function listScoresDelta(client, table, filters, after, limit) {
 	return listSignalDelta({
@@ -17121,12 +17072,14 @@ async function listScoresDelta(client, table, filters, after, limit) {
 	});
 }
 async function runScoreAggregateQuery(client, schema, args, filters) {
+	const table = qualifiedTable(schema, TABLE_SCORE_EVENTS);
 	const acc = newFilterAccumulator();
 	pushScoreIdentity(acc, args.scorerId, args.scoreSource);
 	applyScoreFilters(acc, filters);
+	applyLatestScorePredicate(acc, table);
 	const sql = `
     SELECT ${aggregationSql(args.aggregation, "\"score\"")} AS "value"
-    FROM ${qualifiedTable(schema, TABLE_SCORE_EVENTS)}
+    FROM ${table} s
     ${whereOrEmpty(acc)}
   `;
 	const row = await client.oneOrNone(sql, acc.params);
@@ -17158,10 +17111,12 @@ async function getScoreBreakdown(client, schema, args) {
 	});
 	pushScoreIdentity(acc, args.scorerId, args.scoreSource);
 	applyScoreFilters(acc, args.filters);
+	const table = qualifiedTable(schema, TABLE_SCORE_EVENTS);
+	applyLatestScorePredicate(acc, table);
 	const sql = `
     SELECT ${resolved.map((e) => e.selectSql).join(", ")},
            ${aggregationSql(args.aggregation, "\"score\"")} AS "value"
-    FROM ${qualifiedTable(schema, TABLE_SCORE_EVENTS)}
+    FROM ${table} s
     ${whereOrEmpty(acc)}
     GROUP BY ${resolved.map((e) => e.alias).join(", ")}
     ORDER BY "value" DESC NULLS LAST
@@ -17181,11 +17136,13 @@ async function getScoreTimeSeries(client, schema, args) {
 		});
 		pushScoreIdentity(acc, args.scorerId, args.scoreSource);
 		applyScoreFilters(acc, args.filters);
+		const table = qualifiedTable(schema, TABLE_SCORE_EVENTS);
+		applyLatestScorePredicate(acc, table);
 		const sql = `
       SELECT ${bucket} AS bucket,
              ${resolved.map((e) => e.selectSql).join(", ")},
              ${aggregationSql(args.aggregation, "\"score\"")} AS "value"
-      FROM ${qualifiedTable(schema, TABLE_SCORE_EVENTS)}
+      FROM ${table} s
       ${whereOrEmpty(acc)}
       GROUP BY bucket, ${resolved.map((e) => e.alias).join(", ")}
       ORDER BY bucket
@@ -17203,10 +17160,12 @@ async function getScoreTimeSeries(client, schema, args) {
 	const acc = newFilterAccumulator();
 	pushScoreIdentity(acc, args.scorerId, args.scoreSource);
 	applyScoreFilters(acc, args.filters);
+	const table = qualifiedTable(schema, TABLE_SCORE_EVENTS);
+	applyLatestScorePredicate(acc, table);
 	const sql = `
     SELECT ${bucket} AS bucket,
            ${aggregationSql(args.aggregation, "\"score\"")} AS "value"
-    FROM ${qualifiedTable(schema, TABLE_SCORE_EVENTS)}
+    FROM ${table} s
     ${whereOrEmpty(acc)}
     GROUP BY bucket
     ORDER BY bucket
@@ -17226,9 +17185,11 @@ async function getScorePercentiles(client, schema, args) {
 	const acc = newFilterAccumulator();
 	pushScoreIdentity(acc, args.scorerId, args.scoreSource);
 	applyScoreFilters(acc, args.filters);
+	const table = qualifiedTable(schema, TABLE_SCORE_EVENTS);
+	applyLatestScorePredicate(acc, table);
 	const sql = `
     SELECT ${bucket} AS bucket, ${percentileSelectSql(args.percentiles, "\"score\"")}
-    FROM ${qualifiedTable(schema, TABLE_SCORE_EVENTS)}
+    FROM ${table} s
     ${whereOrEmpty(acc)}
     GROUP BY bucket
     ORDER BY bucket
@@ -17291,6 +17252,11 @@ const FEEDBACK_FIELDS = {
 const TRACE_SELECT = `
   r."traceId" AS "traceId",
   r."spanId" AS "rootSpanId",
+  r."name" AS "name",
+  r."entityId" AS "entityId",
+  r."parentSpanId" AS "parentSpanId",
+  r."metadata" AS "metadata",
+  r."input" AS "input",
   r."threadId" AS "threadId",
   r."resourceId" AS "resourceId",
   r."startedAt" AS "startedAt",
@@ -17422,13 +17388,6 @@ function latestSpanPredicate$1(spanTable) {
       AND (newer."isPending" < s."isPending" OR (newer."isPending" = s."isPending" AND newer."cursorId" > s."cursorId"))
   )`;
 }
-function latestScorePredicate(scoreTable) {
-	return `NOT EXISTS (
-    SELECT 1 FROM ${scoreTable} newer
-    WHERE newer."scoreId" = s."scoreId"
-      AND newer."cursorId" > s."cursorId"
-  )`;
-}
 function latestFeedbackPredicate(feedbackTable) {
 	return `NOT EXISTS (
     SELECT 1 FROM ${feedbackTable} newer
@@ -17598,7 +17557,7 @@ function compilePostgresTraceScope(schema, selection, relationCollections) {
 		values
 	};
 }
-function compilePostgresTraceQuery(schema, plan) {
+function compilePostgresTraceQuery(schema, plan, mode = "data") {
 	const { ctes, values } = compilePostgresTraceScope(schema, plan, collectRelationCollections(plan.where));
 	let predicateSql = "TRUE";
 	if (plan.where) {
@@ -17612,6 +17571,12 @@ function compilePostgresTraceQuery(schema, plan) {
     WHERE ${predicateSql}
   )`);
 	const candidates = `WITH ${ctes.join(",\n")}`;
+	if (plan.paginationMode === "page" && mode === "count") return {
+		text: `${candidates}
+SELECT COUNT(*)::text AS count
+FROM candidates`,
+		values
+	};
 	if (plan.result === "groups") {
 		const pageCondition = plan.cursor ? `AND "threadId" > $${values.length + 1}` : "";
 		if (plan.cursor) values.push(plan.cursor.threadId);
@@ -17629,6 +17594,17 @@ LIMIT $${values.length}`,
 	}
 	const orderField = plan.orderBy.field === "startedAt" ? "\"startedAt\"" : "\"endedAt\"";
 	const direction = plan.orderBy.direction === "asc" ? "ASC" : "DESC";
+	if (plan.paginationMode === "page") {
+		values.push(plan.perPage, plan.page * plan.perPage);
+		return {
+			text: `${candidates}
+SELECT *
+FROM candidates
+ORDER BY ${orderField} ${direction}, "traceId" ASC
+LIMIT $${values.length - 1} OFFSET $${values.length}`,
+			values
+		};
+	}
 	let pageCondition = "";
 	if (plan.cursor) {
 		const comparison = plan.orderBy.direction === "asc" ? ">" : "<";
@@ -17770,15 +17746,22 @@ function isPostgresStatementTimeout(error) {
 	const candidate = error;
 	return candidate.code === "57014" && String(candidate.message ?? "").includes("statement timeout");
 }
-async function runWithPostgresTraceQueryTimeout(client, timeoutMs, execute) {
+function isPostgresResourceLimit(error) {
+	if (!error || typeof error !== "object") return false;
+	const candidate = error;
+	return candidate.code === "53200" || candidate.code === "53400";
+}
+async function runWithPostgresTraceQueryTimeout(client, timeoutMs, execute, options = {}) {
 	const resolvedTimeoutMs = coreStorage.resolveTraceQueryTimeoutMs(timeoutMs);
 	try {
 		return await client.tx(async (transaction) => {
+			if (options.repeatableRead) await transaction.query("SET TRANSACTION ISOLATION LEVEL REPEATABLE READ");
 			await transaction.query(`SELECT set_config('statement_timeout', $1, true)`, [`${resolvedTimeoutMs}ms`]);
 			return execute(transaction);
 		});
 	} catch (error) {
 		if (isPostgresStatementTimeout(error)) throw new coreStorage.TraceQueryExecutionError();
+		if (isPostgresResourceLimit(error)) throw new coreStorage.TraceQueryResourceLimitError();
 		throw error;
 	}
 }
@@ -17806,6 +17789,50 @@ async function getTraceQueryValues(client, schema, plan, timeoutMs) {
 	});
 }
 async function queryTraces(client, schema, plan, timeoutMs) {
+	if (plan.paginationMode === "page") {
+		const resolvedTimeoutMs = coreStorage.resolveTraceQueryTimeoutMs(timeoutMs);
+		const deadline = performance.now() + resolvedTimeoutMs;
+		const countQuery = compilePostgresTraceQuery(schema, plan, "count");
+		const dataQuery = compilePostgresTraceQuery(schema, plan);
+		const { total, rows } = await runWithPostgresTraceQueryTimeout(client, resolvedTimeoutMs, async (transaction) => {
+			const countRows = await transaction.any(countQuery.text, countQuery.values);
+			const remainingTimeoutMs = Math.floor(deadline - performance.now());
+			if (remainingTimeoutMs <= 0) throw new coreStorage.TraceQueryExecutionError();
+			await transaction.query(`SELECT set_config('statement_timeout', $1, true)`, [`${remainingTimeoutMs}ms`]);
+			const rows = await transaction.any(dataQuery.text, dataQuery.values);
+			return {
+				total: Number(countRows[0]?.count ?? 0),
+				rows
+			};
+		}, { repeatableRead: true });
+		const traces = rows.map((row) => ({
+			traceId: String(row.traceId),
+			rootSpanId: String(row.rootSpanId),
+			name: row.name,
+			entityId: row.entityId ?? null,
+			parentSpanId: row.parentSpanId ?? null,
+			createdAt: asIsoTimestamp$1(row.startedAt),
+			metadata: row.metadata ?? null,
+			inputPreview: coreStorage.buildInputPreview(row.input) ?? null,
+			threadId: row.threadId == null ? null : String(row.threadId),
+			resourceId: row.resourceId == null ? null : String(row.resourceId),
+			startedAt: asIsoTimestamp$1(row.startedAt),
+			endedAt: asIsoTimestamp$1(row.endedAt),
+			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
+		}));
+		return coreStorage.traceQueryResponseSchema.parse({
+			traces,
+			pagination: {
+				total,
+				page: plan.page,
+				perPage: plan.perPage,
+				hasMore: (plan.page + 1) * plan.perPage < total
+			}
+		});
+	}
 	const query = compilePostgresTraceQuery(schema, plan);
 	const rows = await runWithPostgresTraceQueryTimeout(client, timeoutMs, (transaction) => transaction.any(query.text, query.values));
 	const visibleRows = rows.slice(0, plan.limit);
@@ -17823,6 +17850,12 @@ async function queryTraces(client, schema, plan, timeoutMs) {
 	const traces = visibleRows.map((row) => ({
 		traceId: String(row.traceId),
 		rootSpanId: String(row.rootSpanId),
+		name: row.name,
+		entityId: row.entityId ?? null,
+		parentSpanId: row.parentSpanId ?? null,
+		createdAt: asIsoTimestamp$1(row.startedAt),
+		metadata: row.metadata ?? null,
+		inputPreview: coreStorage.buildInputPreview(row.input) ?? null,
 		threadId: row.threadId == null ? null : String(row.threadId),
 		resourceId: row.resourceId == null ? null : String(row.resourceId),
 		startedAt: asIsoTimestamp$1(row.startedAt),
@@ -18570,7 +18603,7 @@ async function dangerouslyClearTracing(client, schema) {
 * Use it through `MastraCompositeStore` with a dedicated Postgres connection.
 */
 function wrapError(op, error, details) {
-	if (error instanceof MastraError || error instanceof coreStorage.TraceQueryExecutionError) throw error;
+	if (error instanceof MastraError || error instanceof coreStorage.TraceQueryExecutionError || error instanceof coreStorage.TraceQueryResourceLimitError) throw error;
 	throw new MastraError({
 		id: createStorageErrorId("PG", op, "FAILED"),
 		domain: ErrorDomain.STORAGE,