@mastra/cloudflare-d1 1.0.0-beta.0 → 1.0.0-beta.2

package/dist/index.js

@@ -1,5 +1,5 @@
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { MastraStorage, StoreOperations, ScoresStorage, TABLE_SCORERS, normalizePerPage, calculatePagination, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, ensureDate, MemoryStorage, TABLE_RESOURCES, TABLE_THREADS, TABLE_MESSAGES, serializeDate, safelyParseJSON } from '@mastra/core/storage';
+import { MastraStorage, StoreOperations, ScoresStorage, TABLE_SCORERS, normalizePerPage, calculatePagination, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, ensureDate, MemoryStorage, TABLE_RESOURCES, TABLE_THREADS, TABLE_MESSAGES, serializeDate, transformScoreRow as transformScoreRow$1 } from '@mastra/core/storage';
 import Cloudflare from 'cloudflare';
 import { MessageList } from '@mastra/core/agent';
 import { parseSqlIdentifier } from '@mastra/core/utils';
@@ -627,23 +627,25 @@ var MemoryStorageD1 = class extends MemoryStorage {
       );
     }
   }
-  async _getIncludedMessages(threadId, include) {
-    if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
-    if (!include) return null;
+  async _getIncludedMessages(include) {
+    if (!include || include.length === 0) return null;
     const unionQueries = [];
     const params = [];
     let paramIdx = 1;
+    const tableName = this.operations.getTableName(TABLE_MESSAGES);
     for (const inc of include) {
       const { id, withPreviousMessages = 0, withNextMessages = 0 } = inc;
-      const searchId = inc.threadId || threadId;
       unionQueries.push(`
                 SELECT * FROM (
-                  WITH ordered_messages AS (
+                  WITH target_thread AS (
+                    SELECT thread_id FROM ${tableName} WHERE id = ?
+                  ),
+                  ordered_messages AS (
                     SELECT
                       *,
                       ROW_NUMBER() OVER (ORDER BY createdAt ASC) AS row_num
-                    FROM ${this.operations.getTableName(TABLE_MESSAGES)}
-                    WHERE thread_id = ?
+                    FROM ${tableName}
+                    WHERE thread_id = (SELECT thread_id FROM target_thread)
                   )
                   SELECT
                     m.id,
@@ -666,7 +668,7 @@ var MemoryStorageD1 = class extends MemoryStorage {
                   )
                 ) AS query_${paramIdx}
             `);
-      params.push(searchId, id, id, withNextMessages, withPreviousMessages);
+      params.push(id, id, id, withNextMessages, withPreviousMessages);
       paramIdx++;
     }
     const finalQuery = unionQueries.join(" UNION ALL ") + " ORDER BY createdAt ASC";
@@ -723,15 +725,16 @@ var MemoryStorageD1 = class extends MemoryStorage {
   }
   async listMessages(args) {
     const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
-    if (!threadId.trim()) {
+    const threadIds = Array.isArray(threadId) ? threadId : [threadId];
+    if (threadIds.length === 0 || threadIds.some((id) => !id.trim())) {
       throw new MastraError(
         {
           id: "STORAGE_CLOUDFLARE_D1_LIST_MESSAGES_INVALID_THREAD_ID",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { threadId }
+          details: { threadId: Array.isArray(threadId) ? threadId.join(",") : threadId }
         },
-        new Error("threadId must be a non-empty string")
+        new Error("threadId must be a non-empty string or array of non-empty strings")
       );
     }
     if (page < 0) {
@@ -816,7 +819,7 @@ var MemoryStorageD1 = class extends MemoryStorage {
       const messageIds = new Set(paginatedMessages.map((m) => m.id));
       let includeMessages = [];
       if (include && include.length > 0) {
-        const includeResult = await this._getIncludedMessages(threadId, include);
+        const includeResult = await this._getIncludedMessages(include);
         if (Array.isArray(includeResult)) {
           includeMessages = includeResult;
           for (const includeMsg of includeMessages) {
@@ -857,9 +860,9 @@ var MemoryStorageD1 = class extends MemoryStorage {
           id: "CLOUDFLARE_D1_STORAGE_LIST_MESSAGES_ERROR",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          text: `Failed to list messages for thread ${threadId}: ${error instanceof Error ? error.message : String(error)}`,
+          text: `Failed to list messages for thread ${Array.isArray(threadId) ? threadId.join(",") : threadId}: ${error instanceof Error ? error.message : String(error)}`,
           details: {
-            threadId,
+            threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
             resourceId: resourceId ?? ""
           }
         },
@@ -1364,19 +1367,12 @@ var StoreOperationsD1 = class extends StoreOperations {
   }
 };
 function transformScoreRow(row) {
-  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.requestContext = safelyParseJSON(row.requestContext);
-  deserialized.entity = safelyParseJSON(row.entity);
-  deserialized.createdAt = row.createdAtZ || row.createdAt;
-  deserialized.updatedAt = row.updatedAtZ || row.updatedAt;
-  return deserialized;
+  return transformScoreRow$1(row, {
+    preferredTimestampFields: {
+      createdAt: "createdAtZ",
+      updatedAt: "updatedAtZ"
+    }
+  });
 }
 var ScoresStorageD1 = class extends ScoresStorage {
   operations;
@@ -1798,13 +1794,18 @@ var WorkflowsStorageD1 = class extends WorkflowsStorage {
     toDate,
     page,
     perPage,
-    resourceId
+    resourceId,
+    status
   } = {}) {
     const fullTableName = this.operations.getTableName(TABLE_WORKFLOW_SNAPSHOT);
     try {
       const builder = createSqlBuilder().select().from(fullTableName);
       const countBuilder = createSqlBuilder().count().from(fullTableName);
       if (workflowName) builder.whereAnd("workflow_name = ?", workflowName);
+      if (status) {
+        builder.whereAnd("json_extract(snapshot, '$.status') = ?", status);
+        countBuilder.whereAnd("json_extract(snapshot, '$.status') = ?", status);
+      }
       if (resourceId) {
         const hasResourceId = await this.operations.hasColumn(fullTableName, "resourceId");
         if (hasResourceId) {
@@ -2064,15 +2065,8 @@ var D1Store = class extends MastraStorage {
   async loadWorkflowSnapshot(params) {
     return this.stores.workflows.loadWorkflowSnapshot(params);
   }
-  async listWorkflowRuns({
-    workflowName,
-    fromDate,
-    toDate,
-    perPage,
-    page,
-    resourceId
-  } = {}) {
-    return this.stores.workflows.listWorkflowRuns({ workflowName, fromDate, toDate, perPage, page, resourceId });
+  async listWorkflowRuns(args = {}) {
+    return this.stores.workflows.listWorkflowRuns(args);
   }
   async getWorkflowRunById({
     runId,