@mastra/cloudflare 0.0.0-update-scorers-api-20250801170445 → 0.0.0-usechat-duplicate-20251016110554

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export * from './storage';
+export * from './storage/index.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,7 +1,8 @@
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { MastraStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_WORKFLOW_SNAPSHOT, TABLE_EVALS, TABLE_SCORERS, TABLE_TRACES, StoreOperations, serializeDate, ensureDate, LegacyEvalsStorage, WorkflowsStorage, TracesStorage, MemoryStorage, resolveMessageLimit, TABLE_RESOURCES, ScoresStorage } from '@mastra/core/storage';
+import { MastraStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_WORKFLOW_SNAPSHOT, TABLE_EVALS, TABLE_SCORERS, TABLE_TRACES, StoreOperations, serializeDate, ensureDate, LegacyEvalsStorage, WorkflowsStorage, TracesStorage, MemoryStorage, resolveMessageLimit, TABLE_RESOURCES, ScoresStorage, safelyParseJSON } from '@mastra/core/storage';
 import Cloudflare from 'cloudflare';
 import { MessageList } from '@mastra/core/agent';
+import { saveScorePayloadSchema } from '@mastra/core/scores';
 
 // src/storage/index.ts
 var LegacyEvalsStorageCloudflare = class extends LegacyEvalsStorage {
@@ -463,9 +464,9 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
       const messageMigrationTasks = [];
       for (const message of validatedMessages) {
         const existingMessage = await this.findMessageInAnyThread(message.id);
-        console.log(`Checking message ${message.id}: existing=${existingMessage?.threadId}, new=${message.threadId}`);
+        console.info(`Checking message ${message.id}: existing=${existingMessage?.threadId}, new=${message.threadId}`);
         if (existingMessage && existingMessage.threadId && existingMessage.threadId !== message.threadId) {
-          console.log(`Migrating message ${message.id} from ${existingMessage.threadId} to ${message.threadId}`);
+          console.info(`Migrating message ${message.id} from ${existingMessage.threadId} to ${message.threadId}`);
           messageMigrationTasks.push(this.migrateMessage(message.id, existingMessage.threadId, message.threadId));
         }
       }
@@ -494,7 +495,7 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
                   ...cleanMessage,
                   createdAt: serializeDate(cleanMessage.createdAt)
                 };
-                console.log(`Saving message ${message.id} with content:`, {
+                console.info(`Saving message ${message.id} with content:`, {
                   content: serializedMessage.content,
                   contentType: typeof serializedMessage.content,
                   isArray: Array.isArray(serializedMessage.content)
@@ -590,13 +591,14 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
     );
   }
   async getRecentMessages(threadId, limit, messageIds) {
+    if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
     if (limit <= 0) return;
     try {
       const threadMessagesKey = this.getThreadMessagesKey(threadId);
       const latestIds = await this.getLastN(threadMessagesKey, limit);
       latestIds.forEach((id) => messageIds.add(id));
     } catch {
-      console.log(`No message order found for thread ${threadId}, skipping latest messages`);
+      console.info(`No message order found for thread ${threadId}, skipping latest messages`);
     }
   }
   async fetchAndParseMessagesFromMultipleThreads(messageIds, include, targetThreadId) {
@@ -627,7 +629,7 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
           const data = await this.operations.getKV(TABLE_MESSAGES, key);
           if (!data) return null;
           const parsed = typeof data === "string" ? JSON.parse(data) : data;
-          console.log(`Retrieved message ${id} from thread ${threadId} with content:`, {
+          console.info(`Retrieved message ${id} from thread ${threadId} with content:`, {
             content: parsed.content,
             contentType: typeof parsed.content,
             isArray: Array.isArray(parsed.content)
@@ -648,15 +650,14 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
     selectBy,
     format
   }) {
-    console.log(`getMessages called with format: ${format}, threadId: ${threadId}`);
-    if (!threadId) throw new Error("threadId is required");
+    console.info(`getMessages called with format: ${format}, threadId: ${threadId}`);
     const actualFormat = format || "v1";
-    console.log(`Using format: ${actualFormat}`);
-    if (!threadId) throw new Error("threadId is required");
+    console.info(`Using format: ${actualFormat}`);
     const limit = resolveMessageLimit({ last: selectBy?.last, defaultLimit: 40 });
     const messageIds = /* @__PURE__ */ new Set();
     if (limit === 0 && !selectBy?.include?.length) return [];
     try {
+      if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
       await Promise.all([
         selectBy?.include?.length ? this.getIncludedMessagesWithContext(threadId, selectBy.include, messageIds) : Promise.resolve(),
         limit > 0 ? this.getRecentMessages(threadId, limit, messageIds) : Promise.resolve()
@@ -701,7 +702,7 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
         createdAt: ensureDate(message.createdAt)
       }));
       if (actualFormat === `v1`) {
-        console.log(`Processing ${prepared.length} messages for v1 format - returning directly without MessageList`);
+        console.info(`Processing ${prepared.length} messages for v1 format - returning directly without MessageList`);
         return prepared.map((msg) => ({
           ...msg,
           createdAt: new Date(msg.createdAt)
@@ -717,7 +718,43 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
           category: ErrorCategory.THIRD_PARTY,
           text: `Error retrieving messages for thread ${threadId}`,
           details: {
-            threadId
+            threadId,
+            resourceId: resourceId ?? ""
+          }
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
+      return [];
+    }
+  }
+  async getMessagesById({
+    messageIds,
+    format
+  }) {
+    if (messageIds.length === 0) return [];
+    try {
+      const messages = (await Promise.all(messageIds.map((id) => this.findMessageInAnyThread(id)))).filter(
+        (result) => !!result
+      );
+      const prepared = messages.map(({ _index, ...message }) => ({
+        ...message,
+        ...message.type !== `v2` && { type: message.type },
+        createdAt: ensureDate(message.createdAt)
+      }));
+      const list = new MessageList().add(prepared, "memory");
+      if (format === `v1`) return list.get.all.v1();
+      return list.get.all.v2();
+    } catch (error) {
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_GET_MESSAGES_BY_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Error retrieving messages by ID`,
+          details: {
+            messageIds: JSON.stringify(messageIds)
           }
         },
         error
@@ -728,9 +765,10 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
     }
   }
   async getMessagesPaginated(args) {
+    const { threadId, resourceId, selectBy, format = "v1" } = args;
+    const { page = 0, perPage = 100 } = selectBy?.pagination || {};
     try {
-      const { threadId, selectBy, format = "v1" } = args;
-      const { page = 0, perPage = 100 } = selectBy?.pagination || {};
+      if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
       const messages = format === "v2" ? await this.getMessages({ threadId, selectBy, format: "v2" }) : await this.getMessages({ threadId, selectBy, format: "v1" });
       let filteredMessages = messages;
       if (selectBy?.pagination?.dateRange) {
@@ -753,15 +791,22 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
         messages: paginatedMessages
       };
     } catch (error) {
-      throw new MastraError(
+      const mastraError = new MastraError(
         {
           id: "CLOUDFLARE_STORAGE_GET_MESSAGES_PAGINATED_FAILED",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          text: "Failed to get messages with pagination"
+          text: "Failed to get messages with pagination",
+          details: {
+            threadId,
+            resourceId: resourceId ?? ""
+          }
         },
         error
       );
+      this.logger?.trackException?.(mastraError);
+      this.logger?.error?.(mastraError.toString());
+      return { messages: [], total: 0, page, perPage: perPage || 40, hasMore: false };
     }
   }
   async updateMessages(args) {
@@ -1529,18 +1574,17 @@ var StoreOperationsCloudflare = class extends StoreOperations {
   }
 };
 function transformScoreRow(row) {
-  let input = void 0;
-  if (row.input) {
-    try {
-      input = JSON.parse(row.input);
-    } catch {
-      input = row.input;
-    }
-  }
-  return {
-    ...row,
-    input
-  };
+  const deserialized = { ...row };
+  deserialized.input = safelyParseJSON(row.input);
+  deserialized.output = safelyParseJSON(row.output);
+  deserialized.scorer = safelyParseJSON(row.scorer);
+  deserialized.preprocessStepResult = safelyParseJSON(row.preprocessStepResult);
+  deserialized.analyzeStepResult = safelyParseJSON(row.analyzeStepResult);
+  deserialized.metadata = safelyParseJSON(row.metadata);
+  deserialized.additionalContext = safelyParseJSON(row.additionalContext);
+  deserialized.runtimeContext = safelyParseJSON(row.runtimeContext);
+  deserialized.entity = safelyParseJSON(row.entity);
+  return deserialized;
 }
 var ScoresStorageCloudflare = class extends ScoresStorage {
   operations;
@@ -1571,10 +1615,24 @@ var ScoresStorageCloudflare = class extends ScoresStorage {
     }
   }
   async saveScore(score) {
+    let parsedScore;
     try {
-      const { input, ...rest } = score;
+      parsedScore = saveScorePayloadSchema.parse(score);
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_SAVE_SCORE_FAILED_INVALID_SCORE_PAYLOAD",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: { scoreId: score.id }
+        },
+        error
+      );
+    }
+    try {
+      const id = crypto.randomUUID();
       const serializedRecord = {};
-      for (const [key, value] of Object.entries(rest)) {
+      for (const [key, value] of Object.entries(parsedScore)) {
         if (value !== null && value !== void 0) {
           if (typeof value === "object") {
             serializedRecord[key] = JSON.stringify(value);
@@ -1585,12 +1643,12 @@ var ScoresStorageCloudflare = class extends ScoresStorage {
           serializedRecord[key] = null;
         }
       }
-      serializedRecord.input = JSON.stringify(input);
+      serializedRecord.id = id;
       serializedRecord.createdAt = (/* @__PURE__ */ new Date()).toISOString();
       serializedRecord.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
       await this.operations.putKV({
         tableName: TABLE_SCORERS,
-        key: score.id,
+        key: id,
         value: serializedRecord
       });
       const scoreFromDb = await this.getScoreById({ id: score.id });
@@ -1612,6 +1670,9 @@ var ScoresStorageCloudflare = class extends ScoresStorage {
   }
   async getScoresByScorerId({
     scorerId,
+    entityId,
+    entityType,
+    source,
     pagination
   }) {
     try {
@@ -1619,6 +1680,15 @@ var ScoresStorageCloudflare = class extends ScoresStorage {
       const scores = [];
       for (const { name: key } of keys) {
         const score = await this.operations.getKV(TABLE_SCORERS, key);
+        if (entityId && score.entityId !== entityId) {
+          continue;
+        }
+        if (entityType && score.entityType !== entityType) {
+          continue;
+        }
+        if (source && score.source !== source) {
+          continue;
+        }
         if (score && score.scorerId === scorerId) {
           scores.push(transformScoreRow(score));
         }
@@ -1749,6 +1819,50 @@ var ScoresStorageCloudflare = class extends ScoresStorage {
       return { pagination: { total: 0, page: 0, perPage: 100, hasMore: false }, scores: [] };
     }
   }
+  async getScoresBySpan({
+    traceId,
+    spanId,
+    pagination
+  }) {
+    try {
+      const keys = await this.operations.listKV(TABLE_SCORERS);
+      const scores = [];
+      for (const { name: key } of keys) {
+        const score = await this.operations.getKV(TABLE_SCORERS, key);
+        if (score && score.traceId === traceId && score.spanId === spanId) {
+          scores.push(transformScoreRow(score));
+        }
+      }
+      scores.sort((a, b) => {
+        const dateA = new Date(a.createdAt || 0).getTime();
+        const dateB = new Date(b.createdAt || 0).getTime();
+        return dateB - dateA;
+      });
+      const total = scores.length;
+      const start = pagination.page * pagination.perPage;
+      const end = start + pagination.perPage;
+      const pagedScores = scores.slice(start, end);
+      return {
+        pagination: {
+          total,
+          page: pagination.page,
+          perPage: pagination.perPage,
+          hasMore: end < total
+        },
+        scores: pagedScores
+      };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_SCORES_GET_SCORES_BY_SPAN_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to get scores by span: traceId=${traceId}, spanId=${spanId}`
+        },
+        error
+      );
+    }
+  }
 };
 var TracesStorageCloudflare = class extends TracesStorage {
   operations;
@@ -1882,15 +1996,32 @@ var WorkflowsStorageCloudflare = class extends WorkflowsStorage {
       throw new Error("Invalid workflow snapshot parameters");
     }
   }
+  updateWorkflowResults({
+    // workflowName,
+    // runId,
+    // stepId,
+    // result,
+    // runtimeContext,
+  }) {
+    throw new Error("Method not implemented.");
+  }
+  updateWorkflowState({
+    // workflowName,
+    // runId,
+    // opts,
+  }) {
+    throw new Error("Method not implemented.");
+  }
   async persistWorkflowSnapshot(params) {
     try {
-      const { workflowName, runId, snapshot } = params;
+      const { workflowName, runId, resourceId, snapshot } = params;
       await this.operations.putKV({
         tableName: TABLE_WORKFLOW_SNAPSHOT,
         key: this.operations.getKey(TABLE_WORKFLOW_SNAPSHOT, { workflow_name: workflowName, run_id: runId }),
         value: {
           workflow_name: workflowName,
           run_id: runId,
+          resourceId,
           snapshot: typeof snapshot === "string" ? snapshot : JSON.stringify(snapshot),
           createdAt: /* @__PURE__ */ new Date(),
           updatedAt: /* @__PURE__ */ new Date()
@@ -2122,6 +2253,11 @@ var CloudflareStore = class extends MastraStorage {
       throw new Error("apiToken is required for REST API");
     }
   }
+  get supports() {
+    const supports = super.supports;
+    supports.getScoresBySpan = true;
+    return supports;
+  }
   constructor(config) {
     super({ name: "Cloudflare" });
     try {
@@ -2233,6 +2369,28 @@ var CloudflareStore = class extends MastraStorage {
   }) {
     return this.stores.memory.getMessages({ threadId, resourceId, selectBy, format });
   }
+  async updateWorkflowResults({
+    workflowName,
+    runId,
+    stepId,
+    result,
+    runtimeContext
+  }) {
+    return this.stores.workflows.updateWorkflowResults({ workflowName, runId, stepId, result, runtimeContext });
+  }
+  async updateWorkflowState({
+    workflowName,
+    runId,
+    opts
+  }) {
+    return this.stores.workflows.updateWorkflowState({ workflowName, runId, opts });
+  }
+  async getMessagesById({
+    messageIds,
+    format
+  }) {
+    return this.stores.memory.getMessagesById({ messageIds, format });
+  }
   async persistWorkflowSnapshot(params) {
     return this.stores.workflows.persistWorkflowSnapshot(params);
   }
@@ -2323,9 +2481,19 @@ var CloudflareStore = class extends MastraStorage {
   }
   async getScoresByScorerId({
     scorerId,
+    entityId,
+    entityType,
+    source,
+    pagination
+  }) {
+    return this.stores.scores.getScoresByScorerId({ scorerId, entityId, entityType, source, pagination });
+  }
+  async getScoresBySpan({
+    traceId,
+    spanId,
     pagination
   }) {
-    return this.stores.scores.getScoresByScorerId({ scorerId, pagination });
+    return this.stores.scores.getScoresBySpan({ traceId, spanId, pagination });
   }
   async getResourceById({ resourceId }) {
     return this.stores.memory.getResourceById({ resourceId });