@mastra/pg 1.33.0-alpha.2 → 1.33.0

package/dist/docs/SKILL.md

@@ -3,7 +3,7 @@ name: mastra-pg
 description: Documentation for @mastra/pg. Use when working with @mastra/pg APIs, configuration, or implementation.
 metadata:
   package: "@mastra/pg"
-  version: "1.33.0-alpha.2"
+  version: "1.33.0"
 ---
 
 ## When to use

package/dist/docs/assets/SOURCE_MAP.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.33.0-alpha.2",
+  "version": "1.33.0",
   "package": "@mastra/pg",
   "exports": {},
   "modules": {}

package/dist/docs/references/docs-memory-semantic-recall.md

@@ -456,8 +456,10 @@ const agent = new Agent({
         indexConfig: {
           type: 'hnsw', // Use HNSW for better performance
           metric: 'dotproduct', // Best for OpenAI embeddings
-          m: 16, // Number of bi-directional links (default: 16)
-          efConstruction: 64, // Size of candidate list during construction (default: 64)
+          hnsw: {
+            m: 16, // Number of bi-directional links (default: 16)
+            efConstruction: 64, // Size of candidate list during construction (default: 64)
+          },
         },
       },
     },

package/dist/docs/references/reference-memory-memory-class.md

@@ -4,7 +4,7 @@
 
 # Memory class
 
-The `Memory` class provides a reliable system for managing conversation history and thread-based message storage in Mastra. It enables persistent storage of conversations, semantic search capabilities, and efficient message retrieval. You must configure a storage provider for conversation history, and if you enable semantic recall you will also need to provide a vector store and embedder.
+The `Memory` class provides a reliable system for managing conversation history and thread-based message storage in Mastra. It enables persistent storage of conversations, semantic search capabilities, and efficient message retrieval. You must configure a storage provider for conversation history, and if you enable semantic recall you will also need to provide a vector store and, unless that vector store embeds text itself, an embedder.
 
 ## Usage example
 
@@ -31,11 +31,11 @@ export const agent = new Agent({
 
 ## Constructor parameters
 
-**storage** (`MastraCompositeStore`): Storage implementation for persisting memory data. Defaults to new DefaultStorage({ config: { url: "file:memory.db" } }) if not provided.
+**storage** (`MastraCompositeStore`): Storage implementation for persisting memory data. Optional: when omitted, an agent uses the storage of the Mastra instance it belongs to. If neither is configured, accessing memory.storage throws Memory requires a storage provider to function.
 
 **vector** (`MastraVector | false`): Vector store for semantic search capabilities. Set to false to disable vector operations.
 
-**embedder** (`EmbeddingModel<string> | EmbeddingModelV2<string>`): Embedder instance for vector embeddings. Required when semantic recall is enabled.
+**embedder** (`string | EmbeddingModel<string> | EmbeddingModelV2<string>`): Embedder for vector embeddings, as a model-router ID string (for example "openai/text-embedding-3-small"), an EmbeddingModel, or an EmbeddingModelV2. Required when semantic recall is enabled and the vector store doesn't generate embeddings itself (vector.isSelfEmbedding is false).
 
 **embeddingDimension** (`number`): Output dimension of the embedder, as a positive integer. When set, Memory uses it to name the semantic recall index instead of embedding a probe string on first use. It must match the vectors the embedder returns: a mismatch throws a MASTRA_MEMORY_EMBEDDING_DIMENSION_MISMATCH error before any index is created. See Setting the embedding dimension.
 
@@ -49,7 +49,7 @@ export const agent = new Agent({
 
 **options.retainFullInput** (`boolean`): When true, the request input is processed exactly as supplied instead of being filtered against stored history. Use this when you assemble the input yourself and need the message sequence preserved. Stored history is still loaded underneath, and every input message that isn't already stored is saved to the thread, including few-shot examples. Can be set per call on memory.options or agent-wide in the memory constructor options.
 
-**options.semanticRecall** (`boolean | { topK: number; messageRange: number | { before: number; after: number }; scope?: 'thread' | 'resource' }`): Enable semantic search in message history. Can be a boolean or an object with configuration options. When enabled, requires both vector store and embedder to be configured. Default topK is 4, default messageRange is {before: 1, after: 1}.
+**options.semanticRecall** (`boolean | { topK: number; messageRange: number | { before: number; after: number }; scope?: 'thread' | 'resource' }`): Enable semantic search in message history. Can be a boolean or an object with configuration options. When enabled, requires a vector store, and an embedder unless the vector store embeds text itself (isSelfEmbedding). Default topK is 4, default messageRange is {before: 1, after: 1}.
 
 **options.workingMemory** (`WorkingMemory`): Configuration for working memory feature. Can be { enabled: boolean; template?: string; schema?: ZodObject\<any> | JSONSchema7; scope?: 'thread' | 'resource' } or { enabled: boolean } to disable.
 
@@ -128,8 +128,10 @@ export const agent = new Agent({
         indexConfig: {
           type: 'hnsw', // Use HNSW for better performance
           metric: 'dotproduct', // Optimal for OpenAI embeddings
-          m: 16, // Number of bi-directional links
-          efConstruction: 64, // Construction-time candidate list size
+          hnsw: {
+            m: 16, // Number of bi-directional links
+            efConstruction: 64, // Construction-time candidate list size
+          },
         },
       },
       workingMemory: {

package/dist/index.cjs

@@ -262,7 +262,7 @@ const createNumericOperator = (symbol) => {
 			sql: `(CASE WHEN jsonb_typeof(${jsonExtract}) = 'number' THEN (${textExtract})::numeric ${symbol} $${paramIndex}::numeric ELSE NULL END)`,
 			needsValue: true
 		};
-		else return {
+		return {
 			sql: `${textExtract} ${symbol} $${paramIndex}::text`,
 			needsValue: true
 		};
@@ -4019,6 +4019,42 @@ MIGRATION REQUIRED: Duplicate spans detected in ${duplicateInfo.tableName}\n====
 			}, error);
 		}
 	}
+	/**
+	* Runs one UPDATE per record in a transaction, changing a row only while every
+	* column in `nullColumns` is still NULL. Never inserts. Returns, in input order,
+	* whether each update changed a row.
+	*/
+	async batchUpdateWhereNull({ tableName, updates, nullColumns }) {
+		const nullConditions = nullColumns.map((column) => ` AND "${(0, _mastra_core_utils.parseSqlIdentifier)(column, "column name")}" IS NULL`).join("");
+		try {
+			return await this.client.tx(async (tx) => {
+				const applied = [];
+				for (const update of updates) {
+					const query = await this.buildUpdateQuery({
+						tableName,
+						...update
+					});
+					if (!query) {
+						applied.push(false);
+						continue;
+					}
+					const rows = await tx.any(`${query.sql}${nullConditions} RETURNING 1`, query.values);
+					applied.push(rows.length > 0);
+				}
+				return applied;
+			});
+		} catch (error) {
+			throw new _mastra_core_error.MastraError({
+				id: (0, _mastra_core_storage.createStorageErrorId)("PG", "BATCH_UPDATE_WHERE_NULL", "FAILED"),
+				domain: _mastra_core_error.ErrorDomain.STORAGE,
+				category: _mastra_core_error.ErrorCategory.THIRD_PARTY,
+				details: {
+					tableName,
+					numberOfRecords: updates.length
+				}
+			}, error);
+		}
+	}
 	async batchDelete({ tableName, keys }) {
 		try {
 			if (keys.length === 0) return;
@@ -4139,9 +4175,14 @@ MIGRATION REQUIRED: Duplicate spans detected in ${duplicateInfo.tableName}\n====
 			columns: [column]
 		});
 	}
-	async executeUpdate(client, { tableName, keys, data }) {
+	async executeUpdate(client, args) {
+		const query = await this.buildUpdateQuery(args);
+		if (!query) return;
+		await client.none(query.sql, query.values);
+	}
+	async buildUpdateQuery({ tableName, keys, data }) {
 		const filteredData = await this.filterRecordToKnownColumns(tableName, data);
-		if (Object.keys(filteredData).length === 0) return;
+		if (Object.keys(filteredData).length === 0) return null;
 		const setColumns = [];
 		const setValues = [];
 		let paramIndex = 1;
@@ -4157,12 +4198,13 @@ MIGRATION REQUIRED: Duplicate spans detected in ${duplicateInfo.tableName}\n====
 			whereConditions.push(`"${parsedKey}" = $${paramIndex++}`);
 			whereValues.push(this.prepareValue(value, key, tableName));
 		});
-		const sql = `UPDATE ${getTableName$6({
-			indexName: tableName,
-			schemaName: getSchemaName$6(this.schemaName)
-		})} SET ${setColumns.join(", ")} WHERE ${whereConditions.join(" AND ")}`;
-		const values = [...setValues, ...whereValues];
-		await client.none(sql, values);
+		return {
+			sql: `UPDATE ${getTableName$6({
+				indexName: tableName,
+				schemaName: getSchemaName$6(this.schemaName)
+			})} SET ${setColumns.join(", ")} WHERE ${whereConditions.join(" AND ")}`,
+			values: [...setValues, ...whereValues]
+		};
 	}
 };
 // src/storage/domains/utils.ts
@@ -12038,7 +12080,7 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 				indexName: OM_TABLE,
 				schemaName: quotedSchemaName
 			});
-			const idxPrefix = schemaPrefix ? `${schemaPrefix}` : "";
+			const idxPrefix = schemaPrefix ? schemaPrefix : "";
 			statements.push(`CREATE INDEX IF NOT EXISTS "${idxPrefix}idx_om_lookup_key" ON ${fullOmTableName} ("lookupKey");`);
 		}
 		for (const idx of MemoryPG.getDefaultIndexDefs(schemaPrefix)) statements.push(generateIndexSQL(idx, schemaName));
@@ -15712,30 +15754,33 @@ var ObservabilityPG = class ObservabilityPG extends _mastra_core_storage.Observa
 			}, error);
 		}
 	}
+	#toSpanUpdates(records) {
+		return records.map((record) => {
+			const data = { ...record.updates };
+			if (data.endedAt instanceof Date) {
+				const endedAt = data.endedAt.toISOString();
+				data.endedAt = endedAt;
+				data.endedAtZ = endedAt;
+			}
+			if (data.startedAt instanceof Date) {
+				const startedAt = data.startedAt.toISOString();
+				data.startedAt = startedAt;
+				data.startedAtZ = startedAt;
+			}
+			return {
+				keys: {
+					spanId: record.spanId,
+					traceId: record.traceId
+				},
+				data
+			};
+		});
+	}
 	async batchUpdateSpans(args) {
 		try {
 			return this.#db.batchUpdate({
 				tableName: _mastra_core_storage.TABLE_SPANS,
-				updates: args.records.map((record) => {
-					const data = { ...record.updates };
-					if (data.endedAt instanceof Date) {
-						const endedAt = data.endedAt.toISOString();
-						data.endedAt = endedAt;
-						data.endedAtZ = endedAt;
-					}
-					if (data.startedAt instanceof Date) {
-						const startedAt = data.startedAt.toISOString();
-						data.startedAt = startedAt;
-						data.startedAtZ = startedAt;
-					}
-					return {
-						keys: {
-							spanId: record.spanId,
-							traceId: record.traceId
-						},
-						data
-					};
-				})
+				updates: this.#toSpanUpdates(args.records)
 			});
 		} catch (error) {
 			throw new _mastra_core_error.MastraError({
@@ -15745,6 +15790,25 @@ var ObservabilityPG = class ObservabilityPG extends _mastra_core_storage.Observa
 			}, error);
 		}
 	}
+	async batchUpdateUnendedSpans(args) {
+		try {
+			const applied = await this.#db.batchUpdateWhereNull({
+				tableName: _mastra_core_storage.TABLE_SPANS,
+				updates: this.#toSpanUpdates(args.records),
+				nullColumns: ["endedAt"]
+			});
+			return { updated: args.records.filter((_, index) => applied[index]).map(({ traceId, spanId }) => ({
+				traceId,
+				spanId
+			})) };
+		} catch (error) {
+			throw new _mastra_core_error.MastraError({
+				id: (0, _mastra_core_storage.createStorageErrorId)("PG", "BATCH_UPDATE_UNENDED_SPANS", "FAILED"),
+				domain: _mastra_core_error.ErrorDomain.STORAGE,
+				category: _mastra_core_error.ErrorCategory.USER
+			}, error);
+		}
+	}
 	async batchDeleteTraces(args) {
 		this.assertUnscopedBatchDeleteTraces(args);
 		try {
@@ -16062,6 +16126,51 @@ const SPAN_EVENT_COLUMNS = [
 		type: "double precision",
 		nullable: true
 	},
+	{
+		name: "externalParentSpanId",
+		type: "text",
+		nullable: true
+	},
+	{
+		name: "resumedFromSpanId",
+		type: "text",
+		nullable: true
+	},
+	{
+		name: "model",
+		type: "text",
+		nullable: true
+	},
+	{
+		name: "provider",
+		type: "text",
+		nullable: true
+	},
+	{
+		name: "outcome",
+		type: "text",
+		nullable: true
+	},
+	{
+		name: "stopReason",
+		type: "text",
+		nullable: true
+	},
+	{
+		name: "timeToFirstTokenMs",
+		type: "double precision",
+		nullable: true
+	},
+	{
+		name: "errorCount",
+		type: "integer",
+		nullable: true
+	},
+	{
+		name: "stopReasonContext",
+		type: "jsonb",
+		nullable: true
+	},
 	{
 		name: "tags",
 		type: "text[]",
@@ -16770,6 +16879,26 @@ function allTableDDL(schema, mode) {
 	];
 }
 /**
+* Span event columns added after the table first shipped, with their types. All
+* nullable with no default, so each ALTER is a catalog-only change; rows written
+* before it read NULL and readers fall back to the payload or attributes.
+*/
+const ADDED_SPAN_COLUMNS = [
+	["inputPreview", "text"],
+	["outputPreview", "text"],
+	["errorPreview", "text"],
+	["timeToFirstChunkMs", "double precision"],
+	["externalParentSpanId", "text"],
+	["resumedFromSpanId", "text"],
+	["model", "text"],
+	["provider", "text"],
+	["outcome", "text"],
+	["stopReason", "text"],
+	["timeToFirstTokenMs", "double precision"],
+	["errorCount", "integer"],
+	["stopReasonContext", "jsonb"]
+];
+/**
 * Additive column migrations for tables created by an older version of this
 * schema. `CREATE TABLE IF NOT EXISTS` is a no-op on an existing table, so new
 * columns have to be added out of band.
@@ -16786,20 +16915,11 @@ function additiveColumns(schema) {
 			column: "isPending",
 			ddl: `ALTER TABLE ${qualifiedTable(schema, TABLE_SPAN_EVENTS)} ADD COLUMN IF NOT EXISTS "isPending" boolean NOT NULL DEFAULT false`
 		},
-		...[
-			"inputPreview",
-			"outputPreview",
-			"errorPreview"
-		].map((column) => ({
+		...ADDED_SPAN_COLUMNS.map(([column, type]) => ({
 			table: TABLE_SPAN_EVENTS,
 			column,
-			ddl: `ALTER TABLE ${qualifiedTable(schema, TABLE_SPAN_EVENTS)} ADD COLUMN IF NOT EXISTS "${column}" text`
+			ddl: `ALTER TABLE ${qualifiedTable(schema, TABLE_SPAN_EVENTS)} ADD COLUMN IF NOT EXISTS "${column}" ${type}`
 		})),
-		{
-			table: TABLE_SPAN_EVENTS,
-			column: "timeToFirstChunkMs",
-			ddl: `ALTER TABLE ${qualifiedTable(schema, TABLE_SPAN_EVENTS)} ADD COLUMN IF NOT EXISTS "timeToFirstChunkMs" double precision`
-		},
 		{
 			table: TABLE_FEEDBACK_EVENTS,
 			column: "reviewStatus",
@@ -17352,6 +17472,11 @@ const PROMOTED_KEYS = /* @__PURE__ */ new Set([
 	"executionSource",
 	"serviceName"
 ]);
+function nullableNumber$1(value) {
+	if (value == null || value === "") return null;
+	const n = Number(value);
+	return Number.isNaN(n) ? null : n;
+}
 function nullableString(value) {
 	if (typeof value === "string") return value === "" ? null : value;
 	if (value == null) return null;
@@ -17513,6 +17638,15 @@ function spanRecordToRow(span) {
 		startedAt: toIsoOrDate(span.startedAt),
 		endedAt: toIsoOrDate(endedAt),
 		timeToFirstChunkMs: span.timeToFirstChunkMs ?? null,
+		externalParentSpanId: span.externalParentSpanId ?? null,
+		resumedFromSpanId: span.resumedFromSpanId ?? null,
+		model: span.model ?? null,
+		provider: span.provider ?? null,
+		outcome: span.outcome ?? null,
+		stopReason: span.stopReason ?? null,
+		stopReasonContext: jsonField(span.stopReasonContext),
+		timeToFirstTokenMs: span.timeToFirstTokenMs ?? null,
+		errorCount: span.errorCount ?? null,
 		tags: normalizeTags(span.tags),
 		metadataSearch: buildMetadataSearch(metadata),
 		metadataRaw: jsonField(metadata),
@@ -17542,6 +17676,7 @@ function rowToSpanRecord(row) {
 	const startedAt = toDate(row.startedAt);
 	const endedAt = spanRowEndedAt(row, startedAt);
 	const error = parsedJson(row.error);
+	const attributes = parsedJson(row.attributes);
 	const { executionSource, ...ctx } = rowToCommonContext(row);
 	return {
 		...ctx,
@@ -17554,10 +17689,19 @@ function rowToSpanRecord(row) {
 		isEvent: Boolean(row.isEvent),
 		startedAt,
 		endedAt,
+		externalParentSpanId: nullableString(row.externalParentSpanId),
+		resumedFromSpanId: nullableString(row.resumedFromSpanId),
+		model: nullableString(row.model) ?? (0, _mastra_core_storage.getStringAttribute)(attributes, "model"),
+		provider: nullableString(row.provider) ?? (0, _mastra_core_storage.getStringAttribute)(attributes, "provider"),
+		outcome: nullableString(row.outcome),
+		stopReason: nullableString(row.stopReason),
+		stopReasonContext: parsedJson(row.stopReasonContext) ?? null,
+		timeToFirstTokenMs: nullableNumber$1(row.timeToFirstTokenMs),
+		errorCount: nullableNumber$1(row.errorCount),
 		tags: normalizeTags(row.tags),
 		metadata: parsedJson(row.metadataRaw) ?? void 0,
 		scope: parsedJson(row.scope) ?? void 0,
-		attributes: parsedJson(row.attributes) ?? void 0,
+		attributes: attributes ?? void 0,
 		links: parsedJson(row.links) ?? void 0,
 		input: parsedJson(row.input) ?? void 0,
 		output: parsedJson(row.output) ?? void 0,
@@ -20583,7 +20727,7 @@ async function queryThreadRows(client, schema, plan, timeoutMs, strategy = "auto
 			return `"${field}" ${field === "organizationId" || field === "resourceId" ? "IS NOT DISTINCT FROM" : "="} $${values.length}`;
 		}).join(" AND ")})`;
 	}));
-	const payloads = await run(`SELECT "organizationId", "traceId", "cursorId", "spanType", ${contextFields.map((field) => `"${field}"`).join(", ")},
+	const payloads = await run(`SELECT "organizationId", "traceId", "cursorId", ${contextFields.map((field) => `"${field}"`).join(", ")},
     CASE WHEN "spanType" = 'agent_run' THEN "timeToFirstChunkMs" END AS "timeToFirstChunkMs",
     CASE WHEN error IS NULL THEN 'success' ELSE 'error' END AS status,
     ${[
@@ -20598,30 +20742,10 @@ async function queryThreadRows(client, schema, plan, timeoutMs, strategy = "auto
 		String(version)
 	]);
 	const byRoot = new Map(payloads.map((row) => [key(row.organizationId, row.traceId, row.cursorId), row]));
-	const agents = page.filter((row) => byRoot.get(key(row.organizationId, row.firstTraceId, row.firstCursorId))?.spanType === "agent_run");
-	const models = /* @__PURE__ */ new Map();
-	if (agents.length) {
-		const modelValues = [];
-		const rows = await run(`SELECT DISTINCT ON ("organizationId", "traceId") "organizationId", "traceId",
-        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
-        FROM ${table} WHERE "spanType" = 'model_generation' AND NOT "isPending" AND (${agents.map((row) => `(${Object.entries({
-			organizationId: row.organizationId,
-			resourceId: row.resourceId,
-			traceId: row.firstTraceId,
-			parentSpanId: row.firstSpanId
-		}).map(([field, value]) => {
-			modelValues.push(value);
-			return `"${field}" ${field === "organizationId" || field === "resourceId" ? "IS NOT DISTINCT FROM" : "="} $${modelValues.length}`;
-		}).join(" AND ")})`).join(" OR ")})
-        ORDER BY "organizationId", "traceId", "startedAt", "spanId" COLLATE "C", "cursorId" DESC`, modelValues);
-		for (const row of rows) models.set(JSON.stringify([row.organizationId, row.traceId]), row);
-	}
 	const threads = page.flatMap((row) => {
 		const first = byRoot.get(key(row.organizationId, row.firstTraceId, row.firstCursorId));
 		const last = byRoot.get(key(row.organizationId, row.lastTraceId, row.lastCursorId));
 		if (!first || !last) return [];
-		const model = models.get(JSON.stringify([row.organizationId, row.firstTraceId]));
 		return [_mastra_core_storage.threadQueryRowSchema.parse({
 			organizationId: row.organizationId,
 			threadId: row.threadId,
@@ -20633,8 +20757,6 @@ async function queryThreadRows(client, schema, plan, timeoutMs, strategy = "auto
 			endedAt: row.endedAt.toISOString(),
 			traceCount: Number(row.traceCount),
 			timeToFirstChunkMs: first.timeToFirstChunkMs,
-			model: model?.model ?? null,
-			provider: model?.provider ?? null,
 			inputPreview: readPreview(first.inputPreview, first.input),
 			outputPreview: readPreview(last.outputPreview, last.output),
 			errorPreview: readPreview(last.errorPreview, last.error)
@@ -25618,6 +25740,13 @@ var WorkflowsPG = class WorkflowsPG extends _mastra_core_storage.WorkflowsStorag
 	supportsConcurrentUpdates() {
 		return true;
 	}
+	supportsGuardedSnapshotWrites() {
+		return true;
+	}
+	/** SQL for a snapshot's status. Legacy json/text columns can hold escapes that fail a jsonb cast (#11563). */
+	async #statusExpression(column) {
+		return await this.#db.getColumnType(_mastra_core_storage.TABLE_WORKFLOW_SNAPSHOT, "snapshot") === "jsonb" ? `${column} ->> 'status'` : `regexp_replace(${column}::text, '\\\\u(0000|[Dd][89A-Fa-f][0-9A-Fa-f]{2})', '', 'g')::jsonb ->> 'status'`;
+	}
 	parseWorkflowRun(row) {
 		let parsedSnapshot = row.snapshot;
 		if (typeof parsedSnapshot === "string") try {
@@ -26013,20 +26142,22 @@ var WorkflowsPG = class WorkflowsPG extends _mastra_core_storage.WorkflowsStorag
 			}, error);
 		}
 	}
-	async persistWorkflowSnapshot({ workflowName, runId, resourceId, snapshot, createdAt, updatedAt, fence }) {
+	async persistWorkflowSnapshot({ workflowName, runId, resourceId, snapshot, createdAt, updatedAt, fence, expectedStatus }) {
 		try {
 			const now = /* @__PURE__ */ new Date();
 			const createdAtValue = createdAt ? createdAt : now;
 			const updatedAtValue = updatedAt ? updatedAt : now;
 			const sanitizedSnapshot = toPgJson(snapshot);
-			await withRunFence(this.#db.client, this.#runOwnersTable(), (0, _mastra_core_storage.resolveRunFence)(this, fence, runId), "persistWorkflowSnapshot", (q) => q.none(`INSERT INTO ${getTableName({
+			const guard = expectedStatus === void 0 ? "" : ` WHERE ${await this.#statusExpression("t.snapshot")} = ANY($9::text[])`;
+			return await withRunFence(this.#db.client, this.#runOwnersTable(), (0, _mastra_core_storage.resolveRunFence)(this, fence, runId), "persistWorkflowSnapshot", (q) => q.oneOrNone(`INSERT INTO ${getTableName({
 				indexName: _mastra_core_storage.TABLE_WORKFLOW_SNAPSHOT,
 				schemaName: getSchemaName(this.#schema)
 			})} AS t
                  (workflow_name, run_id, "resourceId", snapshot, "createdAt", "updatedAt", "createdAtZ", "updatedAtZ")
                  VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
                  ON CONFLICT (workflow_name, run_id) DO UPDATE
-                 SET "resourceId" = COALESCE($3, t."resourceId"), snapshot = $4, "updatedAt" = $6, "updatedAtZ" = $8`, [
+                 SET "resourceId" = COALESCE($3, t."resourceId"), snapshot = $4, "updatedAt" = $6, "updatedAtZ" = $8${guard}
+                 RETURNING 1 AS written`, [
 				workflowName,
 				runId,
 				resourceId,
@@ -26034,8 +26165,9 @@ var WorkflowsPG = class WorkflowsPG extends _mastra_core_storage.WorkflowsStorag
 				createdAtValue,
 				updatedAtValue,
 				createdAtValue,
-				updatedAtValue
-			]));
+				updatedAtValue,
+				...expectedStatus === void 0 ? [] : [Array.isArray(expectedStatus) ? expectedStatus : [expectedStatus]]
+			])) !== null;
 		} catch (error) {
 			if ((0, _mastra_core_storage.isRunFenceConflictError)(error)) throw error;
 			throw new _mastra_core_error.MastraError({
@@ -26045,6 +26177,25 @@ var WorkflowsPG = class WorkflowsPG extends _mastra_core_storage.WorkflowsStorag
 			}, error);
 		}
 	}
+	async loadWorkflowRunStatus({ workflowName, runId }) {
+		try {
+			const statusExpr = await this.#statusExpression("snapshot");
+			return (await this.#db.client.oneOrNone(`SELECT ${statusExpr} AS status FROM ${getTableName({
+				indexName: _mastra_core_storage.TABLE_WORKFLOW_SNAPSHOT,
+				schemaName: getSchemaName(this.#schema)
+			})} WHERE "workflow_name" = $1 AND "run_id" = $2 ORDER BY "createdAt" DESC LIMIT 1`, [workflowName, runId]))?.status ?? null;
+		} catch (error) {
+			throw new _mastra_core_error.MastraError({
+				id: (0, _mastra_core_storage.createStorageErrorId)("PG", "LOAD_WORKFLOW_RUN_STATUS", "FAILED"),
+				domain: _mastra_core_error.ErrorDomain.STORAGE,
+				category: _mastra_core_error.ErrorCategory.THIRD_PARTY,
+				details: {
+					workflowName,
+					runId
+				}
+			}, error);
+		}
+	}
 	async loadWorkflowSnapshot({ workflowName, runId }) {
 		try {
 			const result = await this.#db.load({