@mastra/upstash 1.0.0-beta.2 → 1.0.0-beta.4

package/dist/index.js

@@ -1,4 +1,4 @@
-import { MastraStorage, StoreOperations, ScoresStorage, TABLE_SCORERS, normalizePerPage, calculatePagination, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, MemoryStorage, TABLE_THREADS, TABLE_RESOURCES, TABLE_MESSAGES, serializeDate } from '@mastra/core/storage';
+import { MastraStorage, createVectorErrorId, StoreOperations, createStorageErrorId, ScoresStorage, TABLE_SCORERS, normalizePerPage, calculatePagination, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, MemoryStorage, TABLE_THREADS, TABLE_RESOURCES, TABLE_MESSAGES, serializeDate, transformScoreRow as transformScoreRow$1 } from '@mastra/core/storage';
 import { Redis } from '@upstash/redis';
 import { MessageList } from '@mastra/core/agent';
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
@@ -52,6 +52,9 @@ function getMessageKey(threadId, messageId) {
   const key = getKey(TABLE_MESSAGES, { threadId, id: messageId });
   return key;
 }
+function getMessageIndexKey(messageId) {
+  return `msg-idx:${messageId}`;
+}
 var StoreMemoryUpstash = class extends MemoryStorage {
   client;
   operations;
@@ -76,7 +79,7 @@ var StoreMemoryUpstash = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_STORAGE_GET_THREAD_BY_ID_FAILED",
+          id: createStorageErrorId("UPSTASH", "GET_THREAD_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -94,7 +97,7 @@ var StoreMemoryUpstash = class extends MemoryStorage {
     if (page < 0) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_LIST_THREADS_BY_RESOURCE_ID_INVALID_PAGE",
+          id: createStorageErrorId("UPSTASH", "LIST_THREADS_BY_RESOURCE_ID", "INVALID_PAGE"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
           details: { page }
@@ -136,7 +139,7 @@ var StoreMemoryUpstash = class extends MemoryStorage {
     } catch (error) {
       const mastraError = new MastraError(
         {
-          id: "STORAGE_UPSTASH_STORAGE_LIST_THREADS_BY_RESOURCE_ID_FAILED",
+          id: createStorageErrorId("UPSTASH", "LIST_THREADS_BY_RESOURCE_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -168,7 +171,7 @@ var StoreMemoryUpstash = class extends MemoryStorage {
     } catch (error) {
       const mastraError = new MastraError(
         {
-          id: "STORAGE_UPSTASH_STORAGE_SAVE_THREAD_FAILED",
+          id: createStorageErrorId("UPSTASH", "SAVE_THREAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -190,7 +193,7 @@ var StoreMemoryUpstash = class extends MemoryStorage {
     const thread = await this.getThreadById({ threadId: id });
     if (!thread) {
       throw new MastraError({
-        id: "STORAGE_UPSTASH_STORAGE_UPDATE_THREAD_FAILED",
+        id: createStorageErrorId("UPSTASH", "UPDATE_THREAD", "FAILED"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
         text: `Thread ${id} not found`,
@@ -213,7 +216,7 @@ var StoreMemoryUpstash = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_STORAGE_UPDATE_THREAD_FAILED",
+          id: createStorageErrorId("UPSTASH", "UPDATE_THREAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -242,7 +245,7 @@ var StoreMemoryUpstash = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_STORAGE_DELETE_THREAD_FAILED",
+          id: createStorageErrorId("UPSTASH", "DELETE_THREAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -268,7 +271,7 @@ var StoreMemoryUpstash = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_STORAGE_SAVE_MESSAGES_INVALID_ARGS",
+          id: createStorageErrorId("UPSTASH", "SAVE_MESSAGES", "INVALID_ARGS"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER
         },
@@ -318,6 +321,7 @@ var StoreMemoryUpstash = class extends MemoryStorage {
             }
           }
           pipeline.set(key, message);
+          pipeline.set(getMessageIndexKey(message.id), message.threadId);
           pipeline.zadd(getThreadMessagesKey(message.threadId), {
             score,
             member: message.id
@@ -337,7 +341,7 @@ var StoreMemoryUpstash = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_STORAGE_SAVE_MESSAGES_FAILED",
+          id: createStorageErrorId("UPSTASH", "SAVE_MESSAGES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -348,43 +352,60 @@ var StoreMemoryUpstash = class extends MemoryStorage {
       );
     }
   }
-  async _getIncludedMessages(threadId, include) {
-    if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
+  /**
+   * Lookup threadId for a message - tries index first (O(1)), falls back to scan (backwards compatible)
+   */
+  async _getThreadIdForMessage(messageId) {
+    const indexedThreadId = await this.client.get(getMessageIndexKey(messageId));
+    if (indexedThreadId) {
+      return indexedThreadId;
+    }
+    const existingKeyPattern = getMessageKey("*", messageId);
+    const keys = await this.operations.scanKeys(existingKeyPattern);
+    if (keys.length === 0) return null;
+    const messageData = await this.client.get(keys[0]);
+    if (!messageData) return null;
+    if (messageData.threadId) {
+      await this.client.set(getMessageIndexKey(messageId), messageData.threadId);
+    }
+    return messageData.threadId || null;
+  }
+  async _getIncludedMessages(include) {
+    if (!include?.length) return [];
     const messageIds = /* @__PURE__ */ new Set();
     const messageIdToThreadIds = {};
-    if (include?.length) {
-      for (const item of include) {
-        messageIds.add(item.id);
-        const itemThreadId = item.threadId || threadId;
-        messageIdToThreadIds[item.id] = itemThreadId;
-        const itemThreadMessagesKey = getThreadMessagesKey(itemThreadId);
-        const rank = await this.client.zrank(itemThreadMessagesKey, item.id);
-        if (rank === null) continue;
-        if (item.withPreviousMessages) {
-          const start = Math.max(0, rank - item.withPreviousMessages);
-          const prevIds = rank === 0 ? [] : await this.client.zrange(itemThreadMessagesKey, start, rank - 1);
-          prevIds.forEach((id) => {
-            messageIds.add(id);
-            messageIdToThreadIds[id] = itemThreadId;
-          });
-        }
-        if (item.withNextMessages) {
-          const nextIds = await this.client.zrange(itemThreadMessagesKey, rank + 1, rank + item.withNextMessages);
-          nextIds.forEach((id) => {
-            messageIds.add(id);
-            messageIdToThreadIds[id] = itemThreadId;
-          });
-        }
+    for (const item of include) {
+      const itemThreadId = await this._getThreadIdForMessage(item.id);
+      if (!itemThreadId) continue;
+      messageIds.add(item.id);
+      messageIdToThreadIds[item.id] = itemThreadId;
+      const itemThreadMessagesKey = getThreadMessagesKey(itemThreadId);
+      const rank = await this.client.zrank(itemThreadMessagesKey, item.id);
+      if (rank === null) continue;
+      if (item.withPreviousMessages) {
+        const start = Math.max(0, rank - item.withPreviousMessages);
+        const prevIds = rank === 0 ? [] : await this.client.zrange(itemThreadMessagesKey, start, rank - 1);
+        prevIds.forEach((id) => {
+          messageIds.add(id);
+          messageIdToThreadIds[id] = itemThreadId;
+        });
+      }
+      if (item.withNextMessages) {
+        const nextIds = await this.client.zrange(itemThreadMessagesKey, rank + 1, rank + item.withNextMessages);
+        nextIds.forEach((id) => {
+          messageIds.add(id);
+          messageIdToThreadIds[id] = itemThreadId;
+        });
       }
-      const pipeline = this.client.pipeline();
-      Array.from(messageIds).forEach((id) => {
-        const tId = messageIdToThreadIds[id] || threadId;
-        pipeline.get(getMessageKey(tId, id));
-      });
-      const results = await pipeline.exec();
-      return results.filter((result) => result !== null);
     }
-    return [];
+    if (messageIds.size === 0) return [];
+    const pipeline = this.client.pipeline();
+    Array.from(messageIds).forEach((id) => {
+      const tId = messageIdToThreadIds[id];
+      pipeline.get(getMessageKey(tId, id));
+    });
+    const results = await pipeline.exec();
+    return results.filter((result) => result !== null);
   }
   parseStoredMessage(storedMessage) {
     const defaultMessageContent = { format: 2, parts: [{ type: "text", text: "" }] };
@@ -398,23 +419,55 @@ var StoreMemoryUpstash = class extends MemoryStorage {
   async listMessagesById({ messageIds }) {
     if (messageIds.length === 0) return { messages: [] };
     try {
-      const threadKeys = await this.client.keys("thread:*");
-      const result = await Promise.all(
-        threadKeys.map((threadKey) => {
-          const threadId = threadKey.split(":")[1];
-          if (!threadId) throw new Error(`Failed to parse thread ID from thread key "${threadKey}"`);
-          return this.client.mget(
-            messageIds.map((id) => getMessageKey(threadId, id))
-          );
-        })
-      );
-      const rawMessages = result.flat(1).filter((msg) => !!msg);
+      const rawMessages = [];
+      const indexPipeline = this.client.pipeline();
+      messageIds.forEach((id) => indexPipeline.get(getMessageIndexKey(id)));
+      const indexResults = await indexPipeline.exec();
+      const indexedIds = [];
+      const unindexedIds = [];
+      messageIds.forEach((id, i) => {
+        const threadId = indexResults[i];
+        if (threadId) {
+          indexedIds.push({ messageId: id, threadId });
+        } else {
+          unindexedIds.push(id);
+        }
+      });
+      if (indexedIds.length > 0) {
+        const messagePipeline = this.client.pipeline();
+        indexedIds.forEach(({ messageId, threadId }) => messagePipeline.get(getMessageKey(threadId, messageId)));
+        const messageResults = await messagePipeline.exec();
+        rawMessages.push(...messageResults.filter((msg) => msg !== null));
+      }
+      if (unindexedIds.length > 0) {
+        const threadKeys = await this.client.keys("thread:*");
+        const result = await Promise.all(
+          threadKeys.map((threadKey) => {
+            const threadId = threadKey.split(":")[1];
+            if (!threadId) throw new Error(`Failed to parse thread ID from thread key "${threadKey}"`);
+            return this.client.mget(
+              unindexedIds.map((id) => getMessageKey(threadId, id))
+            );
+          })
+        );
+        const foundMessages = result.flat(1).filter((msg) => !!msg);
+        rawMessages.push(...foundMessages);
+        if (foundMessages.length > 0) {
+          const backfillPipeline = this.client.pipeline();
+          foundMessages.forEach((msg) => {
+            if (msg.threadId) {
+              backfillPipeline.set(getMessageIndexKey(msg.id), msg.threadId);
+            }
+          });
+          await backfillPipeline.exec();
+        }
+      }
       const list = new MessageList().add(rawMessages.map(this.parseStoredMessage), "memory");
       return { messages: list.get.all.db() };
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_STORAGE_LIST_MESSAGES_BY_ID_FAILED",
+          id: createStorageErrorId("UPSTASH", "LIST_MESSAGES_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -427,25 +480,25 @@ var StoreMemoryUpstash = class extends MemoryStorage {
   }
   async listMessages(args) {
     const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
-    if (!threadId.trim()) {
+    const threadIds = Array.isArray(threadId) ? threadId : [threadId];
+    if (threadIds.length === 0 || threadIds.some((id) => !id.trim())) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_LIST_MESSAGES_INVALID_THREAD_ID",
+          id: createStorageErrorId("UPSTASH", "LIST_MESSAGES", "INVALID_THREAD_ID"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { threadId }
+          details: { threadId: Array.isArray(threadId) ? threadId.join(",") : threadId }
         },
-        new Error("threadId must be a non-empty string")
+        new Error("threadId must be a non-empty string or array of non-empty strings")
       );
     }
-    const threadMessagesKey = getThreadMessagesKey(threadId);
     const perPage = normalizePerPage(perPageInput, 40);
     const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
     try {
       if (page < 0) {
         throw new MastraError(
           {
-            id: "STORAGE_UPSTASH_LIST_MESSAGES_INVALID_PAGE",
+            id: createStorageErrorId("UPSTASH", "LIST_MESSAGES", "INVALID_PAGE"),
             domain: ErrorDomain.STORAGE,
             category: ErrorCategory.USER,
             details: { page }
@@ -455,11 +508,18 @@ var StoreMemoryUpstash = class extends MemoryStorage {
       }
       let includedMessages = [];
       if (include && include.length > 0) {
-        const included = await this._getIncludedMessages(threadId, include);
+        const included = await this._getIncludedMessages(include);
         includedMessages = included.map(this.parseStoredMessage);
       }
-      const allMessageIds = await this.client.zrange(threadMessagesKey, 0, -1);
-      if (allMessageIds.length === 0) {
+      const allMessageIdsWithThreads = [];
+      for (const tid of threadIds) {
+        const threadMessagesKey = getThreadMessagesKey(tid);
+        const messageIds2 = await this.client.zrange(threadMessagesKey, 0, -1);
+        for (const mid of messageIds2) {
+          allMessageIdsWithThreads.push({ threadId: tid, messageId: mid });
+        }
+      }
+      if (allMessageIdsWithThreads.length === 0) {
         return {
           messages: [],
           total: 0,
@@ -469,7 +529,7 @@ var StoreMemoryUpstash = class extends MemoryStorage {
         };
       }
       const pipeline = this.client.pipeline();
-      allMessageIds.forEach((id) => pipeline.get(getMessageKey(threadId, id)));
+      allMessageIdsWithThreads.forEach(({ threadId: tid, messageId }) => pipeline.get(getMessageKey(tid, messageId)));
       const results = await pipeline.exec();
       let messagesData = results.filter((msg) => msg !== null).map(this.parseStoredMessage);
       if (resourceId) {
@@ -541,11 +601,11 @@ var StoreMemoryUpstash = class extends MemoryStorage {
     } catch (error) {
       const mastraError = new MastraError(
         {
-          id: "STORAGE_UPSTASH_STORAGE_LIST_MESSAGES_FAILED",
+          id: createStorageErrorId("UPSTASH", "LIST_MESSAGES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
-            threadId,
+            threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
             resourceId: resourceId ?? ""
           }
         },
@@ -732,7 +792,7 @@ var StoreMemoryUpstash = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_STORAGE_UPDATE_MESSAGES_FAILED",
+          id: createStorageErrorId("UPSTASH", "UPDATE_MESSAGES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -750,13 +810,33 @@ var StoreMemoryUpstash = class extends MemoryStorage {
     try {
       const threadIds = /* @__PURE__ */ new Set();
       const messageKeys = [];
-      for (const messageId of messageIds) {
+      const foundMessageIds = [];
+      const indexPipeline = this.client.pipeline();
+      messageIds.forEach((id) => indexPipeline.get(getMessageIndexKey(id)));
+      const indexResults = await indexPipeline.exec();
+      const indexedMessages = [];
+      const unindexedMessageIds = [];
+      messageIds.forEach((id, i) => {
+        const threadId = indexResults[i];
+        if (threadId) {
+          indexedMessages.push({ messageId: id, threadId });
+        } else {
+          unindexedMessageIds.push(id);
+        }
+      });
+      for (const { messageId, threadId } of indexedMessages) {
+        messageKeys.push(getMessageKey(threadId, messageId));
+        foundMessageIds.push(messageId);
+        threadIds.add(threadId);
+      }
+      for (const messageId of unindexedMessageIds) {
         const pattern = getMessageKey("*", messageId);
         const keys = await this.operations.scanKeys(pattern);
         for (const key of keys) {
           const message = await this.client.get(key);
           if (message && message.id === messageId) {
             messageKeys.push(key);
+            foundMessageIds.push(messageId);
             if (message.threadId) {
               threadIds.add(message.threadId);
             }
@@ -771,6 +851,9 @@ var StoreMemoryUpstash = class extends MemoryStorage {
       for (const key of messageKeys) {
         pipeline.del(key);
       }
+      for (const messageId of foundMessageIds) {
+        pipeline.del(getMessageIndexKey(messageId));
+      }
       if (threadIds.size > 0) {
         for (const threadId of threadIds) {
           const threadKey = getKey(TABLE_THREADS, { id: threadId });
@@ -788,7 +871,7 @@ var StoreMemoryUpstash = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_DELETE_MESSAGES_FAILED",
+          id: createStorageErrorId("UPSTASH", "DELETE_MESSAGES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { messageIds: messageIds.join(", ") }
@@ -833,7 +916,7 @@ var StoreOperationsUpstash = class extends StoreOperations {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_STORAGE_CLEAR_TABLE_FAILED",
+          id: createStorageErrorId("UPSTASH", "CLEAR_TABLE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -854,7 +937,7 @@ var StoreOperationsUpstash = class extends StoreOperations {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_STORAGE_INSERT_FAILED",
+          id: createStorageErrorId("UPSTASH", "INSERT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -882,7 +965,7 @@ var StoreOperationsUpstash = class extends StoreOperations {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_STORAGE_BATCH_INSERT_FAILED",
+          id: createStorageErrorId("UPSTASH", "BATCH_INSERT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -901,7 +984,7 @@ var StoreOperationsUpstash = class extends StoreOperations {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_STORAGE_LOAD_FAILED",
+          id: createStorageErrorId("UPSTASH", "LOAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -946,32 +1029,7 @@ var StoreOperationsUpstash = class extends StoreOperations {
   }
 };
 function transformScoreRow(row) {
-  const parseField = (v) => {
-    if (typeof v === "string") {
-      try {
-        return JSON.parse(v);
-      } catch {
-        return v;
-      }
-    }
-    return v;
-  };
-  return {
-    ...row,
-    scorer: parseField(row.scorer),
-    preprocessStepResult: parseField(row.preprocessStepResult),
-    generateScorePrompt: row.generateScorePrompt,
-    generateReasonPrompt: row.generateReasonPrompt,
-    analyzeStepResult: parseField(row.analyzeStepResult),
-    metadata: parseField(row.metadata),
-    input: parseField(row.input),
-    output: parseField(row.output),
-    additionalContext: parseField(row.additionalContext),
-    requestContext: parseField(row.requestContext),
-    entity: parseField(row.entity),
-    createdAt: row.createdAt,
-    updatedAt: row.updatedAt
-  };
+  return transformScoreRow$1(row);
 }
 var ScoresUpstash = class extends ScoresStorage {
   client;
@@ -992,7 +1050,7 @@ var ScoresUpstash = class extends ScoresStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_STORAGE_GET_SCORE_BY_ID_FAILED",
+          id: createStorageErrorId("UPSTASH", "GET_SCORE_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1063,7 +1121,7 @@ var ScoresUpstash = class extends ScoresStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_STORAGE_SAVE_SCORE_VALIDATION_FAILED",
+          id: createStorageErrorId("UPSTASH", "SAVE_SCORE", "VALIDATION_FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY
         },
@@ -1077,7 +1135,7 @@ var ScoresUpstash = class extends ScoresStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_STORAGE_SAVE_SCORE_FAILED",
+          id: createStorageErrorId("UPSTASH", "SAVE_SCORE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { id: score.id }
@@ -1288,7 +1346,7 @@ var WorkflowsUpstash = class extends WorkflowsStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_STORAGE_PERSIST_WORKFLOW_SNAPSHOT_FAILED",
+          id: createStorageErrorId("UPSTASH", "PERSIST_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1315,7 +1373,7 @@ var WorkflowsUpstash = class extends WorkflowsStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_STORAGE_LOAD_WORKFLOW_SNAPSHOT_FAILED",
+          id: createStorageErrorId("UPSTASH", "LOAD_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1347,7 +1405,7 @@ var WorkflowsUpstash = class extends WorkflowsStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_STORAGE_GET_WORKFLOW_RUN_BY_ID_FAILED",
+          id: createStorageErrorId("UPSTASH", "GET_WORKFLOW_RUN_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1373,7 +1431,7 @@ var WorkflowsUpstash = class extends WorkflowsStorage {
       if (page !== void 0 && page < 0) {
         throw new MastraError(
           {
-            id: "UPSTASH_STORE_INVALID_PAGE",
+            id: createStorageErrorId("UPSTASH", "LIST_WORKFLOW_RUNS", "INVALID_PAGE"),
             domain: ErrorDomain.STORAGE,
             category: ErrorCategory.USER,
             details: { page }
@@ -1433,9 +1491,10 @@ var WorkflowsUpstash = class extends WorkflowsStorage {
       }
       return { runs, total };
     } catch (error) {
+      if (error instanceof MastraError) throw error;
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_STORAGE_LIST_WORKFLOW_RUNS_FAILED",
+          id: createStorageErrorId("UPSTASH", "LIST_WORKFLOW_RUNS", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1455,7 +1514,7 @@ var UpstashStore = class extends MastraStorage {
   redis;
   stores;
   constructor(config) {
-    super({ id: config.id, name: "Upstash" });
+    super({ id: config.id, name: "Upstash", disableInit: config.disableInit });
     this.redis = new Redis({
       url: config.url,
       token: config.token
@@ -1861,7 +1920,7 @@ var UpstashVector = class extends MastraVector {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_VECTOR_UPSERT_FAILED",
+          id: createVectorErrorId("UPSTASH", "UPSERT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { namespace, vectorCount: vectors.length }
@@ -1924,7 +1983,7 @@ var UpstashVector = class extends MastraVector {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_VECTOR_QUERY_FAILED",
+          id: createVectorErrorId("UPSTASH", "QUERY", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { namespace, topK }
@@ -1944,7 +2003,7 @@ var UpstashVector = class extends MastraVector {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_VECTOR_LIST_INDEXES_FAILED",
+          id: createVectorErrorId("UPSTASH", "LIST_INDEXES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY
         },
@@ -1969,7 +2028,7 @@ var UpstashVector = class extends MastraVector {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_VECTOR_DESCRIBE_INDEX_FAILED",
+          id: createVectorErrorId("UPSTASH", "DESCRIBE_INDEX", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { namespace }
@@ -1994,7 +2053,7 @@ var UpstashVector = class extends MastraVector {
       }
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_VECTOR_DELETE_INDEX_FAILED",
+          id: createVectorErrorId("UPSTASH", "DELETE_INDEX", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { namespace }
@@ -2019,7 +2078,7 @@ var UpstashVector = class extends MastraVector {
     const sparseVector = upstashUpdate.sparseVector;
     if ("id" in params && params.id && "filter" in params && params.filter) {
       throw new MastraError({
-        id: "STORAGE_UPSTASH_VECTOR_UPDATE_MUTUALLY_EXCLUSIVE",
+        id: createVectorErrorId("UPSTASH", "UPDATE_VECTOR", "MUTUALLY_EXCLUSIVE"),
         text: "Cannot specify both id and filter - they are mutually exclusive",
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
@@ -2028,7 +2087,7 @@ var UpstashVector = class extends MastraVector {
     }
     if (!("id" in params && params.id) && !("filter" in params && params.filter)) {
       throw new MastraError({
-        id: "STORAGE_UPSTASH_VECTOR_UPDATE_NO_TARGET",
+        id: createVectorErrorId("UPSTASH", "UPDATE_VECTOR", "NO_TARGET"),
         text: "Either id or filter must be provided",
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
@@ -2037,7 +2096,7 @@ var UpstashVector = class extends MastraVector {
     }
     if (!update.vector && !update.metadata && !sparseVector) {
       throw new MastraError({
-        id: "STORAGE_UPSTASH_VECTOR_UPDATE_NO_PAYLOAD",
+        id: createVectorErrorId("UPSTASH", "UPDATE_VECTOR", "NO_PAYLOAD"),
         text: "No update data provided",
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
@@ -2046,7 +2105,7 @@ var UpstashVector = class extends MastraVector {
     }
     if ("filter" in params && params.filter && Object.keys(params.filter).length === 0) {
       throw new MastraError({
-        id: "STORAGE_UPSTASH_VECTOR_UPDATE_EMPTY_FILTER",
+        id: createVectorErrorId("UPSTASH", "UPDATE_VECTOR", "EMPTY_FILTER"),
         text: "Filter cannot be an empty filter object",
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
@@ -2114,7 +2173,7 @@ var UpstashVector = class extends MastraVector {
       if (error instanceof MastraError) throw error;
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_VECTOR_UPDATE_VECTOR_FAILED",
+          id: createVectorErrorId("UPSTASH", "UPDATE_VECTOR", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -2141,7 +2200,7 @@ var UpstashVector = class extends MastraVector {
     } catch (error) {
       const mastraError = new MastraError(
         {
-          id: "STORAGE_UPSTASH_VECTOR_DELETE_VECTOR_FAILED",
+          id: createVectorErrorId("UPSTASH", "DELETE_VECTOR", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -2165,7 +2224,7 @@ var UpstashVector = class extends MastraVector {
   async deleteVectors({ indexName: namespace, filter, ids }) {
     if (ids && filter) {
       throw new MastraError({
-        id: "STORAGE_UPSTASH_VECTOR_DELETE_VECTORS_MUTUALLY_EXCLUSIVE",
+        id: createVectorErrorId("UPSTASH", "DELETE_VECTORS", "MUTUALLY_EXCLUSIVE"),
         text: "Cannot specify both ids and filter - they are mutually exclusive",
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
@@ -2174,7 +2233,7 @@ var UpstashVector = class extends MastraVector {
     }
     if (!ids && !filter) {
       throw new MastraError({
-        id: "STORAGE_UPSTASH_VECTOR_DELETE_VECTORS_NO_TARGET",
+        id: createVectorErrorId("UPSTASH", "DELETE_VECTORS", "NO_TARGET"),
         text: "Either filter or ids must be provided",
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
@@ -2183,7 +2242,7 @@ var UpstashVector = class extends MastraVector {
     }
     if (ids && ids.length === 0) {
       throw new MastraError({
-        id: "STORAGE_UPSTASH_VECTOR_DELETE_VECTORS_EMPTY_IDS",
+        id: createVectorErrorId("UPSTASH", "DELETE_VECTORS", "EMPTY_IDS"),
         text: "Cannot delete with empty ids array",
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
@@ -2192,7 +2251,7 @@ var UpstashVector = class extends MastraVector {
     }
     if (filter && Object.keys(filter).length === 0) {
       throw new MastraError({
-        id: "STORAGE_UPSTASH_VECTOR_DELETE_VECTORS_EMPTY_FILTER",
+        id: createVectorErrorId("UPSTASH", "DELETE_VECTORS", "EMPTY_FILTER"),
         text: "Cannot delete with empty filter object",
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
@@ -2226,7 +2285,7 @@ var UpstashVector = class extends MastraVector {
       if (error instanceof MastraError) throw error;
       throw new MastraError(
         {
-          id: "STORAGE_UPSTASH_VECTOR_DELETE_VECTORS_FAILED",
+          id: createVectorErrorId("UPSTASH", "DELETE_VECTORS", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {