@mastra/cloudflare-d1 0.0.0-vnext-inngest-20250508131921 → 0.0.0-vnextAgentNetwork-20250602134426

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

@@ -1,8 +1,9 @@
 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 { MessageType as MessageType_2 } from '@mastra/core';
 import type { StorageColumn } from '@mastra/core/storage';
 import type { StorageGetMessagesArg } from '@mastra/core/storage';
 import type { StorageThreadType } from '@mastra/core/memory';
@@ -14,7 +15,7 @@ import type { WorkflowRunState as WorkflowRunState_2 } from '@mastra/core';
 
 export declare const checkWorkflowSnapshot: (snapshot: WorkflowRunState_2 | string, stepId: string, status: string) => void;
 
-export declare const createSampleMessage: (threadId: string) => MessageType_2;
+export declare const createSampleMessage: (threadId: string, parts?: MastraMessageV2_2["content"]["parts"]) => MastraMessageV2_2;
 
 export declare const createSampleThread: () => {
     id: string;
@@ -92,7 +93,6 @@ declare class D1Store extends MastraStorage {
     constructor(config: D1StoreConfig);
     private getTableName;
     private formatSqlParams;
-    private createIndexIfNotExists;
     private executeWorkersBindingQuery;
     private executeRestQuery;
     /**
@@ -139,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;
@@ -213,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
@@ -279,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
@@ -317,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 */
@@ -325,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,8 +1,9 @@
 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 { MessageType as MessageType_2 } from '@mastra/core';
 import type { StorageColumn } from '@mastra/core/storage';
 import type { StorageGetMessagesArg } from '@mastra/core/storage';
 import type { StorageThreadType } from '@mastra/core/memory';
@@ -14,7 +15,7 @@ import type { WorkflowRunState as WorkflowRunState_2 } from '@mastra/core';
 
 export declare const checkWorkflowSnapshot: (snapshot: WorkflowRunState_2 | string, stepId: string, status: string) => void;
 
-export declare const createSampleMessage: (threadId: string) => MessageType_2;
+export declare const createSampleMessage: (threadId: string, parts?: MastraMessageV2_2["content"]["parts"]) => MastraMessageV2_2;
 
 export declare const createSampleThread: () => {
     id: string;
@@ -92,7 +93,6 @@ declare class D1Store extends MastraStorage {
     constructor(config: D1StoreConfig);
     private getTableName;
     private formatSqlParams;
-    private createIndexIfNotExists;
     private executeWorkersBindingQuery;
     private executeRestQuery;
     /**
@@ -139,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;
@@ -213,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
@@ -279,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
@@ -317,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 */
@@ -325,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) {
@@ -87,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;
   }
   /**
@@ -118,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;
   }
   /**
@@ -143,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;
   }
   /**
@@ -159,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);
@@ -176,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);
@@ -210,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) {
@@ -228,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) {
@@ -254,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 = [],
@@ -656,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();
@@ -679,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({
@@ -687,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 || [];
@@ -717,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 (
@@ -744,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);
@@ -758,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,

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) {
@@ -81,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;
   }
   /**
@@ -112,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;
   }
   /**
@@ -137,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;
   }
   /**
@@ -153,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);
@@ -170,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);
@@ -204,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) {
@@ -222,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) {
@@ -248,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 = [],
@@ -650,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();
@@ -673,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({
@@ -681,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 || [];
@@ -711,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 (
@@ -738,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);
@@ -752,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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/cloudflare-d1",
-  "version": "0.0.0-vnext-inngest-20250508131921",
+  "version": "0.0.0-vnextAgentNetwork-20250602134426",
   "description": "D1 provider for Mastra - includes db storage capabilities",
   "type": "module",
   "files": [
@@ -22,8 +22,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "cloudflare": "^4.1.0",
-    "@mastra/core": "0.0.0-vnext-inngest-20250508131921"
+    "cloudflare": "^4.1.0"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250417.0",
@@ -35,7 +34,11 @@
     "tsup": "^8.4.0",
     "typescript": "^5.8.2",
     "vitest": "^3.1.2",
-    "@internal/lint": "0.0.0-vnext-inngest-20250508131921"
+    "@internal/lint": "0.0.0-vnextAgentNetwork-20250602134426",
+    "@mastra/core": "0.0.0-vnextAgentNetwork-20250602134426"
+  },
+  "peerDependencies": {
+    "@mastra/core": "^0.10.0-alpha.0"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting",