@mastra/redis 1.4.6 → 1.4.7

package/dist/index.js

@@ -36,8 +36,7 @@ function processRecord(tableName, record) {
 	else if (tableName === TABLE_WORKFLOW_SNAPSHOT) key = getKey(tableName, {
 		namespace: record.namespace || "workflows",
 		workflow_name: record.workflow_name,
-		run_id: record.run_id,
-		...record.resourceId ? { resourceId: record.resourceId } : {}
+		run_id: record.run_id
 	});
 	else key = getKey(tableName, { id: record.id });
 	const processedRecord = {
@@ -1171,6 +1170,22 @@ function parseWorkflowRun(row) {
 		resourceId: row.resourceId
 	};
 }
+function escapeGlob(value) {
+	return value.replace(/[*?[\]\\]/g, "\\$&");
+}
+function snapshotKey(namespace, workflowName, runId) {
+	return getKey(TABLE_WORKFLOW_SNAPSHOT, {
+		namespace,
+		workflow_name: workflowName,
+		run_id: runId
+	});
+}
+/**
+* Earlier versions appended `:resourceId:<id>` to snapshot keys. Matches those keys for a run.
+*/
+function legacySnapshotKeyPattern(namespace, workflowName, runId) {
+	return `${escapeGlob(snapshotKey(namespace, workflowName, runId))}:resourceId:*`;
+}
 var WorkflowsRedis = class extends WorkflowsStorage {
 	client;
 	db;
@@ -1179,6 +1194,18 @@ var WorkflowsRedis = class extends WorkflowsStorage {
 		this.client = config.client;
 		this.db = new RedisDB({ client: config.client });
 	}
+	/**
+	* Reads a run's snapshot record by its canonical key, falling back to legacy
+	* `:resourceId:`-suffixed keys only when the canonical key is missing.
+	*/
+	async getSnapshotRecord(namespace, workflowName, runId) {
+		const data = await this.client.get(snapshotKey(namespace, workflowName, runId));
+		if (data) return JSON.parse(data);
+		const legacyKeys = await this.db.scanKeys(legacySnapshotKeyPattern(namespace, workflowName, runId));
+		if (legacyKeys.length === 0) return null;
+		const legacyData = await this.client.get(legacyKeys[0]);
+		return legacyData ? JSON.parse(legacyData) : null;
+	}
 	supportsConcurrentUpdates() {
 		return false;
 	}
@@ -1187,14 +1214,7 @@ var WorkflowsRedis = class extends WorkflowsStorage {
 	}
 	async updateWorkflowResults({ workflowName, runId, stepId, result, requestContext }) {
 		try {
-			const existingRecord = await this.db.get({
-				tableName: TABLE_WORKFLOW_SNAPSHOT,
-				keys: {
-					namespace: "workflows",
-					workflow_name: workflowName,
-					run_id: runId
-				}
-			});
+			const existingRecord = await this.getSnapshotRecord("workflows", workflowName, runId);
 			let snapshot = existingRecord?.snapshot;
 			if (!snapshot) snapshot = {
 				context: {},
@@ -1219,6 +1239,7 @@ var WorkflowsRedis = class extends WorkflowsStorage {
 				namespace: "workflows",
 				workflowName,
 				runId,
+				resourceId: existingRecord?.resourceId,
 				snapshot,
 				createdAt: existingRecord?.createdAt ? ensureDate(existingRecord.createdAt) : void 0
 			});
@@ -1239,14 +1260,7 @@ var WorkflowsRedis = class extends WorkflowsStorage {
 	}
 	async updateWorkflowState({ workflowName, runId, opts }) {
 		try {
-			const existingRecord = await this.db.get({
-				tableName: TABLE_WORKFLOW_SNAPSHOT,
-				keys: {
-					namespace: "workflows",
-					workflow_name: workflowName,
-					run_id: runId
-				}
-			});
+			const existingRecord = await this.getSnapshotRecord("workflows", workflowName, runId);
 			const existingSnapshot = existingRecord?.snapshot;
 			if (!existingSnapshot || !existingSnapshot.context) return;
 			const { expectedStatus, ...state } = opts;
@@ -1259,6 +1273,7 @@ var WorkflowsRedis = class extends WorkflowsStorage {
 				namespace: "workflows",
 				workflowName,
 				runId,
+				resourceId: existingRecord.resourceId,
 				snapshot: updatedSnapshot,
 				createdAt: existingRecord?.createdAt ? ensureDate(existingRecord.createdAt) : void 0
 			});
@@ -1280,16 +1295,13 @@ var WorkflowsRedis = class extends WorkflowsStorage {
 		const { namespace = "workflows", workflowName, runId, resourceId, snapshot, createdAt, updatedAt } = params;
 		try {
 			let finalCreatedAt = createdAt;
-			if (!finalCreatedAt) {
-				const existing = await this.db.get({
-					tableName: TABLE_WORKFLOW_SNAPSHOT,
-					keys: {
-						namespace,
-						workflow_name: workflowName,
-						run_id: runId
-					}
-				});
-				finalCreatedAt = existing?.createdAt ? ensureDate(existing.createdAt) : /* @__PURE__ */ new Date();
+			let finalResourceId = resourceId;
+			if (!finalCreatedAt || !finalResourceId) {
+				const canonicalKey = snapshotKey(namespace, workflowName, runId);
+				const existingData = await this.client.get(canonicalKey) ?? (resourceId ? await this.client.get(`${canonicalKey}:resourceId:${resourceId}`) : null);
+				const existing = existingData ? JSON.parse(existingData) : null;
+				finalCreatedAt ??= existing?.createdAt ? ensureDate(existing.createdAt) : /* @__PURE__ */ new Date();
+				finalResourceId ??= existing?.resourceId;
 			}
 			await this.db.insert({
 				tableName: TABLE_WORKFLOW_SNAPSHOT,
@@ -1297,7 +1309,7 @@ var WorkflowsRedis = class extends WorkflowsStorage {
 					namespace,
 					workflow_name: workflowName,
 					run_id: runId,
-					resourceId,
+					resourceId: finalResourceId,
 					snapshot,
 					createdAt: finalCreatedAt,
 					updatedAt: updatedAt ?? /* @__PURE__ */ new Date()
@@ -1318,15 +1330,8 @@ var WorkflowsRedis = class extends WorkflowsStorage {
 	}
 	async loadWorkflowSnapshot(params) {
 		const { namespace = "workflows", workflowName, runId } = params;
-		const key = getKey(TABLE_WORKFLOW_SNAPSHOT, {
-			namespace,
-			workflow_name: workflowName,
-			run_id: runId
-		});
 		try {
-			const data = await this.client.get(key);
-			if (!data) return null;
-			return JSON.parse(data).snapshot;
+			return (await this.getSnapshotRecord(namespace, workflowName, runId))?.snapshot ?? null;
 		} catch (error) {
 			throw new MastraError({
 				id: createStorageErrorId("REDIS", "LOAD_WORKFLOW_SNAPSHOT", "FAILED"),
@@ -1342,12 +1347,9 @@ var WorkflowsRedis = class extends WorkflowsStorage {
 	}
 	async getWorkflowRunById({ runId, workflowName }) {
 		try {
-			const key = getKey(TABLE_WORKFLOW_SNAPSHOT, {
-				namespace: "workflows",
-				workflow_name: workflowName,
-				run_id: runId
-			}) + "*";
-			const keys = await this.db.scanKeys(key);
+			const workflowNamePattern = workflowName ? escapeGlob(workflowName) : "*";
+			const canonicalPattern = `${escapeGlob(getKey(TABLE_WORKFLOW_SNAPSHOT, { namespace: "workflows" }))}:workflow_name:${workflowNamePattern}:run_id:${escapeGlob(runId)}`;
+			const keys = [...await this.db.scanKeys(canonicalPattern), ...await this.db.scanKeys(`${canonicalPattern}:resourceId:*`)];
 			if (keys.length === 0) return null;
 			const data = (await this.client.mGet(keys)).filter((data) => data !== null).map((data) => JSON.parse(data)).find((workflow) => {
 				if (!workflow) return false;
@@ -1371,13 +1373,9 @@ var WorkflowsRedis = class extends WorkflowsStorage {
 		}
 	}
 	async deleteWorkflowRunById({ runId, workflowName }) {
-		const key = getKey(TABLE_WORKFLOW_SNAPSHOT, {
-			namespace: "workflows",
-			workflow_name: workflowName,
-			run_id: runId
-		});
 		try {
-			await this.client.del(key);
+			const legacyKeys = await this.db.scanKeys(legacySnapshotKeyPattern("workflows", workflowName, runId));
+			await this.client.del([snapshotKey("workflows", workflowName, runId), ...legacyKeys]);
 		} catch (error) {
 			throw new MastraError({
 				id: createStorageErrorId("REDIS", "DELETE_WORKFLOW_RUN_BY_ID", "FAILED"),
@@ -1401,29 +1399,30 @@ var WorkflowsRedis = class extends WorkflowsStorage {
 			}, /* @__PURE__ */ new Error("page must be >= 0"));
 			const normalizedFrom = fromDate ? ensureDate(fromDate) : void 0;
 			const normalizedTo = toDate ? ensureDate(toDate) : void 0;
-			let pattern = getKey(TABLE_WORKFLOW_SNAPSHOT, { namespace: "workflows" }) + ":*";
-			if (workflowName && resourceId) pattern = getKey(TABLE_WORKFLOW_SNAPSHOT, {
-				namespace: "workflows",
-				workflow_name: workflowName,
-				run_id: "*",
-				resourceId
-			});
-			else if (workflowName) pattern = getKey(TABLE_WORKFLOW_SNAPSHOT, {
+			const pattern = workflowName ? `${escapeGlob(getKey(TABLE_WORKFLOW_SNAPSHOT, {
 				namespace: "workflows",
 				workflow_name: workflowName
-			}) + ":*";
-			else if (resourceId) pattern = getKey(TABLE_WORKFLOW_SNAPSHOT, {
-				namespace: "workflows",
-				workflow_name: "*",
-				run_id: "*",
-				resourceId
-			});
+			}))}:*` : `${getKey(TABLE_WORKFLOW_SNAPSHOT, { namespace: "workflows" })}:*`;
 			const keys = await this.db.scanKeys(pattern);
 			if (keys.length === 0) return {
 				runs: [],
 				total: 0
 			};
-			let runs = (await this.client.mGet(keys)).filter((data) => data !== null).map((data) => JSON.parse(data)).filter((record) => record !== null && record !== void 0 && typeof record === "object" && "workflow_name" in record).filter((record) => !workflowName || record.workflow_name === workflowName).map((w) => parseWorkflowRun(w)).filter((w) => {
+			const results = await this.client.mGet(keys);
+			const recordsByRun = /* @__PURE__ */ new Map();
+			results.forEach((data, index) => {
+				if (data === null) return;
+				const record = JSON.parse(data);
+				if (record === null || typeof record !== "object" || !("workflow_name" in record)) return;
+				const legacy = keys[index] !== snapshotKey(record.namespace ?? "workflows", record.workflow_name, record.run_id);
+				const runKey = `${record.workflow_name}\u0000${record.run_id}`;
+				const current = recordsByRun.get(runKey);
+				if (!current || current.legacy && !legacy) recordsByRun.set(runKey, {
+					record,
+					legacy
+				});
+			});
+			let runs = [...recordsByRun.values()].map(({ record }) => record).filter((record) => !workflowName || record.workflow_name === workflowName).filter((record) => !resourceId || record.resourceId === resourceId).map((w) => parseWorkflowRun(w)).filter((w) => {
 				if (normalizedFrom && w.createdAt < normalizedFrom) return false;
 				if (normalizedTo && w.createdAt > normalizedTo) return false;
 				if (status) {