@mastra/upstash 0.10.3-alpha.1 → 0.10.3-alpha.2

package/.turbo/turbo-build.log

@@ -1,39 +1,39 @@
 
-> @mastra/upstash@0.10.3-alpha.1 build /home/runner/work/mastra/mastra/stores/upstash
+> @mastra/upstash@0.10.3-alpha.2 build /home/runner/work/mastra/mastra/stores/upstash
 > tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting
 
 CLI Building entry: src/index.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v8.5.0
 TSC Build start
-TSC ⚡️ Build success in 10151ms
+TSC ⚡️ Build success in 10231ms
 DTS Build start
 CLI Target: es2022
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/stores/upstash/dist/_tsup-dts-rollup.d.ts
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/stores/upstash/dist/_tsup-dts-rollup.d.cts
-DTS ⚡️ Build success in 11729ms
+DTS ⚡️ Build success in 10756ms
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-dist/index.cjs (1651:18): Use of eval in "dist/index.cjs" is strongly discouraged as it poses security risks and may cause issues with minification.
 dist/index.js (1651:18): Use of eval in "dist/index.js" is strongly discouraged as it poses security risks and may cause issues with minification.
+dist/index.cjs (1651:18): Use of eval in "dist/index.cjs" is strongly discouraged as it poses security risks and may cause issues with minification.
+ESM dist/getMachineId-darwin-UTKBTJ2U.js      1.08 KB
+ESM dist/getMachineId-linux-K3QXQYAB.js       740.00 B
+ESM dist/getMachineId-bsd-KKIDU47O.js         896.00 B
+ESM dist/getMachineId-win-L2EYIM5A.js         1.04 KB
+ESM dist/chunk-IGKEDEDE.js                    452.00 B
+ESM dist/getMachineId-unsupported-VPWBQCK7.js 700.00 B
+ESM dist/chunk-HSTZWXH7.js                    61.52 KB
+ESM dist/index.js                             1.64 MB
+ESM ⚡️ Build success in 23117ms
 CJS dist/getMachineId-darwin-3PL23DL6.cjs      1.19 KB
 CJS dist/getMachineId-linux-KYLPK3HC.cjs       813.00 B
 CJS dist/getMachineId-bsd-HDZ73WR7.cjs         1015.00 B
-CJS dist/chunk-N2CPQVE3.cjs                    1.09 KB
 CJS dist/getMachineId-win-ZTI2LRDJ.cjs         1.66 KB
+CJS dist/chunk-N2CPQVE3.cjs                    1.09 KB
 CJS dist/getMachineId-unsupported-DEDJN4ZS.cjs 777.00 B
 CJS dist/chunk-U74OJRHU.cjs                    62.08 KB
 CJS dist/index.cjs                             1.65 MB
-CJS ⚡️ Build success in 21940ms
-ESM dist/getMachineId-linux-K3QXQYAB.js       740.00 B
-ESM dist/getMachineId-darwin-UTKBTJ2U.js      1.08 KB
-ESM dist/getMachineId-win-L2EYIM5A.js         1.04 KB
-ESM dist/getMachineId-bsd-KKIDU47O.js         896.00 B
-ESM dist/chunk-IGKEDEDE.js                    452.00 B
-ESM dist/getMachineId-unsupported-VPWBQCK7.js 700.00 B
-ESM dist/chunk-HSTZWXH7.js                    61.52 KB
-ESM dist/index.js                             1.64 MB
-ESM ⚡️ Build success in 21983ms
+CJS ⚡️ Build success in 23122ms

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @mastra/upstash
 
+## 0.10.3-alpha.2
+
+### Patch Changes
+
+- 48eddb9: update filter logic in Memory class to support semantic recall search scope
+- Updated dependencies [48eddb9]
+  - @mastra/core@0.10.4-alpha.2
+
 ## 0.10.3-alpha.1
 
 ### Patch Changes

package/dist/_tsup-dts-rollup.d.cts

@@ -55,6 +55,9 @@ export declare class UpstashFilterTranslator extends BaseFilterTranslator {
 declare class UpstashStore extends MastraStorage {
     private redis;
     constructor(config: UpstashConfig);
+    get supports(): {
+        selectByIncludeResourceScope: boolean;
+    };
     private transformEvalRecord;
     private parseJSON;
     private getKey;

package/dist/_tsup-dts-rollup.d.ts

@@ -55,6 +55,9 @@ export declare class UpstashFilterTranslator extends BaseFilterTranslator {
 declare class UpstashStore extends MastraStorage {
     private redis;
     constructor(config: UpstashConfig);
+    get supports(): {
+        selectByIncludeResourceScope: boolean;
+    };
     private transformEvalRecord;
     private parseJSON;
     private getKey;

package/dist/index.cjs

@@ -31172,9 +31172,9 @@ var require_chunk_QVROTSA5 = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../packages/core/dist/chunk-H5IRI46R.cjs
-var require_chunk_H5IRI46R = chunkU74OJRHU_cjs.__commonJS({
-  "../../packages/core/dist/chunk-H5IRI46R.cjs"(exports2) {
+// ../../packages/core/dist/chunk-XUODQRSL.cjs
+var require_chunk_XUODQRSL = chunkU74OJRHU_cjs.__commonJS({
+  "../../packages/core/dist/chunk-XUODQRSL.cjs"(exports2) {
     var chunkQVROTSA5_cjs = require_chunk_QVROTSA5();
     var crypto2 = chunkU74OJRHU_cjs.__require("crypto");
     var ai = require_dist4();
@@ -31746,7 +31746,7 @@ ${JSON.stringify(message, null, 2)}`
         }
         const latestMessagePartType = latestMessage?.content?.parts?.filter((p) => p.type !== `step-start`)?.at?.(-1)?.type;
         const newMessageFirstPartType = messageV2.content.parts.filter((p) => p.type !== `step-start`).at(0)?.type;
-        const shouldAppendToLastAssistantMessage = latestMessage?.role === "assistant" && messageV2.role === "assistant";
+        const shouldAppendToLastAssistantMessage = latestMessage?.role === "assistant" && messageV2.role === "assistant" && latestMessage.threadId === messageV2.threadId;
         const shouldAppendToLastAssistantMessageParts = shouldAppendToLastAssistantMessage && newMessageFirstPartType && (newMessageFirstPartType === `tool-invocation` && latestMessagePartType !== `text` || newMessageFirstPartType === latestMessagePartType);
         if (
           // backwards compat check!
@@ -31824,7 +31824,11 @@ ${JSON.stringify(message, null, 2)}`
         return this;
       }
       inputToMastraMessageV2(message, messageSource) {
-        if (`threadId` in message && message.threadId && this.memoryInfo && message.threadId !== this.memoryInfo.threadId) {
+        if (
+          // we can't throw if the threadId doesn't match and this message came from memory
+          // this is because per-user semantic recall can retrieve messages from other threads
+          messageSource !== `memory` && `threadId` in message && message.threadId && this.memoryInfo && message.threadId !== this.memoryInfo.threadId
+        ) {
           throw new Error(
             `Received input message with wrong threadId. Input ${message.threadId}, expected ${this.memoryInfo.threadId}`
           );
@@ -38437,11 +38441,11 @@ ${err.message}`);
   }
 });
 
-// ../../packages/core/dist/chunk-OKHKG5C7.cjs
-var require_chunk_OKHKG5C7 = chunkU74OJRHU_cjs.__commonJS({
-  "../../packages/core/dist/chunk-OKHKG5C7.cjs"(exports2) {
+// ../../packages/core/dist/chunk-ZWYZGIV3.cjs
+var require_chunk_ZWYZGIV3 = chunkU74OJRHU_cjs.__commonJS({
+  "../../packages/core/dist/chunk-ZWYZGIV3.cjs"(exports2) {
     var chunkJYLH5IY3_cjs = require_chunk_JYLH5IY3();
-    var chunkH5IRI46R_cjs = require_chunk_H5IRI46R();
+    var chunkXUODQRSL_cjs = require_chunk_XUODQRSL();
     var chunkST5RMVLG_cjs = require_chunk_ST5RMVLG();
     var chunkRO5VPM3P_cjs = require_chunk_RO5VPM3P();
     var chunkZAXPU6F2_cjs = require_chunk_ZAXPU6F2();
@@ -38847,7 +38851,7 @@ var require_chunk_OKHKG5C7 = chunkU74OJRHU_cjs.__commonJS({
         memoryConfig,
         resourceId,
         runId,
-        messageList = new chunkH5IRI46R_cjs.MessageList({
+        messageList = new chunkXUODQRSL_cjs.MessageList({
           threadId,
           resourceId
         })
@@ -38862,14 +38866,11 @@ var require_chunk_OKHKG5C7 = chunkU74OJRHU_cjs.__commonJS({
               threadId: threadId || ""
             };
           }
-          const allUIMessages = messageList.get.all.ui();
-          const currentUserMessages = allUIMessages.filter((m) => m.role === "user");
-          const lastUserMessageContent = currentUserMessages.at(-1)?.content ?? "";
           const [memoryMessages, memorySystemMessage] = threadId && memory ? await Promise.all([memory.rememberMessages({
             threadId,
             resourceId,
             config: memoryConfig,
-            vectorMessageSearch: lastUserMessageContent
+            vectorMessageSearch: messageList.getLatestUserContent() || ""
           }).then((r) => r.messagesV2), memory.getSystemMessage({
             threadId,
             memoryConfig
@@ -39218,7 +39219,7 @@ var require_chunk_OKHKG5C7 = chunkU74OJRHU_cjs.__commonJS({
               runId,
               runtimeContext
             });
-            const messageList = new chunkH5IRI46R_cjs.MessageList({
+            const messageList = new chunkXUODQRSL_cjs.MessageList({
               threadId,
               resourceId,
               generateMessageId
@@ -39251,12 +39252,13 @@ var require_chunk_OKHKG5C7 = chunkU74OJRHU_cjs.__commonJS({
               resourceId,
               memoryConfig
             });
-            const [memoryMessages, memorySystemMessage] = threadId && memory ? await Promise.all([memory.rememberMessages({
+            let [memoryMessages, memorySystemMessage] = threadId && memory ? await Promise.all([memory.rememberMessages({
               threadId,
               resourceId,
               config: memoryConfig,
-              vectorMessageSearch: messageList.getLatestUserContent() || ""
-            }).then((r) => r.messages), memory.getSystemMessage({
+              // The new user messages aren't in the list yet cause we add memory messages first to try to make sure ordering is correct (memory comes before new user messages)
+              vectorMessageSearch: new chunkXUODQRSL_cjs.MessageList().add(messages, `user`).getLatestUserContent() || ""
+            }).then((r) => r.messagesV2), memory.getSystemMessage({
               threadId,
               memoryConfig
             })]) : [[], null];
@@ -39265,10 +39267,28 @@ var require_chunk_OKHKG5C7 = chunkU74OJRHU_cjs.__commonJS({
               runId,
               fetchedCount: memoryMessages.length
             });
+            const resultsFromOtherThreads = memoryMessages.filter((m) => m.threadId !== threadId);
+            if (resultsFromOtherThreads.length && !memorySystemMessage) {
+              memorySystemMessage = ``;
+            }
+            if (resultsFromOtherThreads.length) {
+              memorySystemMessage += `
+The following messages were remembered from a different conversation:
+<remembered_from_other_conversation>
+${JSON.stringify(
+                // get v1 since they're closer to CoreMessages (which get sent to the LLM) but also include timestamps
+                new chunkXUODQRSL_cjs.MessageList().add(resultsFromOtherThreads, "memory").get.all.v1()
+              )}
+<end_remembered_from_other_conversation>`;
+            }
             if (memorySystemMessage) {
               messageList.addSystem(memorySystemMessage, "memory");
             }
-            messageList.add(memoryMessages, "memory").add(messages, "user");
+            messageList.add(
+              memoryMessages.filter((m) => m.threadId === threadId),
+              // filter out messages from other threads. those are added to system message above
+              "memory"
+            ).add(messages, "user");
             const systemMessage = messageList.getSystemMessages()?.map((m) => m.content)?.join(`
 `) ?? void 0;
             const processedMemoryMessages = memory.processMessages({
@@ -39280,7 +39300,7 @@ var require_chunk_OKHKG5C7 = chunkU74OJRHU_cjs.__commonJS({
               systemMessage,
               memorySystemMessage: memorySystemMessage || void 0
             });
-            const processedList = new chunkH5IRI46R_cjs.MessageList({
+            const processedList = new chunkXUODQRSL_cjs.MessageList({
               threadId,
               resourceId
             }).addSystem(instructions || `${this.instructions}.`).addSystem(memorySystemMessage).add(context2 || [], "context").add(processedMemoryMessages, "memory").add(messageList.get.input.v2(), "user").get.all.prompt();
@@ -42755,18 +42775,18 @@ var require_chunk_OKHKG5C7 = chunkU74OJRHU_cjs.__commonJS({
 // ../../packages/core/dist/agent/index.cjs
 var require_agent = chunkU74OJRHU_cjs.__commonJS({
   "../../packages/core/dist/agent/index.cjs"(exports2) {
-    var chunkOKHKG5C7_cjs = require_chunk_OKHKG5C7();
-    var chunkH5IRI46R_cjs = require_chunk_H5IRI46R();
+    var chunkZWYZGIV3_cjs = require_chunk_ZWYZGIV3();
+    var chunkXUODQRSL_cjs = require_chunk_XUODQRSL();
     Object.defineProperty(exports2, "Agent", {
       enumerable: true,
       get: function() {
-        return chunkOKHKG5C7_cjs.Agent;
+        return chunkZWYZGIV3_cjs.Agent;
       }
     });
     Object.defineProperty(exports2, "MessageList", {
       enumerable: true,
       get: function() {
-        return chunkH5IRI46R_cjs.MessageList;
+        return chunkXUODQRSL_cjs.MessageList;
       }
     });
   }
@@ -42783,6 +42803,11 @@ var UpstashStore = class extends storage.MastraStorage {
       token: config.token
     });
   }
+  get supports() {
+    return {
+      selectByIncludeResourceScope: true
+    };
+  }
   transformEvalRecord(record) {
     let result = record.result;
     if (typeof result === "string") {
@@ -42867,7 +42892,8 @@ var UpstashStore = class extends storage.MastraStorage {
     return totalDeleted;
   }
   getMessageKey(threadId, messageId) {
-    return this.getKey(storage.TABLE_MESSAGES, { threadId, id: messageId });
+    const key = this.getKey(storage.TABLE_MESSAGES, { threadId, id: messageId });
+    return key;
   }
   getThreadMessagesKey(threadId) {
     return `thread:${threadId}:messages`;
@@ -43240,6 +43266,14 @@ var UpstashStore = class extends storage.MastraStorage {
   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`);
+    }
     const messagesWithIndex = messages.map((message, index) => ({
       ...message,
       _index: index
@@ -43250,7 +43284,8 @@ var UpstashStore = class extends storage.MastraStorage {
       const pipeline = this.redis.pipeline();
       for (const message of batch) {
         const key = this.getMessageKey(message.threadId, message.id);
-        const score = message._index !== void 0 ? message._index : new Date(message.createdAt).getTime();
+        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,
@@ -43345,38 +43380,55 @@ var UpstashStore = class extends storage.MastraStorage {
       limit = Number.MAX_SAFE_INTEGER;
     }
     const messageIds = /* @__PURE__ */ new Set();
+    const messageIdToThreadIds = {};
     if (limit === 0 && !selectBy?.include) {
       return [];
     }
     if (selectBy?.include?.length) {
       for (const item of selectBy.include) {
         messageIds.add(item.id);
-        if (item.withPreviousMessages || item.withNextMessages) {
-          const rank = await this.redis.zrank(threadMessagesKey, item.id);
-          if (rank === null) continue;
-          if (item.withPreviousMessages) {
-            const start = Math.max(0, rank - item.withPreviousMessages);
-            const prevIds = rank === 0 ? [] : await this.redis.zrange(threadMessagesKey, start, rank - 1);
-            prevIds.forEach((id) => messageIds.add(id));
-          }
-          if (item.withNextMessages) {
-            const nextIds = await this.redis.zrange(threadMessagesKey, rank + 1, rank + item.withNextMessages);
-            nextIds.forEach((id) => messageIds.add(id));
-          }
+        const itemThreadId = item.threadId || threadId;
+        messageIdToThreadIds[item.id] = itemThreadId;
+        const itemThreadMessagesKey = this.getThreadMessagesKey(itemThreadId);
+        const rank = await this.redis.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.redis.zrange(itemThreadMessagesKey, start, rank - 1);
+          prevIds.forEach((id) => {
+            messageIds.add(id);
+            messageIdToThreadIds[id] = itemThreadId;
+          });
+        }
+        if (item.withNextMessages) {
+          const nextIds = await this.redis.zrange(itemThreadMessagesKey, rank + 1, rank + item.withNextMessages);
+          nextIds.forEach((id) => {
+            messageIds.add(id);
+            messageIdToThreadIds[id] = itemThreadId;
+          });
         }
       }
     }
     if (limit === Number.MAX_SAFE_INTEGER) {
       const allIds = await this.redis.zrange(threadMessagesKey, 0, -1);
-      allIds.forEach((id) => messageIds.add(id));
+      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));
+      latestIds.forEach((id) => {
+        messageIds.add(id);
+        messageIdToThreadIds[id] = threadId;
+      });
     }
     const messages = (await Promise.all(
-      Array.from(messageIds).map(
-        async (id) => this.redis.get(this.getMessageKey(threadId, id))
-      )
+      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 prepared = messages.filter((message) => message !== null && message !== void 0).map((message) => {

package/dist/index.js

@@ -31170,9 +31170,9 @@ var require_chunk_QVROTSA5 = __commonJS({
   }
 });
 
-// ../../packages/core/dist/chunk-H5IRI46R.cjs
-var require_chunk_H5IRI46R = __commonJS({
-  "../../packages/core/dist/chunk-H5IRI46R.cjs"(exports2) {
+// ../../packages/core/dist/chunk-XUODQRSL.cjs
+var require_chunk_XUODQRSL = __commonJS({
+  "../../packages/core/dist/chunk-XUODQRSL.cjs"(exports2) {
     var chunkQVROTSA5_cjs = require_chunk_QVROTSA5();
     var crypto2 = __require("crypto");
     var ai = require_dist4();
@@ -31744,7 +31744,7 @@ ${JSON.stringify(message, null, 2)}`
         }
         const latestMessagePartType = latestMessage?.content?.parts?.filter((p) => p.type !== `step-start`)?.at?.(-1)?.type;
         const newMessageFirstPartType = messageV2.content.parts.filter((p) => p.type !== `step-start`).at(0)?.type;
-        const shouldAppendToLastAssistantMessage = latestMessage?.role === "assistant" && messageV2.role === "assistant";
+        const shouldAppendToLastAssistantMessage = latestMessage?.role === "assistant" && messageV2.role === "assistant" && latestMessage.threadId === messageV2.threadId;
         const shouldAppendToLastAssistantMessageParts = shouldAppendToLastAssistantMessage && newMessageFirstPartType && (newMessageFirstPartType === `tool-invocation` && latestMessagePartType !== `text` || newMessageFirstPartType === latestMessagePartType);
         if (
           // backwards compat check!
@@ -31822,7 +31822,11 @@ ${JSON.stringify(message, null, 2)}`
         return this;
       }
       inputToMastraMessageV2(message, messageSource) {
-        if (`threadId` in message && message.threadId && this.memoryInfo && message.threadId !== this.memoryInfo.threadId) {
+        if (
+          // we can't throw if the threadId doesn't match and this message came from memory
+          // this is because per-user semantic recall can retrieve messages from other threads
+          messageSource !== `memory` && `threadId` in message && message.threadId && this.memoryInfo && message.threadId !== this.memoryInfo.threadId
+        ) {
           throw new Error(
             `Received input message with wrong threadId. Input ${message.threadId}, expected ${this.memoryInfo.threadId}`
           );
@@ -38435,11 +38439,11 @@ ${err.message}`);
   }
 });
 
-// ../../packages/core/dist/chunk-OKHKG5C7.cjs
-var require_chunk_OKHKG5C7 = __commonJS({
-  "../../packages/core/dist/chunk-OKHKG5C7.cjs"(exports2) {
+// ../../packages/core/dist/chunk-ZWYZGIV3.cjs
+var require_chunk_ZWYZGIV3 = __commonJS({
+  "../../packages/core/dist/chunk-ZWYZGIV3.cjs"(exports2) {
     var chunkJYLH5IY3_cjs = require_chunk_JYLH5IY3();
-    var chunkH5IRI46R_cjs = require_chunk_H5IRI46R();
+    var chunkXUODQRSL_cjs = require_chunk_XUODQRSL();
     var chunkST5RMVLG_cjs = require_chunk_ST5RMVLG();
     var chunkRO5VPM3P_cjs = require_chunk_RO5VPM3P();
     var chunkZAXPU6F2_cjs = require_chunk_ZAXPU6F2();
@@ -38845,7 +38849,7 @@ var require_chunk_OKHKG5C7 = __commonJS({
         memoryConfig,
         resourceId,
         runId,
-        messageList = new chunkH5IRI46R_cjs.MessageList({
+        messageList = new chunkXUODQRSL_cjs.MessageList({
           threadId,
           resourceId
         })
@@ -38860,14 +38864,11 @@ var require_chunk_OKHKG5C7 = __commonJS({
               threadId: threadId || ""
             };
           }
-          const allUIMessages = messageList.get.all.ui();
-          const currentUserMessages = allUIMessages.filter((m) => m.role === "user");
-          const lastUserMessageContent = currentUserMessages.at(-1)?.content ?? "";
           const [memoryMessages, memorySystemMessage] = threadId && memory ? await Promise.all([memory.rememberMessages({
             threadId,
             resourceId,
             config: memoryConfig,
-            vectorMessageSearch: lastUserMessageContent
+            vectorMessageSearch: messageList.getLatestUserContent() || ""
           }).then((r) => r.messagesV2), memory.getSystemMessage({
             threadId,
             memoryConfig
@@ -39216,7 +39217,7 @@ var require_chunk_OKHKG5C7 = __commonJS({
               runId,
               runtimeContext
             });
-            const messageList = new chunkH5IRI46R_cjs.MessageList({
+            const messageList = new chunkXUODQRSL_cjs.MessageList({
               threadId,
               resourceId,
               generateMessageId
@@ -39249,12 +39250,13 @@ var require_chunk_OKHKG5C7 = __commonJS({
               resourceId,
               memoryConfig
             });
-            const [memoryMessages, memorySystemMessage] = threadId && memory ? await Promise.all([memory.rememberMessages({
+            let [memoryMessages, memorySystemMessage] = threadId && memory ? await Promise.all([memory.rememberMessages({
               threadId,
               resourceId,
               config: memoryConfig,
-              vectorMessageSearch: messageList.getLatestUserContent() || ""
-            }).then((r) => r.messages), memory.getSystemMessage({
+              // The new user messages aren't in the list yet cause we add memory messages first to try to make sure ordering is correct (memory comes before new user messages)
+              vectorMessageSearch: new chunkXUODQRSL_cjs.MessageList().add(messages, `user`).getLatestUserContent() || ""
+            }).then((r) => r.messagesV2), memory.getSystemMessage({
               threadId,
               memoryConfig
             })]) : [[], null];
@@ -39263,10 +39265,28 @@ var require_chunk_OKHKG5C7 = __commonJS({
               runId,
               fetchedCount: memoryMessages.length
             });
+            const resultsFromOtherThreads = memoryMessages.filter((m) => m.threadId !== threadId);
+            if (resultsFromOtherThreads.length && !memorySystemMessage) {
+              memorySystemMessage = ``;
+            }
+            if (resultsFromOtherThreads.length) {
+              memorySystemMessage += `
+The following messages were remembered from a different conversation:
+<remembered_from_other_conversation>
+${JSON.stringify(
+                // get v1 since they're closer to CoreMessages (which get sent to the LLM) but also include timestamps
+                new chunkXUODQRSL_cjs.MessageList().add(resultsFromOtherThreads, "memory").get.all.v1()
+              )}
+<end_remembered_from_other_conversation>`;
+            }
             if (memorySystemMessage) {
               messageList.addSystem(memorySystemMessage, "memory");
             }
-            messageList.add(memoryMessages, "memory").add(messages, "user");
+            messageList.add(
+              memoryMessages.filter((m) => m.threadId === threadId),
+              // filter out messages from other threads. those are added to system message above
+              "memory"
+            ).add(messages, "user");
             const systemMessage = messageList.getSystemMessages()?.map((m) => m.content)?.join(`
 `) ?? void 0;
             const processedMemoryMessages = memory.processMessages({
@@ -39278,7 +39298,7 @@ var require_chunk_OKHKG5C7 = __commonJS({
               systemMessage,
               memorySystemMessage: memorySystemMessage || void 0
             });
-            const processedList = new chunkH5IRI46R_cjs.MessageList({
+            const processedList = new chunkXUODQRSL_cjs.MessageList({
               threadId,
               resourceId
             }).addSystem(instructions || `${this.instructions}.`).addSystem(memorySystemMessage).add(context2 || [], "context").add(processedMemoryMessages, "memory").add(messageList.get.input.v2(), "user").get.all.prompt();
@@ -42753,18 +42773,18 @@ var require_chunk_OKHKG5C7 = __commonJS({
 // ../../packages/core/dist/agent/index.cjs
 var require_agent = __commonJS({
   "../../packages/core/dist/agent/index.cjs"(exports2) {
-    var chunkOKHKG5C7_cjs = require_chunk_OKHKG5C7();
-    var chunkH5IRI46R_cjs = require_chunk_H5IRI46R();
+    var chunkZWYZGIV3_cjs = require_chunk_ZWYZGIV3();
+    var chunkXUODQRSL_cjs = require_chunk_XUODQRSL();
     Object.defineProperty(exports2, "Agent", {
       enumerable: true,
       get: function() {
-        return chunkOKHKG5C7_cjs.Agent;
+        return chunkZWYZGIV3_cjs.Agent;
       }
     });
     Object.defineProperty(exports2, "MessageList", {
       enumerable: true,
       get: function() {
-        return chunkH5IRI46R_cjs.MessageList;
+        return chunkXUODQRSL_cjs.MessageList;
       }
     });
   }
@@ -42781,6 +42801,11 @@ var UpstashStore = class extends MastraStorage {
       token: config.token
     });
   }
+  get supports() {
+    return {
+      selectByIncludeResourceScope: true
+    };
+  }
   transformEvalRecord(record) {
     let result = record.result;
     if (typeof result === "string") {
@@ -42865,7 +42890,8 @@ var UpstashStore = class extends MastraStorage {
     return totalDeleted;
   }
   getMessageKey(threadId, messageId) {
-    return this.getKey(TABLE_MESSAGES, { threadId, id: messageId });
+    const key = this.getKey(TABLE_MESSAGES, { threadId, id: messageId });
+    return key;
   }
   getThreadMessagesKey(threadId) {
     return `thread:${threadId}:messages`;
@@ -43238,6 +43264,14 @@ var UpstashStore = class extends MastraStorage {
   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`);
+    }
     const messagesWithIndex = messages.map((message, index) => ({
       ...message,
       _index: index
@@ -43248,7 +43282,8 @@ var UpstashStore = class extends MastraStorage {
       const pipeline = this.redis.pipeline();
       for (const message of batch) {
         const key = this.getMessageKey(message.threadId, message.id);
-        const score = message._index !== void 0 ? message._index : new Date(message.createdAt).getTime();
+        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,
@@ -43343,38 +43378,55 @@ var UpstashStore = class extends MastraStorage {
       limit = Number.MAX_SAFE_INTEGER;
     }
     const messageIds = /* @__PURE__ */ new Set();
+    const messageIdToThreadIds = {};
     if (limit === 0 && !selectBy?.include) {
       return [];
     }
     if (selectBy?.include?.length) {
       for (const item of selectBy.include) {
         messageIds.add(item.id);
-        if (item.withPreviousMessages || item.withNextMessages) {
-          const rank = await this.redis.zrank(threadMessagesKey, item.id);
-          if (rank === null) continue;
-          if (item.withPreviousMessages) {
-            const start = Math.max(0, rank - item.withPreviousMessages);
-            const prevIds = rank === 0 ? [] : await this.redis.zrange(threadMessagesKey, start, rank - 1);
-            prevIds.forEach((id) => messageIds.add(id));
-          }
-          if (item.withNextMessages) {
-            const nextIds = await this.redis.zrange(threadMessagesKey, rank + 1, rank + item.withNextMessages);
-            nextIds.forEach((id) => messageIds.add(id));
-          }
+        const itemThreadId = item.threadId || threadId;
+        messageIdToThreadIds[item.id] = itemThreadId;
+        const itemThreadMessagesKey = this.getThreadMessagesKey(itemThreadId);
+        const rank = await this.redis.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.redis.zrange(itemThreadMessagesKey, start, rank - 1);
+          prevIds.forEach((id) => {
+            messageIds.add(id);
+            messageIdToThreadIds[id] = itemThreadId;
+          });
+        }
+        if (item.withNextMessages) {
+          const nextIds = await this.redis.zrange(itemThreadMessagesKey, rank + 1, rank + item.withNextMessages);
+          nextIds.forEach((id) => {
+            messageIds.add(id);
+            messageIdToThreadIds[id] = itemThreadId;
+          });
         }
       }
     }
     if (limit === Number.MAX_SAFE_INTEGER) {
       const allIds = await this.redis.zrange(threadMessagesKey, 0, -1);
-      allIds.forEach((id) => messageIds.add(id));
+      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));
+      latestIds.forEach((id) => {
+        messageIds.add(id);
+        messageIdToThreadIds[id] = threadId;
+      });
     }
     const messages = (await Promise.all(
-      Array.from(messageIds).map(
-        async (id) => this.redis.get(this.getMessageKey(threadId, id))
-      )
+      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 prepared = messages.filter((message) => message !== null && message !== void 0).map((message) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/upstash",
-  "version": "0.10.3-alpha.1",
+  "version": "0.10.3-alpha.2",
   "description": "Upstash provider for Mastra - includes both vector and db storage capabilities",
   "type": "module",
   "main": "dist/index.js",
@@ -31,9 +31,9 @@
     "tsup": "^8.5.0",
     "typescript": "^5.8.2",
     "vitest": "^3.2.2",
-    "@internal/storage-test-utils": "0.0.6",
     "@internal/lint": "0.0.10",
-    "@mastra/core": "0.10.4-alpha.1"
+    "@internal/storage-test-utils": "0.0.6",
+    "@mastra/core": "0.10.4-alpha.2"
   },
   "peerDependencies": {
     "@mastra/core": "^0.10.2-alpha.0"

package/src/storage/index.ts

@@ -36,6 +36,14 @@ export class UpstashStore extends MastraStorage {
     });
   }
 
+  public get supports(): {
+    selectByIncludeResourceScope: boolean;
+  } {
+    return {
+      selectByIncludeResourceScope: true,
+    };
+  }
+
   private transformEvalRecord(record: Record<string, any>): EvalRow {
     // Parse JSON strings if needed
     let result = record.result;
@@ -136,7 +144,8 @@ export class UpstashStore extends MastraStorage {
   }
 
   private getMessageKey(threadId: string, messageId: string): string {
-    return this.getKey(TABLE_MESSAGES, { threadId, id: messageId });
+    const key = this.getKey(TABLE_MESSAGES, { threadId, id: messageId });
+    return key;
   }
 
   private getThreadMessagesKey(threadId: string): string {
@@ -664,6 +673,17 @@ export class UpstashStore extends MastraStorage {
     const { messages, format = 'v1' } = args;
     if (messages.length === 0) return [];
 
+    const threadId = messages[0]?.threadId;
+    if (!threadId) {
+      throw new Error('Thread ID is required');
+    }
+
+    // Check if thread exists
+    const thread = await this.getThreadById({ threadId });
+    if (!thread) {
+      throw new Error(`Thread ${threadId} not found`);
+    }
+
     // Add an index to each message to maintain order
     const messagesWithIndex = messages.map((message, index) => ({
       ...message,
@@ -676,7 +696,8 @@ export class UpstashStore extends MastraStorage {
       const pipeline = this.redis.pipeline();
       for (const message of batch) {
         const key = this.getMessageKey(message.threadId!, message.id);
-        const score = message._index !== undefined ? message._index : new Date(message.createdAt).getTime();
+        const createdAtScore = new Date(message.createdAt).getTime();
+        const score = message._index !== undefined ? message._index : createdAtScore;
 
         // Store the message data
         pipeline.set(key, message);
@@ -844,6 +865,7 @@ export class UpstashStore extends MastraStorage {
     }
 
     const messageIds = new Set<string>();
+    const messageIdToThreadIds: Record<string, string> = {};
 
     if (limit === 0 && !selectBy?.include) {
       return [];
@@ -854,23 +876,32 @@ export class UpstashStore extends MastraStorage {
       for (const item of selectBy.include) {
         messageIds.add(item.id);
 
-        if (item.withPreviousMessages || item.withNextMessages) {
-          // Get the rank of this message in the sorted set
-          const rank = await this.redis.zrank(threadMessagesKey, item.id);
-          if (rank === null) continue;
-
-          // Get previous messages if requested
-          if (item.withPreviousMessages) {
-            const start = Math.max(0, rank - item.withPreviousMessages);
-            const prevIds = rank === 0 ? [] : await this.redis.zrange(threadMessagesKey, start, rank - 1);
-            prevIds.forEach(id => messageIds.add(id as string));
-          }
+        // Use per-include threadId if present, else fallback to main threadId
+        const itemThreadId = item.threadId || threadId;
+        messageIdToThreadIds[item.id] = itemThreadId;
+        const itemThreadMessagesKey = this.getThreadMessagesKey(itemThreadId);
+
+        // Get the rank of this message in the sorted set
+        const rank = await this.redis.zrank(itemThreadMessagesKey, item.id);
+        if (rank === null) continue;
+
+        // Get previous messages if requested
+        if (item.withPreviousMessages) {
+          const start = Math.max(0, rank - item.withPreviousMessages);
+          const prevIds = rank === 0 ? [] : await this.redis.zrange(itemThreadMessagesKey, start, rank - 1);
+          prevIds.forEach(id => {
+            messageIds.add(id as string);
+            messageIdToThreadIds[id as string] = itemThreadId;
+          });
+        }
 
-          // Get next messages if requested
-          if (item.withNextMessages) {
-            const nextIds = await this.redis.zrange(threadMessagesKey, rank + 1, rank + item.withNextMessages);
-            nextIds.forEach(id => messageIds.add(id as string));
-          }
+        // Get next messages if requested
+        if (item.withNextMessages) {
+          const nextIds = await this.redis.zrange(itemThreadMessagesKey, rank + 1, rank + item.withNextMessages);
+          nextIds.forEach(id => {
+            messageIds.add(id as string);
+            messageIdToThreadIds[id as string] = itemThreadId;
+          });
         }
       }
     }
@@ -879,19 +910,29 @@ export class UpstashStore extends MastraStorage {
     if (limit === Number.MAX_SAFE_INTEGER) {
       // Get all messages
       const allIds = await this.redis.zrange(threadMessagesKey, 0, -1);
-      allIds.forEach(id => messageIds.add(id as string));
+      allIds.forEach(id => {
+        messageIds.add(id as string);
+        messageIdToThreadIds[id as string] = threadId;
+      });
     } else if (limit > 0) {
       // Get limited number of recent messages
       const latestIds = await this.redis.zrange(threadMessagesKey, -limit, -1);
-      latestIds.forEach(id => messageIds.add(id as string));
+      latestIds.forEach(id => {
+        messageIds.add(id as string);
+        messageIdToThreadIds[id as string] = threadId;
+      });
     }
 
     // Fetch all needed messages in parallel
     const messages = (
       await Promise.all(
-        Array.from(messageIds).map(async id =>
-          this.redis.get<MastraMessageV2 & { _index?: number }>(this.getMessageKey(threadId, id)),
-        ),
+        Array.from(messageIds).map(async id => {
+          const tId = messageIdToThreadIds[id] || threadId;
+          const byThreadId = await this.redis.get<MastraMessageV2 & { _index?: number }>(this.getMessageKey(tId, id));
+          if (byThreadId) return byThreadId;
+
+          return null;
+        }),
       )
     ).filter(msg => msg !== null) as (MastraMessageV2 & { _index?: number })[];
 

package/src/storage/upstash.test.ts

@@ -1,5 +1,10 @@
 import { randomUUID } from 'crypto';
-import { createSampleMessageV2, createSampleThread, createSampleWorkflowSnapshot } from '@internal/storage-test-utils';
+import {
+  checkWorkflowSnapshot,
+  createSampleMessageV2,
+  createSampleThread,
+  createSampleWorkflowSnapshot,
+} from '@internal/storage-test-utils';
 import type { MastraMessageV2 } from '@mastra/core';
 import type { TABLE_NAMES } from '@mastra/core/storage';
 import {
@@ -51,13 +56,6 @@ const createSampleEval = (agentName: string, isTest = false) => {
   };
 };
 
-const checkWorkflowSnapshot = (snapshot: WorkflowRunState | string, stepId: string, status: string) => {
-  if (typeof snapshot === 'string') {
-    throw new Error('Expected WorkflowRunState, got string');
-  }
-  expect(snapshot.context?.[stepId]?.status).toBe(status);
-};
-
 describe('UpstashStore', () => {
   let store: UpstashStore;
   const testTableName = 'test_table';
@@ -154,7 +152,7 @@ describe('UpstashStore', () => {
 
     it('should get threads by resource ID', async () => {
       const thread1 = createSampleThread();
-      const thread2 = { ...createSampleThread(), resourceId: thread1.resourceId };
+      const thread2 = createSampleThread({ resourceId: thread1.resourceId });
       const threads = [thread1, thread2];
 
       const resourceId = threads[0].resourceId;
@@ -187,7 +185,7 @@ describe('UpstashStore', () => {
     it('should fetch >100000 threads by resource ID', async () => {
       const resourceId = `resource-${randomUUID()}`;
       const total = 100_000;
-      const threads = Array.from({ length: total }, () => ({ ...createSampleThread(), resourceId }));
+      const threads = Array.from({ length: total }, () => createSampleThread({ resourceId }));
 
       await store.batchInsert({ tableName: TABLE_THREADS, records: threads });
 
@@ -300,13 +298,117 @@ describe('UpstashStore', () => {
         createSampleMessageV2({ threadId, content: 'Third' }),
       ];
 
-      await store.saveMessages({ messages: messages, format: 'v2' });
+      await store.saveMessages({ messages, format: 'v2' });
 
       const retrievedMessages = await store.getMessages({ threadId, format: 'v2' });
       expect(retrievedMessages).toHaveLength(3);
       expect(retrievedMessages.map((m: any) => m.content.parts[0].text)).toEqual(['First', 'Second', 'Third']);
     });
 
+    it('should retrieve messages w/ next/prev messages by message id + resource id', async () => {
+      const thread = createSampleThread({ id: 'thread-one' });
+      await store.saveThread({ thread });
+
+      const thread2 = createSampleThread({ id: 'thread-two' });
+      await store.saveThread({ thread: thread2 });
+
+      const thread3 = createSampleThread({ id: 'thread-three' });
+      await store.saveThread({ thread: thread3 });
+
+      const messages: MastraMessageV2[] = [
+        createSampleMessageV2({ threadId: 'thread-one', content: 'First', resourceId: 'cross-thread-resource' }),
+        createSampleMessageV2({ threadId: 'thread-one', content: 'Second', resourceId: 'cross-thread-resource' }),
+        createSampleMessageV2({ threadId: 'thread-one', content: 'Third', resourceId: 'cross-thread-resource' }),
+
+        createSampleMessageV2({ threadId: 'thread-two', content: 'Fourth', resourceId: 'cross-thread-resource' }),
+        createSampleMessageV2({ threadId: 'thread-two', content: 'Fifth', resourceId: 'cross-thread-resource' }),
+        createSampleMessageV2({ threadId: 'thread-two', content: 'Sixth', resourceId: 'cross-thread-resource' }),
+
+        createSampleMessageV2({ threadId: 'thread-three', content: 'Seventh', resourceId: 'other-resource' }),
+        createSampleMessageV2({ threadId: 'thread-three', content: 'Eighth', resourceId: 'other-resource' }),
+      ];
+
+      await store.saveMessages({ messages: messages, format: 'v2' });
+
+      const retrievedMessages = await store.getMessages({ threadId: 'thread-one', format: 'v2' });
+      expect(retrievedMessages).toHaveLength(3);
+      expect(retrievedMessages.map((m: any) => m.content.parts[0].text)).toEqual(['First', 'Second', 'Third']);
+
+      const retrievedMessages2 = await store.getMessages({ threadId: 'thread-two', format: 'v2' });
+      expect(retrievedMessages2).toHaveLength(3);
+      expect(retrievedMessages2.map((m: any) => m.content.parts[0].text)).toEqual(['Fourth', 'Fifth', 'Sixth']);
+
+      const retrievedMessages3 = await store.getMessages({ threadId: 'thread-three', format: 'v2' });
+      expect(retrievedMessages3).toHaveLength(2);
+      expect(retrievedMessages3.map((m: any) => m.content.parts[0].text)).toEqual(['Seventh', 'Eighth']);
+
+      const crossThreadMessages = await store.getMessages({
+        threadId: 'thread-doesnt-exist',
+        format: 'v2',
+        selectBy: {
+          last: 0,
+          include: [
+            {
+              id: messages[1].id,
+              threadId: 'thread-one',
+              withNextMessages: 2,
+              withPreviousMessages: 2,
+            },
+            {
+              id: messages[4].id,
+              threadId: 'thread-two',
+              withPreviousMessages: 2,
+              withNextMessages: 2,
+            },
+          ],
+        },
+      });
+
+      expect(crossThreadMessages).toHaveLength(6);
+      expect(crossThreadMessages.filter(m => m.threadId === `thread-one`)).toHaveLength(3);
+      expect(crossThreadMessages.filter(m => m.threadId === `thread-two`)).toHaveLength(3);
+
+      const crossThreadMessages2 = await store.getMessages({
+        threadId: 'thread-one',
+        format: 'v2',
+        selectBy: {
+          last: 0,
+          include: [
+            {
+              id: messages[4].id,
+              threadId: 'thread-two',
+              withPreviousMessages: 1,
+              withNextMessages: 1,
+            },
+          ],
+        },
+      });
+
+      expect(crossThreadMessages2).toHaveLength(3);
+      expect(crossThreadMessages2.filter(m => m.threadId === `thread-one`)).toHaveLength(0);
+      expect(crossThreadMessages2.filter(m => m.threadId === `thread-two`)).toHaveLength(3);
+
+      const crossThreadMessages3 = await store.getMessages({
+        threadId: 'thread-two',
+        format: 'v2',
+        selectBy: {
+          last: 0,
+          include: [
+            {
+              id: messages[1].id,
+              threadId: 'thread-one',
+              withNextMessages: 1,
+              withPreviousMessages: 1,
+            },
+          ],
+        },
+      });
+
+      expect(crossThreadMessages3).toHaveLength(3);
+      expect(crossThreadMessages3.filter(m => m.threadId === `thread-one`)).toHaveLength(3);
+      expect(crossThreadMessages3.filter(m => m.threadId === `thread-two`)).toHaveLength(0);
+    });
+
     it('should handle empty message array', async () => {
       const result = await store.saveMessages({ messages: [] });
       expect(result).toEqual([]);
@@ -1219,10 +1321,7 @@ describe('UpstashStore', () => {
     describe('Enhanced existing methods with pagination', () => {
       it('should support pagination in getThreadsByResourceId', async () => {
         const resourceId = 'enhanced-resource';
-        const threads = Array.from({ length: 17 }, () => ({
-          ...createSampleThread(),
-          resourceId,
-        }));
+        const threads = Array.from({ length: 17 }, () => createSampleThread({ resourceId }));
 
         for (const thread of threads) {
           await store.saveThread({ thread });