@mastra/cloudflare-d1 0.10.1 → 0.10.2-alpha.0

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

@@ -1,21 +1,21 @@
 import type { D1Database as D1Database_2 } from '@cloudflare/workers-types';
 import type { EvalRow } from '@mastra/core/storage';
 import type { MastraMessageV1 } from '@mastra/core/memory';
-import type { MastraMessageV2 } from '@mastra/core/memory';
-import type { MastraMessageV2 as MastraMessageV2_2 } from '@mastra/core';
+import type { MastraMessageV2 } from '@mastra/core';
 import { MastraStorage } from '@mastra/core/storage';
+import type { PaginationInfo } from '@mastra/core/storage';
 import type { StorageColumn } from '@mastra/core/storage';
 import type { StorageGetMessagesArg } from '@mastra/core/storage';
-import type { StorageThreadType } from '@mastra/core/memory';
+import type { StorageThreadType } from '@mastra/core';
 import type { TABLE_NAMES } from '@mastra/core/storage';
+import type { Trace } from '@mastra/core';
 import type { WorkflowRun } from '@mastra/core/storage';
 import type { WorkflowRuns } from '@mastra/core/storage';
-import type { WorkflowRunState } from '@mastra/core/workflows';
-import type { WorkflowRunState as WorkflowRunState_2 } from '@mastra/core';
+import type { WorkflowRunState } from '@mastra/core';
 
-export declare const checkWorkflowSnapshot: (snapshot: WorkflowRunState_2 | string, stepId: string, status: string) => void;
+export declare const checkWorkflowSnapshot: (snapshot: WorkflowRunState | string, stepId: string, status: string) => void;
 
-export declare const createSampleMessage: (threadId: string, parts?: MastraMessageV2_2["content"]["parts"]) => MastraMessageV2_2;
+export declare const createSampleMessage: (threadId: string, parts?: MastraMessageV2["content"]["parts"], createdAt?: Date) => MastraMessageV2;
 
 export declare const createSampleThread: () => {
     id: string;
@@ -57,7 +57,7 @@ export declare const createSampleTrace: (name: string, scope?: string, attribute
 };
 
 export declare const createSampleWorkflowSnapshot: (threadId: string, status: string, createdAt?: Date) => {
-    snapshot: WorkflowRunState_2;
+    snapshot: WorkflowRunState;
     runId: string;
     stepId: string;
 };
@@ -125,9 +125,19 @@ declare class D1Store extends MastraStorage {
     getThreadById({ threadId }: {
         threadId: string;
     }): Promise<StorageThreadType | null>;
+    /**
+     * @deprecated use getThreadsByResourceIdPaginated instead
+     */
     getThreadsByResourceId({ resourceId }: {
         resourceId: string;
     }): Promise<StorageThreadType[]>;
+    getThreadsByResourceIdPaginated(args: {
+        resourceId: string;
+        page: number;
+        perPage: number;
+    }): Promise<PaginationInfo & {
+        threads: StorageThreadType[];
+    }>;
     saveThread({ thread }: {
         thread: StorageThreadType;
     }): Promise<StorageThreadType>;
@@ -147,12 +157,21 @@ declare class D1Store extends MastraStorage {
         messages: MastraMessageV2[];
         format: 'v2';
     }): Promise<MastraMessageV2[]>;
+    private _getIncludedMessages;
+    /**
+     * @deprecated use getMessagesPaginated instead
+     */
     getMessages(args: StorageGetMessagesArg & {
         format?: 'v1';
     }): Promise<MastraMessageV1[]>;
     getMessages(args: StorageGetMessagesArg & {
         format: 'v2';
     }): Promise<MastraMessageV2[]>;
+    getMessagesPaginated({ threadId, selectBy, format, }: StorageGetMessagesArg & {
+        format?: 'v1' | 'v2';
+    }): Promise<PaginationInfo & {
+        messages: MastraMessageV1[] | MastraMessageV2[];
+    }>;
     persistWorkflowSnapshot({ workflowName, runId, snapshot, }: {
         workflowName: string;
         runId: string;
@@ -171,6 +190,9 @@ declare class D1Store extends MastraStorage {
         tableName: TABLE_NAMES;
         records: Record<string, any>[];
     }): Promise<void>;
+    /**
+     * @deprecated use getTracesPaginated instead
+     */
     getTraces({ name, scope, page, perPage, attributes, fromDate, toDate, }: {
         name?: string;
         scope?: string;
@@ -179,8 +201,32 @@ declare class D1Store extends MastraStorage {
         attributes?: Record<string, string>;
         fromDate?: Date;
         toDate?: Date;
-    }): Promise<Record<string, any>[]>;
+    }): Promise<Trace[]>;
+    getTracesPaginated(args: {
+        name?: string;
+        scope?: string;
+        attributes?: Record<string, string>;
+        page: number;
+        perPage: number;
+        fromDate?: Date;
+        toDate?: Date;
+    }): Promise<PaginationInfo & {
+        traces: Trace[];
+    }>;
+    /**
+     * @deprecated use getEvals instead
+     */
     getEvalsByAgentName(agentName: string, type?: 'test' | 'live'): Promise<EvalRow[]>;
+    getEvals(options?: {
+        agentName?: string;
+        type?: 'test' | 'live';
+        page?: number;
+        perPage?: number;
+        fromDate?: Date;
+        toDate?: Date;
+    }): Promise<PaginationInfo & {
+        evals: EvalRow[];
+    }>;
     private parseWorkflowRun;
     private hasColumn;
     getWorkflowRuns({ workflowName, fromDate, toDate, limit, offset, resourceId, }?: {

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

@@ -1,21 +1,21 @@
 import type { D1Database as D1Database_2 } from '@cloudflare/workers-types';
 import type { EvalRow } from '@mastra/core/storage';
 import type { MastraMessageV1 } from '@mastra/core/memory';
-import type { MastraMessageV2 } from '@mastra/core/memory';
-import type { MastraMessageV2 as MastraMessageV2_2 } from '@mastra/core';
+import type { MastraMessageV2 } from '@mastra/core';
 import { MastraStorage } from '@mastra/core/storage';
+import type { PaginationInfo } from '@mastra/core/storage';
 import type { StorageColumn } from '@mastra/core/storage';
 import type { StorageGetMessagesArg } from '@mastra/core/storage';
-import type { StorageThreadType } from '@mastra/core/memory';
+import type { StorageThreadType } from '@mastra/core';
 import type { TABLE_NAMES } from '@mastra/core/storage';
+import type { Trace } from '@mastra/core';
 import type { WorkflowRun } from '@mastra/core/storage';
 import type { WorkflowRuns } from '@mastra/core/storage';
-import type { WorkflowRunState } from '@mastra/core/workflows';
-import type { WorkflowRunState as WorkflowRunState_2 } from '@mastra/core';
+import type { WorkflowRunState } from '@mastra/core';
 
-export declare const checkWorkflowSnapshot: (snapshot: WorkflowRunState_2 | string, stepId: string, status: string) => void;
+export declare const checkWorkflowSnapshot: (snapshot: WorkflowRunState | string, stepId: string, status: string) => void;
 
-export declare const createSampleMessage: (threadId: string, parts?: MastraMessageV2_2["content"]["parts"]) => MastraMessageV2_2;
+export declare const createSampleMessage: (threadId: string, parts?: MastraMessageV2["content"]["parts"], createdAt?: Date) => MastraMessageV2;
 
 export declare const createSampleThread: () => {
     id: string;
@@ -57,7 +57,7 @@ export declare const createSampleTrace: (name: string, scope?: string, attribute
 };
 
 export declare const createSampleWorkflowSnapshot: (threadId: string, status: string, createdAt?: Date) => {
-    snapshot: WorkflowRunState_2;
+    snapshot: WorkflowRunState;
     runId: string;
     stepId: string;
 };
@@ -125,9 +125,19 @@ declare class D1Store extends MastraStorage {
     getThreadById({ threadId }: {
         threadId: string;
     }): Promise<StorageThreadType | null>;
+    /**
+     * @deprecated use getThreadsByResourceIdPaginated instead
+     */
     getThreadsByResourceId({ resourceId }: {
         resourceId: string;
     }): Promise<StorageThreadType[]>;
+    getThreadsByResourceIdPaginated(args: {
+        resourceId: string;
+        page: number;
+        perPage: number;
+    }): Promise<PaginationInfo & {
+        threads: StorageThreadType[];
+    }>;
     saveThread({ thread }: {
         thread: StorageThreadType;
     }): Promise<StorageThreadType>;
@@ -147,12 +157,21 @@ declare class D1Store extends MastraStorage {
         messages: MastraMessageV2[];
         format: 'v2';
     }): Promise<MastraMessageV2[]>;
+    private _getIncludedMessages;
+    /**
+     * @deprecated use getMessagesPaginated instead
+     */
     getMessages(args: StorageGetMessagesArg & {
         format?: 'v1';
     }): Promise<MastraMessageV1[]>;
     getMessages(args: StorageGetMessagesArg & {
         format: 'v2';
     }): Promise<MastraMessageV2[]>;
+    getMessagesPaginated({ threadId, selectBy, format, }: StorageGetMessagesArg & {
+        format?: 'v1' | 'v2';
+    }): Promise<PaginationInfo & {
+        messages: MastraMessageV1[] | MastraMessageV2[];
+    }>;
     persistWorkflowSnapshot({ workflowName, runId, snapshot, }: {
         workflowName: string;
         runId: string;
@@ -171,6 +190,9 @@ declare class D1Store extends MastraStorage {
         tableName: TABLE_NAMES;
         records: Record<string, any>[];
     }): Promise<void>;
+    /**
+     * @deprecated use getTracesPaginated instead
+     */
     getTraces({ name, scope, page, perPage, attributes, fromDate, toDate, }: {
         name?: string;
         scope?: string;
@@ -179,8 +201,32 @@ declare class D1Store extends MastraStorage {
         attributes?: Record<string, string>;
         fromDate?: Date;
         toDate?: Date;
-    }): Promise<Record<string, any>[]>;
+    }): Promise<Trace[]>;
+    getTracesPaginated(args: {
+        name?: string;
+        scope?: string;
+        attributes?: Record<string, string>;
+        page: number;
+        perPage: number;
+        fromDate?: Date;
+        toDate?: Date;
+    }): Promise<PaginationInfo & {
+        traces: Trace[];
+    }>;
+    /**
+     * @deprecated use getEvals instead
+     */
     getEvalsByAgentName(agentName: string, type?: 'test' | 'live'): Promise<EvalRow[]>;
+    getEvals(options?: {
+        agentName?: string;
+        type?: 'test' | 'live';
+        page?: number;
+        perPage?: number;
+        fromDate?: Date;
+        toDate?: Date;
+    }): Promise<PaginationInfo & {
+        evals: EvalRow[];
+    }>;
     private parseWorkflowRun;
     private hasColumn;
     getWorkflowRuns({ workflowName, fromDate, toDate, limit, offset, resourceId, }?: {

package/dist/index.cjs

@@ -562,6 +562,9 @@ var D1Store = class extends storage.MastraStorage {
       return null;
     }
   }
+  /**
+   * @deprecated use getThreadsByResourceIdPaginated instead
+   */
   async getThreadsByResourceId({ resourceId }) {
     const fullTableName = this.getTableName(storage.TABLE_THREADS);
     try {
@@ -581,6 +584,29 @@ var D1Store = class extends storage.MastraStorage {
       return [];
     }
   }
+  async getThreadsByResourceIdPaginated(args) {
+    const { resourceId, page, perPage } = args;
+    const fullTableName = this.getTableName(storage.TABLE_THREADS);
+    const mapRowToStorageThreadType = (row) => ({
+      ...row,
+      createdAt: this.ensureDate(row.createdAt),
+      updatedAt: this.ensureDate(row.updatedAt),
+      metadata: typeof row.metadata === "string" ? JSON.parse(row.metadata || "{}") : row.metadata || {}
+    });
+    const countQuery = createSqlBuilder().count().from(fullTableName).where("resourceId = ?", resourceId);
+    const countResult = await this.executeQuery(countQuery.build());
+    const total = Number(countResult?.[0]?.count ?? 0);
+    const selectQuery = createSqlBuilder().select("*").from(fullTableName).where("resourceId = ?", resourceId).orderBy("createdAt", "DESC").limit(perPage).offset(page * perPage);
+    const results = await this.executeQuery(selectQuery.build());
+    const threads = results.map(mapRowToStorageThreadType);
+    return {
+      threads,
+      total,
+      page,
+      perPage,
+      hasMore: page * perPage + threads.length < total
+    };
+  }
   async saveThread({ thread }) {
     const fullTableName = this.getTableName(storage.TABLE_THREADS);
     const threadToSave = {
@@ -703,26 +729,18 @@ var D1Store = class extends storage.MastraStorage {
       throw error;
     }
   }
-  async getMessages({
-    threadId,
-    selectBy,
-    format
-  }) {
-    const fullTableName = this.getTableName(storage.TABLE_MESSAGES);
-    const limit = typeof selectBy?.last === "number" ? selectBy.last : 40;
-    const include = selectBy?.include || [];
-    const messages = [];
-    try {
-      if (include.length) {
-        const prevMax = Math.max(...include.map((i) => i.withPreviousMessages || 0));
-        const nextMax = Math.max(...include.map((i) => i.withNextMessages || 0));
-        const includeIds = include.map((i) => i.id);
-        const sql2 = `
+  async _getIncludedMessages(threadId, selectBy) {
+    const include = selectBy?.include;
+    if (!include) return null;
+    const prevMax = Math.max(...include.map((i) => i.withPreviousMessages || 0));
+    const nextMax = Math.max(...include.map((i) => i.withNextMessages || 0));
+    const includeIds = include.map((i) => i.id);
+    const sql = `
         WITH ordered_messages AS (
           SELECT
             *,
             ROW_NUMBER() OVER (ORDER BY createdAt DESC) AS row_num
-          FROM ${fullTableName}
+          FROM ${this.getTableName(storage.TABLE_MESSAGES)}
           WHERE thread_id = ?
         )
         SELECT
@@ -745,20 +763,38 @@ var D1Store = class extends storage.MastraStorage {
         )
         ORDER BY m.createdAt DESC
       `;
-        const params2 = [
-          threadId,
-          ...includeIds,
-          // for m.id IN (...)
-          ...includeIds,
-          // for target.id IN (...)
-          prevMax,
-          nextMax
-        ];
-        const includeResult = await this.executeQuery({ sql: sql2, params: params2 });
+    const params = [
+      threadId,
+      ...includeIds,
+      // for m.id IN (...)
+      ...includeIds,
+      // for target.id IN (...)
+      prevMax,
+      nextMax
+    ];
+    const messages = await this.executeQuery({ sql, params });
+    return messages;
+  }
+  async getMessages({
+    threadId,
+    selectBy,
+    format
+  }) {
+    const fullTableName = this.getTableName(storage.TABLE_MESSAGES);
+    const limit = typeof selectBy?.last === "number" ? selectBy.last : 40;
+    const include = selectBy?.include || [];
+    const messages = [];
+    try {
+      if (include.length) {
+        const includeResult = await this._getIncludedMessages(threadId, selectBy);
         if (Array.isArray(includeResult)) messages.push(...includeResult);
       }
       const excludeIds = messages.map((m) => m.id);
-      let query = createSqlBuilder().select(["id", "content", "role", "type", "createdAt", "thread_id AS threadId"]).from(fullTableName).where("thread_id = ?", threadId).andWhere(`id NOT IN (${excludeIds.map(() => "?").join(",")})`, ...excludeIds).orderBy("createdAt", "DESC").limit(limit);
+      const query = createSqlBuilder().select(["id", "content", "role", "type", "createdAt", "thread_id AS threadId"]).from(fullTableName).where("thread_id = ?", threadId);
+      if (excludeIds.length > 0) {
+        query.andWhere(`id NOT IN (${excludeIds.map(() => "?").join(",")})`, ...excludeIds);
+      }
+      query.orderBy("createdAt", "DESC").limit(limit);
       const { sql, params } = query.build();
       const result = await this.executeQuery({ sql, params });
       if (Array.isArray(result)) messages.push(...result);
@@ -789,6 +825,47 @@ var D1Store = class extends storage.MastraStorage {
       return [];
     }
   }
+  async getMessagesPaginated({
+    threadId,
+    selectBy,
+    format
+  }) {
+    const { dateRange, page = 0, perPage = 40 } = selectBy?.pagination || {};
+    const { start: fromDate, end: toDate } = dateRange || {};
+    const fullTableName = this.getTableName(storage.TABLE_MESSAGES);
+    const messages = [];
+    if (selectBy?.include?.length) {
+      const includeResult = await this._getIncludedMessages(threadId, selectBy);
+      if (Array.isArray(includeResult)) messages.push(...includeResult);
+    }
+    const countQuery = createSqlBuilder().count().from(fullTableName).where("thread_id = ?", threadId);
+    if (fromDate) {
+      countQuery.andWhere("createdAt >= ?", this.serializeDate(fromDate));
+    }
+    if (toDate) {
+      countQuery.andWhere("createdAt <= ?", this.serializeDate(toDate));
+    }
+    const countResult = await this.executeQuery(countQuery.build());
+    const total = Number(countResult[0]?.count ?? 0);
+    const query = createSqlBuilder().select(["id", "content", "role", "type", "createdAt", "thread_id AS threadId"]).from(fullTableName).where("thread_id = ?", threadId);
+    if (fromDate) {
+      query.andWhere("createdAt >= ?", this.serializeDate(fromDate));
+    }
+    if (toDate) {
+      query.andWhere("createdAt <= ?", this.serializeDate(toDate));
+    }
+    query.orderBy("createdAt", "DESC").limit(perPage).offset(page * perPage);
+    const results = await this.executeQuery(query.build());
+    const list = new agent.MessageList().add(results, "memory");
+    messages.push(...format === `v2` ? list.get.all.v2() : list.get.all.v1());
+    return {
+      messages,
+      total,
+      page,
+      perPage,
+      hasMore: page * perPage + messages.length < total
+    };
+  }
   async persistWorkflowSnapshot({
     workflowName,
     runId,
@@ -881,6 +958,9 @@ var D1Store = class extends storage.MastraStorage {
       throw new Error(`Failed to batch insert into ${tableName}: ${error}`);
     }
   }
+  /**
+   * @deprecated use getTracesPaginated instead
+   */
   async getTraces({
     name,
     scope,
@@ -910,22 +990,83 @@ var D1Store = class extends storage.MastraStorage {
       if (toDate) {
         query.andWhere("createdAt <= ?", toDate instanceof Date ? toDate.toISOString() : toDate);
       }
-      query.orderBy("startTime", "DESC").limit(perPage).offset((page - 1) * perPage);
+      query.orderBy("startTime", "DESC").limit(perPage).offset(page * perPage);
       const { sql, params } = query.build();
       const results = await this.executeQuery({ sql, params });
-      return isArrayOfRecords(results) ? results.map((trace) => ({
-        ...trace,
-        attributes: this.deserializeValue(trace.attributes, "jsonb"),
-        status: this.deserializeValue(trace.status, "jsonb"),
-        events: this.deserializeValue(trace.events, "jsonb"),
-        links: this.deserializeValue(trace.links, "jsonb"),
-        other: this.deserializeValue(trace.other, "jsonb")
-      })) : [];
+      return isArrayOfRecords(results) ? results.map(
+        (trace) => ({
+          ...trace,
+          attributes: this.deserializeValue(trace.attributes, "jsonb"),
+          status: this.deserializeValue(trace.status, "jsonb"),
+          events: this.deserializeValue(trace.events, "jsonb"),
+          links: this.deserializeValue(trace.links, "jsonb"),
+          other: this.deserializeValue(trace.other, "jsonb")
+        })
+      ) : [];
     } catch (error) {
       this.logger.error("Error getting traces:", { message: error instanceof Error ? error.message : String(error) });
       return [];
     }
   }
+  async getTracesPaginated(args) {
+    const { name, scope, page, perPage, attributes, fromDate, toDate } = args;
+    const fullTableName = this.getTableName(storage.TABLE_TRACES);
+    try {
+      const dataQuery = createSqlBuilder().select("*").from(fullTableName).where("1=1");
+      const countQuery = createSqlBuilder().count().from(fullTableName).where("1=1");
+      if (name) {
+        dataQuery.andWhere("name LIKE ?", `%${name}%`);
+        countQuery.andWhere("name LIKE ?", `%${name}%`);
+      }
+      if (scope) {
+        dataQuery.andWhere("scope = ?", scope);
+        countQuery.andWhere("scope = ?", scope);
+      }
+      if (attributes && Object.keys(attributes).length > 0) {
+        for (const [key, value] of Object.entries(attributes)) {
+          dataQuery.jsonLike("attributes", key, value);
+          countQuery.jsonLike("attributes", key, value);
+        }
+      }
+      if (fromDate) {
+        const fromDateStr = fromDate instanceof Date ? fromDate.toISOString() : fromDate;
+        dataQuery.andWhere("createdAt >= ?", fromDateStr);
+        countQuery.andWhere("createdAt >= ?", fromDateStr);
+      }
+      if (toDate) {
+        const toDateStr = toDate instanceof Date ? toDate.toISOString() : toDate;
+        dataQuery.andWhere("createdAt <= ?", toDateStr);
+        countQuery.andWhere("createdAt <= ?", toDateStr);
+      }
+      const countResult = await this.executeQuery(countQuery.build());
+      const total = Number(countResult?.[0]?.count ?? 0);
+      dataQuery.orderBy("startTime", "DESC").limit(perPage).offset(page * perPage);
+      const results = await this.executeQuery(dataQuery.build());
+      const traces = isArrayOfRecords(results) ? results.map(
+        (trace) => ({
+          ...trace,
+          attributes: this.deserializeValue(trace.attributes, "jsonb"),
+          status: this.deserializeValue(trace.status, "jsonb"),
+          events: this.deserializeValue(trace.events, "jsonb"),
+          links: this.deserializeValue(trace.links, "jsonb"),
+          other: this.deserializeValue(trace.other, "jsonb")
+        })
+      ) : [];
+      return {
+        traces,
+        total,
+        page,
+        perPage,
+        hasMore: page * perPage + traces.length < total
+      };
+    } catch (error) {
+      this.logger.error("Error getting traces:", { message: error instanceof Error ? error.message : String(error) });
+      return { traces: [], total: 0, page, perPage, hasMore: false };
+    }
+  }
+  /**
+   * @deprecated use getEvals instead
+   */
   async getEvalsByAgentName(agentName, type) {
     const fullTableName = this.getTableName(storage.TABLE_EVALS);
     try {
@@ -961,6 +1102,80 @@ var D1Store = class extends storage.MastraStorage {
       return [];
     }
   }
+  async getEvals(options) {
+    const { agentName, type, page = 0, perPage = 40, fromDate, toDate } = options || {};
+    const fullTableName = this.getTableName(storage.TABLE_EVALS);
+    const conditions = [];
+    const queryParams = [];
+    if (agentName) {
+      conditions.push(`agent_name = ?`);
+      queryParams.push(agentName);
+    }
+    if (type === "test") {
+      conditions.push(`(test_info IS NOT NULL AND json_extract(test_info, '$.testPath') IS NOT NULL)`);
+    } else if (type === "live") {
+      conditions.push(`(test_info IS NULL OR json_extract(test_info, '$.testPath') IS NULL)`);
+    }
+    if (fromDate) {
+      conditions.push(`createdAt >= ?`);
+      queryParams.push(this.serializeDate(fromDate));
+    }
+    if (toDate) {
+      conditions.push(`createdAt <= ?`);
+      queryParams.push(this.serializeDate(toDate));
+    }
+    const countQueryBuilder = createSqlBuilder().count().from(fullTableName);
+    if (conditions.length > 0) {
+      countQueryBuilder.where(conditions.join(" AND "), ...queryParams);
+    }
+    const { sql: countSql, params: countParams } = countQueryBuilder.build();
+    const countResult = await this.executeQuery({ sql: countSql, params: countParams, first: true });
+    const total = Number(countResult?.count || 0);
+    const currentOffset = page * perPage;
+    if (total === 0) {
+      return {
+        evals: [],
+        total: 0,
+        page,
+        perPage,
+        hasMore: false
+      };
+    }
+    const dataQueryBuilder = createSqlBuilder().select("*").from(fullTableName);
+    if (conditions.length > 0) {
+      dataQueryBuilder.where(conditions.join(" AND "), ...queryParams);
+    }
+    dataQueryBuilder.orderBy("createdAt", "DESC").limit(perPage).offset(currentOffset);
+    const { sql: dataSql, params: dataParams } = dataQueryBuilder.build();
+    const rows = await this.executeQuery({ sql: dataSql, params: dataParams });
+    const evals = (isArrayOfRecords(rows) ? rows : []).map((row) => {
+      const result = this.deserializeValue(row.result);
+      const testInfo = row.test_info ? this.deserializeValue(row.test_info) : void 0;
+      if (!result || typeof result !== "object" || !("score" in result)) {
+        throw new Error(`Invalid MetricResult format: ${JSON.stringify(result)}`);
+      }
+      return {
+        input: row.input,
+        output: row.output,
+        result,
+        agentName: row.agent_name,
+        metricName: row.metric_name,
+        instructions: row.instructions,
+        testInfo,
+        globalRunId: row.global_run_id,
+        runId: row.run_id,
+        createdAt: row.createdAt
+      };
+    });
+    const hasMore = currentOffset + evals.length < total;
+    return {
+      evals,
+      total,
+      page,
+      perPage,
+      hasMore
+    };
+  }
   parseWorkflowRun(row) {
     let parsedSnapshot = row.snapshot;
     if (typeof parsedSnapshot === "string") {

package/dist/index.js

@@ -556,6 +556,9 @@ var D1Store = class extends MastraStorage {
       return null;
     }
   }
+  /**
+   * @deprecated use getThreadsByResourceIdPaginated instead
+   */
   async getThreadsByResourceId({ resourceId }) {
     const fullTableName = this.getTableName(TABLE_THREADS);
     try {
@@ -575,6 +578,29 @@ var D1Store = class extends MastraStorage {
       return [];
     }
   }
+  async getThreadsByResourceIdPaginated(args) {
+    const { resourceId, page, perPage } = args;
+    const fullTableName = this.getTableName(TABLE_THREADS);
+    const mapRowToStorageThreadType = (row) => ({
+      ...row,
+      createdAt: this.ensureDate(row.createdAt),
+      updatedAt: this.ensureDate(row.updatedAt),
+      metadata: typeof row.metadata === "string" ? JSON.parse(row.metadata || "{}") : row.metadata || {}
+    });
+    const countQuery = createSqlBuilder().count().from(fullTableName).where("resourceId = ?", resourceId);
+    const countResult = await this.executeQuery(countQuery.build());
+    const total = Number(countResult?.[0]?.count ?? 0);
+    const selectQuery = createSqlBuilder().select("*").from(fullTableName).where("resourceId = ?", resourceId).orderBy("createdAt", "DESC").limit(perPage).offset(page * perPage);
+    const results = await this.executeQuery(selectQuery.build());
+    const threads = results.map(mapRowToStorageThreadType);
+    return {
+      threads,
+      total,
+      page,
+      perPage,
+      hasMore: page * perPage + threads.length < total
+    };
+  }
   async saveThread({ thread }) {
     const fullTableName = this.getTableName(TABLE_THREADS);
     const threadToSave = {
@@ -697,26 +723,18 @@ var D1Store = class extends MastraStorage {
       throw error;
     }
   }
-  async getMessages({
-    threadId,
-    selectBy,
-    format
-  }) {
-    const fullTableName = this.getTableName(TABLE_MESSAGES);
-    const limit = typeof selectBy?.last === "number" ? selectBy.last : 40;
-    const include = selectBy?.include || [];
-    const messages = [];
-    try {
-      if (include.length) {
-        const prevMax = Math.max(...include.map((i) => i.withPreviousMessages || 0));
-        const nextMax = Math.max(...include.map((i) => i.withNextMessages || 0));
-        const includeIds = include.map((i) => i.id);
-        const sql2 = `
+  async _getIncludedMessages(threadId, selectBy) {
+    const include = selectBy?.include;
+    if (!include) return null;
+    const prevMax = Math.max(...include.map((i) => i.withPreviousMessages || 0));
+    const nextMax = Math.max(...include.map((i) => i.withNextMessages || 0));
+    const includeIds = include.map((i) => i.id);
+    const sql = `
         WITH ordered_messages AS (
           SELECT
             *,
             ROW_NUMBER() OVER (ORDER BY createdAt DESC) AS row_num
-          FROM ${fullTableName}
+          FROM ${this.getTableName(TABLE_MESSAGES)}
           WHERE thread_id = ?
         )
         SELECT
@@ -739,20 +757,38 @@ var D1Store = class extends MastraStorage {
         )
         ORDER BY m.createdAt DESC
       `;
-        const params2 = [
-          threadId,
-          ...includeIds,
-          // for m.id IN (...)
-          ...includeIds,
-          // for target.id IN (...)
-          prevMax,
-          nextMax
-        ];
-        const includeResult = await this.executeQuery({ sql: sql2, params: params2 });
+    const params = [
+      threadId,
+      ...includeIds,
+      // for m.id IN (...)
+      ...includeIds,
+      // for target.id IN (...)
+      prevMax,
+      nextMax
+    ];
+    const messages = await this.executeQuery({ sql, params });
+    return messages;
+  }
+  async getMessages({
+    threadId,
+    selectBy,
+    format
+  }) {
+    const fullTableName = this.getTableName(TABLE_MESSAGES);
+    const limit = typeof selectBy?.last === "number" ? selectBy.last : 40;
+    const include = selectBy?.include || [];
+    const messages = [];
+    try {
+      if (include.length) {
+        const includeResult = await this._getIncludedMessages(threadId, selectBy);
         if (Array.isArray(includeResult)) messages.push(...includeResult);
       }
       const excludeIds = messages.map((m) => m.id);
-      let query = createSqlBuilder().select(["id", "content", "role", "type", "createdAt", "thread_id AS threadId"]).from(fullTableName).where("thread_id = ?", threadId).andWhere(`id NOT IN (${excludeIds.map(() => "?").join(",")})`, ...excludeIds).orderBy("createdAt", "DESC").limit(limit);
+      const query = createSqlBuilder().select(["id", "content", "role", "type", "createdAt", "thread_id AS threadId"]).from(fullTableName).where("thread_id = ?", threadId);
+      if (excludeIds.length > 0) {
+        query.andWhere(`id NOT IN (${excludeIds.map(() => "?").join(",")})`, ...excludeIds);
+      }
+      query.orderBy("createdAt", "DESC").limit(limit);
       const { sql, params } = query.build();
       const result = await this.executeQuery({ sql, params });
       if (Array.isArray(result)) messages.push(...result);
@@ -783,6 +819,47 @@ var D1Store = class extends MastraStorage {
       return [];
     }
   }
+  async getMessagesPaginated({
+    threadId,
+    selectBy,
+    format
+  }) {
+    const { dateRange, page = 0, perPage = 40 } = selectBy?.pagination || {};
+    const { start: fromDate, end: toDate } = dateRange || {};
+    const fullTableName = this.getTableName(TABLE_MESSAGES);
+    const messages = [];
+    if (selectBy?.include?.length) {
+      const includeResult = await this._getIncludedMessages(threadId, selectBy);
+      if (Array.isArray(includeResult)) messages.push(...includeResult);
+    }
+    const countQuery = createSqlBuilder().count().from(fullTableName).where("thread_id = ?", threadId);
+    if (fromDate) {
+      countQuery.andWhere("createdAt >= ?", this.serializeDate(fromDate));
+    }
+    if (toDate) {
+      countQuery.andWhere("createdAt <= ?", this.serializeDate(toDate));
+    }
+    const countResult = await this.executeQuery(countQuery.build());
+    const total = Number(countResult[0]?.count ?? 0);
+    const query = createSqlBuilder().select(["id", "content", "role", "type", "createdAt", "thread_id AS threadId"]).from(fullTableName).where("thread_id = ?", threadId);
+    if (fromDate) {
+      query.andWhere("createdAt >= ?", this.serializeDate(fromDate));
+    }
+    if (toDate) {
+      query.andWhere("createdAt <= ?", this.serializeDate(toDate));
+    }
+    query.orderBy("createdAt", "DESC").limit(perPage).offset(page * perPage);
+    const results = await this.executeQuery(query.build());
+    const list = new MessageList().add(results, "memory");
+    messages.push(...format === `v2` ? list.get.all.v2() : list.get.all.v1());
+    return {
+      messages,
+      total,
+      page,
+      perPage,
+      hasMore: page * perPage + messages.length < total
+    };
+  }
   async persistWorkflowSnapshot({
     workflowName,
     runId,
@@ -875,6 +952,9 @@ var D1Store = class extends MastraStorage {
       throw new Error(`Failed to batch insert into ${tableName}: ${error}`);
     }
   }
+  /**
+   * @deprecated use getTracesPaginated instead
+   */
   async getTraces({
     name,
     scope,
@@ -904,22 +984,83 @@ var D1Store = class extends MastraStorage {
       if (toDate) {
         query.andWhere("createdAt <= ?", toDate instanceof Date ? toDate.toISOString() : toDate);
       }
-      query.orderBy("startTime", "DESC").limit(perPage).offset((page - 1) * perPage);
+      query.orderBy("startTime", "DESC").limit(perPage).offset(page * perPage);
       const { sql, params } = query.build();
       const results = await this.executeQuery({ sql, params });
-      return isArrayOfRecords(results) ? results.map((trace) => ({
-        ...trace,
-        attributes: this.deserializeValue(trace.attributes, "jsonb"),
-        status: this.deserializeValue(trace.status, "jsonb"),
-        events: this.deserializeValue(trace.events, "jsonb"),
-        links: this.deserializeValue(trace.links, "jsonb"),
-        other: this.deserializeValue(trace.other, "jsonb")
-      })) : [];
+      return isArrayOfRecords(results) ? results.map(
+        (trace) => ({
+          ...trace,
+          attributes: this.deserializeValue(trace.attributes, "jsonb"),
+          status: this.deserializeValue(trace.status, "jsonb"),
+          events: this.deserializeValue(trace.events, "jsonb"),
+          links: this.deserializeValue(trace.links, "jsonb"),
+          other: this.deserializeValue(trace.other, "jsonb")
+        })
+      ) : [];
     } catch (error) {
       this.logger.error("Error getting traces:", { message: error instanceof Error ? error.message : String(error) });
       return [];
     }
   }
+  async getTracesPaginated(args) {
+    const { name, scope, page, perPage, attributes, fromDate, toDate } = args;
+    const fullTableName = this.getTableName(TABLE_TRACES);
+    try {
+      const dataQuery = createSqlBuilder().select("*").from(fullTableName).where("1=1");
+      const countQuery = createSqlBuilder().count().from(fullTableName).where("1=1");
+      if (name) {
+        dataQuery.andWhere("name LIKE ?", `%${name}%`);
+        countQuery.andWhere("name LIKE ?", `%${name}%`);
+      }
+      if (scope) {
+        dataQuery.andWhere("scope = ?", scope);
+        countQuery.andWhere("scope = ?", scope);
+      }
+      if (attributes && Object.keys(attributes).length > 0) {
+        for (const [key, value] of Object.entries(attributes)) {
+          dataQuery.jsonLike("attributes", key, value);
+          countQuery.jsonLike("attributes", key, value);
+        }
+      }
+      if (fromDate) {
+        const fromDateStr = fromDate instanceof Date ? fromDate.toISOString() : fromDate;
+        dataQuery.andWhere("createdAt >= ?", fromDateStr);
+        countQuery.andWhere("createdAt >= ?", fromDateStr);
+      }
+      if (toDate) {
+        const toDateStr = toDate instanceof Date ? toDate.toISOString() : toDate;
+        dataQuery.andWhere("createdAt <= ?", toDateStr);
+        countQuery.andWhere("createdAt <= ?", toDateStr);
+      }
+      const countResult = await this.executeQuery(countQuery.build());
+      const total = Number(countResult?.[0]?.count ?? 0);
+      dataQuery.orderBy("startTime", "DESC").limit(perPage).offset(page * perPage);
+      const results = await this.executeQuery(dataQuery.build());
+      const traces = isArrayOfRecords(results) ? results.map(
+        (trace) => ({
+          ...trace,
+          attributes: this.deserializeValue(trace.attributes, "jsonb"),
+          status: this.deserializeValue(trace.status, "jsonb"),
+          events: this.deserializeValue(trace.events, "jsonb"),
+          links: this.deserializeValue(trace.links, "jsonb"),
+          other: this.deserializeValue(trace.other, "jsonb")
+        })
+      ) : [];
+      return {
+        traces,
+        total,
+        page,
+        perPage,
+        hasMore: page * perPage + traces.length < total
+      };
+    } catch (error) {
+      this.logger.error("Error getting traces:", { message: error instanceof Error ? error.message : String(error) });
+      return { traces: [], total: 0, page, perPage, hasMore: false };
+    }
+  }
+  /**
+   * @deprecated use getEvals instead
+   */
   async getEvalsByAgentName(agentName, type) {
     const fullTableName = this.getTableName(TABLE_EVALS);
     try {
@@ -955,6 +1096,80 @@ var D1Store = class extends MastraStorage {
       return [];
     }
   }
+  async getEvals(options) {
+    const { agentName, type, page = 0, perPage = 40, fromDate, toDate } = options || {};
+    const fullTableName = this.getTableName(TABLE_EVALS);
+    const conditions = [];
+    const queryParams = [];
+    if (agentName) {
+      conditions.push(`agent_name = ?`);
+      queryParams.push(agentName);
+    }
+    if (type === "test") {
+      conditions.push(`(test_info IS NOT NULL AND json_extract(test_info, '$.testPath') IS NOT NULL)`);
+    } else if (type === "live") {
+      conditions.push(`(test_info IS NULL OR json_extract(test_info, '$.testPath') IS NULL)`);
+    }
+    if (fromDate) {
+      conditions.push(`createdAt >= ?`);
+      queryParams.push(this.serializeDate(fromDate));
+    }
+    if (toDate) {
+      conditions.push(`createdAt <= ?`);
+      queryParams.push(this.serializeDate(toDate));
+    }
+    const countQueryBuilder = createSqlBuilder().count().from(fullTableName);
+    if (conditions.length > 0) {
+      countQueryBuilder.where(conditions.join(" AND "), ...queryParams);
+    }
+    const { sql: countSql, params: countParams } = countQueryBuilder.build();
+    const countResult = await this.executeQuery({ sql: countSql, params: countParams, first: true });
+    const total = Number(countResult?.count || 0);
+    const currentOffset = page * perPage;
+    if (total === 0) {
+      return {
+        evals: [],
+        total: 0,
+        page,
+        perPage,
+        hasMore: false
+      };
+    }
+    const dataQueryBuilder = createSqlBuilder().select("*").from(fullTableName);
+    if (conditions.length > 0) {
+      dataQueryBuilder.where(conditions.join(" AND "), ...queryParams);
+    }
+    dataQueryBuilder.orderBy("createdAt", "DESC").limit(perPage).offset(currentOffset);
+    const { sql: dataSql, params: dataParams } = dataQueryBuilder.build();
+    const rows = await this.executeQuery({ sql: dataSql, params: dataParams });
+    const evals = (isArrayOfRecords(rows) ? rows : []).map((row) => {
+      const result = this.deserializeValue(row.result);
+      const testInfo = row.test_info ? this.deserializeValue(row.test_info) : void 0;
+      if (!result || typeof result !== "object" || !("score" in result)) {
+        throw new Error(`Invalid MetricResult format: ${JSON.stringify(result)}`);
+      }
+      return {
+        input: row.input,
+        output: row.output,
+        result,
+        agentName: row.agent_name,
+        metricName: row.metric_name,
+        instructions: row.instructions,
+        testInfo,
+        globalRunId: row.global_run_id,
+        runId: row.run_id,
+        createdAt: row.createdAt
+      };
+    });
+    const hasMore = currentOffset + evals.length < total;
+    return {
+      evals,
+      total,
+      page,
+      perPage,
+      hasMore
+    };
+  }
   parseWorkflowRun(row) {
     let parsedSnapshot = row.snapshot;
     if (typeof parsedSnapshot === "string") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/cloudflare-d1",
-  "version": "0.10.1",
+  "version": "0.10.2-alpha.0",
   "description": "D1 provider for Mastra - includes db storage capabilities",
   "type": "module",
   "files": [
@@ -26,16 +26,17 @@
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250417.0",
-    "@microsoft/api-extractor": "^7.52.5",
-    "@types/node": "^20.17.27",
-    "dotenv": "^16.4.7",
-    "eslint": "^9.23.0",
+    "@microsoft/api-extractor": "^7.52.8",
+    "@types/node": "^20.17.57",
+    "dotenv": "^16.5.0",
+    "eslint": "^9.28.0",
     "miniflare": "^4.20250410.1",
-    "tsup": "^8.4.0",
+    "tsup": "^8.5.0",
     "typescript": "^5.8.2",
     "vitest": "^3.1.2",
-    "@internal/lint": "0.0.8",
-    "@mastra/core": "0.10.2"
+    "@internal/lint": "0.0.10",
+    "@internal/storage-test-utils": "0.0.6",
+    "@mastra/core": "0.10.4-alpha.0"
   },
   "peerDependencies": {
     "@mastra/core": "^0.10.2-alpha.0"