@mastra/cloudflare 0.10.2-alpha.1 → 0.10.2-alpha.3

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

@@ -1,9 +1,11 @@
 import type { EvalRow } from '@mastra/core/storage';
 import type { KVNamespace as KVNamespace_2 } from '@cloudflare/workers-types';
 import { KVNamespaceListKey as KVNamespaceListKey_2 } from '@cloudflare/workers-types';
+import type { MastraMessageV1 } from '@mastra/core/memory';
+import type { MastraMessageV2 } from '@mastra/core/agent';
+import type { MastraMessageV2 as MastraMessageV2_2 } from '@mastra/core/memory';
+import type { MastraMessageV2 as MastraMessageV2_3 } from '@mastra/core';
 import { MastraStorage } from '@mastra/core/storage';
-import type { MessageType } from '@mastra/core/memory';
-import type { MessageType as MessageType_2 } from '@mastra/core';
 import type { StorageColumn } from '@mastra/core/storage';
 import type { StorageGetMessagesArg } from '@mastra/core/storage';
 import type { StorageThreadType } from '@mastra/core/memory';
@@ -144,10 +146,20 @@ declare class CloudflareStore extends MastraStorage {
     }): Promise<void>;
     private getMessageKey;
     private getThreadMessagesKey;
-    saveMessages({ messages }: {
-        messages: MessageType[];
-    }): Promise<MessageType[]>;
-    getMessages<T extends MessageType = MessageType>({ threadId, selectBy }: StorageGetMessagesArg): Promise<T[]>;
+    saveMessages(args: {
+        messages: MastraMessageV1[];
+        format?: undefined | 'v1';
+    }): Promise<MastraMessageV1[]>;
+    saveMessages(args: {
+        messages: MastraMessageV2[];
+        format: 'v2';
+    }): Promise<MastraMessageV2[]>;
+    getMessages(args: StorageGetMessagesArg & {
+        format?: 'v1';
+    }): Promise<MastraMessageV1[]>;
+    getMessages(args: StorageGetMessagesArg & {
+        format: 'v2';
+    }): Promise<MastraMessageV2[]>;
     private validateWorkflowParams;
     private validateWorkflowState;
     private normalizeSteps;
@@ -216,7 +228,7 @@ export declare interface CloudflareWorkersConfig {
     keyPrefix?: string;
 }
 
-export declare const createSampleMessage: (threadId: string) => MessageType_2;
+export declare const createSampleMessage: (threadId: string, parts?: MastraMessageV2_3["content"]["parts"]) => MastraMessageV2_3;
 
 export declare const createSampleThread: () => {
     id: string;
@@ -278,7 +290,7 @@ export declare type ListOptions = {
 
 export declare type RecordTypes = {
     [TABLE_THREADS]: StorageThreadType;
-    [TABLE_MESSAGES]: MessageType;
+    [TABLE_MESSAGES]: MastraMessageV2_2;
     [TABLE_WORKFLOW_SNAPSHOT]: WorkflowRunState;
     [TABLE_EVALS]: EvalRow;
     [TABLE_TRACES]: any;

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

@@ -1,9 +1,11 @@
 import type { EvalRow } from '@mastra/core/storage';
 import type { KVNamespace as KVNamespace_2 } from '@cloudflare/workers-types';
 import { KVNamespaceListKey as KVNamespaceListKey_2 } from '@cloudflare/workers-types';
+import type { MastraMessageV1 } from '@mastra/core/memory';
+import type { MastraMessageV2 } from '@mastra/core/agent';
+import type { MastraMessageV2 as MastraMessageV2_2 } from '@mastra/core/memory';
+import type { MastraMessageV2 as MastraMessageV2_3 } from '@mastra/core';
 import { MastraStorage } from '@mastra/core/storage';
-import type { MessageType } from '@mastra/core/memory';
-import type { MessageType as MessageType_2 } from '@mastra/core';
 import type { StorageColumn } from '@mastra/core/storage';
 import type { StorageGetMessagesArg } from '@mastra/core/storage';
 import type { StorageThreadType } from '@mastra/core/memory';
@@ -144,10 +146,20 @@ declare class CloudflareStore extends MastraStorage {
     }): Promise<void>;
     private getMessageKey;
     private getThreadMessagesKey;
-    saveMessages({ messages }: {
-        messages: MessageType[];
-    }): Promise<MessageType[]>;
-    getMessages<T extends MessageType = MessageType>({ threadId, selectBy }: StorageGetMessagesArg): Promise<T[]>;
+    saveMessages(args: {
+        messages: MastraMessageV1[];
+        format?: undefined | 'v1';
+    }): Promise<MastraMessageV1[]>;
+    saveMessages(args: {
+        messages: MastraMessageV2[];
+        format: 'v2';
+    }): Promise<MastraMessageV2[]>;
+    getMessages(args: StorageGetMessagesArg & {
+        format?: 'v1';
+    }): Promise<MastraMessageV1[]>;
+    getMessages(args: StorageGetMessagesArg & {
+        format: 'v2';
+    }): Promise<MastraMessageV2[]>;
     private validateWorkflowParams;
     private validateWorkflowState;
     private normalizeSteps;
@@ -216,7 +228,7 @@ export declare interface CloudflareWorkersConfig {
     keyPrefix?: string;
 }
 
-export declare const createSampleMessage: (threadId: string) => MessageType_2;
+export declare const createSampleMessage: (threadId: string, parts?: MastraMessageV2_3["content"]["parts"]) => MastraMessageV2_3;
 
 export declare const createSampleThread: () => {
     id: string;
@@ -278,7 +290,7 @@ export declare type ListOptions = {
 
 export declare type RecordTypes = {
     [TABLE_THREADS]: StorageThreadType;
-    [TABLE_MESSAGES]: MessageType;
+    [TABLE_MESSAGES]: MastraMessageV2_2;
     [TABLE_WORKFLOW_SNAPSHOT]: WorkflowRunState;
     [TABLE_EVALS]: EvalRow;
     [TABLE_TRACES]: any;

package/dist/index.cjs

@@ -1,5 +1,6 @@
 'use strict';
 
+var agent = require('@mastra/core/agent');
 var storage = require('@mastra/core/storage');
 var Cloudflare = require('cloudflare');
 
@@ -812,7 +813,8 @@ var CloudflareStore = class extends storage.MastraStorage {
       throw error;
     }
   }
-  async saveMessages({ messages }) {
+  async saveMessages(args) {
+    const { messages, format = "v1" } = args;
     if (!Array.isArray(messages) || messages.length === 0) return [];
     try {
       const validatedMessages = messages.map((message, index) => {
@@ -833,10 +835,12 @@ var CloudflareStore = class extends storage.MastraStorage {
         };
       });
       const messagesByThread = validatedMessages.reduce((acc, message) => {
-        if (!acc.has(message.threadId)) {
+        if (message.threadId && !acc.has(message.threadId)) {
           acc.set(message.threadId, []);
         }
-        acc.get(message.threadId).push(message);
+        if (message.threadId) {
+          acc.get(message.threadId).push(message);
+        }
         return acc;
       }, /* @__PURE__ */ new Map());
       await Promise.all(
@@ -848,7 +852,7 @@ var CloudflareStore = class extends storage.MastraStorage {
             }
             await Promise.all(
               threadMessages.map(async (message) => {
-                const key = await this.getMessageKey(threadId, message.id);
+                const key = this.getMessageKey(threadId, message.id);
                 const { _index, ...cleanMessage } = message;
                 const serializedMessage = {
                   ...cleanMessage,
@@ -867,16 +871,24 @@ var CloudflareStore = class extends storage.MastraStorage {
           }
         })
       );
-      return validatedMessages.map(
+      const prepared = validatedMessages.map(
         ({ _index, ...message }) => ({ ...message, type: message.type !== "v2" ? message.type : void 0 })
       );
+      const list = new agent.MessageList().add(prepared, "memory");
+      if (format === `v2`) return list.get.all.v2();
+      return list.get.all.v1();
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
       this.logger.error(`Error saving messages: ${errorMessage}`);
       throw error;
     }
   }
-  async getMessages({ threadId, selectBy }) {
+  async getMessages({
+    threadId,
+    resourceId,
+    selectBy,
+    format
+  }) {
     if (!threadId) throw new Error("threadId is required");
     let limit = 40;
     if (typeof selectBy?.last === "number") {
@@ -908,11 +920,14 @@ var CloudflareStore = class extends storage.MastraStorage {
         this.logger.warn(`Error sorting messages, falling back to creation time: ${errorMessage}`);
         messages.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
       }
-      return messages.map(({ _index, ...message }) => ({
+      const prepared = messages.map(({ _index, ...message }) => ({
         ...message,
         type: message.type === `v2` ? void 0 : message.type,
         createdAt: this.ensureDate(message.createdAt)
       }));
+      const list = new agent.MessageList({ threadId, resourceId }).add(prepared, "memory");
+      if (format === `v1`) return list.get.all.v1();
+      return list.get.all.v2();
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
       this.logger.error(`Error retrieving messages for thread ${threadId}: ${errorMessage}`);
@@ -946,6 +961,7 @@ var CloudflareStore = class extends storage.MastraStorage {
       runId: data.runId,
       value: data.value,
       context: data.context,
+      serializedStepGraph: data.serializedStepGraph,
       suspendedPaths: data.suspendedPaths || {},
       activePaths: data.activePaths || [],
       timestamp: data.timestamp || Date.now()

package/dist/index.js

@@ -1,3 +1,4 @@
+import { MessageList } from '@mastra/core/agent';
 import { MastraStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_WORKFLOW_SNAPSHOT, TABLE_EVALS, TABLE_TRACES } from '@mastra/core/storage';
 import Cloudflare from 'cloudflare';
 
@@ -806,7 +807,8 @@ var CloudflareStore = class extends MastraStorage {
       throw error;
     }
   }
-  async saveMessages({ messages }) {
+  async saveMessages(args) {
+    const { messages, format = "v1" } = args;
     if (!Array.isArray(messages) || messages.length === 0) return [];
     try {
       const validatedMessages = messages.map((message, index) => {
@@ -827,10 +829,12 @@ var CloudflareStore = class extends MastraStorage {
         };
       });
       const messagesByThread = validatedMessages.reduce((acc, message) => {
-        if (!acc.has(message.threadId)) {
+        if (message.threadId && !acc.has(message.threadId)) {
           acc.set(message.threadId, []);
         }
-        acc.get(message.threadId).push(message);
+        if (message.threadId) {
+          acc.get(message.threadId).push(message);
+        }
         return acc;
       }, /* @__PURE__ */ new Map());
       await Promise.all(
@@ -842,7 +846,7 @@ var CloudflareStore = class extends MastraStorage {
             }
             await Promise.all(
               threadMessages.map(async (message) => {
-                const key = await this.getMessageKey(threadId, message.id);
+                const key = this.getMessageKey(threadId, message.id);
                 const { _index, ...cleanMessage } = message;
                 const serializedMessage = {
                   ...cleanMessage,
@@ -861,16 +865,24 @@ var CloudflareStore = class extends MastraStorage {
           }
         })
       );
-      return validatedMessages.map(
+      const prepared = validatedMessages.map(
         ({ _index, ...message }) => ({ ...message, type: message.type !== "v2" ? message.type : void 0 })
       );
+      const list = new MessageList().add(prepared, "memory");
+      if (format === `v2`) return list.get.all.v2();
+      return list.get.all.v1();
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
       this.logger.error(`Error saving messages: ${errorMessage}`);
       throw error;
     }
   }
-  async getMessages({ threadId, selectBy }) {
+  async getMessages({
+    threadId,
+    resourceId,
+    selectBy,
+    format
+  }) {
     if (!threadId) throw new Error("threadId is required");
     let limit = 40;
     if (typeof selectBy?.last === "number") {
@@ -902,11 +914,14 @@ var CloudflareStore = class extends MastraStorage {
         this.logger.warn(`Error sorting messages, falling back to creation time: ${errorMessage}`);
         messages.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
       }
-      return messages.map(({ _index, ...message }) => ({
+      const prepared = messages.map(({ _index, ...message }) => ({
         ...message,
         type: message.type === `v2` ? void 0 : message.type,
         createdAt: this.ensureDate(message.createdAt)
       }));
+      const list = new MessageList({ threadId, resourceId }).add(prepared, "memory");
+      if (format === `v1`) return list.get.all.v1();
+      return list.get.all.v2();
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
       this.logger.error(`Error retrieving messages for thread ${threadId}: ${errorMessage}`);
@@ -940,6 +955,7 @@ var CloudflareStore = class extends MastraStorage {
       runId: data.runId,
       value: data.value,
       context: data.context,
+      serializedStepGraph: data.serializedStepGraph,
       suspendedPaths: data.suspendedPaths || {},
       activePaths: data.activePaths || [],
       timestamp: data.timestamp || Date.now()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/cloudflare",
-  "version": "0.10.2-alpha.1",
+  "version": "0.10.2-alpha.3",
   "description": "Cloudflare provider for Mastra - includes db storage capabilities",
   "type": "module",
   "files": [
@@ -36,10 +36,10 @@
     "typescript": "^5.8.2",
     "vitest": "^3.1.2",
     "@internal/lint": "0.0.7",
-    "@mastra/core": "0.10.2-alpha.1"
+    "@mastra/core": "0.10.2-alpha.4"
   },
   "peerDependencies": {
-    "@mastra/core": "^0.10.0"
+    "@mastra/core": "^0.10.0-alpha.0"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting",