@mastra/cloudflare 1.0.0-beta.1 → 1.0.0-beta.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @mastra/cloudflare
 
+## 1.0.0-beta.2
+
+### Patch Changes
+
+- Fix message sorting in listMessages when using semantic recall (include parameter). Messages are now always sorted by createdAt instead of storage order, ensuring correct chronological ordering of conversation history. ([#10491](https://github.com/mastra-ai/mastra/pull/10491))
+
+- Updated dependencies [[`21a15de`](https://github.com/mastra-ai/mastra/commit/21a15de369fe82aac26bb642ed7be73505475e8b), [`feb7ee4`](https://github.com/mastra-ai/mastra/commit/feb7ee4d09a75edb46c6669a3beaceec78811747), [`b0e2ea5`](https://github.com/mastra-ai/mastra/commit/b0e2ea5b52c40fae438b9e2f7baee6f0f89c5442), [`c456e01`](https://github.com/mastra-ai/mastra/commit/c456e0149e3c176afcefdbd9bb1d2c5917723725), [`ab035c2`](https://github.com/mastra-ai/mastra/commit/ab035c2ef6d8cc7bb25f06f1a38508bd9e6f126b), [`1a46a56`](https://github.com/mastra-ai/mastra/commit/1a46a566f45a3fcbadc1cf36bf86d351f264bfa3), [`3cf540b`](https://github.com/mastra-ai/mastra/commit/3cf540b9fbfea8f4fc8d3a2319a4e6c0b0cbfd52), [`1c6ce51`](https://github.com/mastra-ai/mastra/commit/1c6ce51f875915ab57fd36873623013699a2a65d), [`898a972`](https://github.com/mastra-ai/mastra/commit/898a9727d286c2510d6b702dfd367e6aaf5c6b0f), [`a97003a`](https://github.com/mastra-ai/mastra/commit/a97003aa1cf2f4022a41912324a1e77263b326b8), [`ccc141e`](https://github.com/mastra-ai/mastra/commit/ccc141ed27da0abc3a3fc28e9e5128152e8e37f4), [`fe3b897`](https://github.com/mastra-ai/mastra/commit/fe3b897c2ccbcd2b10e81b099438c7337feddf89), [`00123ba`](https://github.com/mastra-ai/mastra/commit/00123ba96dc9e5cd0b110420ebdba56d8f237b25), [`29c4309`](https://github.com/mastra-ai/mastra/commit/29c4309f818b24304c041bcb4a8f19b5f13f6b62), [`16785ce`](https://github.com/mastra-ai/mastra/commit/16785ced928f6f22638f4488cf8a125d99211799), [`de8239b`](https://github.com/mastra-ai/mastra/commit/de8239bdcb1d8c0cfa06da21f1569912a66bbc8a), [`b5e6cd7`](https://github.com/mastra-ai/mastra/commit/b5e6cd77fc8c8e64e0494c1d06cee3d84e795d1e), [`3759cb0`](https://github.com/mastra-ai/mastra/commit/3759cb064935b5f74c65ac2f52a1145f7352899d), [`651e772`](https://github.com/mastra-ai/mastra/commit/651e772eb1475fb13e126d3fcc01751297a88214), [`b61b93f`](https://github.com/mastra-ai/mastra/commit/b61b93f9e058b11dd2eec169853175d31dbdd567), [`bae33d9`](https://github.com/mastra-ai/mastra/commit/bae33d91a63fbb64d1e80519e1fc1acaed1e9013), [`c0b731f`](https://github.com/mastra-ai/mastra/commit/c0b731fb27d712dc8582e846df5c0332a6a0c5ba), [`43ca8f2`](https://github.com/mastra-ai/mastra/commit/43ca8f2c7334851cc7b4d3d2f037d8784bfbdd5f), [`2ca67cc`](https://github.com/mastra-ai/mastra/commit/2ca67cc3bb1f6a617353fdcab197d9efebe60d6f), [`9e67002`](https://github.com/mastra-ai/mastra/commit/9e67002b52c9be19936c420a489dbee9c5fd6a78), [`35edc49`](https://github.com/mastra-ai/mastra/commit/35edc49ac0556db609189641d6341e76771b81fc)]:
+  - @mastra/core@1.0.0-beta.5
+
 ## 1.0.0-beta.1
 
 ### Patch Changes

package/dist/index.cjs

@@ -578,69 +578,32 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
         );
       }
       const { field, direction } = this.parseOrderBy(orderBy, "ASC");
-      const messageIds = /* @__PURE__ */ new Set();
-      const hasFilters = !!resourceId || !!filter?.dateRange;
-      if (hasFilters || perPage === Number.MAX_SAFE_INTEGER) {
-        try {
-          const threadMessagesKey = this.getThreadMessagesKey(threadId);
-          const allIds = await this.getFullOrder(threadMessagesKey);
-          allIds.forEach((id) => messageIds.add(id));
-        } catch {
-        }
-      } else {
-        if (perPage > 0) {
-          try {
-            const threadMessagesKey = this.getThreadMessagesKey(threadId);
-            const fullOrder = await this.getFullOrder(threadMessagesKey);
-            const totalMessages = fullOrder.length;
-            let start;
-            let end;
-            if (direction === "ASC") {
-              start = offset;
-              end = Math.min(offset + perPage - 1, totalMessages - 1);
-            } else {
-              start = Math.max(totalMessages - offset - perPage, 0);
-              end = totalMessages - offset - 1;
-            }
-            const paginatedIds = await this.getRange(threadMessagesKey, start, end);
-            paginatedIds.forEach((id) => messageIds.add(id));
-          } catch {
-          }
-        }
-      }
-      if (include && include.length > 0) {
-        await this.getIncludedMessagesWithContext(threadId, include, messageIds);
+      const threadMessageIds = /* @__PURE__ */ new Set();
+      try {
+        const threadMessagesKey = this.getThreadMessagesKey(threadId);
+        const allIds = await this.getFullOrder(threadMessagesKey);
+        allIds.forEach((id) => threadMessageIds.add(id));
+      } catch {
       }
-      const messages = await this.fetchAndParseMessagesFromMultipleThreads(
-        Array.from(messageIds),
-        include,
-        include && include.length > 0 ? void 0 : threadId
+      const threadMessages = await this.fetchAndParseMessagesFromMultipleThreads(
+        Array.from(threadMessageIds),
+        void 0,
+        threadId
       );
-      let filteredMessages = messages;
+      let filteredThreadMessages = threadMessages;
       if (resourceId) {
-        filteredMessages = filteredMessages.filter((msg) => msg.resourceId === resourceId);
+        filteredThreadMessages = filteredThreadMessages.filter((msg) => msg.resourceId === resourceId);
       }
       const dateRange = filter?.dateRange;
       if (dateRange) {
-        filteredMessages = filteredMessages.filter((msg) => {
+        filteredThreadMessages = filteredThreadMessages.filter((msg) => {
           const messageDate = new Date(msg.createdAt);
           if (dateRange.start && messageDate < new Date(dateRange.start)) return false;
           if (dateRange.end && messageDate > new Date(dateRange.end)) return false;
           return true;
         });
       }
-      let total;
-      if (hasFilters) {
-        total = filteredMessages.length;
-      } else {
-        try {
-          const threadMessagesKey = this.getThreadMessagesKey(threadId);
-          const fullOrder = await this.getFullOrder(threadMessagesKey);
-          total = fullOrder.length;
-        } catch {
-          total = filteredMessages.length;
-        }
-      }
+      const total = filteredThreadMessages.length;
       if (perPage === 0 && (!include || include.length === 0)) {
         return {
           messages: [],
@@ -650,45 +613,58 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
           hasMore: offset < total
         };
       }
-      if (hasFilters && perPage !== Number.MAX_SAFE_INTEGER && perPage > 0) {
-        if (direction === "ASC") {
-          filteredMessages = filteredMessages.slice(offset, offset + perPage);
-        } else {
-          const start = Math.max(filteredMessages.length - offset - perPage, 0);
-          const end = filteredMessages.length - offset;
-          filteredMessages = filteredMessages.slice(start, end);
+      filteredThreadMessages.sort((a, b) => {
+        const timeA = new Date(a.createdAt).getTime();
+        const timeB = new Date(b.createdAt).getTime();
+        const timeDiff = direction === "ASC" ? timeA - timeB : timeB - timeA;
+        if (timeDiff === 0) {
+          return a.id.localeCompare(b.id);
         }
+        return timeDiff;
+      });
+      let paginatedMessages;
+      if (perPage === 0) {
+        paginatedMessages = [];
+      } else if (perPage === Number.MAX_SAFE_INTEGER) {
+        paginatedMessages = filteredThreadMessages;
+      } else {
+        paginatedMessages = filteredThreadMessages.slice(offset, offset + perPage);
       }
-      const paginatedCount = hasFilters && perPage !== Number.MAX_SAFE_INTEGER && perPage > 0 ? filteredMessages.length : filteredMessages.length;
-      try {
-        const threadMessagesKey = this.getThreadMessagesKey(threadId);
-        const messageOrder = await this.getFullOrder(threadMessagesKey);
-        const orderMap = new Map(messageOrder.map((id, index) => [id, index]));
-        filteredMessages.sort((a, b) => {
-          const indexA = orderMap.get(a.id);
-          const indexB = orderMap.get(b.id);
-          if (indexA !== void 0 && indexB !== void 0) {
-            return direction === "ASC" ? indexA - indexB : indexB - indexA;
-          }
-          const timeA = new Date(a.createdAt).getTime();
-          const timeB = new Date(b.createdAt).getTime();
-          const timeDiff = direction === "ASC" ? timeA - timeB : timeB - timeA;
-          if (timeDiff === 0) {
-            return a.id.localeCompare(b.id);
-          }
-          return timeDiff;
-        });
-      } catch {
-        filteredMessages.sort((a, b) => {
-          const timeA = new Date(a.createdAt).getTime();
-          const timeB = new Date(b.createdAt).getTime();
-          const timeDiff = direction === "ASC" ? timeA - timeB : timeB - timeA;
-          if (timeDiff === 0) {
-            return a.id.localeCompare(b.id);
-          }
-          return timeDiff;
-        });
+      let includedMessages = [];
+      if (include && include.length > 0) {
+        const includedMessageIds = /* @__PURE__ */ new Set();
+        await this.getIncludedMessagesWithContext(threadId, include, includedMessageIds);
+        const paginatedIds = new Set(paginatedMessages.map((m) => m.id));
+        const idsToFetch = Array.from(includedMessageIds).filter((id) => !paginatedIds.has(id));
+        if (idsToFetch.length > 0) {
+          includedMessages = await this.fetchAndParseMessagesFromMultipleThreads(idsToFetch, include, void 0);
+        }
+      }
+      const seenIds = /* @__PURE__ */ new Set();
+      const allMessages = [];
+      for (const msg of paginatedMessages) {
+        if (!seenIds.has(msg.id)) {
+          allMessages.push(msg);
+          seenIds.add(msg.id);
+        }
+      }
+      for (const msg of includedMessages) {
+        if (!seenIds.has(msg.id)) {
+          allMessages.push(msg);
+          seenIds.add(msg.id);
+        }
       }
+      allMessages.sort((a, b) => {
+        const timeA = new Date(a.createdAt).getTime();
+        const timeB = new Date(b.createdAt).getTime();
+        const timeDiff = direction === "ASC" ? timeA - timeB : timeB - timeA;
+        if (timeDiff === 0) {
+          return a.id.localeCompare(b.id);
+        }
+        return timeDiff;
+      });
+      let filteredMessages = allMessages;
+      const paginatedCount = paginatedMessages.length;
       if (total === 0 && filteredMessages.length === 0 && (!include || include.length === 0)) {
         return {
           messages: [],
@@ -721,14 +697,7 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
       });
       const returnedThreadMessageIds = new Set(finalMessages.filter((m) => m.threadId === threadId).map((m) => m.id));
       const allThreadMessagesReturned = returnedThreadMessageIds.size >= total;
-      let hasMore;
-      if (perPageInput === false || allThreadMessagesReturned) {
-        hasMore = false;
-      } else if (direction === "ASC") {
-        hasMore = offset + paginatedCount < total;
-      } else {
-        hasMore = total - offset - perPage > 0;
-      }
+      const hasMore = perPageInput !== false && !allThreadMessagesReturned && offset + paginatedCount < total;
       return {
         messages: finalMessages,
         total,