@mastra/cloudflare-d1 0.0.0-switch-to-core-20250424015131 → 0.0.0-taofeeqInngest-20250603090617

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

@@ -1,16 +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 { MastraStorage } from '@mastra/core/storage';
-import type { MessageType } from '@mastra/core/memory';
 import type { StorageColumn } from '@mastra/core/storage';
 import type { StorageGetMessagesArg } from '@mastra/core/storage';
 import type { StorageThreadType } from '@mastra/core/memory';
 import type { TABLE_NAMES } from '@mastra/core/storage';
+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';
 
-export declare const createSampleMessage: (threadId: string) => any;
+export declare const checkWorkflowSnapshot: (snapshot: WorkflowRunState_2 | string, stepId: string, status: string) => void;
+
+export declare const createSampleMessage: (threadId: string, parts?: MastraMessageV2_2["content"]["parts"]) => MastraMessageV2_2;
 
 export declare const createSampleThread: () => {
     id: string;
@@ -51,7 +56,11 @@ export declare const createSampleTrace: (name: string, scope?: string, attribute
     createdAt: string;
 };
 
-export declare const createSampleWorkflowSnapshot: (threadId: string) => WorkflowRunState_2;
+export declare const createSampleWorkflowSnapshot: (threadId: string, status: string, createdAt?: Date) => {
+    snapshot: WorkflowRunState_2;
+    runId: string;
+    stepId: string;
+};
 
 export declare function createSqlBuilder(): SqlBuilder;
 
@@ -84,7 +93,6 @@ declare class D1Store extends MastraStorage {
     constructor(config: D1StoreConfig);
     private getTableName;
     private formatSqlParams;
-    private createIndexIfNotExists;
     private executeWorkersBindingQuery;
     private executeRestQuery;
     /**
@@ -131,10 +139,20 @@ declare class D1Store extends MastraStorage {
     deleteThread({ threadId }: {
         threadId: string;
     }): Promise<void>;
-    saveMessages({ messages }: {
-        messages: MessageType[];
-    }): Promise<MessageType[]>;
-    getMessages<T = 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[]>;
     persistWorkflowSnapshot({ workflowName, runId, snapshot, }: {
         workflowName: string;
         runId: string;
@@ -153,21 +171,30 @@ declare class D1Store extends MastraStorage {
         tableName: TABLE_NAMES;
         records: Record<string, any>[];
     }): Promise<void>;
-    getTraces({ name, scope, page, perPage, attributes, }: {
+    getTraces({ name, scope, page, perPage, attributes, fromDate, toDate, }: {
         name?: string;
         scope?: string;
         page: number;
         perPage: number;
         attributes?: Record<string, string>;
+        fromDate?: Date;
+        toDate?: Date;
     }): Promise<Record<string, any>[]>;
     getEvalsByAgentName(agentName: string, type?: 'test' | 'live'): Promise<EvalRow[]>;
-    getWorkflowRuns(_args?: {
+    private parseWorkflowRun;
+    private hasColumn;
+    getWorkflowRuns({ workflowName, fromDate, toDate, limit, offset, resourceId, }?: {
         workflowName?: string;
         fromDate?: Date;
         toDate?: Date;
         limit?: number;
         offset?: number;
+        resourceId?: string;
     }): Promise<WorkflowRuns>;
+    getWorkflowRunById({ runId, workflowName, }: {
+        runId: string;
+        workflowName?: string;
+    }): Promise<WorkflowRun | null>;
     /**
      * Close the database connection
      * No explicit cleanup needed for D1 in either REST or Workers Binding mode
@@ -196,9 +223,30 @@ declare interface D1WorkersConfig {
 export { D1WorkersConfig }
 export { D1WorkersConfig as D1WorkersConfig_alias_1 }
 
+/**
+ * Parses and returns a valid SQL SELECT column identifier.
+ * Allows a single identifier (letters, numbers, underscores), or '*', optionally with 'AS alias'.
+ *
+ * @param column - The column identifier string to parse.
+ * @returns The validated column identifier as a branded type.
+ * @throws {Error} If invalid.
+ *
+ * @example
+ * const col = parseSelectIdentifier('user_id'); // Ok
+ * parseSelectIdentifier('user_id AS uid'); // Ok
+ * parseSelectIdentifier('*'); // Ok
+ * parseSelectIdentifier('user id'); // Throws error
+ */
+export declare function parseSelectIdentifier(column: string): SelectIdentifier;
+
 export declare const retryUntil: <T>(fn: () => Promise<T>, condition: (result: T) => boolean, timeout?: number, // REST API needs longer timeout due to higher latency
 interval?: number) => Promise<T>;
 
+/** Represents a validated SQL SELECT column identifier (or '*', optionally with 'AS alias'). */
+declare type SelectIdentifier = string & {
+    __brand: 'SelectIdentifier';
+};
+
 /**
  * SQL Builder class for constructing type-safe SQL queries
  * This helps create maintainable and secure SQL queries with proper parameter handling
@@ -226,6 +274,7 @@ export declare class SqlBuilder {
     orderBy(column: string, direction?: 'ASC' | 'DESC'): SqlBuilder;
     limit(count: number): SqlBuilder;
     offset(count: number): SqlBuilder;
+    count(): SqlBuilder;
     /**
      * Insert a row, or update specific columns on conflict (upsert).
      * @param table Table name
@@ -261,7 +310,6 @@ export declare class SqlBuilder {
      * @returns The builder instance
      */
     createIndex(indexName: string, tableName: string, columnName: string, indexType?: string): SqlBuilder;
-    raw(sql: string, ...params: SqlParam[]): SqlBuilder;
     /**
      * Add a LIKE condition to the query
      * @param column The column to check
@@ -299,7 +347,7 @@ export declare type SqlParam = string | number | boolean | null | undefined;
 /**
  * Interface for SQL query options with generic type support
  */
-declare interface SqlQueryOptions {
+export declare interface SqlQueryOptions {
     /** SQL query to execute */
     sql: string;
     /** Parameters to bind to the query */
@@ -307,7 +355,5 @@ declare interface SqlQueryOptions {
     /** Whether to return only the first result */
     first?: boolean;
 }
-export { SqlQueryOptions }
-export { SqlQueryOptions as SqlQueryOptions_alias_1 }
 
 export { }

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

@@ -1,16 +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 { MastraStorage } from '@mastra/core/storage';
-import type { MessageType } from '@mastra/core/memory';
 import type { StorageColumn } from '@mastra/core/storage';
 import type { StorageGetMessagesArg } from '@mastra/core/storage';
 import type { StorageThreadType } from '@mastra/core/memory';
 import type { TABLE_NAMES } from '@mastra/core/storage';
+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';
 
-export declare const createSampleMessage: (threadId: string) => any;
+export declare const checkWorkflowSnapshot: (snapshot: WorkflowRunState_2 | string, stepId: string, status: string) => void;
+
+export declare const createSampleMessage: (threadId: string, parts?: MastraMessageV2_2["content"]["parts"]) => MastraMessageV2_2;
 
 export declare const createSampleThread: () => {
     id: string;
@@ -51,7 +56,11 @@ export declare const createSampleTrace: (name: string, scope?: string, attribute
     createdAt: string;
 };
 
-export declare const createSampleWorkflowSnapshot: (threadId: string) => WorkflowRunState_2;
+export declare const createSampleWorkflowSnapshot: (threadId: string, status: string, createdAt?: Date) => {
+    snapshot: WorkflowRunState_2;
+    runId: string;
+    stepId: string;
+};
 
 export declare function createSqlBuilder(): SqlBuilder;
 
@@ -84,7 +93,6 @@ declare class D1Store extends MastraStorage {
     constructor(config: D1StoreConfig);
     private getTableName;
     private formatSqlParams;
-    private createIndexIfNotExists;
     private executeWorkersBindingQuery;
     private executeRestQuery;
     /**
@@ -131,10 +139,20 @@ declare class D1Store extends MastraStorage {
     deleteThread({ threadId }: {
         threadId: string;
     }): Promise<void>;
-    saveMessages({ messages }: {
-        messages: MessageType[];
-    }): Promise<MessageType[]>;
-    getMessages<T = 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[]>;
     persistWorkflowSnapshot({ workflowName, runId, snapshot, }: {
         workflowName: string;
         runId: string;
@@ -153,21 +171,30 @@ declare class D1Store extends MastraStorage {
         tableName: TABLE_NAMES;
         records: Record<string, any>[];
     }): Promise<void>;
-    getTraces({ name, scope, page, perPage, attributes, }: {
+    getTraces({ name, scope, page, perPage, attributes, fromDate, toDate, }: {
         name?: string;
         scope?: string;
         page: number;
         perPage: number;
         attributes?: Record<string, string>;
+        fromDate?: Date;
+        toDate?: Date;
     }): Promise<Record<string, any>[]>;
     getEvalsByAgentName(agentName: string, type?: 'test' | 'live'): Promise<EvalRow[]>;
-    getWorkflowRuns(_args?: {
+    private parseWorkflowRun;
+    private hasColumn;
+    getWorkflowRuns({ workflowName, fromDate, toDate, limit, offset, resourceId, }?: {
         workflowName?: string;
         fromDate?: Date;
         toDate?: Date;
         limit?: number;
         offset?: number;
+        resourceId?: string;
     }): Promise<WorkflowRuns>;
+    getWorkflowRunById({ runId, workflowName, }: {
+        runId: string;
+        workflowName?: string;
+    }): Promise<WorkflowRun | null>;
     /**
      * Close the database connection
      * No explicit cleanup needed for D1 in either REST or Workers Binding mode
@@ -196,9 +223,30 @@ declare interface D1WorkersConfig {
 export { D1WorkersConfig }
 export { D1WorkersConfig as D1WorkersConfig_alias_1 }
 
+/**
+ * Parses and returns a valid SQL SELECT column identifier.
+ * Allows a single identifier (letters, numbers, underscores), or '*', optionally with 'AS alias'.
+ *
+ * @param column - The column identifier string to parse.
+ * @returns The validated column identifier as a branded type.
+ * @throws {Error} If invalid.
+ *
+ * @example
+ * const col = parseSelectIdentifier('user_id'); // Ok
+ * parseSelectIdentifier('user_id AS uid'); // Ok
+ * parseSelectIdentifier('*'); // Ok
+ * parseSelectIdentifier('user id'); // Throws error
+ */
+export declare function parseSelectIdentifier(column: string): SelectIdentifier;
+
 export declare const retryUntil: <T>(fn: () => Promise<T>, condition: (result: T) => boolean, timeout?: number, // REST API needs longer timeout due to higher latency
 interval?: number) => Promise<T>;
 
+/** Represents a validated SQL SELECT column identifier (or '*', optionally with 'AS alias'). */
+declare type SelectIdentifier = string & {
+    __brand: 'SelectIdentifier';
+};
+
 /**
  * SQL Builder class for constructing type-safe SQL queries
  * This helps create maintainable and secure SQL queries with proper parameter handling
@@ -226,6 +274,7 @@ export declare class SqlBuilder {
     orderBy(column: string, direction?: 'ASC' | 'DESC'): SqlBuilder;
     limit(count: number): SqlBuilder;
     offset(count: number): SqlBuilder;
+    count(): SqlBuilder;
     /**
      * Insert a row, or update specific columns on conflict (upsert).
      * @param table Table name
@@ -261,7 +310,6 @@ export declare class SqlBuilder {
      * @returns The builder instance
      */
     createIndex(indexName: string, tableName: string, columnName: string, indexType?: string): SqlBuilder;
-    raw(sql: string, ...params: SqlParam[]): SqlBuilder;
     /**
      * Add a LIKE condition to the query
      * @param column The column to check
@@ -299,7 +347,7 @@ export declare type SqlParam = string | number | boolean | null | undefined;
 /**
  * Interface for SQL query options with generic type support
  */
-declare interface SqlQueryOptions {
+export declare interface SqlQueryOptions {
     /** SQL query to execute */
     sql: string;
     /** Parameters to bind to the query */
@@ -307,7 +355,5 @@ declare interface SqlQueryOptions {
     /** Whether to return only the first result */
     first?: boolean;
 }
-export { SqlQueryOptions }
-export { SqlQueryOptions as SqlQueryOptions_alias_1 }
 
 export { }

package/dist/index.cjs

@@ -1,15 +1,15 @@
 'use strict';
 
+var agent = require('@mastra/core/agent');
 var storage = require('@mastra/core/storage');
 var Cloudflare = require('cloudflare');
+var utils = require('@mastra/core/utils');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var Cloudflare__default = /*#__PURE__*/_interopDefault(Cloudflare);
 
 // src/storage/index.ts
-
-// src/storage/sql-builder.ts
 var SqlBuilder = class {
   sql = "";
   params = [];
@@ -19,12 +19,15 @@ var SqlBuilder = class {
     if (!columns || Array.isArray(columns) && columns.length === 0) {
       this.sql = "SELECT *";
     } else {
-      this.sql = `SELECT ${Array.isArray(columns) ? columns.join(", ") : columns}`;
+      const cols = Array.isArray(columns) ? columns : [columns];
+      const parsedCols = cols.map((col) => parseSelectIdentifier(col));
+      this.sql = `SELECT ${parsedCols.join(", ")}`;
     }
     return this;
   }
   from(table) {
-    this.sql += ` FROM ${table}`;
+    const parsedTableName = utils.parseSqlIdentifier(table, "table name");
+    this.sql += ` FROM ${parsedTableName}`;
     return this;
   }
   /**
@@ -61,7 +64,11 @@ var SqlBuilder = class {
     return this;
   }
   orderBy(column, direction = "ASC") {
-    this.sql += ` ORDER BY ${column} ${direction}`;
+    const parsedColumn = utils.parseSqlIdentifier(column, "column name");
+    if (!["ASC", "DESC"].includes(direction)) {
+      throw new Error(`Invalid sort direction: ${direction}`);
+    }
+    this.sql += ` ORDER BY ${parsedColumn} ${direction}`;
     return this;
   }
   limit(count) {
@@ -74,6 +81,10 @@ var SqlBuilder = class {
     this.params.push(count);
     return this;
   }
+  count() {
+    this.sql += "SELECT COUNT(*) AS count";
+    return this;
+  }
   /**
    * Insert a row, or update specific columns on conflict (upsert).
    * @param table Table name
@@ -83,27 +94,33 @@ var SqlBuilder = class {
    * @param updateMap Object mapping columns to update to their new value (e.g. { name: 'excluded.name' })
    */
   insert(table, columns, values, conflictColumns, updateMap) {
-    const placeholders = columns.map(() => "?").join(", ");
+    const parsedTableName = utils.parseSqlIdentifier(table, "table name");
+    const parsedColumns = columns.map((col) => utils.parseSqlIdentifier(col, "column name"));
+    const placeholders = parsedColumns.map(() => "?").join(", ");
     if (conflictColumns && updateMap) {
+      const parsedConflictColumns = conflictColumns.map((col) => utils.parseSqlIdentifier(col, "column name"));
       const updateClause = Object.entries(updateMap).map(([col, expr]) => `${col} = ${expr}`).join(", ");
-      this.sql = `INSERT INTO ${table} (${columns.join(", ")}) VALUES (${placeholders}) ON CONFLICT(${conflictColumns.join(", ")}) DO UPDATE SET ${updateClause}`;
+      this.sql = `INSERT INTO ${parsedTableName} (${parsedColumns.join(", ")}) VALUES (${placeholders}) ON CONFLICT(${parsedConflictColumns.join(", ")}) DO UPDATE SET ${updateClause}`;
       this.params.push(...values);
       return this;
     }
-    this.sql = `INSERT INTO ${table} (${columns.join(", ")}) VALUES (${placeholders})`;
+    this.sql = `INSERT INTO ${parsedTableName} (${parsedColumns.join(", ")}) VALUES (${placeholders})`;
     this.params.push(...values);
     return this;
   }
   // Update operations
   update(table, columns, values) {
-    const setClause = columns.map((col) => `${col} = ?`).join(", ");
-    this.sql = `UPDATE ${table} SET ${setClause}`;
+    const parsedTableName = utils.parseSqlIdentifier(table, "table name");
+    const parsedColumns = columns.map((col) => utils.parseSqlIdentifier(col, "column name"));
+    const setClause = parsedColumns.map((col) => `${col} = ?`).join(", ");
+    this.sql = `UPDATE ${parsedTableName} SET ${setClause}`;
     this.params.push(...values);
     return this;
   }
   // Delete operations
   delete(table) {
-    this.sql = `DELETE FROM ${table}`;
+    const parsedTableName = utils.parseSqlIdentifier(table, "table name");
+    this.sql = `DELETE FROM ${parsedTableName}`;
     return this;
   }
   /**
@@ -114,9 +131,16 @@ var SqlBuilder = class {
    * @returns The builder instance
    */
   createTable(table, columnDefinitions, tableConstraints) {
-    const columns = columnDefinitions.join(", ");
+    const parsedTableName = utils.parseSqlIdentifier(table, "table name");
+    const parsedColumnDefinitions = columnDefinitions.map((def) => {
+      const colName = def.split(/\s+/)[0];
+      if (!colName) throw new Error("Empty column name in definition");
+      utils.parseSqlIdentifier(colName, "column name");
+      return def;
+    });
+    const columns = parsedColumnDefinitions.join(", ");
     const constraints = tableConstraints && tableConstraints.length > 0 ? ", " + tableConstraints.join(", ") : "";
-    this.sql = `CREATE TABLE IF NOT EXISTS ${table} (${columns}${constraints})`;
+    this.sql = `CREATE TABLE IF NOT EXISTS ${parsedTableName} (${columns}${constraints})`;
     return this;
   }
   /**
@@ -139,13 +163,10 @@ var SqlBuilder = class {
    * @returns The builder instance
    */
   createIndex(indexName, tableName, columnName, indexType = "") {
-    this.sql = `CREATE ${indexType ? indexType + " " : ""}INDEX IF NOT EXISTS ${indexName} ON ${tableName}(${columnName})`;
-    return this;
-  }
-  // Raw SQL with params
-  raw(sql, ...params) {
-    this.sql = sql;
-    this.params.push(...params);
+    const parsedIndexName = utils.parseSqlIdentifier(indexName, "index name");
+    const parsedTableName = utils.parseSqlIdentifier(tableName, "table name");
+    const parsedColumnName = utils.parseSqlIdentifier(columnName, "column name");
+    this.sql = `CREATE ${indexType ? indexType + " " : ""}INDEX IF NOT EXISTS ${parsedIndexName} ON ${parsedTableName}(${parsedColumnName})`;
     return this;
   }
   /**
@@ -155,11 +176,12 @@ var SqlBuilder = class {
    * @param exact If true, will not add % wildcards
    */
   like(column, value, exact = false) {
+    const parsedColumnName = utils.parseSqlIdentifier(column, "column name");
     const likeValue = exact ? value : `%${value}%`;
     if (this.whereAdded) {
-      this.sql += ` AND ${column} LIKE ?`;
+      this.sql += ` AND ${parsedColumnName} LIKE ?`;
     } else {
-      this.sql += ` WHERE ${column} LIKE ?`;
+      this.sql += ` WHERE ${parsedColumnName} LIKE ?`;
       this.whereAdded = true;
     }
     this.params.push(likeValue);
@@ -172,11 +194,13 @@ var SqlBuilder = class {
    * @param value The value to match
    */
   jsonLike(column, key, value) {
-    const jsonPattern = `%"${key}":"${value}"%`;
+    const parsedColumnName = utils.parseSqlIdentifier(column, "column name");
+    const parsedKey = utils.parseSqlIdentifier(key, "key name");
+    const jsonPattern = `%"${parsedKey}":"${value}"%`;
     if (this.whereAdded) {
-      this.sql += ` AND ${column} LIKE ?`;
+      this.sql += ` AND ${parsedColumnName} LIKE ?`;
     } else {
-      this.sql += ` WHERE ${column} LIKE ?`;
+      this.sql += ` WHERE ${parsedColumnName} LIKE ?`;
       this.whereAdded = true;
     }
     this.params.push(jsonPattern);
@@ -206,6 +230,15 @@ var SqlBuilder = class {
 function createSqlBuilder() {
   return new SqlBuilder();
 }
+var SQL_IDENTIFIER_PATTERN = /^[a-zA-Z0-9_]+(\s+AS\s+[a-zA-Z0-9_]+)?$/;
+function parseSelectIdentifier(column) {
+  if (column !== "*" && !SQL_IDENTIFIER_PATTERN.test(column)) {
+    throw new Error(
+      `Invalid column name: "${column}". Must be "*" or a valid identifier (letters, numbers, underscores), optionally with "AS alias".`
+    );
+  }
+  return column;
+}
 
 // src/storage/index.ts
 function isArrayOfRecords(value) {
@@ -224,6 +257,9 @@ var D1Store = class extends storage.MastraStorage {
    */
   constructor(config) {
     super({ name: "D1" });
+    if (config.tablePrefix && !/^[a-zA-Z0-9_]*$/.test(config.tablePrefix)) {
+      throw new Error("Invalid tablePrefix: only letters, numbers, and underscores are allowed.");
+    }
     this.tablePrefix = config.tablePrefix || "";
     if ("binding" in config) {
       if (!config.binding) {
@@ -250,30 +286,6 @@ var D1Store = class extends storage.MastraStorage {
   formatSqlParams(params) {
     return params.map((p) => p === void 0 || p === null ? null : p);
   }
-  // Helper method to create SQL indexes for better query performance
-  async createIndexIfNotExists(tableName, columnName, indexType = "") {
-    const fullTableName = this.getTableName(tableName);
-    const indexName = `idx_${tableName}_${columnName}`;
-    try {
-      const checkQuery = createSqlBuilder().checkIndexExists(indexName, fullTableName);
-      const { sql: checkSql, params: checkParams } = checkQuery.build();
-      const indexExists = await this.executeQuery({
-        sql: checkSql,
-        params: checkParams,
-        first: true
-      });
-      if (!indexExists) {
-        const createQuery = createSqlBuilder().createIndex(indexName, fullTableName, columnName, indexType);
-        const { sql: createSql, params: createParams } = createQuery.build();
-        await this.executeQuery({ sql: createSql, params: createParams });
-        this.logger.debug(`Created index ${indexName} on ${fullTableName}(${columnName})`);
-      }
-    } catch (error) {
-      this.logger.error(`Error creating index on ${fullTableName}(${columnName}):`, {
-        message: error instanceof Error ? error.message : String(error)
-      });
-    }
-  }
   async executeWorkersBindingQuery({
     sql,
     params = [],
@@ -496,7 +508,8 @@ var D1Store = class extends storage.MastraStorage {
     try {
       await this.executeQuery({ sql, params });
     } catch (error) {
-      this.logger.error(`Error inserting into ${fullTableName}:`, { error });
+      const message = error instanceof Error ? error.message : String(error);
+      this.logger.error(`Error inserting into ${fullTableName}:`, { message });
       throw new Error(`Failed to insert into ${fullTableName}: ${error}`);
     }
   }
@@ -594,7 +607,8 @@ var D1Store = class extends storage.MastraStorage {
       await this.executeQuery({ sql, params });
       return thread;
     } catch (error) {
-      this.logger.error(`Error saving thread to ${fullTableName}:`, { error });
+      const message = error instanceof Error ? error.message : String(error);
+      this.logger.error(`Error saving thread to ${fullTableName}:`, { message });
       throw error;
     }
   }
@@ -628,7 +642,8 @@ var D1Store = class extends storage.MastraStorage {
         updatedAt: /* @__PURE__ */ new Date()
       };
     } catch (error) {
-      this.logger.error("Error updating thread:", { error });
+      const message = error instanceof Error ? error.message : String(error);
+      this.logger.error("Error updating thread:", { message });
       throw error;
     }
   }
@@ -649,8 +664,8 @@ var D1Store = class extends storage.MastraStorage {
       throw new Error(`Failed to delete thread ${threadId}: ${error}`);
     }
   }
-  // Thread and message management methods
-  async saveMessages({ messages }) {
+  async saveMessages(args) {
+    const { messages, format = "v1" } = args;
     if (messages.length === 0) return [];
     try {
       const now = /* @__PURE__ */ new Date();
@@ -672,7 +687,7 @@ var D1Store = class extends storage.MastraStorage {
           content: typeof message.content === "string" ? message.content : JSON.stringify(message.content),
           createdAt: createdAt.toISOString(),
           role: message.role,
-          type: message.type
+          type: message.type || "v2"
         };
       });
       await this.batchInsert({
@@ -680,13 +695,19 @@ var D1Store = class extends storage.MastraStorage {
         records: messagesToInsert
       });
       this.logger.debug(`Saved ${messages.length} messages`);
-      return messages;
+      const list = new agent.MessageList().add(messages, "memory");
+      if (format === `v2`) return list.get.all.v2();
+      return list.get.all.v1();
     } catch (error) {
       this.logger.error("Error saving messages:", { message: error instanceof Error ? error.message : String(error) });
       throw error;
     }
   }
-  async getMessages({ threadId, selectBy }) {
+  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 || [];
@@ -710,7 +731,7 @@ var D1Store = class extends storage.MastraStorage {
           m.role,
           m.type,
           m.createdAt,
-          m.thread_id AS "threadId"
+          m.thread_id AS threadId
         FROM ordered_messages m
         WHERE m.id IN (${includeIds.map(() => "?").join(",")})
         OR EXISTS (
@@ -737,7 +758,7 @@ var D1Store = class extends storage.MastraStorage {
         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);
+      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 { sql, params } = query.build();
       const result = await this.executeQuery({ sql, params });
       if (Array.isArray(result)) messages.push(...result);
@@ -751,12 +772,15 @@ var D1Store = class extends storage.MastraStorage {
       const processedMessages = messages.map((message) => {
         const processedMsg = {};
         for (const [key, value] of Object.entries(message)) {
+          if (key === `type` && value === `v2`) continue;
           processedMsg[key] = this.deserializeValue(value);
         }
         return processedMsg;
       });
       this.logger.debug(`Retrieved ${messages.length} messages for thread ${threadId}`);
-      return processedMessages;
+      const list = new agent.MessageList().add(processedMessages, "memory");
+      if (format === `v2`) return list.get.all.v2();
+      return list.get.all.v1();
     } catch (error) {
       this.logger.error("Error retrieving messages for thread", {
         threadId,
@@ -862,7 +886,9 @@ var D1Store = class extends storage.MastraStorage {
     scope,
     page,
     perPage,
-    attributes
+    attributes,
+    fromDate,
+    toDate
   }) {
     const fullTableName = this.getTableName(storage.TABLE_TRACES);
     try {
@@ -878,6 +904,12 @@ var D1Store = class extends storage.MastraStorage {
           query.jsonLike("attributes", key, value);
         }
       }
+      if (fromDate) {
+        query.andWhere("createdAt >= ?", fromDate instanceof Date ? fromDate.toISOString() : fromDate);
+      }
+      if (toDate) {
+        query.andWhere("createdAt <= ?", toDate instanceof Date ? toDate.toISOString() : toDate);
+      }
       query.orderBy("startTime", "DESC").limit(perPage).offset((page - 1) * perPage);
       const { sql, params } = query.build();
       const results = await this.executeQuery({ sql, params });
@@ -929,8 +961,107 @@ var D1Store = class extends storage.MastraStorage {
       return [];
     }
   }
-  getWorkflowRuns(_args) {
-    throw new Error("Method not implemented.");
+  parseWorkflowRun(row) {
+    let parsedSnapshot = row.snapshot;
+    if (typeof parsedSnapshot === "string") {
+      try {
+        parsedSnapshot = JSON.parse(row.snapshot);
+      } catch (e) {
+        console.warn(`Failed to parse snapshot for workflow ${row.workflow_name}: ${e}`);
+      }
+    }
+    return {
+      workflowName: row.workflow_name,
+      runId: row.run_id,
+      snapshot: parsedSnapshot,
+      createdAt: this.ensureDate(row.createdAt),
+      updatedAt: this.ensureDate(row.updatedAt),
+      resourceId: row.resourceId
+    };
+  }
+  async hasColumn(table, column) {
+    const sql = `PRAGMA table_info(${table});`;
+    const result = await this.executeQuery({ sql, params: [] });
+    if (!result || !Array.isArray(result)) return false;
+    return result.some((col) => col.name === column || col.name === column.toLowerCase());
+  }
+  async getWorkflowRuns({
+    workflowName,
+    fromDate,
+    toDate,
+    limit,
+    offset,
+    resourceId
+  } = {}) {
+    const fullTableName = this.getTableName(storage.TABLE_WORKFLOW_SNAPSHOT);
+    try {
+      const builder = createSqlBuilder().select().from(fullTableName);
+      const countBuilder = createSqlBuilder().count().from(fullTableName);
+      if (workflowName) builder.whereAnd("workflow_name = ?", workflowName);
+      if (resourceId) {
+        const hasResourceId = await this.hasColumn(fullTableName, "resourceId");
+        if (hasResourceId) {
+          builder.whereAnd("resourceId = ?", resourceId);
+          countBuilder.whereAnd("resourceId = ?", resourceId);
+        } else {
+          console.warn(`[${fullTableName}] resourceId column not found. Skipping resourceId filter.`);
+        }
+      }
+      if (fromDate) {
+        builder.whereAnd("createdAt >= ?", fromDate instanceof Date ? fromDate.toISOString() : fromDate);
+        countBuilder.whereAnd("createdAt >= ?", fromDate instanceof Date ? fromDate.toISOString() : fromDate);
+      }
+      if (toDate) {
+        builder.whereAnd("createdAt <= ?", toDate instanceof Date ? toDate.toISOString() : toDate);
+        countBuilder.whereAnd("createdAt <= ?", toDate instanceof Date ? toDate.toISOString() : toDate);
+      }
+      builder.orderBy("createdAt", "DESC");
+      if (typeof limit === "number") builder.limit(limit);
+      if (typeof offset === "number") builder.offset(offset);
+      const { sql, params } = builder.build();
+      let total = 0;
+      if (limit !== void 0 && offset !== void 0) {
+        const { sql: countSql, params: countParams } = countBuilder.build();
+        const countResult = await this.executeQuery({ sql: countSql, params: countParams, first: true });
+        total = Number(countResult?.count ?? 0);
+      }
+      const results = await this.executeQuery({ sql, params });
+      const runs = (isArrayOfRecords(results) ? results : []).map((row) => this.parseWorkflowRun(row));
+      return { runs, total: total || runs.length };
+    } catch (error) {
+      this.logger.error("Error getting workflow runs:", {
+        message: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
+  async getWorkflowRunById({
+    runId,
+    workflowName
+  }) {
+    const fullTableName = this.getTableName(storage.TABLE_WORKFLOW_SNAPSHOT);
+    try {
+      const conditions = [];
+      const params = [];
+      if (runId) {
+        conditions.push("run_id = ?");
+        params.push(runId);
+      }
+      if (workflowName) {
+        conditions.push("workflow_name = ?");
+        params.push(workflowName);
+      }
+      const whereClause = conditions.length > 0 ? "WHERE " + conditions.join(" AND ") : "";
+      const sql = `SELECT * FROM ${fullTableName} ${whereClause} ORDER BY createdAt DESC LIMIT 1`;
+      const result = await this.executeQuery({ sql, params, first: true });
+      if (!result) return null;
+      return this.parseWorkflowRun(result);
+    } catch (error) {
+      this.logger.error("Error getting workflow run by ID:", {
+        message: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
   }
   /**
    * Close the database connection

package/dist/index.d.cts

@@ -1,4 +1,3 @@
-export { SqlQueryOptions } from './_tsup-dts-rollup.cjs';
 export { D1Config } from './_tsup-dts-rollup.cjs';
 export { D1WorkersConfig } from './_tsup-dts-rollup.cjs';
 export { D1StoreConfig } from './_tsup-dts-rollup.cjs';

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-export { SqlQueryOptions } from './_tsup-dts-rollup.js';
 export { D1Config } from './_tsup-dts-rollup.js';
 export { D1WorkersConfig } from './_tsup-dts-rollup.js';
 export { D1StoreConfig } from './_tsup-dts-rollup.js';

package/dist/index.js

@@ -1,9 +1,9 @@
+import { MessageList } from '@mastra/core/agent';
 import { MastraStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_WORKFLOW_SNAPSHOT, TABLE_TRACES, TABLE_EVALS } from '@mastra/core/storage';
 import Cloudflare from 'cloudflare';
+import { parseSqlIdentifier } from '@mastra/core/utils';
 
 // src/storage/index.ts
-
-// src/storage/sql-builder.ts
 var SqlBuilder = class {
   sql = "";
   params = [];
@@ -13,12 +13,15 @@ var SqlBuilder = class {
     if (!columns || Array.isArray(columns) && columns.length === 0) {
       this.sql = "SELECT *";
     } else {
-      this.sql = `SELECT ${Array.isArray(columns) ? columns.join(", ") : columns}`;
+      const cols = Array.isArray(columns) ? columns : [columns];
+      const parsedCols = cols.map((col) => parseSelectIdentifier(col));
+      this.sql = `SELECT ${parsedCols.join(", ")}`;
     }
     return this;
   }
   from(table) {
-    this.sql += ` FROM ${table}`;
+    const parsedTableName = parseSqlIdentifier(table, "table name");
+    this.sql += ` FROM ${parsedTableName}`;
     return this;
   }
   /**
@@ -55,7 +58,11 @@ var SqlBuilder = class {
     return this;
   }
   orderBy(column, direction = "ASC") {
-    this.sql += ` ORDER BY ${column} ${direction}`;
+    const parsedColumn = parseSqlIdentifier(column, "column name");
+    if (!["ASC", "DESC"].includes(direction)) {
+      throw new Error(`Invalid sort direction: ${direction}`);
+    }
+    this.sql += ` ORDER BY ${parsedColumn} ${direction}`;
     return this;
   }
   limit(count) {
@@ -68,6 +75,10 @@ var SqlBuilder = class {
     this.params.push(count);
     return this;
   }
+  count() {
+    this.sql += "SELECT COUNT(*) AS count";
+    return this;
+  }
   /**
    * Insert a row, or update specific columns on conflict (upsert).
    * @param table Table name
@@ -77,27 +88,33 @@ var SqlBuilder = class {
    * @param updateMap Object mapping columns to update to their new value (e.g. { name: 'excluded.name' })
    */
   insert(table, columns, values, conflictColumns, updateMap) {
-    const placeholders = columns.map(() => "?").join(", ");
+    const parsedTableName = parseSqlIdentifier(table, "table name");
+    const parsedColumns = columns.map((col) => parseSqlIdentifier(col, "column name"));
+    const placeholders = parsedColumns.map(() => "?").join(", ");
     if (conflictColumns && updateMap) {
+      const parsedConflictColumns = conflictColumns.map((col) => parseSqlIdentifier(col, "column name"));
       const updateClause = Object.entries(updateMap).map(([col, expr]) => `${col} = ${expr}`).join(", ");
-      this.sql = `INSERT INTO ${table} (${columns.join(", ")}) VALUES (${placeholders}) ON CONFLICT(${conflictColumns.join(", ")}) DO UPDATE SET ${updateClause}`;
+      this.sql = `INSERT INTO ${parsedTableName} (${parsedColumns.join(", ")}) VALUES (${placeholders}) ON CONFLICT(${parsedConflictColumns.join(", ")}) DO UPDATE SET ${updateClause}`;
       this.params.push(...values);
       return this;
     }
-    this.sql = `INSERT INTO ${table} (${columns.join(", ")}) VALUES (${placeholders})`;
+    this.sql = `INSERT INTO ${parsedTableName} (${parsedColumns.join(", ")}) VALUES (${placeholders})`;
     this.params.push(...values);
     return this;
   }
   // Update operations
   update(table, columns, values) {
-    const setClause = columns.map((col) => `${col} = ?`).join(", ");
-    this.sql = `UPDATE ${table} SET ${setClause}`;
+    const parsedTableName = parseSqlIdentifier(table, "table name");
+    const parsedColumns = columns.map((col) => parseSqlIdentifier(col, "column name"));
+    const setClause = parsedColumns.map((col) => `${col} = ?`).join(", ");
+    this.sql = `UPDATE ${parsedTableName} SET ${setClause}`;
     this.params.push(...values);
     return this;
   }
   // Delete operations
   delete(table) {
-    this.sql = `DELETE FROM ${table}`;
+    const parsedTableName = parseSqlIdentifier(table, "table name");
+    this.sql = `DELETE FROM ${parsedTableName}`;
     return this;
   }
   /**
@@ -108,9 +125,16 @@ var SqlBuilder = class {
    * @returns The builder instance
    */
   createTable(table, columnDefinitions, tableConstraints) {
-    const columns = columnDefinitions.join(", ");
+    const parsedTableName = parseSqlIdentifier(table, "table name");
+    const parsedColumnDefinitions = columnDefinitions.map((def) => {
+      const colName = def.split(/\s+/)[0];
+      if (!colName) throw new Error("Empty column name in definition");
+      parseSqlIdentifier(colName, "column name");
+      return def;
+    });
+    const columns = parsedColumnDefinitions.join(", ");
     const constraints = tableConstraints && tableConstraints.length > 0 ? ", " + tableConstraints.join(", ") : "";
-    this.sql = `CREATE TABLE IF NOT EXISTS ${table} (${columns}${constraints})`;
+    this.sql = `CREATE TABLE IF NOT EXISTS ${parsedTableName} (${columns}${constraints})`;
     return this;
   }
   /**
@@ -133,13 +157,10 @@ var SqlBuilder = class {
    * @returns The builder instance
    */
   createIndex(indexName, tableName, columnName, indexType = "") {
-    this.sql = `CREATE ${indexType ? indexType + " " : ""}INDEX IF NOT EXISTS ${indexName} ON ${tableName}(${columnName})`;
-    return this;
-  }
-  // Raw SQL with params
-  raw(sql, ...params) {
-    this.sql = sql;
-    this.params.push(...params);
+    const parsedIndexName = parseSqlIdentifier(indexName, "index name");
+    const parsedTableName = parseSqlIdentifier(tableName, "table name");
+    const parsedColumnName = parseSqlIdentifier(columnName, "column name");
+    this.sql = `CREATE ${indexType ? indexType + " " : ""}INDEX IF NOT EXISTS ${parsedIndexName} ON ${parsedTableName}(${parsedColumnName})`;
     return this;
   }
   /**
@@ -149,11 +170,12 @@ var SqlBuilder = class {
    * @param exact If true, will not add % wildcards
    */
   like(column, value, exact = false) {
+    const parsedColumnName = parseSqlIdentifier(column, "column name");
     const likeValue = exact ? value : `%${value}%`;
     if (this.whereAdded) {
-      this.sql += ` AND ${column} LIKE ?`;
+      this.sql += ` AND ${parsedColumnName} LIKE ?`;
     } else {
-      this.sql += ` WHERE ${column} LIKE ?`;
+      this.sql += ` WHERE ${parsedColumnName} LIKE ?`;
       this.whereAdded = true;
     }
     this.params.push(likeValue);
@@ -166,11 +188,13 @@ var SqlBuilder = class {
    * @param value The value to match
    */
   jsonLike(column, key, value) {
-    const jsonPattern = `%"${key}":"${value}"%`;
+    const parsedColumnName = parseSqlIdentifier(column, "column name");
+    const parsedKey = parseSqlIdentifier(key, "key name");
+    const jsonPattern = `%"${parsedKey}":"${value}"%`;
     if (this.whereAdded) {
-      this.sql += ` AND ${column} LIKE ?`;
+      this.sql += ` AND ${parsedColumnName} LIKE ?`;
     } else {
-      this.sql += ` WHERE ${column} LIKE ?`;
+      this.sql += ` WHERE ${parsedColumnName} LIKE ?`;
       this.whereAdded = true;
     }
     this.params.push(jsonPattern);
@@ -200,6 +224,15 @@ var SqlBuilder = class {
 function createSqlBuilder() {
   return new SqlBuilder();
 }
+var SQL_IDENTIFIER_PATTERN = /^[a-zA-Z0-9_]+(\s+AS\s+[a-zA-Z0-9_]+)?$/;
+function parseSelectIdentifier(column) {
+  if (column !== "*" && !SQL_IDENTIFIER_PATTERN.test(column)) {
+    throw new Error(
+      `Invalid column name: "${column}". Must be "*" or a valid identifier (letters, numbers, underscores), optionally with "AS alias".`
+    );
+  }
+  return column;
+}
 
 // src/storage/index.ts
 function isArrayOfRecords(value) {
@@ -218,6 +251,9 @@ var D1Store = class extends MastraStorage {
    */
   constructor(config) {
     super({ name: "D1" });
+    if (config.tablePrefix && !/^[a-zA-Z0-9_]*$/.test(config.tablePrefix)) {
+      throw new Error("Invalid tablePrefix: only letters, numbers, and underscores are allowed.");
+    }
     this.tablePrefix = config.tablePrefix || "";
     if ("binding" in config) {
       if (!config.binding) {
@@ -244,30 +280,6 @@ var D1Store = class extends MastraStorage {
   formatSqlParams(params) {
     return params.map((p) => p === void 0 || p === null ? null : p);
   }
-  // Helper method to create SQL indexes for better query performance
-  async createIndexIfNotExists(tableName, columnName, indexType = "") {
-    const fullTableName = this.getTableName(tableName);
-    const indexName = `idx_${tableName}_${columnName}`;
-    try {
-      const checkQuery = createSqlBuilder().checkIndexExists(indexName, fullTableName);
-      const { sql: checkSql, params: checkParams } = checkQuery.build();
-      const indexExists = await this.executeQuery({
-        sql: checkSql,
-        params: checkParams,
-        first: true
-      });
-      if (!indexExists) {
-        const createQuery = createSqlBuilder().createIndex(indexName, fullTableName, columnName, indexType);
-        const { sql: createSql, params: createParams } = createQuery.build();
-        await this.executeQuery({ sql: createSql, params: createParams });
-        this.logger.debug(`Created index ${indexName} on ${fullTableName}(${columnName})`);
-      }
-    } catch (error) {
-      this.logger.error(`Error creating index on ${fullTableName}(${columnName}):`, {
-        message: error instanceof Error ? error.message : String(error)
-      });
-    }
-  }
   async executeWorkersBindingQuery({
     sql,
     params = [],
@@ -490,7 +502,8 @@ var D1Store = class extends MastraStorage {
     try {
       await this.executeQuery({ sql, params });
     } catch (error) {
-      this.logger.error(`Error inserting into ${fullTableName}:`, { error });
+      const message = error instanceof Error ? error.message : String(error);
+      this.logger.error(`Error inserting into ${fullTableName}:`, { message });
       throw new Error(`Failed to insert into ${fullTableName}: ${error}`);
     }
   }
@@ -588,7 +601,8 @@ var D1Store = class extends MastraStorage {
       await this.executeQuery({ sql, params });
       return thread;
     } catch (error) {
-      this.logger.error(`Error saving thread to ${fullTableName}:`, { error });
+      const message = error instanceof Error ? error.message : String(error);
+      this.logger.error(`Error saving thread to ${fullTableName}:`, { message });
       throw error;
     }
   }
@@ -622,7 +636,8 @@ var D1Store = class extends MastraStorage {
         updatedAt: /* @__PURE__ */ new Date()
       };
     } catch (error) {
-      this.logger.error("Error updating thread:", { error });
+      const message = error instanceof Error ? error.message : String(error);
+      this.logger.error("Error updating thread:", { message });
       throw error;
     }
   }
@@ -643,8 +658,8 @@ var D1Store = class extends MastraStorage {
       throw new Error(`Failed to delete thread ${threadId}: ${error}`);
     }
   }
-  // Thread and message management methods
-  async saveMessages({ messages }) {
+  async saveMessages(args) {
+    const { messages, format = "v1" } = args;
     if (messages.length === 0) return [];
     try {
       const now = /* @__PURE__ */ new Date();
@@ -666,7 +681,7 @@ var D1Store = class extends MastraStorage {
           content: typeof message.content === "string" ? message.content : JSON.stringify(message.content),
           createdAt: createdAt.toISOString(),
           role: message.role,
-          type: message.type
+          type: message.type || "v2"
         };
       });
       await this.batchInsert({
@@ -674,13 +689,19 @@ var D1Store = class extends MastraStorage {
         records: messagesToInsert
       });
       this.logger.debug(`Saved ${messages.length} messages`);
-      return messages;
+      const list = new MessageList().add(messages, "memory");
+      if (format === `v2`) return list.get.all.v2();
+      return list.get.all.v1();
     } catch (error) {
       this.logger.error("Error saving messages:", { message: error instanceof Error ? error.message : String(error) });
       throw error;
     }
   }
-  async getMessages({ threadId, selectBy }) {
+  async getMessages({
+    threadId,
+    selectBy,
+    format
+  }) {
     const fullTableName = this.getTableName(TABLE_MESSAGES);
     const limit = typeof selectBy?.last === "number" ? selectBy.last : 40;
     const include = selectBy?.include || [];
@@ -704,7 +725,7 @@ var D1Store = class extends MastraStorage {
           m.role,
           m.type,
           m.createdAt,
-          m.thread_id AS "threadId"
+          m.thread_id AS threadId
         FROM ordered_messages m
         WHERE m.id IN (${includeIds.map(() => "?").join(",")})
         OR EXISTS (
@@ -731,7 +752,7 @@ var D1Store = class extends MastraStorage {
         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);
+      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 { sql, params } = query.build();
       const result = await this.executeQuery({ sql, params });
       if (Array.isArray(result)) messages.push(...result);
@@ -745,12 +766,15 @@ var D1Store = class extends MastraStorage {
       const processedMessages = messages.map((message) => {
         const processedMsg = {};
         for (const [key, value] of Object.entries(message)) {
+          if (key === `type` && value === `v2`) continue;
           processedMsg[key] = this.deserializeValue(value);
         }
         return processedMsg;
       });
       this.logger.debug(`Retrieved ${messages.length} messages for thread ${threadId}`);
-      return processedMessages;
+      const list = new MessageList().add(processedMessages, "memory");
+      if (format === `v2`) return list.get.all.v2();
+      return list.get.all.v1();
     } catch (error) {
       this.logger.error("Error retrieving messages for thread", {
         threadId,
@@ -856,7 +880,9 @@ var D1Store = class extends MastraStorage {
     scope,
     page,
     perPage,
-    attributes
+    attributes,
+    fromDate,
+    toDate
   }) {
     const fullTableName = this.getTableName(TABLE_TRACES);
     try {
@@ -872,6 +898,12 @@ var D1Store = class extends MastraStorage {
           query.jsonLike("attributes", key, value);
         }
       }
+      if (fromDate) {
+        query.andWhere("createdAt >= ?", fromDate instanceof Date ? fromDate.toISOString() : fromDate);
+      }
+      if (toDate) {
+        query.andWhere("createdAt <= ?", toDate instanceof Date ? toDate.toISOString() : toDate);
+      }
       query.orderBy("startTime", "DESC").limit(perPage).offset((page - 1) * perPage);
       const { sql, params } = query.build();
       const results = await this.executeQuery({ sql, params });
@@ -923,8 +955,107 @@ var D1Store = class extends MastraStorage {
       return [];
     }
   }
-  getWorkflowRuns(_args) {
-    throw new Error("Method not implemented.");
+  parseWorkflowRun(row) {
+    let parsedSnapshot = row.snapshot;
+    if (typeof parsedSnapshot === "string") {
+      try {
+        parsedSnapshot = JSON.parse(row.snapshot);
+      } catch (e) {
+        console.warn(`Failed to parse snapshot for workflow ${row.workflow_name}: ${e}`);
+      }
+    }
+    return {
+      workflowName: row.workflow_name,
+      runId: row.run_id,
+      snapshot: parsedSnapshot,
+      createdAt: this.ensureDate(row.createdAt),
+      updatedAt: this.ensureDate(row.updatedAt),
+      resourceId: row.resourceId
+    };
+  }
+  async hasColumn(table, column) {
+    const sql = `PRAGMA table_info(${table});`;
+    const result = await this.executeQuery({ sql, params: [] });
+    if (!result || !Array.isArray(result)) return false;
+    return result.some((col) => col.name === column || col.name === column.toLowerCase());
+  }
+  async getWorkflowRuns({
+    workflowName,
+    fromDate,
+    toDate,
+    limit,
+    offset,
+    resourceId
+  } = {}) {
+    const fullTableName = this.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 (resourceId) {
+        const hasResourceId = await this.hasColumn(fullTableName, "resourceId");
+        if (hasResourceId) {
+          builder.whereAnd("resourceId = ?", resourceId);
+          countBuilder.whereAnd("resourceId = ?", resourceId);
+        } else {
+          console.warn(`[${fullTableName}] resourceId column not found. Skipping resourceId filter.`);
+        }
+      }
+      if (fromDate) {
+        builder.whereAnd("createdAt >= ?", fromDate instanceof Date ? fromDate.toISOString() : fromDate);
+        countBuilder.whereAnd("createdAt >= ?", fromDate instanceof Date ? fromDate.toISOString() : fromDate);
+      }
+      if (toDate) {
+        builder.whereAnd("createdAt <= ?", toDate instanceof Date ? toDate.toISOString() : toDate);
+        countBuilder.whereAnd("createdAt <= ?", toDate instanceof Date ? toDate.toISOString() : toDate);
+      }
+      builder.orderBy("createdAt", "DESC");
+      if (typeof limit === "number") builder.limit(limit);
+      if (typeof offset === "number") builder.offset(offset);
+      const { sql, params } = builder.build();
+      let total = 0;
+      if (limit !== void 0 && offset !== void 0) {
+        const { sql: countSql, params: countParams } = countBuilder.build();
+        const countResult = await this.executeQuery({ sql: countSql, params: countParams, first: true });
+        total = Number(countResult?.count ?? 0);
+      }
+      const results = await this.executeQuery({ sql, params });
+      const runs = (isArrayOfRecords(results) ? results : []).map((row) => this.parseWorkflowRun(row));
+      return { runs, total: total || runs.length };
+    } catch (error) {
+      this.logger.error("Error getting workflow runs:", {
+        message: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
+  async getWorkflowRunById({
+    runId,
+    workflowName
+  }) {
+    const fullTableName = this.getTableName(TABLE_WORKFLOW_SNAPSHOT);
+    try {
+      const conditions = [];
+      const params = [];
+      if (runId) {
+        conditions.push("run_id = ?");
+        params.push(runId);
+      }
+      if (workflowName) {
+        conditions.push("workflow_name = ?");
+        params.push(workflowName);
+      }
+      const whereClause = conditions.length > 0 ? "WHERE " + conditions.join(" AND ") : "";
+      const sql = `SELECT * FROM ${fullTableName} ${whereClause} ORDER BY createdAt DESC LIMIT 1`;
+      const result = await this.executeQuery({ sql, params, first: true });
+      if (!result) return null;
+      return this.parseWorkflowRun(result);
+    } catch (error) {
+      this.logger.error("Error getting workflow run by ID:", {
+        message: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
   }
   /**
    * Close the database connection

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/cloudflare-d1",
-  "version": "0.0.0-switch-to-core-20250424015131",
+  "version": "0.0.0-taofeeqInngest-20250603090617",
   "description": "D1 provider for Mastra - includes db storage capabilities",
   "type": "module",
   "files": [
@@ -22,20 +22,23 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "cloudflare": "^4.1.0",
-    "@mastra/core": "0.0.0-switch-to-core-20250424015131"
+    "cloudflare": "^4.1.0"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250417.0",
-    "@microsoft/api-extractor": "^7.52.1",
+    "@microsoft/api-extractor": "^7.52.5",
     "@types/node": "^20.17.27",
     "dotenv": "^16.4.7",
     "eslint": "^9.23.0",
     "miniflare": "^4.20250410.1",
     "tsup": "^8.4.0",
     "typescript": "^5.8.2",
-    "vitest": "^3.0.9",
-    "@internal/lint": "0.0.2"
+    "vitest": "^3.1.2",
+    "@mastra/core": "0.0.0-taofeeqInngest-20250603090617",
+    "@internal/lint": "0.0.0-taofeeqInngest-20250603090617"
+  },
+  "peerDependencies": {
+    "@mastra/core": "^0.10.0-alpha.0"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting",