@mastra/upstash 0.11.1-alpha.0 → 0.11.1-alpha.2

package/dist/index.js

@@ -1,5 +1,6 @@
 import { MessageList } from '@mastra/core/agent';
-import { MastraStorage, TABLE_MESSAGES, TABLE_WORKFLOW_SNAPSHOT, TABLE_EVALS, TABLE_TRACES, TABLE_THREADS } from '@mastra/core/storage';
+import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
+import { MastraStorage, TABLE_MESSAGES, TABLE_WORKFLOW_SNAPSHOT, TABLE_EVALS, TABLE_TRACES, TABLE_THREADS, TABLE_RESOURCES } from '@mastra/core/storage';
 import { Redis } from '@upstash/redis';
 import { MastraVector } from '@mastra/core/vector';
 import { Index } from '@upstash/vector';
@@ -17,7 +18,8 @@ var UpstashStore = class extends MastraStorage {
   }
   get supports() {
     return {
-      selectByIncludeResourceScope: true
+      selectByIncludeResourceScope: true,
+      resourceWorkingMemory: true
     };
   }
   transformEvalRecord(record) {
@@ -197,7 +199,17 @@ var UpstashStore = class extends MastraStorage {
       }
       return filteredEvals.map((record) => this.transformEvalRecord(record));
     } catch (error) {
-      console.error("Failed to get evals for the specified agent:", error);
+      const mastraError = new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_GET_EVALS_BY_AGENT_NAME_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { agentName }
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger.error(mastraError.toString());
       return [];
     }
   }
@@ -211,8 +223,19 @@ var UpstashStore = class extends MastraStorage {
         end: args.toDate
       };
     }
-    const { traces } = await this.getTracesPaginated(args);
-    return traces;
+    try {
+      const { traces } = await this.getTracesPaginated(args);
+      return traces;
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_GET_TRACES_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+    }
   }
   async getTracesPaginated(args) {
     const { name, scope, page = 0, perPage = 100, attributes, filters, dateRange } = args;
@@ -296,7 +319,20 @@ var UpstashStore = class extends MastraStorage {
         hasMore
       };
     } catch (error) {
-      console.error("Failed to get traces:", error);
+      const mastraError = new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_GET_TRACES_PAGINATED_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            name: args.name || "",
+            scope: args.scope || ""
+          }
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger.error(mastraError.toString());
       return {
         traces: [],
         total: 0,
@@ -310,7 +346,21 @@ var UpstashStore = class extends MastraStorage {
     tableName,
     schema
   }) {
-    await this.redis.set(`schema:${tableName}`, schema);
+    try {
+      await this.redis.set(`schema:${tableName}`, schema);
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_CREATE_TABLE_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error
+      );
+    }
   }
   /**
    * No-op: This backend is schemaless and does not require schema changes.
@@ -322,43 +372,113 @@ var UpstashStore = class extends MastraStorage {
   }
   async clearTable({ tableName }) {
     const pattern = `${tableName}:*`;
-    await this.scanAndDelete(pattern);
+    try {
+      await this.scanAndDelete(pattern);
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_CLEAR_TABLE_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error
+      );
+    }
   }
   async insert({ tableName, record }) {
     const { key, processedRecord } = this.processRecord(tableName, record);
-    await this.redis.set(key, processedRecord);
+    try {
+      await this.redis.set(key, processedRecord);
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_INSERT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error
+      );
+    }
   }
   async batchInsert(input) {
     const { tableName, records } = input;
     if (!records.length) return;
     const batchSize = 1e3;
-    for (let i = 0; i < records.length; i += batchSize) {
-      const batch = records.slice(i, i + batchSize);
-      const pipeline = this.redis.pipeline();
-      for (const record of batch) {
-        const { key, processedRecord } = this.processRecord(tableName, record);
-        pipeline.set(key, processedRecord);
+    try {
+      for (let i = 0; i < records.length; i += batchSize) {
+        const batch = records.slice(i, i + batchSize);
+        const pipeline = this.redis.pipeline();
+        for (const record of batch) {
+          const { key, processedRecord } = this.processRecord(tableName, record);
+          pipeline.set(key, processedRecord);
+        }
+        await pipeline.exec();
       }
-      await pipeline.exec();
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_BATCH_INSERT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error
+      );
     }
   }
   async load({ tableName, keys }) {
     const key = this.getKey(tableName, keys);
-    const data = await this.redis.get(key);
-    return data || null;
+    try {
+      const data = await this.redis.get(key);
+      return data || null;
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_LOAD_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error
+      );
+    }
   }
   async getThreadById({ threadId }) {
-    const thread = await this.load({
-      tableName: TABLE_THREADS,
-      keys: { id: threadId }
-    });
-    if (!thread) return null;
-    return {
-      ...thread,
-      createdAt: this.ensureDate(thread.createdAt),
-      updatedAt: this.ensureDate(thread.updatedAt),
-      metadata: typeof thread.metadata === "string" ? JSON.parse(thread.metadata) : thread.metadata
-    };
+    try {
+      const thread = await this.load({
+        tableName: TABLE_THREADS,
+        keys: { id: threadId }
+      });
+      if (!thread) return null;
+      return {
+        ...thread,
+        createdAt: this.ensureDate(thread.createdAt),
+        updatedAt: this.ensureDate(thread.updatedAt),
+        metadata: typeof thread.metadata === "string" ? JSON.parse(thread.metadata) : thread.metadata
+      };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_GET_THREAD_BY_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            threadId
+          }
+        },
+        error
+      );
+    }
   }
   /**
    * @deprecated use getThreadsByResourceIdPaginated instead
@@ -388,7 +508,19 @@ var UpstashStore = class extends MastraStorage {
       allThreads.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime());
       return allThreads;
     } catch (error) {
-      console.error("Error in getThreadsByResourceId:", error);
+      const mastraError = new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_GET_THREADS_BY_RESOURCE_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            resourceId
+          }
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger.error(mastraError.toString());
       return [];
     }
   }
@@ -409,7 +541,21 @@ var UpstashStore = class extends MastraStorage {
         hasMore
       };
     } catch (error) {
-      console.error("Error in getThreadsByResourceIdPaginated:", error);
+      const mastraError = new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_GET_THREADS_BY_RESOURCE_ID_PAGINATED_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            resourceId,
+            page,
+            perPage
+          }
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger.error(mastraError.toString());
       return {
         threads: [],
         total: 0,
@@ -420,11 +566,28 @@ var UpstashStore = class extends MastraStorage {
     }
   }
   async saveThread({ thread }) {
-    await this.insert({
-      tableName: TABLE_THREADS,
-      record: thread
-    });
-    return thread;
+    try {
+      await this.insert({
+        tableName: TABLE_THREADS,
+        record: thread
+      });
+      return thread;
+    } catch (error) {
+      const mastraError = new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_SAVE_THREAD_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            threadId: thread.id
+          }
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger.error(mastraError.toString());
+      throw mastraError;
+    }
   }
   async updateThread({
     id,
@@ -433,7 +596,15 @@ var UpstashStore = class extends MastraStorage {
   }) {
     const thread = await this.getThreadById({ threadId: id });
     if (!thread) {
-      throw new Error(`Thread ${id} not found`);
+      throw new MastraError({
+        id: "STORAGE_UPSTASH_STORAGE_UPDATE_THREAD_FAILED",
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: `Thread ${id} not found`,
+        details: {
+          threadId: id
+        }
+      });
     }
     const updatedThread = {
       ...thread,
@@ -443,34 +614,73 @@ var UpstashStore = class extends MastraStorage {
         ...metadata
       }
     };
-    await this.saveThread({ thread: updatedThread });
-    return updatedThread;
+    try {
+      await this.saveThread({ thread: updatedThread });
+      return updatedThread;
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_UPDATE_THREAD_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            threadId: id
+          }
+        },
+        error
+      );
+    }
   }
   async deleteThread({ threadId }) {
     const threadKey = this.getKey(TABLE_THREADS, { id: threadId });
     const threadMessagesKey = this.getThreadMessagesKey(threadId);
-    const messageIds = await this.redis.zrange(threadMessagesKey, 0, -1);
-    const pipeline = this.redis.pipeline();
-    pipeline.del(threadKey);
-    pipeline.del(threadMessagesKey);
-    for (let i = 0; i < messageIds.length; i++) {
-      const messageId = messageIds[i];
-      const messageKey = this.getMessageKey(threadId, messageId);
-      pipeline.del(messageKey);
+    try {
+      const messageIds = await this.redis.zrange(threadMessagesKey, 0, -1);
+      const pipeline = this.redis.pipeline();
+      pipeline.del(threadKey);
+      pipeline.del(threadMessagesKey);
+      for (let i = 0; i < messageIds.length; i++) {
+        const messageId = messageIds[i];
+        const messageKey = this.getMessageKey(threadId, messageId);
+        pipeline.del(messageKey);
+      }
+      await pipeline.exec();
+      await this.scanAndDelete(this.getMessageKey(threadId, "*"));
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_DELETE_THREAD_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            threadId
+          }
+        },
+        error
+      );
     }
-    await pipeline.exec();
-    await this.scanAndDelete(this.getMessageKey(threadId, "*"));
   }
   async saveMessages(args) {
     const { messages, format = "v1" } = args;
     if (messages.length === 0) return [];
     const threadId = messages[0]?.threadId;
-    if (!threadId) {
-      throw new Error("Thread ID is required");
-    }
-    const thread = await this.getThreadById({ threadId });
-    if (!thread) {
-      throw new Error(`Thread ${threadId} not found`);
+    try {
+      if (!threadId) {
+        throw new Error("Thread ID is required");
+      }
+      const thread = await this.getThreadById({ threadId });
+      if (!thread) {
+        throw new Error(`Thread ${threadId} not found`);
+      }
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_SAVE_MESSAGES_INVALID_ARGS",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER
+        },
+        error
+      );
     }
     const messagesWithIndex = messages.map((message, index) => ({
       ...message,
@@ -478,32 +688,63 @@ var UpstashStore = class extends MastraStorage {
     }));
     const threadKey = this.getKey(TABLE_THREADS, { id: threadId });
     const existingThread = await this.redis.get(threadKey);
-    const batchSize = 1e3;
-    for (let i = 0; i < messagesWithIndex.length; i += batchSize) {
-      const batch = messagesWithIndex.slice(i, i + batchSize);
-      const pipeline = this.redis.pipeline();
-      for (const message of batch) {
-        const key = this.getMessageKey(message.threadId, message.id);
-        const createdAtScore = new Date(message.createdAt).getTime();
-        const score = message._index !== void 0 ? message._index : createdAtScore;
-        pipeline.set(key, message);
-        pipeline.zadd(this.getThreadMessagesKey(message.threadId), {
-          score,
-          member: message.id
-        });
-      }
-      if (i === 0 && existingThread) {
-        const updatedThread = {
-          ...existingThread,
-          updatedAt: /* @__PURE__ */ new Date()
-        };
-        pipeline.set(threadKey, this.processRecord(TABLE_THREADS, updatedThread).processedRecord);
+    try {
+      const batchSize = 1e3;
+      for (let i = 0; i < messagesWithIndex.length; i += batchSize) {
+        const batch = messagesWithIndex.slice(i, i + batchSize);
+        const pipeline = this.redis.pipeline();
+        for (const message of batch) {
+          const key = this.getMessageKey(message.threadId, message.id);
+          const createdAtScore = new Date(message.createdAt).getTime();
+          const score = message._index !== void 0 ? message._index : createdAtScore;
+          const existingKeyPattern = this.getMessageKey("*", message.id);
+          const keys = await this.scanKeys(existingKeyPattern);
+          if (keys.length > 0) {
+            const pipeline2 = this.redis.pipeline();
+            keys.forEach((key2) => pipeline2.get(key2));
+            const results = await pipeline2.exec();
+            const existingMessages = results.filter(
+              (msg) => msg !== null
+            );
+            for (const existingMessage of existingMessages) {
+              const existingMessageKey = this.getMessageKey(existingMessage.threadId, existingMessage.id);
+              if (existingMessage && existingMessage.threadId !== message.threadId) {
+                pipeline.del(existingMessageKey);
+                pipeline.zrem(this.getThreadMessagesKey(existingMessage.threadId), existingMessage.id);
+              }
+            }
+          }
+          pipeline.set(key, message);
+          pipeline.zadd(this.getThreadMessagesKey(message.threadId), {
+            score,
+            member: message.id
+          });
+        }
+        if (i === 0 && existingThread) {
+          const updatedThread = {
+            ...existingThread,
+            updatedAt: /* @__PURE__ */ new Date()
+          };
+          pipeline.set(threadKey, this.processRecord(TABLE_THREADS, updatedThread).processedRecord);
+        }
+        await pipeline.exec();
       }
-      await pipeline.exec();
+      const list = new MessageList().add(messages, "memory");
+      if (format === `v2`) return list.get.all.v2();
+      return list.get.all.v1();
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_SAVE_MESSAGES_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            threadId
+          }
+        },
+        error
+      );
     }
-    const list = new MessageList().add(messages, "memory");
-    if (format === `v2`) return list.get.all.v2();
-    return list.get.all.v1();
   }
   async _getIncludedMessages(threadId, selectBy) {
     const messageIds = /* @__PURE__ */ new Set();
@@ -548,63 +789,72 @@ var UpstashStore = class extends MastraStorage {
     format
   }) {
     const threadMessagesKey = this.getThreadMessagesKey(threadId);
-    const allMessageIds = await this.redis.zrange(threadMessagesKey, 0, -1);
-    let limit;
-    if (typeof selectBy?.last === "number") {
-      limit = Math.max(0, selectBy.last);
-    } else if (selectBy?.last === false) {
-      limit = 0;
-    } else {
-      limit = Number.MAX_SAFE_INTEGER;
-    }
-    const messageIds = /* @__PURE__ */ new Set();
-    const messageIdToThreadIds = {};
-    if (limit === 0 && !selectBy?.include) {
-      return [];
-    }
-    if (limit === Number.MAX_SAFE_INTEGER) {
-      const allIds = await this.redis.zrange(threadMessagesKey, 0, -1);
-      allIds.forEach((id) => {
-        messageIds.add(id);
-        messageIdToThreadIds[id] = threadId;
+    try {
+      const allMessageIds = await this.redis.zrange(threadMessagesKey, 0, -1);
+      const limit = this.resolveMessageLimit({ last: selectBy?.last, defaultLimit: Number.MAX_SAFE_INTEGER });
+      const messageIds = /* @__PURE__ */ new Set();
+      const messageIdToThreadIds = {};
+      if (limit === 0 && !selectBy?.include) {
+        return [];
+      }
+      if (limit === Number.MAX_SAFE_INTEGER) {
+        const allIds = await this.redis.zrange(threadMessagesKey, 0, -1);
+        allIds.forEach((id) => {
+          messageIds.add(id);
+          messageIdToThreadIds[id] = threadId;
+        });
+      } else if (limit > 0) {
+        const latestIds = await this.redis.zrange(threadMessagesKey, -limit, -1);
+        latestIds.forEach((id) => {
+          messageIds.add(id);
+          messageIdToThreadIds[id] = threadId;
+        });
+      }
+      const includedMessages = await this._getIncludedMessages(threadId, selectBy);
+      const messages = [
+        ...includedMessages,
+        ...(await Promise.all(
+          Array.from(messageIds).map(async (id) => {
+            const tId = messageIdToThreadIds[id] || threadId;
+            const byThreadId = await this.redis.get(
+              this.getMessageKey(tId, id)
+            );
+            if (byThreadId) return byThreadId;
+            return null;
+          })
+        )).filter((msg) => msg !== null)
+      ];
+      messages.sort((a, b) => allMessageIds.indexOf(a.id) - allMessageIds.indexOf(b.id));
+      const seen = /* @__PURE__ */ new Set();
+      const dedupedMessages = messages.filter((row) => {
+        if (seen.has(row.id)) return false;
+        seen.add(row.id);
+        return true;
       });
-    } else if (limit > 0) {
-      const latestIds = await this.redis.zrange(threadMessagesKey, -limit, -1);
-      latestIds.forEach((id) => {
-        messageIds.add(id);
-        messageIdToThreadIds[id] = threadId;
+      const prepared = dedupedMessages.filter((message) => message !== null && message !== void 0).map((message) => {
+        const { _index, ...messageWithoutIndex } = message;
+        return messageWithoutIndex;
       });
+      if (format === "v2") {
+        return prepared.map((msg) => ({
+          ...msg,
+          content: msg.content || { format: 2, parts: [{ type: "text", text: "" }] }
+        }));
+      }
+      return prepared;
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_GET_MESSAGES_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            threadId
+          }
+        },
+        error
+      );
     }
-    const includedMessages = await this._getIncludedMessages(threadId, selectBy);
-    const messages = [
-      ...includedMessages,
-      ...(await Promise.all(
-        Array.from(messageIds).map(async (id) => {
-          const tId = messageIdToThreadIds[id] || threadId;
-          const byThreadId = await this.redis.get(this.getMessageKey(tId, id));
-          if (byThreadId) return byThreadId;
-          return null;
-        })
-      )).filter((msg) => msg !== null)
-    ];
-    messages.sort((a, b) => allMessageIds.indexOf(a.id) - allMessageIds.indexOf(b.id));
-    const seen = /* @__PURE__ */ new Set();
-    const dedupedMessages = messages.filter((row) => {
-      if (seen.has(row.id)) return false;
-      seen.add(row.id);
-      return true;
-    });
-    const prepared = dedupedMessages.filter((message) => message !== null && message !== void 0).map((message) => {
-      const { _index, ...messageWithoutIndex } = message;
-      return messageWithoutIndex;
-    });
-    if (format === "v2") {
-      return prepared.map((msg) => ({
-        ...msg,
-        content: msg.content || { format: 2, parts: [{ type: "text", text: "" }] }
-      }));
-    }
-    return prepared;
   }
   async getMessagesPaginated(args) {
     const { threadId, selectBy, format } = args;
@@ -613,9 +863,9 @@ var UpstashStore = class extends MastraStorage {
     const toDate = dateRange?.end;
     const threadMessagesKey = this.getThreadMessagesKey(threadId);
     const messages = [];
-    const includedMessages = await this._getIncludedMessages(threadId, selectBy);
-    messages.push(...includedMessages);
     try {
+      const includedMessages = await this._getIncludedMessages(threadId, selectBy);
+      messages.push(...includedMessages);
       const allMessageIds = await this.redis.zrange(threadMessagesKey, 0, -1);
       if (allMessageIds.length === 0) {
         return {
@@ -653,7 +903,19 @@ var UpstashStore = class extends MastraStorage {
         hasMore
       };
     } catch (error) {
-      console.error("Failed to get paginated messages:", error);
+      const mastraError = new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_GET_MESSAGES_PAGINATED_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            threadId
+          }
+        },
+        error
+      );
+      this.logger.error(mastraError.toString());
+      this.logger?.trackException(mastraError);
       return {
         messages: [],
         total: 0,
@@ -665,17 +927,33 @@ var UpstashStore = class extends MastraStorage {
   }
   async persistWorkflowSnapshot(params) {
     const { namespace = "workflows", workflowName, runId, snapshot } = params;
-    await this.insert({
-      tableName: TABLE_WORKFLOW_SNAPSHOT,
-      record: {
-        namespace,
-        workflow_name: workflowName,
-        run_id: runId,
-        snapshot,
-        createdAt: /* @__PURE__ */ new Date(),
-        updatedAt: /* @__PURE__ */ new Date()
-      }
-    });
+    try {
+      await this.insert({
+        tableName: TABLE_WORKFLOW_SNAPSHOT,
+        record: {
+          namespace,
+          workflow_name: workflowName,
+          run_id: runId,
+          snapshot,
+          createdAt: /* @__PURE__ */ new Date(),
+          updatedAt: /* @__PURE__ */ new Date()
+        }
+      });
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_PERSIST_WORKFLOW_SNAPSHOT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            namespace,
+            workflowName,
+            runId
+          }
+        },
+        error
+      );
+    }
   }
   async loadWorkflowSnapshot(params) {
     const { namespace = "workflows", workflowName, runId } = params;
@@ -684,9 +962,25 @@ var UpstashStore = class extends MastraStorage {
       workflow_name: workflowName,
       run_id: runId
     });
-    const data = await this.redis.get(key);
-    if (!data) return null;
-    return data.snapshot;
+    try {
+      const data = await this.redis.get(key);
+      if (!data) return null;
+      return data.snapshot;
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_LOAD_WORKFLOW_SNAPSHOT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            namespace,
+            workflowName,
+            runId
+          }
+        },
+        error
+      );
+    }
   }
   /**
    * Get all evaluations with pagination and total count
@@ -775,7 +1069,20 @@ var UpstashStore = class extends MastraStorage {
       };
     } catch (error) {
       const { page = 0, perPage = 100 } = options || {};
-      console.error("Failed to get evals:", error);
+      const mastraError = new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_GET_EVALS_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            page,
+            perPage
+          }
+        },
+        error
+      );
+      this.logger.error(mastraError.toString());
+      this.logger?.trackException(mastraError);
       return {
         evals: [],
         total: 0,
@@ -828,8 +1135,19 @@ var UpstashStore = class extends MastraStorage {
       }
       return { runs, total };
     } catch (error) {
-      console.error("Error getting workflow runs:", error);
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_GET_WORKFLOW_RUNS_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            namespace,
+            workflowName: workflowName || "",
+            resourceId: resourceId || ""
+          }
+        },
+        error
+      );
     }
   }
   async getWorkflowRunById({
@@ -850,8 +1168,19 @@ var UpstashStore = class extends MastraStorage {
       if (!data) return null;
       return this.parseWorkflowRun(data);
     } catch (error) {
-      console.error("Error getting workflow run by ID:", error);
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_GET_WORKFLOW_RUN_BY_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            namespace,
+            runId,
+            workflowName: workflowName || ""
+          }
+        },
+        error
+      );
     }
   }
   async close() {
@@ -860,6 +1189,75 @@ var UpstashStore = class extends MastraStorage {
     this.logger.error("updateMessages is not yet implemented in UpstashStore");
     throw new Error("Method not implemented");
   }
+  async getResourceById({ resourceId }) {
+    try {
+      const key = `${TABLE_RESOURCES}:${resourceId}`;
+      const data = await this.redis.get(key);
+      if (!data) {
+        return null;
+      }
+      return {
+        ...data,
+        createdAt: new Date(data.createdAt),
+        updatedAt: new Date(data.updatedAt),
+        // Ensure workingMemory is always returned as a string, regardless of automatic parsing
+        workingMemory: typeof data.workingMemory === "object" ? JSON.stringify(data.workingMemory) : data.workingMemory,
+        metadata: typeof data.metadata === "string" ? JSON.parse(data.metadata) : data.metadata
+      };
+    } catch (error) {
+      this.logger.error("Error getting resource by ID:", error);
+      throw error;
+    }
+  }
+  async saveResource({ resource }) {
+    try {
+      const key = `${TABLE_RESOURCES}:${resource.id}`;
+      const serializedResource = {
+        ...resource,
+        metadata: JSON.stringify(resource.metadata),
+        createdAt: resource.createdAt.toISOString(),
+        updatedAt: resource.updatedAt.toISOString()
+      };
+      await this.redis.set(key, serializedResource);
+      return resource;
+    } catch (error) {
+      this.logger.error("Error saving resource:", error);
+      throw error;
+    }
+  }
+  async updateResource({
+    resourceId,
+    workingMemory,
+    metadata
+  }) {
+    try {
+      const existingResource = await this.getResourceById({ resourceId });
+      if (!existingResource) {
+        const newResource = {
+          id: resourceId,
+          workingMemory,
+          metadata: metadata || {},
+          createdAt: /* @__PURE__ */ new Date(),
+          updatedAt: /* @__PURE__ */ new Date()
+        };
+        return this.saveResource({ resource: newResource });
+      }
+      const updatedResource = {
+        ...existingResource,
+        workingMemory: workingMemory !== void 0 ? workingMemory : existingResource.workingMemory,
+        metadata: {
+          ...existingResource.metadata,
+          ...metadata
+        },
+        updatedAt: /* @__PURE__ */ new Date()
+      };
+      await this.saveResource({ resource: updatedResource });
+      return updatedResource;
+    } catch (error) {
+      this.logger.error("Error updating resource:", error);
+      throw error;
+    }
+  }
 };
 var UpstashFilterTranslator = class extends BaseFilterTranslator {
   getSupportedOperators() {
@@ -1081,14 +1479,26 @@ var UpstashVector = class extends MastraVector {
       vector,
       metadata: metadata?.[index]
     }));
-    await this.client.upsert(points, {
-      namespace
-    });
-    return generatedIds;
+    try {
+      await this.client.upsert(points, {
+        namespace
+      });
+      return generatedIds;
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_VECTOR_UPSERT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { namespace, vectorCount: vectors.length }
+        },
+        error
+      );
+    }
   }
   /**
    * Transforms a Mastra vector filter into an Upstash-compatible filter string.
-   * @param {VectorFilter} [filter] - The filter to transform.
+   * @param {UpstashVectorFilter} [filter] - The filter to transform.
    * @returns {string | undefined} The transformed filter string, or undefined if no filter is provided.
    */
   transformFilter(filter) {
@@ -1115,29 +1525,52 @@ var UpstashVector = class extends MastraVector {
     filter,
     includeVector = false
   }) {
-    const ns = this.client.namespace(namespace);
-    const filterString = this.transformFilter(filter);
-    const results = await ns.query({
-      topK,
-      vector: queryVector,
-      includeVectors: includeVector,
-      includeMetadata: true,
-      ...filterString ? { filter: filterString } : {}
-    });
-    return (results || []).map((result) => ({
-      id: `${result.id}`,
-      score: result.score,
-      metadata: result.metadata,
-      ...includeVector && { vector: result.vector || [] }
-    }));
+    try {
+      const ns = this.client.namespace(namespace);
+      const filterString = this.transformFilter(filter);
+      const results = await ns.query({
+        topK,
+        vector: queryVector,
+        includeVectors: includeVector,
+        includeMetadata: true,
+        ...filterString ? { filter: filterString } : {}
+      });
+      return (results || []).map((result) => ({
+        id: `${result.id}`,
+        score: result.score,
+        metadata: result.metadata,
+        ...includeVector && { vector: result.vector || [] }
+      }));
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_VECTOR_QUERY_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { namespace, topK }
+        },
+        error
+      );
+    }
   }
   /**
    * Lists all namespaces in the Upstash vector index, which correspond to indexes.
    * @returns {Promise<string[]>} A promise that resolves to a list of index names.
    */
   async listIndexes() {
-    const indexes = await this.client.listNamespaces();
-    return indexes.filter(Boolean);
+    try {
+      const indexes = await this.client.listNamespaces();
+      return indexes.filter(Boolean);
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_VECTOR_LIST_INDEXES_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+    }
   }
   /**
    * Retrieves statistics about a vector index.
@@ -1146,12 +1579,24 @@ var UpstashVector = class extends MastraVector {
    * @returns A promise that resolves to the index statistics including dimension, count and metric
    */
   async describeIndex({ indexName: namespace }) {
-    const info = await this.client.info();
-    return {
-      dimension: info.dimension,
-      count: info.namespaces?.[namespace]?.vectorCount || 0,
-      metric: info?.similarityFunction?.toLowerCase()
-    };
+    try {
+      const info = await this.client.info();
+      return {
+        dimension: info.dimension,
+        count: info.namespaces?.[namespace]?.vectorCount || 0,
+        metric: info?.similarityFunction?.toLowerCase()
+      };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_VECTOR_DESCRIBE_INDEX_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { namespace }
+        },
+        error
+      );
+    }
   }
   /**
    * Deletes an index (namespace).
@@ -1162,7 +1607,15 @@ var UpstashVector = class extends MastraVector {
     try {
       await this.client.deleteNamespace(namespace);
     } catch (error) {
-      this.logger.error("Failed to delete namespace:", error);
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_VECTOR_DELETE_INDEX_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { namespace }
+        },
+        error
+      );
     }
   }
   /**
@@ -1183,6 +1636,18 @@ var UpstashVector = class extends MastraVector {
       if (!update.vector && update.metadata) {
         throw new Error("Both vector and metadata must be provided for an update");
       }
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_VECTOR_UPDATE_VECTOR_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { namespace, id }
+        },
+        error
+      );
+    }
+    try {
       const updatePayload = { id };
       if (update.vector) {
         updatePayload.vector = update.vector;
@@ -1199,7 +1664,15 @@ var UpstashVector = class extends MastraVector {
         namespace
       });
     } catch (error) {
-      throw new Error(`Failed to update vector by id: ${id} for index name: ${namespace}: ${error.message}`);
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_VECTOR_UPDATE_VECTOR_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { namespace, id }
+        },
+        error
+      );
     }
   }
   /**
@@ -1215,7 +1688,16 @@ var UpstashVector = class extends MastraVector {
         namespace
       });
     } catch (error) {
-      this.logger.error(`Failed to delete vector by id: ${id} for namespace: ${namespace}:`, error);
+      const mastraError = new MastraError(
+        {
+          id: "STORAGE_UPSTASH_VECTOR_DELETE_VECTOR_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { namespace, id }
+        },
+        error
+      );
+      this.logger?.error(mastraError.toString());
     }
   }
 };