@mastra/libsql 1.0.0-beta.8 → 1.0.0

package/dist/index.js

@@ -1,9 +1,10 @@
 import { createClient } from '@libsql/client';
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { createVectorErrorId, MastraStorage, StoreOperations, TABLE_WORKFLOW_SNAPSHOT, TABLE_SPANS, createStorageErrorId, ScoresStorage, TABLE_SCORERS, normalizePerPage, calculatePagination, transformScoreRow, WorkflowsStorage, MemoryStorage, TABLE_MESSAGES, TABLE_THREADS, TABLE_RESOURCES, ObservabilityStorage, AgentsStorage, TABLE_AGENTS, TABLE_SCHEMAS, safelyParseJSON, SPAN_SCHEMA } from '@mastra/core/storage';
+import { createVectorErrorId, AgentsStorage, AGENTS_SCHEMA, TABLE_AGENTS, createStorageErrorId, normalizePerPage, calculatePagination, MemoryStorage, TABLE_SCHEMAS, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, ObservabilityStorage, SPAN_SCHEMA, TABLE_SPANS, listTracesArgsSchema, ScoresStorage, SCORERS_SCHEMA, TABLE_SCORERS, transformScoreRow, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, MastraCompositeStore, TraceStatus, getSqlType, safelyParseJSON } from '@mastra/core/storage';
 import { parseSqlIdentifier, parseFieldKey } from '@mastra/core/utils';
-import { MastraVector } from '@mastra/core/vector';
+import { MastraVector, validateTopK, validateUpsertInput } from '@mastra/core/vector';
 import { BaseFilterTranslator } from '@mastra/core/vector/filter';
+import { MastraBase } from '@mastra/core/base';
 import { MessageList } from '@mastra/core/agent';
 import { saveScorePayloadSchema } from '@mastra/core/evals';
 
@@ -241,10 +242,10 @@ var FILTER_OPERATORS = {
     };
   },
   // Element Operators
-  $exists: (key) => {
+  $exists: (key, value) => {
     const jsonPath = getJsonPath(key);
     return {
-      sql: `json_extract(metadata, ${jsonPath}) IS NOT NULL`,
+      sql: value === false ? `json_extract(metadata, ${jsonPath}) IS NULL` : `json_extract(metadata, ${jsonPath}) IS NOT NULL`,
       needsValue: false
     };
   },
@@ -508,7 +509,7 @@ var LibSQLVector = class extends MastraVector {
   maxRetries;
   initialBackoffMs;
   constructor({
-    connectionUrl,
+    url,
     authToken,
     syncUrl,
     syncInterval,
@@ -518,14 +519,14 @@ var LibSQLVector = class extends MastraVector {
   }) {
     super({ id });
     this.turso = createClient({
-      url: connectionUrl,
+      url,
       syncUrl,
       authToken,
       syncInterval
     });
     this.maxRetries = maxRetries;
     this.initialBackoffMs = initialBackoffMs;
-    if (connectionUrl.includes(`file:`) || connectionUrl.includes(`:memory:`)) {
+    if (url.includes(`file:`) || url.includes(`:memory:`)) {
       this.turso.execute("PRAGMA journal_mode=WAL;").then(() => this.logger.debug("LibSQLStore: PRAGMA journal_mode=WAL set.")).catch((err) => this.logger.warn("LibSQLStore: Failed to set PRAGMA journal_mode=WAL.", err));
       this.turso.execute("PRAGMA busy_timeout = 5000;").then(() => this.logger.debug("LibSQLStore: PRAGMA busy_timeout=5000 set.")).catch((err) => this.logger.warn("LibSQLStore: Failed to set PRAGMA busy_timeout=5000.", err));
     }
@@ -537,7 +538,7 @@ var LibSQLVector = class extends MastraVector {
       try {
         return await operation();
       } catch (error) {
-        if (error.code === "SQLITE_BUSY" || error.message && error.message.toLowerCase().includes("database is locked")) {
+        if (error.code === "SQLITE_BUSY" || error.code === "SQLITE_LOCKED" || error.code === "SQLITE_LOCKED_SHAREDCACHE" || error.message && error.message.toLowerCase().includes("database is locked") || error.message && error.message.toLowerCase().includes("database table is locked")) {
           attempts++;
           if (attempts >= this.maxRetries) {
             this.logger.error(
@@ -571,22 +572,14 @@ var LibSQLVector = class extends MastraVector {
     minScore = -1
     // Default to -1 to include all results (cosine similarity ranges from -1 to 1)
   }) {
-    try {
-      if (!Number.isInteger(topK) || topK <= 0) {
-        throw new Error("topK must be a positive integer");
-      }
-      if (!Array.isArray(queryVector) || !queryVector.every((x) => typeof x === "number" && Number.isFinite(x))) {
-        throw new Error("queryVector must be an array of finite numbers");
-      }
-    } catch (error) {
-      throw new MastraError(
-        {
-          id: createVectorErrorId("LIBSQL", "QUERY", "INVALID_ARGS"),
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER
-        },
-        error
-      );
+    validateTopK("LIBSQL", topK);
+    if (!Array.isArray(queryVector) || !queryVector.every((x) => typeof x === "number" && Number.isFinite(x))) {
+      throw new MastraError({
+        id: createVectorErrorId("LIBSQL", "QUERY", "INVALID_ARGS"),
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        details: { message: "queryVector must be an array of finite numbers" }
+      });
     }
     try {
       const parsedIndexName = parseSqlIdentifier(indexName, "index name");
@@ -646,6 +639,7 @@ var LibSQLVector = class extends MastraVector {
     }
   }
   async doUpsert({ indexName, vectors, metadata, ids }) {
+    validateUpsertInput("LIBSQL", vectors, metadata, ids);
     const tx = await this.turso.transaction("write");
     try {
       const parsedIndexName = parseSqlIdentifier(indexName, "index name");
@@ -1092,833 +1086,1347 @@ var LibSQLVector = class extends MastraVector {
     });
   }
 };
-var AgentsLibSQL = class extends AgentsStorage {
-  client;
-  constructor({ client, operations: _ }) {
-    super();
-    this.client = client;
-  }
-  parseJson(value, fieldName) {
-    if (!value) return void 0;
-    if (typeof value !== "string") return value;
-    try {
-      return JSON.parse(value);
-    } catch (error) {
-      const details = {
-        value: value.length > 100 ? value.substring(0, 100) + "..." : value
-      };
-      if (fieldName) {
-        details.field = fieldName;
+function buildSelectColumns(tableName) {
+  const schema = TABLE_SCHEMAS[tableName];
+  return Object.keys(schema).map((col) => {
+    const colDef = schema[col];
+    const parsedCol = parseSqlIdentifier(col, "column name");
+    return colDef?.type === "jsonb" ? `json(${parsedCol}) as ${parsedCol}` : parsedCol;
+  }).join(", ");
+}
+function isLockError(error) {
+  return error.code === "SQLITE_BUSY" || error.code === "SQLITE_LOCKED" || error.message?.toLowerCase().includes("database is locked") || error.message?.toLowerCase().includes("database table is locked") || error.message?.toLowerCase().includes("table is locked") || error.constructor.name === "SqliteError" && error.message?.toLowerCase().includes("locked");
+}
+function createExecuteWriteOperationWithRetry({
+  logger,
+  maxRetries,
+  initialBackoffMs
+}) {
+  return async function executeWriteOperationWithRetry(operationFn, operationDescription) {
+    let attempts = 0;
+    let backoff = initialBackoffMs;
+    while (attempts < maxRetries) {
+      try {
+        return await operationFn();
+      } catch (error) {
+        logger.debug(`LibSQLStore: Error caught in retry loop for ${operationDescription}`, {
+          errorType: error.constructor.name,
+          errorCode: error.code,
+          errorMessage: error.message,
+          attempts,
+          maxRetries
+        });
+        if (isLockError(error)) {
+          attempts++;
+          if (attempts >= maxRetries) {
+            logger.error(
+              `LibSQLStore: Operation failed after ${maxRetries} attempts due to database lock: ${error.message}`,
+              { error, attempts, maxRetries }
+            );
+            throw error;
+          }
+          logger.warn(
+            `LibSQLStore: Attempt ${attempts} failed due to database lock during ${operationDescription}. Retrying in ${backoff}ms...`,
+            { errorMessage: error.message, attempts, backoff, maxRetries }
+          );
+          await new Promise((resolve) => setTimeout(resolve, backoff));
+          backoff *= 2;
+        } else {
+          logger.error(`LibSQLStore: Non-lock error during ${operationDescription}, not retrying`, { error });
+          throw error;
+        }
       }
-      throw new MastraError(
-        {
-          id: createStorageErrorId("LIBSQL", "PARSE_JSON", "INVALID_JSON"),
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.SYSTEM,
-          text: `Failed to parse JSON${fieldName ? ` for field "${fieldName}"` : ""}: ${error instanceof Error ? error.message : "Unknown error"}`,
-          details
-        },
-        error
-      );
     }
-  }
-  parseRow(row) {
-    return {
-      id: row.id,
-      name: row.name,
-      description: row.description,
-      instructions: row.instructions,
-      model: this.parseJson(row.model, "model"),
-      tools: this.parseJson(row.tools, "tools"),
-      defaultOptions: this.parseJson(row.defaultOptions, "defaultOptions"),
-      workflows: this.parseJson(row.workflows, "workflows"),
-      agents: this.parseJson(row.agents, "agents"),
-      inputProcessors: this.parseJson(row.inputProcessors, "inputProcessors"),
-      outputProcessors: this.parseJson(row.outputProcessors, "outputProcessors"),
-      memory: this.parseJson(row.memory, "memory"),
-      scorers: this.parseJson(row.scorers, "scorers"),
-      metadata: this.parseJson(row.metadata, "metadata"),
-      createdAt: new Date(row.createdAt),
-      updatedAt: new Date(row.updatedAt)
-    };
-  }
-  async getAgentById({ id }) {
-    try {
-      const result = await this.client.execute({
-        sql: `SELECT * FROM "${TABLE_AGENTS}" WHERE id = ?`,
-        args: [id]
-      });
-      if (!result.rows || result.rows.length === 0) {
-        return null;
-      }
-      return this.parseRow(result.rows[0]);
-    } catch (error) {
-      throw new MastraError(
-        {
-          id: createStorageErrorId("LIBSQL", "GET_AGENT_BY_ID", "FAILED"),
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { agentId: id }
-        },
-        error
-      );
+    throw new Error(`LibSQLStore: Unexpected exit from retry loop for ${operationDescription}`);
+  };
+}
+function prepareStatement({ tableName, record }) {
+  const parsedTableName = parseSqlIdentifier(tableName, "table name");
+  const schema = TABLE_SCHEMAS[tableName];
+  const columnNames = Object.keys(record);
+  const columns = columnNames.map((col) => parseSqlIdentifier(col, "column name"));
+  const values = columnNames.map((col) => {
+    const v = record[col];
+    if (typeof v === `undefined` || v === null) {
+      return null;
     }
-  }
-  async createAgent({ agent }) {
-    try {
-      const now = /* @__PURE__ */ new Date();
-      const nowIso = now.toISOString();
-      await this.client.execute({
-        sql: `INSERT INTO "${TABLE_AGENTS}" (id, name, description, instructions, model, tools, "defaultOptions", workflows, agents, "inputProcessors", "outputProcessors", memory, scorers, metadata, "createdAt", "updatedAt")
-              VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
-        args: [
-          agent.id,
-          agent.name,
-          agent.description ?? null,
-          agent.instructions,
-          JSON.stringify(agent.model),
-          agent.tools ? JSON.stringify(agent.tools) : null,
-          agent.defaultOptions ? JSON.stringify(agent.defaultOptions) : null,
-          agent.workflows ? JSON.stringify(agent.workflows) : null,
-          agent.agents ? JSON.stringify(agent.agents) : null,
-          agent.inputProcessors ? JSON.stringify(agent.inputProcessors) : null,
-          agent.outputProcessors ? JSON.stringify(agent.outputProcessors) : null,
-          agent.memory ? JSON.stringify(agent.memory) : null,
-          agent.scorers ? JSON.stringify(agent.scorers) : null,
-          agent.metadata ? JSON.stringify(agent.metadata) : null,
-          nowIso,
-          nowIso
-        ]
-      });
-      return {
-        ...agent,
-        createdAt: now,
-        updatedAt: now
-      };
-    } catch (error) {
-      throw new MastraError(
-        {
-          id: createStorageErrorId("LIBSQL", "CREATE_AGENT", "FAILED"),
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { agentId: agent.id }
-        },
-        error
-      );
+    const colDef = schema[col];
+    if (colDef?.type === "jsonb") {
+      return JSON.stringify(v);
     }
-  }
-  async updateAgent({ id, ...updates }) {
-    try {
-      const existingAgent = await this.getAgentById({ id });
-      if (!existingAgent) {
-        throw new MastraError({
-          id: createStorageErrorId("LIBSQL", "UPDATE_AGENT", "NOT_FOUND"),
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER,
-          text: `Agent ${id} not found`,
-          details: { agentId: id }
-        });
-      }
-      const setClauses = [];
-      const args = [];
-      if (updates.name !== void 0) {
-        setClauses.push("name = ?");
-        args.push(updates.name);
-      }
-      if (updates.description !== void 0) {
-        setClauses.push("description = ?");
-        args.push(updates.description);
-      }
-      if (updates.instructions !== void 0) {
-        setClauses.push("instructions = ?");
-        args.push(updates.instructions);
-      }
-      if (updates.model !== void 0) {
-        setClauses.push("model = ?");
-        args.push(JSON.stringify(updates.model));
-      }
-      if (updates.tools !== void 0) {
-        setClauses.push("tools = ?");
-        args.push(JSON.stringify(updates.tools));
-      }
-      if (updates.defaultOptions !== void 0) {
-        setClauses.push('"defaultOptions" = ?');
-        args.push(JSON.stringify(updates.defaultOptions));
-      }
-      if (updates.workflows !== void 0) {
-        setClauses.push("workflows = ?");
-        args.push(JSON.stringify(updates.workflows));
-      }
-      if (updates.agents !== void 0) {
-        setClauses.push("agents = ?");
-        args.push(JSON.stringify(updates.agents));
-      }
-      if (updates.inputProcessors !== void 0) {
-        setClauses.push('"inputProcessors" = ?');
-        args.push(JSON.stringify(updates.inputProcessors));
-      }
-      if (updates.outputProcessors !== void 0) {
-        setClauses.push('"outputProcessors" = ?');
-        args.push(JSON.stringify(updates.outputProcessors));
-      }
-      if (updates.memory !== void 0) {
-        setClauses.push("memory = ?");
-        args.push(JSON.stringify(updates.memory));
-      }
-      if (updates.scorers !== void 0) {
-        setClauses.push("scorers = ?");
-        args.push(JSON.stringify(updates.scorers));
-      }
-      if (updates.metadata !== void 0) {
-        const mergedMetadata = { ...existingAgent.metadata, ...updates.metadata };
-        setClauses.push("metadata = ?");
-        args.push(JSON.stringify(mergedMetadata));
-      }
-      const now = /* @__PURE__ */ new Date();
-      setClauses.push('"updatedAt" = ?');
-      args.push(now.toISOString());
-      args.push(id);
-      if (setClauses.length > 1) {
-        await this.client.execute({
-          sql: `UPDATE "${TABLE_AGENTS}" SET ${setClauses.join(", ")} WHERE id = ?`,
-          args
-        });
-      }
-      const updatedAgent = await this.getAgentById({ id });
-      if (!updatedAgent) {
-        throw new MastraError({
-          id: createStorageErrorId("LIBSQL", "UPDATE_AGENT", "NOT_FOUND_AFTER_UPDATE"),
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.SYSTEM,
-          text: `Agent ${id} not found after update`,
-          details: { agentId: id }
-        });
-      }
-      return updatedAgent;
-    } catch (error) {
-      if (error instanceof MastraError) {
-        throw error;
-      }
-      throw new MastraError(
-        {
-          id: createStorageErrorId("LIBSQL", "UPDATE_AGENT", "FAILED"),
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { agentId: id }
-        },
-        error
-      );
+    if (v instanceof Date) {
+      return v.toISOString();
+    }
+    return typeof v === "object" ? JSON.stringify(v) : v;
+  });
+  const placeholders = columnNames.map((col) => {
+    const colDef = schema[col];
+    return colDef?.type === "jsonb" ? "jsonb(?)" : "?";
+  }).join(", ");
+  return {
+    sql: `INSERT OR REPLACE INTO ${parsedTableName} (${columns.join(", ")}) VALUES (${placeholders})`,
+    args: values
+  };
+}
+function prepareUpdateStatement({
+  tableName,
+  updates,
+  keys
+}) {
+  const parsedTableName = parseSqlIdentifier(tableName, "table name");
+  const schema = TABLE_SCHEMAS[tableName];
+  const updateColumnNames = Object.keys(updates);
+  const updateColumns = updateColumnNames.map((col) => parseSqlIdentifier(col, "column name"));
+  const updateValues = updateColumnNames.map((col) => {
+    const colDef = schema[col];
+    const v = updates[col];
+    if (colDef?.type === "jsonb") {
+      return transformToSqlValue(v, true);
     }
+    return transformToSqlValue(v, false);
+  });
+  const setClause = updateColumns.map((col, i) => {
+    const colDef = schema[updateColumnNames[i]];
+    return colDef?.type === "jsonb" ? `${col} = jsonb(?)` : `${col} = ?`;
+  }).join(", ");
+  const whereClause = prepareWhereClause(keys, schema);
+  return {
+    sql: `UPDATE ${parsedTableName} SET ${setClause}${whereClause.sql}`,
+    args: [...updateValues, ...whereClause.args]
+  };
+}
+function transformToSqlValue(value, forceJsonStringify = false) {
+  if (typeof value === "undefined" || value === null) {
+    return null;
   }
-  async deleteAgent({ id }) {
-    try {
-      await this.client.execute({
-        sql: `DELETE FROM "${TABLE_AGENTS}" WHERE id = ?`,
-        args: [id]
-      });
-    } catch (error) {
-      throw new MastraError(
-        {
-          id: createStorageErrorId("LIBSQL", "DELETE_AGENT", "FAILED"),
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { agentId: id }
-        },
-        error
-      );
+  if (forceJsonStringify) {
+    return JSON.stringify(value);
+  }
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+  return typeof value === "object" ? JSON.stringify(value) : value;
+}
+function prepareDeleteStatement({ tableName, keys }) {
+  const parsedTableName = parseSqlIdentifier(tableName, "table name");
+  const whereClause = prepareWhereClause(keys, TABLE_SCHEMAS[tableName]);
+  return {
+    sql: `DELETE FROM ${parsedTableName}${whereClause.sql}`,
+    args: whereClause.args
+  };
+}
+function prepareWhereClause(filters, schema) {
+  const conditions = [];
+  const args = [];
+  for (const [columnName, filterValue] of Object.entries(filters)) {
+    const column = schema[columnName];
+    if (!column) {
+      throw new Error(`Unknown column: ${columnName}`);
     }
+    const parsedColumn = parseSqlIdentifier(columnName, "column name");
+    const result = buildCondition2(parsedColumn, filterValue);
+    conditions.push(result.condition);
+    args.push(...result.args);
   }
-  async listAgents(args) {
-    const { page = 0, perPage: perPageInput, orderBy } = args || {};
-    const { field, direction } = this.parseOrderBy(orderBy);
-    if (page < 0) {
+  return {
+    sql: conditions.length > 0 ? ` WHERE ${conditions.join(" AND ")}` : "",
+    args
+  };
+}
+function buildCondition2(columnName, filterValue) {
+  if (filterValue === null) {
+    return { condition: `${columnName} IS NULL`, args: [] };
+  }
+  if (typeof filterValue === "object" && filterValue !== null && ("startAt" in filterValue || "endAt" in filterValue)) {
+    return buildDateRangeCondition(columnName, filterValue);
+  }
+  return {
+    condition: `${columnName} = ?`,
+    args: [transformToSqlValue(filterValue)]
+  };
+}
+function buildDateRangeCondition(columnName, range) {
+  const conditions = [];
+  const args = [];
+  if (range.startAt !== void 0) {
+    conditions.push(`${columnName} >= ?`);
+    args.push(transformToSqlValue(range.startAt));
+  }
+  if (range.endAt !== void 0) {
+    conditions.push(`${columnName} <= ?`);
+    args.push(transformToSqlValue(range.endAt));
+  }
+  if (conditions.length === 0) {
+    throw new Error("Date range must specify at least startAt or endAt");
+  }
+  return {
+    condition: conditions.join(" AND "),
+    args
+  };
+}
+function transformFromSqlRow({
+  tableName,
+  sqlRow
+}) {
+  const result = {};
+  const jsonColumns = new Set(
+    Object.keys(TABLE_SCHEMAS[tableName]).filter((key) => TABLE_SCHEMAS[tableName][key].type === "jsonb").map((key) => key)
+  );
+  const dateColumns = new Set(
+    Object.keys(TABLE_SCHEMAS[tableName]).filter((key) => TABLE_SCHEMAS[tableName][key].type === "timestamp").map((key) => key)
+  );
+  for (const [key, value] of Object.entries(sqlRow)) {
+    if (value === null || value === void 0) {
+      result[key] = value;
+      continue;
+    }
+    if (dateColumns.has(key) && typeof value === "string") {
+      result[key] = new Date(value);
+      continue;
+    }
+    if (jsonColumns.has(key) && typeof value === "string") {
+      result[key] = safelyParseJSON(value);
+      continue;
+    }
+    result[key] = value;
+  }
+  return result;
+}
+
+// src/storage/db/index.ts
+function resolveClient(config) {
+  if ("client" in config) {
+    return config.client;
+  }
+  return createClient({
+    url: config.url,
+    ...config.authToken ? { authToken: config.authToken } : {}
+  });
+}
+var LibSQLDB = class extends MastraBase {
+  client;
+  maxRetries;
+  initialBackoffMs;
+  executeWriteOperationWithRetry;
+  constructor({
+    client,
+    maxRetries,
+    initialBackoffMs
+  }) {
+    super({
+      component: "STORAGE",
+      name: "LIBSQL_DB_LAYER"
+    });
+    this.client = client;
+    this.maxRetries = maxRetries ?? 5;
+    this.initialBackoffMs = initialBackoffMs ?? 100;
+    this.executeWriteOperationWithRetry = createExecuteWriteOperationWithRetry({
+      logger: this.logger,
+      maxRetries: this.maxRetries,
+      initialBackoffMs: this.initialBackoffMs
+    });
+  }
+  /**
+   * Checks if a column exists in the specified table.
+   *
+   * @param table - The name of the table to check
+   * @param column - The name of the column to look for
+   * @returns `true` if the column exists in the table, `false` otherwise
+   */
+  async hasColumn(table, column) {
+    const sanitizedTable = parseSqlIdentifier(table, "table name");
+    const result = await this.client.execute({
+      sql: `PRAGMA table_info("${sanitizedTable}")`
+    });
+    return result.rows?.some((row) => row.name === column);
+  }
+  /**
+   * Internal insert implementation without retry logic.
+   */
+  async doInsert({
+    tableName,
+    record
+  }) {
+    await this.client.execute(
+      prepareStatement({
+        tableName,
+        record
+      })
+    );
+  }
+  /**
+   * Inserts or replaces a record in the specified table with automatic retry on lock errors.
+   *
+   * @param args - The insert arguments
+   * @param args.tableName - The name of the table to insert into
+   * @param args.record - The record to insert (key-value pairs)
+   */
+  insert(args) {
+    return this.executeWriteOperationWithRetry(() => this.doInsert(args), `insert into table ${args.tableName}`);
+  }
+  /**
+   * Internal update implementation without retry logic.
+   */
+  async doUpdate({
+    tableName,
+    keys,
+    data
+  }) {
+    await this.client.execute(prepareUpdateStatement({ tableName, updates: data, keys }));
+  }
+  /**
+   * Updates a record in the specified table with automatic retry on lock errors.
+   *
+   * @param args - The update arguments
+   * @param args.tableName - The name of the table to update
+   * @param args.keys - The key(s) identifying the record to update
+   * @param args.data - The fields to update (key-value pairs)
+   */
+  update(args) {
+    return this.executeWriteOperationWithRetry(() => this.doUpdate(args), `update table ${args.tableName}`);
+  }
+  /**
+   * Internal batch insert implementation without retry logic.
+   */
+  async doBatchInsert({
+    tableName,
+    records
+  }) {
+    if (records.length === 0) return;
+    const batchStatements = records.map((r) => prepareStatement({ tableName, record: r }));
+    await this.client.batch(batchStatements, "write");
+  }
+  /**
+   * Inserts multiple records in a single batch transaction with automatic retry on lock errors.
+   *
+   * @param args - The batch insert arguments
+   * @param args.tableName - The name of the table to insert into
+   * @param args.records - Array of records to insert
+   * @throws {MastraError} When the batch insert fails after retries
+   */
+  async batchInsert(args) {
+    return this.executeWriteOperationWithRetry(
+      () => this.doBatchInsert(args),
+      `batch insert into table ${args.tableName}`
+    ).catch((error) => {
       throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "LIST_AGENTS", "INVALID_PAGE"),
+          id: createStorageErrorId("LIBSQL", "BATCH_INSERT", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER,
-          details: { page }
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName: args.tableName
+          }
         },
-        new Error("page must be >= 0")
+        error
+      );
+    });
+  }
+  /**
+   * Internal batch update implementation without retry logic.
+   * Each record can be updated based on single or composite keys.
+   */
+  async doBatchUpdate({
+    tableName,
+    updates
+  }) {
+    if (updates.length === 0) return;
+    const batchStatements = updates.map(
+      ({ keys, data }) => prepareUpdateStatement({
+        tableName,
+        updates: data,
+        keys
+      })
+    );
+    await this.client.batch(batchStatements, "write");
+  }
+  /**
+   * Updates multiple records in a single batch transaction with automatic retry on lock errors.
+   * Each record can be updated based on single or composite keys.
+   *
+   * @param args - The batch update arguments
+   * @param args.tableName - The name of the table to update
+   * @param args.updates - Array of update operations, each containing keys and data
+   * @throws {MastraError} When the batch update fails after retries
+   */
+  async batchUpdate(args) {
+    return this.executeWriteOperationWithRetry(
+      () => this.doBatchUpdate(args),
+      `batch update in table ${args.tableName}`
+    ).catch((error) => {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "BATCH_UPDATE", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName: args.tableName
+          }
+        },
+        error
+      );
+    });
+  }
+  /**
+   * Internal batch delete implementation without retry logic.
+   * Each record can be deleted based on single or composite keys.
+   */
+  async doBatchDelete({
+    tableName,
+    keys
+  }) {
+    if (keys.length === 0) return;
+    const batchStatements = keys.map(
+      (keyObj) => prepareDeleteStatement({
+        tableName,
+        keys: keyObj
+      })
+    );
+    await this.client.batch(batchStatements, "write");
+  }
+  /**
+   * Deletes multiple records in a single batch transaction with automatic retry on lock errors.
+   * Each record can be deleted based on single or composite keys.
+   *
+   * @param args - The batch delete arguments
+   * @param args.tableName - The name of the table to delete from
+   * @param args.keys - Array of key objects identifying records to delete
+   * @throws {MastraError} When the batch delete fails after retries
+   */
+  async batchDelete({
+    tableName,
+    keys
+  }) {
+    return this.executeWriteOperationWithRetry(
+      () => this.doBatchDelete({ tableName, keys }),
+      `batch delete from table ${tableName}`
+    ).catch((error) => {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "BATCH_DELETE", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error
+      );
+    });
+  }
+  /**
+   * Internal single-record delete implementation without retry logic.
+   */
+  async doDelete({ tableName, keys }) {
+    await this.client.execute(prepareDeleteStatement({ tableName, keys }));
+  }
+  /**
+   * Deletes a single record from the specified table with automatic retry on lock errors.
+   *
+   * @param args - The delete arguments
+   * @param args.tableName - The name of the table to delete from
+   * @param args.keys - The key(s) identifying the record to delete
+   * @throws {MastraError} When the delete fails after retries
+   */
+  async delete(args) {
+    return this.executeWriteOperationWithRetry(() => this.doDelete(args), `delete from table ${args.tableName}`).catch(
+      (error) => {
+        throw new MastraError(
+          {
+            id: createStorageErrorId("LIBSQL", "DELETE", "FAILED"),
+            domain: ErrorDomain.STORAGE,
+            category: ErrorCategory.THIRD_PARTY,
+            details: {
+              tableName: args.tableName
+            }
+          },
+          error
+        );
+      }
+    );
+  }
+  /**
+   * Selects a single record from the specified table by key(s).
+   * Returns the most recently created record if multiple matches exist.
+   * Automatically parses JSON string values back to objects/arrays.
+   *
+   * @typeParam R - The expected return type of the record
+   * @param args - The select arguments
+   * @param args.tableName - The name of the table to select from
+   * @param args.keys - The key(s) identifying the record to select
+   * @returns The matching record or `null` if not found
+   */
+  async select({ tableName, keys }) {
+    const parsedTableName = parseSqlIdentifier(tableName, "table name");
+    const columns = buildSelectColumns(tableName);
+    const parsedKeys = Object.keys(keys).map((key) => parseSqlIdentifier(key, "column name"));
+    const conditions = parsedKeys.map((key) => `${key} = ?`).join(" AND ");
+    const values = Object.values(keys);
+    const result = await this.client.execute({
+      sql: `SELECT ${columns} FROM ${parsedTableName} WHERE ${conditions} ORDER BY createdAt DESC LIMIT 1`,
+      args: values
+    });
+    if (!result.rows || result.rows.length === 0) {
+      return null;
+    }
+    const row = result.rows[0];
+    const parsed = Object.fromEntries(
+      Object.entries(row || {}).map(([k, v]) => {
+        try {
+          return [k, typeof v === "string" ? v.startsWith("{") || v.startsWith("[") ? JSON.parse(v) : v : v];
+        } catch {
+          return [k, v];
+        }
+      })
+    );
+    return parsed;
+  }
+  /**
+   * Selects multiple records from the specified table with optional filtering, ordering, and pagination.
+   *
+   * @typeParam R - The expected return type of each record
+   * @param args - The select arguments
+   * @param args.tableName - The name of the table to select from
+   * @param args.whereClause - Optional WHERE clause with SQL string and arguments
+   * @param args.orderBy - Optional ORDER BY clause (e.g., "createdAt DESC")
+   * @param args.offset - Optional offset for pagination
+   * @param args.limit - Optional limit for pagination
+   * @param args.args - Optional additional query arguments
+   * @returns Array of matching records
+   */
+  async selectMany({
+    tableName,
+    whereClause,
+    orderBy,
+    offset,
+    limit,
+    args
+  }) {
+    const parsedTableName = parseSqlIdentifier(tableName, "table name");
+    const columns = buildSelectColumns(tableName);
+    let statement = `SELECT ${columns} FROM ${parsedTableName}`;
+    if (whereClause?.sql) {
+      statement += ` ${whereClause.sql}`;
+    }
+    if (orderBy) {
+      statement += ` ORDER BY ${orderBy}`;
+    }
+    if (limit) {
+      statement += ` LIMIT ${limit}`;
+    }
+    if (offset) {
+      statement += ` OFFSET ${offset}`;
+    }
+    const result = await this.client.execute({
+      sql: statement,
+      args: [...whereClause?.args ?? [], ...args ?? []]
+    });
+    return (result.rows ?? []).map((row) => {
+      return Object.fromEntries(
+        Object.entries(row || {}).map(([k, v]) => {
+          try {
+            return [k, typeof v === "string" ? v.startsWith("{") || v.startsWith("[") ? JSON.parse(v) : v : v];
+          } catch {
+            return [k, v];
+          }
+        })
       );
+    });
+  }
+  /**
+   * Returns the total count of records matching the optional WHERE clause.
+   *
+   * @param args - The count arguments
+   * @param args.tableName - The name of the table to count from
+   * @param args.whereClause - Optional WHERE clause with SQL string and arguments
+   * @returns The total count of matching records
+   */
+  async selectTotalCount({
+    tableName,
+    whereClause
+  }) {
+    const parsedTableName = parseSqlIdentifier(tableName, "table name");
+    const statement = `SELECT COUNT(*) as count FROM ${parsedTableName} ${whereClause ? `${whereClause.sql}` : ""}`;
+    const result = await this.client.execute({
+      sql: statement,
+      args: whereClause?.args ?? []
+    });
+    if (!result.rows || result.rows.length === 0) {
+      return 0;
     }
-    const perPage = normalizePerPage(perPageInput, 100);
-    const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+    return result.rows[0]?.count ?? 0;
+  }
+  /**
+   * Maps a storage column type to its SQLite equivalent.
+   */
+  getSqlType(type) {
+    switch (type) {
+      case "bigint":
+        return "INTEGER";
+      // SQLite uses INTEGER for all integer sizes
+      case "timestamp":
+        return "TEXT";
+      // Store timestamps as ISO strings in SQLite
+      case "float":
+        return "REAL";
+      // SQLite's floating point type
+      case "boolean":
+        return "INTEGER";
+      // SQLite uses 0/1 for booleans
+      case "jsonb":
+        return "TEXT";
+      // SQLite: column stores TEXT, we use jsonb()/json() functions for binary optimization
+      default:
+        return getSqlType(type);
+    }
+  }
+  /**
+   * Creates a table if it doesn't exist based on the provided schema.
+   *
+   * @param args - The create table arguments
+   * @param args.tableName - The name of the table to create
+   * @param args.schema - The schema definition for the table columns
+   */
+  async createTable({
+    tableName,
+    schema
+  }) {
     try {
-      const countResult = await this.client.execute({
-        sql: `SELECT COUNT(*) as count FROM "${TABLE_AGENTS}"`,
-        args: []
+      const parsedTableName = parseSqlIdentifier(tableName, "table name");
+      const columnDefinitions = Object.entries(schema).map(([colName, colDef]) => {
+        const type = this.getSqlType(colDef.type);
+        const nullable = colDef.nullable === false ? "NOT NULL" : "";
+        const primaryKey = colDef.primaryKey ? "PRIMARY KEY" : "";
+        return `"${colName}" ${type} ${nullable} ${primaryKey}`.trim();
       });
-      const total = Number(countResult.rows?.[0]?.count ?? 0);
-      if (total === 0) {
-        return {
-          agents: [],
-          total: 0,
-          page,
-          perPage: perPageForResponse,
-          hasMore: false
-        };
+      const tableConstraints = [];
+      if (tableName === TABLE_WORKFLOW_SNAPSHOT) {
+        tableConstraints.push("UNIQUE (workflow_name, run_id)");
+      }
+      if (tableName === TABLE_SPANS) {
+        tableConstraints.push("UNIQUE (spanId, traceId)");
+      }
+      const allDefinitions = [...columnDefinitions, ...tableConstraints].join(",\n  ");
+      const sql = `CREATE TABLE IF NOT EXISTS ${parsedTableName} (
+  ${allDefinitions}
+)`;
+      await this.client.execute(sql);
+      this.logger.debug(`LibSQLDB: Created table ${tableName}`);
+      if (tableName === TABLE_SPANS) {
+        await this.migrateSpansTable();
       }
-      const limitValue = perPageInput === false ? total : perPage;
-      const dataResult = await this.client.execute({
-        sql: `SELECT * FROM "${TABLE_AGENTS}" ORDER BY "${field}" ${direction} LIMIT ? OFFSET ?`,
-        args: [limitValue, offset]
-      });
-      const agents = (dataResult.rows || []).map((row) => this.parseRow(row));
-      return {
-        agents,
-        total,
-        page,
-        perPage: perPageForResponse,
-        hasMore: perPageInput === false ? false : offset + perPage < total
-      };
     } catch (error) {
+      if (error instanceof MastraError) {
+        throw error;
+      }
       throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "LIST_AGENTS", "FAILED"),
+          id: createStorageErrorId("LIBSQL", "CREATE_TABLE", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName }
         },
         error
       );
     }
   }
-};
-var MemoryLibSQL = class extends MemoryStorage {
-  client;
-  operations;
-  constructor({ client, operations }) {
-    super();
-    this.client = client;
-    this.operations = operations;
+  /**
+   * Migrates the spans table schema from OLD_SPAN_SCHEMA to current SPAN_SCHEMA.
+   * This adds new columns that don't exist in old schema and ensures required indexes exist.
+   */
+  async migrateSpansTable() {
+    const schema = TABLE_SCHEMAS[TABLE_SPANS];
+    try {
+      for (const [columnName, columnDef] of Object.entries(schema)) {
+        const columnExists = await this.hasColumn(TABLE_SPANS, columnName);
+        if (!columnExists) {
+          const sqlType = this.getSqlType(columnDef.type);
+          const alterSql = `ALTER TABLE "${TABLE_SPANS}" ADD COLUMN "${columnName}" ${sqlType}`;
+          await this.client.execute(alterSql);
+          this.logger.debug(`LibSQLDB: Added column '${columnName}' to ${TABLE_SPANS}`);
+        }
+      }
+      const indexExists = await this.spansUniqueIndexExists();
+      if (!indexExists) {
+        const duplicateInfo = await this.checkForDuplicateSpans();
+        if (duplicateInfo.hasDuplicates) {
+          const errorMessage = `
+===========================================================================
+MIGRATION REQUIRED: Duplicate spans detected in ${TABLE_SPANS}
+===========================================================================
+
+Found ${duplicateInfo.duplicateCount} duplicate (traceId, spanId) combinations.
+
+The spans table requires a unique constraint on (traceId, spanId), but your
+database contains duplicate entries that must be resolved first.
+
+To fix this, run the manual migration command:
+
+  npx mastra migrate
+
+This command will:
+  1. Remove duplicate spans (keeping the most complete/recent version)
+  2. Add the required unique constraint
+
+Note: This migration may take some time for large tables.
+===========================================================================
+`;
+          throw new MastraError({
+            id: createStorageErrorId("LIBSQL", "MIGRATION_REQUIRED", "DUPLICATE_SPANS"),
+            domain: ErrorDomain.STORAGE,
+            category: ErrorCategory.USER,
+            text: errorMessage
+          });
+        } else {
+          await this.client.execute(
+            `CREATE UNIQUE INDEX IF NOT EXISTS "mastra_ai_spans_spanid_traceid_idx" ON "${TABLE_SPANS}" ("spanId", "traceId")`
+          );
+          this.logger.debug(`LibSQLDB: Created unique index on (spanId, traceId) for ${TABLE_SPANS}`);
+        }
+      }
+      this.logger.info(`LibSQLDB: Migration completed for ${TABLE_SPANS}`);
+    } catch (error) {
+      if (error instanceof MastraError) {
+        throw error;
+      }
+      this.logger.warn(`LibSQLDB: Failed to migrate spans table ${TABLE_SPANS}:`, error);
+    }
   }
-  parseRow(row) {
-    let content = row.content;
+  /**
+   * Checks if the unique index on (spanId, traceId) already exists on the spans table.
+   * Used to skip deduplication when the index already exists (migration already complete).
+   */
+  async spansUniqueIndexExists() {
     try {
-      content = JSON.parse(row.content);
+      const result = await this.client.execute(
+        `SELECT 1 FROM sqlite_master WHERE type = 'index' AND name = 'mastra_ai_spans_spanid_traceid_idx'`
+      );
+      return (result.rows?.length ?? 0) > 0;
     } catch {
+      return false;
     }
-    const result = {
-      id: row.id,
-      content,
-      role: row.role,
-      createdAt: new Date(row.createdAt),
-      threadId: row.thread_id,
-      resourceId: row.resourceId
-    };
-    if (row.type && row.type !== `v2`) result.type = row.type;
-    return result;
   }
-  async _getIncludedMessages({ include }) {
-    if (!include || include.length === 0) return null;
-    const unionQueries = [];
-    const params = [];
-    for (const inc of include) {
-      const { id, withPreviousMessages = 0, withNextMessages = 0 } = inc;
-      unionQueries.push(
-        `
-                SELECT * FROM (
-                  WITH target_thread AS (
-                    SELECT thread_id FROM "${TABLE_MESSAGES}" WHERE id = ?
-                  ),
-                  numbered_messages AS (
-                    SELECT
-                      id, content, role, type, "createdAt", thread_id, "resourceId",
-                      ROW_NUMBER() OVER (ORDER BY "createdAt" ASC) as row_num
-                    FROM "${TABLE_MESSAGES}"
-                    WHERE thread_id = (SELECT thread_id FROM target_thread)
-                  ),
-                  target_positions AS (
-                    SELECT row_num as target_pos
-                    FROM numbered_messages
-                    WHERE id = ?
-                  )
-                  SELECT DISTINCT m.*
-                  FROM numbered_messages m
-                  CROSS JOIN target_positions t
-                  WHERE m.row_num BETWEEN (t.target_pos - ?) AND (t.target_pos + ?)
-                ) 
-                `
-        // Keep ASC for final sorting after fetching context
+  /**
+   * Checks for duplicate (traceId, spanId) combinations in the spans table.
+   * Returns information about duplicates for logging/CLI purposes.
+   */
+  async checkForDuplicateSpans() {
+    try {
+      const result = await this.client.execute(`
+        SELECT COUNT(*) as duplicate_count FROM (
+          SELECT "spanId", "traceId"
+          FROM "${TABLE_SPANS}"
+          GROUP BY "spanId", "traceId"
+          HAVING COUNT(*) > 1
+        )
+      `);
+      const duplicateCount = Number(result.rows?.[0]?.duplicate_count ?? 0);
+      return {
+        hasDuplicates: duplicateCount > 0,
+        duplicateCount
+      };
+    } catch (error) {
+      this.logger.debug(`LibSQLDB: Could not check for duplicates: ${error}`);
+      return { hasDuplicates: false, duplicateCount: 0 };
+    }
+  }
+  /**
+   * Manually run the spans migration to deduplicate and add the unique constraint.
+   * This is intended to be called from the CLI when duplicates are detected.
+   *
+   * @returns Migration result with status and details
+   */
+  async migrateSpans() {
+    const indexExists = await this.spansUniqueIndexExists();
+    if (indexExists) {
+      return {
+        success: true,
+        alreadyMigrated: true,
+        duplicatesRemoved: 0,
+        message: `Migration already complete. Unique index exists on ${TABLE_SPANS}.`
+      };
+    }
+    const duplicateInfo = await this.checkForDuplicateSpans();
+    if (duplicateInfo.hasDuplicates) {
+      this.logger.info(
+        `Found ${duplicateInfo.duplicateCount} duplicate (traceId, spanId) combinations. Starting deduplication...`
       );
-      params.push(id, id, withPreviousMessages, withNextMessages);
+      await this.deduplicateSpans();
+    } else {
+      this.logger.info(`No duplicate spans found.`);
     }
-    const finalQuery = unionQueries.join(" UNION ALL ") + ' ORDER BY "createdAt" ASC';
-    const includedResult = await this.client.execute({ sql: finalQuery, args: params });
-    const includedRows = includedResult.rows?.map((row) => this.parseRow(row));
-    const seen = /* @__PURE__ */ new Set();
-    const dedupedRows = includedRows.filter((row) => {
-      if (seen.has(row.id)) return false;
-      seen.add(row.id);
-      return true;
-    });
-    return dedupedRows;
+    await this.client.execute(
+      `CREATE UNIQUE INDEX IF NOT EXISTS "mastra_ai_spans_spanid_traceid_idx" ON "${TABLE_SPANS}" ("spanId", "traceId")`
+    );
+    return {
+      success: true,
+      alreadyMigrated: false,
+      duplicatesRemoved: duplicateInfo.duplicateCount,
+      message: duplicateInfo.hasDuplicates ? `Migration complete. Removed duplicates and added unique index to ${TABLE_SPANS}.` : `Migration complete. Added unique index to ${TABLE_SPANS}.`
+    };
   }
-  async listMessagesById({ messageIds }) {
-    if (messageIds.length === 0) return { messages: [] };
+  /**
+   * Check migration status for the spans table.
+   * Returns information about whether migration is needed.
+   */
+  async checkSpansMigrationStatus() {
+    const indexExists = await this.spansUniqueIndexExists();
+    if (indexExists) {
+      return {
+        needsMigration: false,
+        hasDuplicates: false,
+        duplicateCount: 0,
+        constraintExists: true,
+        tableName: TABLE_SPANS
+      };
+    }
+    const duplicateInfo = await this.checkForDuplicateSpans();
+    return {
+      needsMigration: true,
+      hasDuplicates: duplicateInfo.hasDuplicates,
+      duplicateCount: duplicateInfo.duplicateCount,
+      constraintExists: false,
+      tableName: TABLE_SPANS
+    };
+  }
+  /**
+   * Deduplicates spans table by removing duplicate (spanId, traceId) combinations.
+   * Keeps the "best" record for each duplicate group based on:
+   * 1. Completed spans (endedAt IS NOT NULL) over incomplete ones
+   * 2. Most recently updated (updatedAt DESC)
+   * 3. Most recently created (createdAt DESC) as tiebreaker
+   */
+  async deduplicateSpans() {
     try {
-      const sql = `
-        SELECT 
-          id, 
-          content, 
-          role, 
-          type,
-          "createdAt", 
-          thread_id,
-          "resourceId"
-        FROM "${TABLE_MESSAGES}"
-        WHERE id IN (${messageIds.map(() => "?").join(", ")})
-        ORDER BY "createdAt" DESC
-      `;
-      const result = await this.client.execute({ sql, args: messageIds });
-      if (!result.rows) return { messages: [] };
-      const list = new MessageList().add(result.rows.map(this.parseRow), "memory");
-      return { messages: list.get.all.db() };
+      const duplicateCheck = await this.client.execute(`
+        SELECT COUNT(*) as duplicate_count FROM (
+          SELECT "spanId", "traceId"
+          FROM "${TABLE_SPANS}"
+          GROUP BY "spanId", "traceId"
+          HAVING COUNT(*) > 1
+        )
+      `);
+      const duplicateCount = Number(duplicateCheck.rows?.[0]?.duplicate_count ?? 0);
+      if (duplicateCount === 0) {
+        this.logger.debug(`LibSQLDB: No duplicate spans found, skipping deduplication`);
+        return;
+      }
+      this.logger.warn(`LibSQLDB: Found ${duplicateCount} duplicate (spanId, traceId) combinations, deduplicating...`);
+      const deleteResult = await this.client.execute(`
+        DELETE FROM "${TABLE_SPANS}"
+        WHERE rowid NOT IN (
+          SELECT MIN(best_rowid) FROM (
+            SELECT
+              rowid as best_rowid,
+              "spanId",
+              "traceId",
+              ROW_NUMBER() OVER (
+                PARTITION BY "spanId", "traceId"
+                ORDER BY
+                  CASE WHEN "endedAt" IS NOT NULL THEN 0 ELSE 1 END,
+                  "updatedAt" DESC,
+                  "createdAt" DESC
+              ) as rn
+            FROM "${TABLE_SPANS}"
+          ) ranked
+          WHERE rn = 1
+          GROUP BY "spanId", "traceId"
+        )
+        AND ("spanId", "traceId") IN (
+          SELECT "spanId", "traceId"
+          FROM "${TABLE_SPANS}"
+          GROUP BY "spanId", "traceId"
+          HAVING COUNT(*) > 1
+        )
+      `);
+      const deletedCount = deleteResult.rowsAffected ?? 0;
+      this.logger.warn(`LibSQLDB: Deleted ${deletedCount} duplicate span records`);
+    } catch (error) {
+      this.logger.warn(`LibSQLDB: Failed to deduplicate spans:`, error);
+    }
+  }
+  /**
+   * Gets a default value for a column type (used when adding NOT NULL columns).
+   */
+  getDefaultValue(type) {
+    switch (type) {
+      case "text":
+      case "uuid":
+        return "DEFAULT ''";
+      case "integer":
+      case "bigint":
+      case "float":
+        return "DEFAULT 0";
+      case "boolean":
+        return "DEFAULT 0";
+      case "jsonb":
+        return "DEFAULT '{}'";
+      case "timestamp":
+        return "DEFAULT CURRENT_TIMESTAMP";
+      default:
+        return "DEFAULT ''";
+    }
+  }
+  /**
+   * Alters an existing table to add missing columns.
+   * Used for schema migrations when new columns are added.
+   *
+   * @param args - The alter table arguments
+   * @param args.tableName - The name of the table to alter
+   * @param args.schema - The full schema definition for the table
+   * @param args.ifNotExists - Array of column names to add if they don't exist
+   */
+  async alterTable({
+    tableName,
+    schema,
+    ifNotExists
+  }) {
+    const parsedTableName = parseSqlIdentifier(tableName, "table name");
+    try {
+      const tableInfo = await this.client.execute({
+        sql: `PRAGMA table_info("${parsedTableName}")`
+      });
+      const existingColumns = new Set((tableInfo.rows || []).map((row) => row.name?.toLowerCase()));
+      for (const columnName of ifNotExists) {
+        if (!existingColumns.has(columnName.toLowerCase()) && schema[columnName]) {
+          const columnDef = schema[columnName];
+          const sqlType = this.getSqlType(columnDef.type);
+          const defaultValue = this.getDefaultValue(columnDef.type);
+          const alterSql = `ALTER TABLE ${parsedTableName} ADD COLUMN "${columnName}" ${sqlType} ${defaultValue}`;
+          await this.client.execute(alterSql);
+          this.logger.debug(`LibSQLDB: Added column ${columnName} to table ${tableName}`);
+        }
+      }
     } catch (error) {
       throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "LIST_MESSAGES_BY_ID", "FAILED"),
+          id: createStorageErrorId("LIBSQL", "ALTER_TABLE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { messageIds: JSON.stringify(messageIds) }
+          details: { tableName }
         },
         error
       );
     }
   }
-  async listMessages(args) {
-    const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
-    const threadIds = Array.isArray(threadId) ? threadId : [threadId];
-    if (threadIds.length === 0 || threadIds.some((id) => !id.trim())) {
-      throw new MastraError(
+  /**
+   * Deletes all records from the specified table.
+   * Errors are logged but not thrown.
+   *
+   * @param args - The delete arguments
+   * @param args.tableName - The name of the table to clear
+   */
+  async deleteData({ tableName }) {
+    const parsedTableName = parseSqlIdentifier(tableName, "table name");
+    try {
+      await this.client.execute(`DELETE FROM ${parsedTableName}`);
+    } catch (e) {
+      const mastraError = new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "LIST_MESSAGES", "INVALID_THREAD_ID"),
+          id: createStorageErrorId("LIBSQL", "CLEAR_TABLE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { threadId: Array.isArray(threadId) ? threadId.join(",") : threadId }
+          details: {
+            tableName
+          }
         },
-        new Error("threadId must be a non-empty string or array of non-empty strings")
+        e
       );
+      this.logger?.trackException?.(mastraError);
+      this.logger?.error?.(mastraError.toString());
     }
-    if (page < 0) {
+  }
+};
+
+// src/storage/domains/agents/index.ts
+var AgentsLibSQL = class extends AgentsStorage {
+  #db;
+  constructor(config) {
+    super();
+    const client = resolveClient(config);
+    this.#db = new LibSQLDB({ client, maxRetries: config.maxRetries, initialBackoffMs: config.initialBackoffMs });
+  }
+  async init() {
+    await this.#db.createTable({ tableName: TABLE_AGENTS, schema: AGENTS_SCHEMA });
+  }
+  async dangerouslyClearAll() {
+    await this.#db.deleteData({ tableName: TABLE_AGENTS });
+  }
+  parseJson(value, fieldName) {
+    if (!value) return void 0;
+    if (typeof value !== "string") return value;
+    try {
+      return JSON.parse(value);
+    } catch (error) {
+      const details = {
+        value: value.length > 100 ? value.substring(0, 100) + "..." : value
+      };
+      if (fieldName) {
+        details.field = fieldName;
+      }
       throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "LIST_MESSAGES", "INVALID_PAGE"),
+          id: createStorageErrorId("LIBSQL", "PARSE_JSON", "INVALID_JSON"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER,
-          details: { page }
+          category: ErrorCategory.SYSTEM,
+          text: `Failed to parse JSON${fieldName ? ` for field "${fieldName}"` : ""}: ${error instanceof Error ? error.message : "Unknown error"}`,
+          details
         },
-        new Error("page must be >= 0")
+        error
       );
     }
-    const perPage = normalizePerPage(perPageInput, 40);
-    const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+  }
+  parseRow(row) {
+    return {
+      id: row.id,
+      name: row.name,
+      description: row.description,
+      instructions: row.instructions,
+      model: this.parseJson(row.model, "model"),
+      tools: this.parseJson(row.tools, "tools"),
+      defaultOptions: this.parseJson(row.defaultOptions, "defaultOptions"),
+      workflows: this.parseJson(row.workflows, "workflows"),
+      agents: this.parseJson(row.agents, "agents"),
+      inputProcessors: this.parseJson(row.inputProcessors, "inputProcessors"),
+      outputProcessors: this.parseJson(row.outputProcessors, "outputProcessors"),
+      memory: this.parseJson(row.memory, "memory"),
+      scorers: this.parseJson(row.scorers, "scorers"),
+      metadata: this.parseJson(row.metadata, "metadata"),
+      createdAt: new Date(row.createdAt),
+      updatedAt: new Date(row.updatedAt)
+    };
+  }
+  async getAgentById({ id }) {
     try {
-      const { field, direction } = this.parseOrderBy(orderBy, "ASC");
-      const orderByStatement = `ORDER BY "${field}" ${direction}`;
-      const threadPlaceholders = threadIds.map(() => "?").join(", ");
-      const conditions = [`thread_id IN (${threadPlaceholders})`];
-      const queryParams = [...threadIds];
-      if (resourceId) {
-        conditions.push(`"resourceId" = ?`);
-        queryParams.push(resourceId);
-      }
-      if (filter?.dateRange?.start) {
-        conditions.push(`"createdAt" >= ?`);
-        queryParams.push(
-          filter.dateRange.start instanceof Date ? filter.dateRange.start.toISOString() : filter.dateRange.start
-        );
-      }
-      if (filter?.dateRange?.end) {
-        conditions.push(`"createdAt" <= ?`);
-        queryParams.push(
-          filter.dateRange.end instanceof Date ? filter.dateRange.end.toISOString() : filter.dateRange.end
-        );
-      }
-      const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
-      const countResult = await this.client.execute({
-        sql: `SELECT COUNT(*) as count FROM ${TABLE_MESSAGES} ${whereClause}`,
-        args: queryParams
-      });
-      const total = Number(countResult.rows?.[0]?.count ?? 0);
-      const limitValue = perPageInput === false ? total : perPage;
-      const dataResult = await this.client.execute({
-        sql: `SELECT id, content, role, type, "createdAt", "resourceId", "thread_id" FROM ${TABLE_MESSAGES} ${whereClause} ${orderByStatement} LIMIT ? OFFSET ?`,
-        args: [...queryParams, limitValue, offset]
+      const result = await this.#db.select({
+        tableName: TABLE_AGENTS,
+        keys: { id }
       });
-      const messages = (dataResult.rows || []).map((row) => this.parseRow(row));
-      if (total === 0 && messages.length === 0 && (!include || include.length === 0)) {
-        return {
-          messages: [],
-          total: 0,
-          page,
-          perPage: perPageForResponse,
-          hasMore: false
-        };
-      }
-      const messageIds = new Set(messages.map((m) => m.id));
-      if (include && include.length > 0) {
-        const includeMessages = await this._getIncludedMessages({ include });
-        if (includeMessages) {
-          for (const includeMsg of includeMessages) {
-            if (!messageIds.has(includeMsg.id)) {
-              messages.push(includeMsg);
-              messageIds.add(includeMsg.id);
-            }
-          }
-        }
-      }
-      const list = new MessageList().add(messages, "memory");
-      let finalMessages = list.get.all.db();
-      finalMessages = finalMessages.sort((a, b) => {
-        const isDateField = field === "createdAt" || field === "updatedAt";
-        const aValue = isDateField ? new Date(a[field]).getTime() : a[field];
-        const bValue = isDateField ? new Date(b[field]).getTime() : b[field];
-        if (typeof aValue === "number" && typeof bValue === "number") {
-          return direction === "ASC" ? aValue - bValue : bValue - aValue;
+      return result ? this.parseRow(result) : null;
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "GET_AGENT_BY_ID", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { agentId: id }
+        },
+        error
+      );
+    }
+  }
+  async createAgent({ agent }) {
+    try {
+      const now = /* @__PURE__ */ new Date();
+      await this.#db.insert({
+        tableName: TABLE_AGENTS,
+        record: {
+          id: agent.id,
+          name: agent.name,
+          description: agent.description ?? null,
+          instructions: agent.instructions,
+          model: agent.model,
+          tools: agent.tools ?? null,
+          defaultOptions: agent.defaultOptions ?? null,
+          workflows: agent.workflows ?? null,
+          agents: agent.agents ?? null,
+          inputProcessors: agent.inputProcessors ?? null,
+          outputProcessors: agent.outputProcessors ?? null,
+          memory: agent.memory ?? null,
+          scorers: agent.scorers ?? null,
+          metadata: agent.metadata ?? null,
+          createdAt: now,
+          updatedAt: now
         }
-        return direction === "ASC" ? String(aValue).localeCompare(String(bValue)) : String(bValue).localeCompare(String(aValue));
       });
-      const threadIdSet = new Set(threadIds);
-      const returnedThreadMessageIds = new Set(
-        finalMessages.filter((m) => m.threadId && threadIdSet.has(m.threadId)).map((m) => m.id)
-      );
-      const allThreadMessagesReturned = returnedThreadMessageIds.size >= total;
-      const hasMore = perPageInput !== false && !allThreadMessagesReturned && offset + perPage < total;
       return {
-        messages: finalMessages,
-        total,
-        page,
-        perPage: perPageForResponse,
-        hasMore
+        ...agent,
+        createdAt: now,
+        updatedAt: now
       };
     } catch (error) {
-      const mastraError = new MastraError(
+      throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "LIST_MESSAGES", "FAILED"),
+          id: createStorageErrorId("LIBSQL", "CREATE_AGENT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: {
-            threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
-            resourceId: resourceId ?? ""
-          }
+          details: { agentId: agent.id }
         },
         error
       );
-      this.logger?.error?.(mastraError.toString());
-      this.logger?.trackException?.(mastraError);
-      return {
-        messages: [],
-        total: 0,
-        page,
-        perPage: perPageForResponse,
-        hasMore: false
-      };
     }
   }
-  async saveMessages({ messages }) {
-    if (messages.length === 0) return { messages };
+  async updateAgent({ id, ...updates }) {
     try {
-      const threadId = messages[0]?.threadId;
-      if (!threadId) {
-        throw new Error("Thread ID is required");
+      const existingAgent = await this.getAgentById({ id });
+      if (!existingAgent) {
+        throw new MastraError({
+          id: createStorageErrorId("LIBSQL", "UPDATE_AGENT", "NOT_FOUND"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          text: `Agent ${id} not found`,
+          details: { agentId: id }
+        });
       }
-      const batchStatements = messages.map((message) => {
-        const time = message.createdAt || /* @__PURE__ */ new Date();
-        if (!message.threadId) {
-          throw new Error(
-            `Expected to find a threadId for message, but couldn't find one. An unexpected error has occurred.`
-          );
-        }
-        if (!message.resourceId) {
-          throw new Error(
-            `Expected to find a resourceId for message, but couldn't find one. An unexpected error has occurred.`
-          );
-        }
-        return {
-          sql: `INSERT INTO "${TABLE_MESSAGES}" (id, thread_id, content, role, type, "createdAt", "resourceId") 
-                  VALUES (?, ?, ?, ?, ?, ?, ?)
-                  ON CONFLICT(id) DO UPDATE SET
-                    thread_id=excluded.thread_id,
-                    content=excluded.content,
-                    role=excluded.role,
-                    type=excluded.type,
-                    "resourceId"=excluded."resourceId"
-                `,
-          args: [
-            message.id,
-            message.threadId,
-            typeof message.content === "object" ? JSON.stringify(message.content) : message.content,
-            message.role,
-            message.type || "v2",
-            time instanceof Date ? time.toISOString() : time,
-            message.resourceId
-          ]
-        };
-      });
-      const now = (/* @__PURE__ */ new Date()).toISOString();
-      batchStatements.push({
-        sql: `UPDATE "${TABLE_THREADS}" SET "updatedAt" = ? WHERE id = ?`,
-        args: [now, threadId]
-      });
-      const BATCH_SIZE = 50;
-      const messageStatements = batchStatements.slice(0, -1);
-      const threadUpdateStatement = batchStatements[batchStatements.length - 1];
-      for (let i = 0; i < messageStatements.length; i += BATCH_SIZE) {
-        const batch = messageStatements.slice(i, i + BATCH_SIZE);
-        if (batch.length > 0) {
-          await this.client.batch(batch, "write");
-        }
+      const data = {
+        updatedAt: /* @__PURE__ */ new Date()
+      };
+      if (updates.name !== void 0) data.name = updates.name;
+      if (updates.description !== void 0) data.description = updates.description;
+      if (updates.instructions !== void 0) data.instructions = updates.instructions;
+      if (updates.model !== void 0) data.model = updates.model;
+      if (updates.tools !== void 0) data.tools = updates.tools;
+      if (updates.defaultOptions !== void 0) data.defaultOptions = updates.defaultOptions;
+      if (updates.workflows !== void 0) data.workflows = updates.workflows;
+      if (updates.agents !== void 0) data.agents = updates.agents;
+      if (updates.inputProcessors !== void 0) data.inputProcessors = updates.inputProcessors;
+      if (updates.outputProcessors !== void 0) data.outputProcessors = updates.outputProcessors;
+      if (updates.memory !== void 0) data.memory = updates.memory;
+      if (updates.scorers !== void 0) data.scorers = updates.scorers;
+      if (updates.metadata !== void 0) {
+        data.metadata = { ...existingAgent.metadata, ...updates.metadata };
       }
-      if (threadUpdateStatement) {
-        await this.client.execute(threadUpdateStatement);
+      if (Object.keys(data).length > 1) {
+        await this.#db.update({
+          tableName: TABLE_AGENTS,
+          keys: { id },
+          data
+        });
+      }
+      const updatedAgent = await this.getAgentById({ id });
+      if (!updatedAgent) {
+        throw new MastraError({
+          id: createStorageErrorId("LIBSQL", "UPDATE_AGENT", "NOT_FOUND_AFTER_UPDATE"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.SYSTEM,
+          text: `Agent ${id} not found after update`,
+          details: { agentId: id }
+        });
       }
-      const list = new MessageList().add(messages, "memory");
-      return { messages: list.get.all.db() };
+      return updatedAgent;
     } catch (error) {
+      if (error instanceof MastraError) {
+        throw error;
+      }
       throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "SAVE_MESSAGES", "FAILED"),
+          id: createStorageErrorId("LIBSQL", "UPDATE_AGENT", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY
+          category: ErrorCategory.THIRD_PARTY,
+          details: { agentId: id }
         },
         error
       );
     }
   }
-  async updateMessages({
-    messages
-  }) {
-    if (messages.length === 0) {
-      return [];
+  async deleteAgent({ id }) {
+    try {
+      await this.#db.delete({
+        tableName: TABLE_AGENTS,
+        keys: { id }
+      });
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "DELETE_AGENT", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { agentId: id }
+        },
+        error
+      );
     }
-    const messageIds = messages.map((m) => m.id);
-    const placeholders = messageIds.map(() => "?").join(",");
-    const selectSql = `SELECT * FROM ${TABLE_MESSAGES} WHERE id IN (${placeholders})`;
-    const existingResult = await this.client.execute({ sql: selectSql, args: messageIds });
-    const existingMessages = existingResult.rows.map((row) => this.parseRow(row));
-    if (existingMessages.length === 0) {
-      return [];
+  }
+  async listAgents(args) {
+    const { page = 0, perPage: perPageInput, orderBy } = args || {};
+    const { field, direction } = this.parseOrderBy(orderBy);
+    if (page < 0) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "LIST_AGENTS", "INVALID_PAGE"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: { page }
+        },
+        new Error("page must be >= 0")
+      );
     }
-    const batchStatements = [];
-    const threadIdsToUpdate = /* @__PURE__ */ new Set();
-    const columnMapping = {
-      threadId: "thread_id"
-    };
-    for (const existingMessage of existingMessages) {
-      const updatePayload = messages.find((m) => m.id === existingMessage.id);
-      if (!updatePayload) continue;
-      const { id, ...fieldsToUpdate } = updatePayload;
-      if (Object.keys(fieldsToUpdate).length === 0) continue;
-      threadIdsToUpdate.add(existingMessage.threadId);
-      if (updatePayload.threadId && updatePayload.threadId !== existingMessage.threadId) {
-        threadIdsToUpdate.add(updatePayload.threadId);
-      }
-      const setClauses = [];
-      const args = [];
-      const updatableFields = { ...fieldsToUpdate };
-      if (updatableFields.content) {
-        const newContent = {
-          ...existingMessage.content,
-          ...updatableFields.content,
-          // Deep merge metadata if it exists on both
-          ...existingMessage.content?.metadata && updatableFields.content.metadata ? {
-            metadata: {
-              ...existingMessage.content.metadata,
-              ...updatableFields.content.metadata
-            }
-          } : {}
+    const perPage = normalizePerPage(perPageInput, 100);
+    const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+    try {
+      const total = await this.#db.selectTotalCount({ tableName: TABLE_AGENTS });
+      if (total === 0) {
+        return {
+          agents: [],
+          total: 0,
+          page,
+          perPage: perPageForResponse,
+          hasMore: false
         };
-        setClauses.push(`${parseSqlIdentifier("content", "column name")} = ?`);
-        args.push(JSON.stringify(newContent));
-        delete updatableFields.content;
       }
-      for (const key in updatableFields) {
-        if (Object.prototype.hasOwnProperty.call(updatableFields, key)) {
-          const dbKey = columnMapping[key] || key;
-          setClauses.push(`${parseSqlIdentifier(dbKey, "column name")} = ?`);
-          let value = updatableFields[key];
-          if (typeof value === "object" && value !== null) {
-            value = JSON.stringify(value);
-          }
-          args.push(value);
-        }
-      }
-      if (setClauses.length === 0) continue;
-      args.push(id);
-      const sql = `UPDATE ${TABLE_MESSAGES} SET ${setClauses.join(", ")} WHERE id = ?`;
-      batchStatements.push({ sql, args });
-    }
-    if (batchStatements.length === 0) {
-      return existingMessages;
+      const limitValue = perPageInput === false ? total : perPage;
+      const rows = await this.#db.selectMany({
+        tableName: TABLE_AGENTS,
+        orderBy: `"${field}" ${direction}`,
+        limit: limitValue,
+        offset
+      });
+      const agents = rows.map((row) => this.parseRow(row));
+      return {
+        agents,
+        total,
+        page,
+        perPage: perPageForResponse,
+        hasMore: perPageInput === false ? false : offset + perPage < total
+      };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "LIST_AGENTS", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
     }
-    const now = (/* @__PURE__ */ new Date()).toISOString();
-    for (const threadId of threadIdsToUpdate) {
-      if (threadId) {
-        batchStatements.push({
-          sql: `UPDATE ${TABLE_THREADS} SET updatedAt = ? WHERE id = ?`,
-          args: [now, threadId]
-        });
-      }
+  }
+};
+var MemoryLibSQL = class extends MemoryStorage {
+  #client;
+  #db;
+  constructor(config) {
+    super();
+    const client = resolveClient(config);
+    this.#client = client;
+    this.#db = new LibSQLDB({ client, maxRetries: config.maxRetries, initialBackoffMs: config.initialBackoffMs });
+  }
+  async init() {
+    await this.#db.createTable({ tableName: TABLE_THREADS, schema: TABLE_SCHEMAS[TABLE_THREADS] });
+    await this.#db.createTable({ tableName: TABLE_MESSAGES, schema: TABLE_SCHEMAS[TABLE_MESSAGES] });
+    await this.#db.createTable({ tableName: TABLE_RESOURCES, schema: TABLE_SCHEMAS[TABLE_RESOURCES] });
+    await this.#db.alterTable({
+      tableName: TABLE_MESSAGES,
+      schema: TABLE_SCHEMAS[TABLE_MESSAGES],
+      ifNotExists: ["resourceId"]
+    });
+  }
+  async dangerouslyClearAll() {
+    await this.#db.deleteData({ tableName: TABLE_MESSAGES });
+    await this.#db.deleteData({ tableName: TABLE_THREADS });
+    await this.#db.deleteData({ tableName: TABLE_RESOURCES });
+  }
+  parseRow(row) {
+    let content = row.content;
+    try {
+      content = JSON.parse(row.content);
+    } catch {
     }
-    await this.client.batch(batchStatements, "write");
-    const updatedResult = await this.client.execute({ sql: selectSql, args: messageIds });
-    return updatedResult.rows.map((row) => this.parseRow(row));
+    const result = {
+      id: row.id,
+      content,
+      role: row.role,
+      createdAt: new Date(row.createdAt),
+      threadId: row.thread_id,
+      resourceId: row.resourceId
+    };
+    if (row.type && row.type !== `v2`) result.type = row.type;
+    return result;
   }
-  async deleteMessages(messageIds) {
-    if (!messageIds || messageIds.length === 0) {
-      return;
+  async _getIncludedMessages({ include }) {
+    if (!include || include.length === 0) return null;
+    const unionQueries = [];
+    const params = [];
+    for (const inc of include) {
+      const { id, withPreviousMessages = 0, withNextMessages = 0 } = inc;
+      unionQueries.push(
+        `
+                SELECT * FROM (
+                  WITH target_thread AS (
+                    SELECT thread_id FROM "${TABLE_MESSAGES}" WHERE id = ?
+                  ),
+                  numbered_messages AS (
+                    SELECT
+                      id, content, role, type, "createdAt", thread_id, "resourceId",
+                      ROW_NUMBER() OVER (ORDER BY "createdAt" ASC) as row_num
+                    FROM "${TABLE_MESSAGES}"
+                    WHERE thread_id = (SELECT thread_id FROM target_thread)
+                  ),
+                  target_positions AS (
+                    SELECT row_num as target_pos
+                    FROM numbered_messages
+                    WHERE id = ?
+                  )
+                  SELECT DISTINCT m.*
+                  FROM numbered_messages m
+                  CROSS JOIN target_positions t
+                  WHERE m.row_num BETWEEN (t.target_pos - ?) AND (t.target_pos + ?)
+                ) 
+                `
+        // Keep ASC for final sorting after fetching context
+      );
+      params.push(id, id, withPreviousMessages, withNextMessages);
     }
+    const finalQuery = unionQueries.join(" UNION ALL ") + ' ORDER BY "createdAt" ASC';
+    const includedResult = await this.#client.execute({ sql: finalQuery, args: params });
+    const includedRows = includedResult.rows?.map((row) => this.parseRow(row));
+    const seen = /* @__PURE__ */ new Set();
+    const dedupedRows = includedRows.filter((row) => {
+      if (seen.has(row.id)) return false;
+      seen.add(row.id);
+      return true;
+    });
+    return dedupedRows;
+  }
+  async listMessagesById({ messageIds }) {
+    if (messageIds.length === 0) return { messages: [] };
     try {
-      const BATCH_SIZE = 100;
-      const threadIds = /* @__PURE__ */ new Set();
-      const tx = await this.client.transaction("write");
-      try {
-        for (let i = 0; i < messageIds.length; i += BATCH_SIZE) {
-          const batch = messageIds.slice(i, i + BATCH_SIZE);
-          const placeholders = batch.map(() => "?").join(",");
-          const result = await tx.execute({
-            sql: `SELECT DISTINCT thread_id FROM "${TABLE_MESSAGES}" WHERE id IN (${placeholders})`,
-            args: batch
-          });
-          result.rows?.forEach((row) => {
-            if (row.thread_id) threadIds.add(row.thread_id);
-          });
-          await tx.execute({
-            sql: `DELETE FROM "${TABLE_MESSAGES}" WHERE id IN (${placeholders})`,
-            args: batch
-          });
-        }
-        if (threadIds.size > 0) {
-          const now = (/* @__PURE__ */ new Date()).toISOString();
-          for (const threadId of threadIds) {
-            await tx.execute({
-              sql: `UPDATE "${TABLE_THREADS}" SET "updatedAt" = ? WHERE id = ?`,
-              args: [now, threadId]
-            });
-          }
-        }
-        await tx.commit();
-      } catch (error) {
-        await tx.rollback();
-        throw error;
-      }
+      const sql = `
+        SELECT 
+          id, 
+          content, 
+          role, 
+          type,
+          "createdAt", 
+          thread_id,
+          "resourceId"
+        FROM "${TABLE_MESSAGES}"
+        WHERE id IN (${messageIds.map(() => "?").join(", ")})
+        ORDER BY "createdAt" DESC
+      `;
+      const result = await this.#client.execute({ sql, args: messageIds });
+      if (!result.rows) return { messages: [] };
+      const list = new MessageList().add(result.rows.map(this.parseRow), "memory");
+      return { messages: list.get.all.db() };
     } catch (error) {
       throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "DELETE_MESSAGES", "FAILED"),
+          id: createStorageErrorId("LIBSQL", "LIST_MESSAGES_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { messageIds: messageIds.join(", ") }
+          details: { messageIds: JSON.stringify(messageIds) }
         },
         error
       );
     }
   }
-  async getResourceById({ resourceId }) {
-    const result = await this.operations.load({
-      tableName: TABLE_RESOURCES,
-      keys: { id: resourceId }
-    });
-    if (!result) {
-      return null;
-    }
-    return {
-      ...result,
-      // Ensure workingMemory is always returned as a string, even if auto-parsed as JSON
-      workingMemory: result.workingMemory && typeof result.workingMemory === "object" ? JSON.stringify(result.workingMemory) : result.workingMemory,
-      metadata: typeof result.metadata === "string" ? JSON.parse(result.metadata) : result.metadata,
-      createdAt: new Date(result.createdAt),
-      updatedAt: new Date(result.updatedAt)
-    };
-  }
-  async saveResource({ resource }) {
-    await this.operations.insert({
-      tableName: TABLE_RESOURCES,
-      record: {
-        ...resource,
-        metadata: JSON.stringify(resource.metadata)
-      }
-    });
-    return resource;
-  }
-  async updateResource({
-    resourceId,
-    workingMemory,
-    metadata
-  }) {
-    const existingResource = await this.getResourceById({ resourceId });
-    if (!existingResource) {
-      const newResource = {
-        id: resourceId,
-        workingMemory,
-        metadata: metadata || {},
-        createdAt: /* @__PURE__ */ new Date(),
-        updatedAt: /* @__PURE__ */ new Date()
-      };
-      return this.saveResource({ resource: newResource });
-    }
-    const updatedResource = {
-      ...existingResource,
-      workingMemory: workingMemory !== void 0 ? workingMemory : existingResource.workingMemory,
-      metadata: {
-        ...existingResource.metadata,
-        ...metadata
-      },
-      updatedAt: /* @__PURE__ */ new Date()
-    };
-    const updates = [];
-    const values = [];
-    if (workingMemory !== void 0) {
-      updates.push("workingMemory = ?");
-      values.push(workingMemory);
-    }
-    if (metadata) {
-      updates.push("metadata = ?");
-      values.push(JSON.stringify(updatedResource.metadata));
-    }
-    updates.push("updatedAt = ?");
-    values.push(updatedResource.updatedAt.toISOString());
-    values.push(resourceId);
-    await this.client.execute({
-      sql: `UPDATE ${TABLE_RESOURCES} SET ${updates.join(", ")} WHERE id = ?`,
-      args: values
-    });
-    return updatedResource;
-  }
-  async getThreadById({ threadId }) {
-    try {
-      const result = await this.operations.load({
-        tableName: TABLE_THREADS,
-        keys: { id: threadId }
-      });
-      if (!result) {
-        return null;
-      }
-      return {
-        ...result,
-        metadata: typeof result.metadata === "string" ? JSON.parse(result.metadata) : result.metadata,
-        createdAt: new Date(result.createdAt),
-        updatedAt: new Date(result.updatedAt)
-      };
-    } catch (error) {
+  async listMessages(args) {
+    const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
+    const threadIds = Array.isArray(threadId) ? threadId : [threadId];
+    if (threadIds.length === 0 || threadIds.some((id) => !id.trim())) {
       throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "GET_THREAD_BY_ID", "FAILED"),
+          id: createStorageErrorId("LIBSQL", "LIST_MESSAGES", "INVALID_THREAD_ID"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { threadId }
+          details: { threadId: Array.isArray(threadId) ? threadId.join(",") : threadId }
         },
-        error
+        new Error("threadId must be a non-empty string or array of non-empty strings")
       );
     }
-  }
-  async listThreadsByResourceId(args) {
-    const { resourceId, page = 0, perPage: perPageInput, orderBy } = args;
     if (page < 0) {
       throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "LIST_THREADS_BY_RESOURCE_ID", "INVALID_PAGE"),
+          id: createStorageErrorId("LIBSQL", "LIST_MESSAGES", "INVALID_PAGE"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
           details: { page }
@@ -1926,63 +2434,106 @@ var MemoryLibSQL = class extends MemoryStorage {
         new Error("page must be >= 0")
       );
     }
-    const perPage = normalizePerPage(perPageInput, 100);
+    const perPage = normalizePerPage(perPageInput, 40);
     const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
-    const { field, direction } = this.parseOrderBy(orderBy);
     try {
-      const baseQuery = `FROM ${TABLE_THREADS} WHERE resourceId = ?`;
-      const queryParams = [resourceId];
-      const mapRowToStorageThreadType = (row) => ({
-        id: row.id,
-        resourceId: row.resourceId,
-        title: row.title,
-        createdAt: new Date(row.createdAt),
-        // Convert string to Date
-        updatedAt: new Date(row.updatedAt),
-        // Convert string to Date
-        metadata: typeof row.metadata === "string" ? JSON.parse(row.metadata) : row.metadata
-      });
-      const countResult = await this.client.execute({
-        sql: `SELECT COUNT(*) as count ${baseQuery}`,
+      const { field, direction } = this.parseOrderBy(orderBy, "ASC");
+      const orderByStatement = `ORDER BY "${field}" ${direction}`;
+      const threadPlaceholders = threadIds.map(() => "?").join(", ");
+      const conditions = [`thread_id IN (${threadPlaceholders})`];
+      const queryParams = [...threadIds];
+      if (resourceId) {
+        conditions.push(`"resourceId" = ?`);
+        queryParams.push(resourceId);
+      }
+      if (filter?.dateRange?.start) {
+        const startOp = filter.dateRange.startExclusive ? ">" : ">=";
+        conditions.push(`"createdAt" ${startOp} ?`);
+        queryParams.push(
+          filter.dateRange.start instanceof Date ? filter.dateRange.start.toISOString() : filter.dateRange.start
+        );
+      }
+      if (filter?.dateRange?.end) {
+        const endOp = filter.dateRange.endExclusive ? "<" : "<=";
+        conditions.push(`"createdAt" ${endOp} ?`);
+        queryParams.push(
+          filter.dateRange.end instanceof Date ? filter.dateRange.end.toISOString() : filter.dateRange.end
+        );
+      }
+      const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
+      const countResult = await this.#client.execute({
+        sql: `SELECT COUNT(*) as count FROM ${TABLE_MESSAGES} ${whereClause}`,
         args: queryParams
       });
       const total = Number(countResult.rows?.[0]?.count ?? 0);
-      if (total === 0) {
+      const limitValue = perPageInput === false ? total : perPage;
+      const dataResult = await this.#client.execute({
+        sql: `SELECT id, content, role, type, "createdAt", "resourceId", "thread_id" FROM ${TABLE_MESSAGES} ${whereClause} ${orderByStatement} LIMIT ? OFFSET ?`,
+        args: [...queryParams, limitValue, offset]
+      });
+      const messages = (dataResult.rows || []).map((row) => this.parseRow(row));
+      if (total === 0 && messages.length === 0 && (!include || include.length === 0)) {
         return {
-          threads: [],
+          messages: [],
           total: 0,
           page,
           perPage: perPageForResponse,
           hasMore: false
         };
       }
-      const limitValue = perPageInput === false ? total : perPage;
-      const dataResult = await this.client.execute({
-        sql: `SELECT * ${baseQuery} ORDER BY "${field}" ${direction} LIMIT ? OFFSET ?`,
-        args: [...queryParams, limitValue, offset]
+      const messageIds = new Set(messages.map((m) => m.id));
+      if (include && include.length > 0) {
+        const includeMessages = await this._getIncludedMessages({ include });
+        if (includeMessages) {
+          for (const includeMsg of includeMessages) {
+            if (!messageIds.has(includeMsg.id)) {
+              messages.push(includeMsg);
+              messageIds.add(includeMsg.id);
+            }
+          }
+        }
+      }
+      const list = new MessageList().add(messages, "memory");
+      let finalMessages = list.get.all.db();
+      finalMessages = finalMessages.sort((a, b) => {
+        const isDateField = field === "createdAt" || field === "updatedAt";
+        const aValue = isDateField ? new Date(a[field]).getTime() : a[field];
+        const bValue = isDateField ? new Date(b[field]).getTime() : b[field];
+        if (typeof aValue === "number" && typeof bValue === "number") {
+          return direction === "ASC" ? aValue - bValue : bValue - aValue;
+        }
+        return direction === "ASC" ? String(aValue).localeCompare(String(bValue)) : String(bValue).localeCompare(String(aValue));
       });
-      const threads = (dataResult.rows || []).map(mapRowToStorageThreadType);
+      const threadIdSet = new Set(threadIds);
+      const returnedThreadMessageIds = new Set(
+        finalMessages.filter((m) => m.threadId && threadIdSet.has(m.threadId)).map((m) => m.id)
+      );
+      const allThreadMessagesReturned = returnedThreadMessageIds.size >= total;
+      const hasMore = perPageInput !== false && !allThreadMessagesReturned && offset + perPage < total;
       return {
-        threads,
+        messages: finalMessages,
         total,
         page,
         perPage: perPageForResponse,
-        hasMore: perPageInput === false ? false : offset + perPage < total
+        hasMore
       };
     } catch (error) {
       const mastraError = new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "LIST_THREADS_BY_RESOURCE_ID", "FAILED"),
+          id: createStorageErrorId("LIBSQL", "LIST_MESSAGES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { resourceId }
+          details: {
+            threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
+            resourceId: resourceId ?? ""
+          }
         },
         error
       );
-      this.logger?.trackException?.(mastraError);
       this.logger?.error?.(mastraError.toString());
+      this.logger?.trackException?.(mastraError);
       return {
-        threads: [],
+        messages: [],
         total: 0,
         page,
         perPage: perPageForResponse,
@@ -1990,909 +2541,1132 @@ var MemoryLibSQL = class extends MemoryStorage {
       };
     }
   }
-  async saveThread({ thread }) {
+  async saveMessages({ messages }) {
+    if (messages.length === 0) return { messages };
     try {
-      await this.operations.insert({
-        tableName: TABLE_THREADS,
-        record: {
-          ...thread,
-          metadata: JSON.stringify(thread.metadata)
+      const threadId = messages[0]?.threadId;
+      if (!threadId) {
+        throw new Error("Thread ID is required");
+      }
+      const batchStatements = messages.map((message) => {
+        const time = message.createdAt || /* @__PURE__ */ new Date();
+        if (!message.threadId) {
+          throw new Error(
+            `Expected to find a threadId for message, but couldn't find one. An unexpected error has occurred.`
+          );
         }
-      });
-      return thread;
-    } catch (error) {
-      const mastraError = new MastraError(
-        {
-          id: createStorageErrorId("LIBSQL", "SAVE_THREAD", "FAILED"),
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { threadId: thread.id }
-        },
-        error
-      );
-      this.logger?.trackException?.(mastraError);
-      this.logger?.error?.(mastraError.toString());
-      throw mastraError;
-    }
-  }
-  async updateThread({
-    id,
-    title,
-    metadata
-  }) {
-    const thread = await this.getThreadById({ threadId: id });
-    if (!thread) {
-      throw new MastraError({
-        id: createStorageErrorId("LIBSQL", "UPDATE_THREAD", "NOT_FOUND"),
-        domain: ErrorDomain.STORAGE,
-        category: ErrorCategory.USER,
-        text: `Thread ${id} not found`,
-        details: {
-          status: 404,
-          threadId: id
+        if (!message.resourceId) {
+          throw new Error(
+            `Expected to find a resourceId for message, but couldn't find one. An unexpected error has occurred.`
+          );
         }
+        return {
+          sql: `INSERT INTO "${TABLE_MESSAGES}" (id, thread_id, content, role, type, "createdAt", "resourceId") 
+                  VALUES (?, ?, ?, ?, ?, ?, ?)
+                  ON CONFLICT(id) DO UPDATE SET
+                    thread_id=excluded.thread_id,
+                    content=excluded.content,
+                    role=excluded.role,
+                    type=excluded.type,
+                    "resourceId"=excluded."resourceId"
+                `,
+          args: [
+            message.id,
+            message.threadId,
+            typeof message.content === "object" ? JSON.stringify(message.content) : message.content,
+            message.role,
+            message.type || "v2",
+            time instanceof Date ? time.toISOString() : time,
+            message.resourceId
+          ]
+        };
       });
-    }
-    const updatedThread = {
-      ...thread,
-      title,
-      metadata: {
-        ...thread.metadata,
-        ...metadata
-      }
-    };
-    try {
-      await this.client.execute({
-        sql: `UPDATE ${TABLE_THREADS} SET title = ?, metadata = ? WHERE id = ?`,
-        args: [title, JSON.stringify(updatedThread.metadata), id]
+      const now = (/* @__PURE__ */ new Date()).toISOString();
+      batchStatements.push({
+        sql: `UPDATE "${TABLE_THREADS}" SET "updatedAt" = ? WHERE id = ?`,
+        args: [now, threadId]
       });
-      return updatedThread;
+      const BATCH_SIZE = 50;
+      const messageStatements = batchStatements.slice(0, -1);
+      const threadUpdateStatement = batchStatements[batchStatements.length - 1];
+      for (let i = 0; i < messageStatements.length; i += BATCH_SIZE) {
+        const batch = messageStatements.slice(i, i + BATCH_SIZE);
+        if (batch.length > 0) {
+          await this.#client.batch(batch, "write");
+        }
+      }
+      if (threadUpdateStatement) {
+        await this.#client.execute(threadUpdateStatement);
+      }
+      const list = new MessageList().add(messages, "memory");
+      return { messages: list.get.all.db() };
     } catch (error) {
       throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "UPDATE_THREAD", "FAILED"),
+          id: createStorageErrorId("LIBSQL", "SAVE_MESSAGES", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          text: `Failed to update thread ${id}`,
-          details: { threadId: id }
+          category: ErrorCategory.THIRD_PARTY
         },
         error
       );
     }
   }
-  async deleteThread({ threadId }) {
-    try {
-      await this.client.execute({
-        sql: `DELETE FROM ${TABLE_MESSAGES} WHERE thread_id = ?`,
-        args: [threadId]
-      });
-      await this.client.execute({
-        sql: `DELETE FROM ${TABLE_THREADS} WHERE id = ?`,
-        args: [threadId]
-      });
-    } catch (error) {
-      throw new MastraError(
-        {
-          id: createStorageErrorId("LIBSQL", "DELETE_THREAD", "FAILED"),
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { threadId }
-        },
-        error
-      );
+  async updateMessages({
+    messages
+  }) {
+    if (messages.length === 0) {
+      return [];
     }
-  }
-};
-function createExecuteWriteOperationWithRetry({
-  logger,
-  maxRetries,
-  initialBackoffMs
-}) {
-  return async function executeWriteOperationWithRetry(operationFn, operationDescription) {
-    let retries = 0;
-    while (true) {
-      try {
-        return await operationFn();
-      } catch (error) {
-        if (error.message && (error.message.includes("SQLITE_BUSY") || error.message.includes("database is locked")) && retries < maxRetries) {
-          retries++;
-          const backoffTime = initialBackoffMs * Math.pow(2, retries - 1);
-          logger.warn(
-            `LibSQLStore: Encountered SQLITE_BUSY during ${operationDescription}. Retrying (${retries}/${maxRetries}) in ${backoffTime}ms...`
-          );
-          await new Promise((resolve) => setTimeout(resolve, backoffTime));
-        } else {
-          logger.error(`LibSQLStore: Error during ${operationDescription} after ${retries} retries: ${error}`);
-          throw error;
+    const messageIds = messages.map((m) => m.id);
+    const placeholders = messageIds.map(() => "?").join(",");
+    const selectSql = `SELECT * FROM ${TABLE_MESSAGES} WHERE id IN (${placeholders})`;
+    const existingResult = await this.#client.execute({ sql: selectSql, args: messageIds });
+    const existingMessages = existingResult.rows.map((row) => this.parseRow(row));
+    if (existingMessages.length === 0) {
+      return [];
+    }
+    const batchStatements = [];
+    const threadIdsToUpdate = /* @__PURE__ */ new Set();
+    const columnMapping = {
+      threadId: "thread_id"
+    };
+    for (const existingMessage of existingMessages) {
+      const updatePayload = messages.find((m) => m.id === existingMessage.id);
+      if (!updatePayload) continue;
+      const { id, ...fieldsToUpdate } = updatePayload;
+      if (Object.keys(fieldsToUpdate).length === 0) continue;
+      threadIdsToUpdate.add(existingMessage.threadId);
+      if (updatePayload.threadId && updatePayload.threadId !== existingMessage.threadId) {
+        threadIdsToUpdate.add(updatePayload.threadId);
+      }
+      const setClauses = [];
+      const args = [];
+      const updatableFields = { ...fieldsToUpdate };
+      if (updatableFields.content) {
+        const newContent = {
+          ...existingMessage.content,
+          ...updatableFields.content,
+          // Deep merge metadata if it exists on both
+          ...existingMessage.content?.metadata && updatableFields.content.metadata ? {
+            metadata: {
+              ...existingMessage.content.metadata,
+              ...updatableFields.content.metadata
+            }
+          } : {}
+        };
+        setClauses.push(`${parseSqlIdentifier("content", "column name")} = ?`);
+        args.push(JSON.stringify(newContent));
+        delete updatableFields.content;
+      }
+      for (const key in updatableFields) {
+        if (Object.prototype.hasOwnProperty.call(updatableFields, key)) {
+          const dbKey = columnMapping[key] || key;
+          setClauses.push(`${parseSqlIdentifier(dbKey, "column name")} = ?`);
+          let value = updatableFields[key];
+          if (typeof value === "object" && value !== null) {
+            value = JSON.stringify(value);
+          }
+          args.push(value);
         }
       }
+      if (setClauses.length === 0) continue;
+      args.push(id);
+      const sql = `UPDATE ${TABLE_MESSAGES} SET ${setClauses.join(", ")} WHERE id = ?`;
+      batchStatements.push({ sql, args });
     }
-  };
-}
-function prepareStatement({ tableName, record }) {
-  const parsedTableName = parseSqlIdentifier(tableName, "table name");
-  const columns = Object.keys(record).map((col) => parseSqlIdentifier(col, "column name"));
-  const values = Object.values(record).map((v) => {
-    if (typeof v === `undefined` || v === null) {
-      return null;
-    }
-    if (v instanceof Date) {
-      return v.toISOString();
-    }
-    return typeof v === "object" ? JSON.stringify(v) : v;
-  });
-  const placeholders = values.map(() => "?").join(", ");
-  return {
-    sql: `INSERT OR REPLACE INTO ${parsedTableName} (${columns.join(", ")}) VALUES (${placeholders})`,
-    args: values
-  };
-}
-function prepareUpdateStatement({
-  tableName,
-  updates,
-  keys
-}) {
-  const parsedTableName = parseSqlIdentifier(tableName, "table name");
-  const schema = TABLE_SCHEMAS[tableName];
-  const updateColumns = Object.keys(updates).map((col) => parseSqlIdentifier(col, "column name"));
-  const updateValues = Object.values(updates).map(transformToSqlValue);
-  const setClause = updateColumns.map((col) => `${col} = ?`).join(", ");
-  const whereClause = prepareWhereClause(keys, schema);
-  return {
-    sql: `UPDATE ${parsedTableName} SET ${setClause}${whereClause.sql}`,
-    args: [...updateValues, ...whereClause.args]
-  };
-}
-function transformToSqlValue(value) {
-  if (typeof value === "undefined" || value === null) {
-    return null;
-  }
-  if (value instanceof Date) {
-    return value.toISOString();
-  }
-  return typeof value === "object" ? JSON.stringify(value) : value;
-}
-function prepareDeleteStatement({ tableName, keys }) {
-  const parsedTableName = parseSqlIdentifier(tableName, "table name");
-  const whereClause = prepareWhereClause(keys, TABLE_SCHEMAS[tableName]);
-  return {
-    sql: `DELETE FROM ${parsedTableName}${whereClause.sql}`,
-    args: whereClause.args
-  };
-}
-function prepareWhereClause(filters, schema) {
-  const conditions = [];
-  const args = [];
-  for (const [columnName, filterValue] of Object.entries(filters)) {
-    const column = schema[columnName];
-    if (!column) {
-      throw new Error(`Unknown column: ${columnName}`);
-    }
-    const parsedColumn = parseSqlIdentifier(columnName, "column name");
-    const result = buildCondition2(parsedColumn, filterValue);
-    conditions.push(result.condition);
-    args.push(...result.args);
-  }
-  return {
-    sql: conditions.length > 0 ? ` WHERE ${conditions.join(" AND ")}` : "",
-    args
-  };
-}
-function buildCondition2(columnName, filterValue) {
-  if (filterValue === null) {
-    return { condition: `${columnName} IS NULL`, args: [] };
-  }
-  if (typeof filterValue === "object" && filterValue !== null && ("startAt" in filterValue || "endAt" in filterValue)) {
-    return buildDateRangeCondition(columnName, filterValue);
-  }
-  return {
-    condition: `${columnName} = ?`,
-    args: [transformToSqlValue(filterValue)]
-  };
-}
-function buildDateRangeCondition(columnName, range) {
-  const conditions = [];
-  const args = [];
-  if (range.startAt !== void 0) {
-    conditions.push(`${columnName} >= ?`);
-    args.push(transformToSqlValue(range.startAt));
-  }
-  if (range.endAt !== void 0) {
-    conditions.push(`${columnName} <= ?`);
-    args.push(transformToSqlValue(range.endAt));
-  }
-  if (conditions.length === 0) {
-    throw new Error("Date range must specify at least startAt or endAt");
-  }
-  return {
-    condition: conditions.join(" AND "),
-    args
-  };
-}
-function buildDateRangeFilter(dateRange, columnName = "createdAt") {
-  if (!dateRange?.start && !dateRange?.end) {
-    return {};
-  }
-  const filter = {};
-  if (dateRange.start) {
-    filter.startAt = new Date(dateRange.start).toISOString();
-  }
-  if (dateRange.end) {
-    filter.endAt = new Date(dateRange.end).toISOString();
-  }
-  return { [columnName]: filter };
-}
-function transformFromSqlRow({
-  tableName,
-  sqlRow
-}) {
-  const result = {};
-  const jsonColumns = new Set(
-    Object.keys(TABLE_SCHEMAS[tableName]).filter((key) => TABLE_SCHEMAS[tableName][key].type === "jsonb").map((key) => key)
-  );
-  const dateColumns = new Set(
-    Object.keys(TABLE_SCHEMAS[tableName]).filter((key) => TABLE_SCHEMAS[tableName][key].type === "timestamp").map((key) => key)
-  );
-  for (const [key, value] of Object.entries(sqlRow)) {
-    if (value === null || value === void 0) {
-      result[key] = value;
-      continue;
-    }
-    if (dateColumns.has(key) && typeof value === "string") {
-      result[key] = new Date(value);
-      continue;
+    if (batchStatements.length === 0) {
+      return existingMessages;
     }
-    if (jsonColumns.has(key) && typeof value === "string") {
-      result[key] = safelyParseJSON(value);
-      continue;
+    const now = (/* @__PURE__ */ new Date()).toISOString();
+    for (const threadId of threadIdsToUpdate) {
+      if (threadId) {
+        batchStatements.push({
+          sql: `UPDATE ${TABLE_THREADS} SET updatedAt = ? WHERE id = ?`,
+          args: [now, threadId]
+        });
+      }
     }
-    result[key] = value;
-  }
-  return result;
-}
-
-// src/storage/domains/observability/index.ts
-var ObservabilityLibSQL = class extends ObservabilityStorage {
-  operations;
-  constructor({ operations }) {
-    super();
-    this.operations = operations;
+    await this.#client.batch(batchStatements, "write");
+    const updatedResult = await this.#client.execute({ sql: selectSql, args: messageIds });
+    return updatedResult.rows.map((row) => this.parseRow(row));
   }
-  async createSpan(span) {
+  async deleteMessages(messageIds) {
+    if (!messageIds || messageIds.length === 0) {
+      return;
+    }
     try {
-      const now = (/* @__PURE__ */ new Date()).toISOString();
-      const record = {
-        ...span,
-        createdAt: now,
-        updatedAt: now
-      };
-      return this.operations.insert({ tableName: TABLE_SPANS, record });
+      const BATCH_SIZE = 100;
+      const threadIds = /* @__PURE__ */ new Set();
+      const tx = await this.#client.transaction("write");
+      try {
+        for (let i = 0; i < messageIds.length; i += BATCH_SIZE) {
+          const batch = messageIds.slice(i, i + BATCH_SIZE);
+          const placeholders = batch.map(() => "?").join(",");
+          const result = await tx.execute({
+            sql: `SELECT DISTINCT thread_id FROM "${TABLE_MESSAGES}" WHERE id IN (${placeholders})`,
+            args: batch
+          });
+          result.rows?.forEach((row) => {
+            if (row.thread_id) threadIds.add(row.thread_id);
+          });
+          await tx.execute({
+            sql: `DELETE FROM "${TABLE_MESSAGES}" WHERE id IN (${placeholders})`,
+            args: batch
+          });
+        }
+        if (threadIds.size > 0) {
+          const now = (/* @__PURE__ */ new Date()).toISOString();
+          for (const threadId of threadIds) {
+            await tx.execute({
+              sql: `UPDATE "${TABLE_THREADS}" SET "updatedAt" = ? WHERE id = ?`,
+              args: [now, threadId]
+            });
+          }
+        }
+        await tx.commit();
+      } catch (error) {
+        await tx.rollback();
+        throw error;
+      }
     } catch (error) {
       throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "CREATE_SPAN", "FAILED"),
+          id: createStorageErrorId("LIBSQL", "DELETE_MESSAGES", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER,
-          details: {
-            spanId: span.spanId,
-            traceId: span.traceId,
-            spanType: span.spanType,
-            spanName: span.name
-          }
+          category: ErrorCategory.THIRD_PARTY,
+          details: { messageIds: messageIds.join(", ") }
         },
         error
       );
     }
   }
-  async getTrace(traceId) {
+  async getResourceById({ resourceId }) {
+    const result = await this.#db.select({
+      tableName: TABLE_RESOURCES,
+      keys: { id: resourceId }
+    });
+    if (!result) {
+      return null;
+    }
+    return {
+      ...result,
+      // Ensure workingMemory is always returned as a string, even if auto-parsed as JSON
+      workingMemory: result.workingMemory && typeof result.workingMemory === "object" ? JSON.stringify(result.workingMemory) : result.workingMemory,
+      metadata: typeof result.metadata === "string" ? JSON.parse(result.metadata) : result.metadata,
+      createdAt: new Date(result.createdAt),
+      updatedAt: new Date(result.updatedAt)
+    };
+  }
+  async saveResource({ resource }) {
+    await this.#db.insert({
+      tableName: TABLE_RESOURCES,
+      record: {
+        ...resource
+        // metadata is handled by prepareStatement which stringifies jsonb columns
+      }
+    });
+    return resource;
+  }
+  async updateResource({
+    resourceId,
+    workingMemory,
+    metadata
+  }) {
+    const existingResource = await this.getResourceById({ resourceId });
+    if (!existingResource) {
+      const newResource = {
+        id: resourceId,
+        workingMemory,
+        metadata: metadata || {},
+        createdAt: /* @__PURE__ */ new Date(),
+        updatedAt: /* @__PURE__ */ new Date()
+      };
+      return this.saveResource({ resource: newResource });
+    }
+    const updatedResource = {
+      ...existingResource,
+      workingMemory: workingMemory !== void 0 ? workingMemory : existingResource.workingMemory,
+      metadata: {
+        ...existingResource.metadata,
+        ...metadata
+      },
+      updatedAt: /* @__PURE__ */ new Date()
+    };
+    const updates = [];
+    const values = [];
+    if (workingMemory !== void 0) {
+      updates.push("workingMemory = ?");
+      values.push(workingMemory);
+    }
+    if (metadata) {
+      updates.push("metadata = jsonb(?)");
+      values.push(JSON.stringify(updatedResource.metadata));
+    }
+    updates.push("updatedAt = ?");
+    values.push(updatedResource.updatedAt.toISOString());
+    values.push(resourceId);
+    await this.#client.execute({
+      sql: `UPDATE ${TABLE_RESOURCES} SET ${updates.join(", ")} WHERE id = ?`,
+      args: values
+    });
+    return updatedResource;
+  }
+  async getThreadById({ threadId }) {
     try {
-      const spans = await this.operations.loadMany({
-        tableName: TABLE_SPANS,
-        whereClause: { sql: " WHERE traceId = ?", args: [traceId] },
-        orderBy: "startedAt DESC"
+      const result = await this.#db.select({
+        tableName: TABLE_THREADS,
+        keys: { id: threadId }
       });
-      if (!spans || spans.length === 0) {
+      if (!result) {
         return null;
       }
       return {
-        traceId,
-        spans: spans.map((span) => transformFromSqlRow({ tableName: TABLE_SPANS, sqlRow: span }))
+        ...result,
+        metadata: typeof result.metadata === "string" ? JSON.parse(result.metadata) : result.metadata,
+        createdAt: new Date(result.createdAt),
+        updatedAt: new Date(result.updatedAt)
       };
     } catch (error) {
       throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "GET_TRACE", "FAILED"),
+          id: createStorageErrorId("LIBSQL", "GET_THREAD_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER,
-          details: {
-            traceId
-          }
+          category: ErrorCategory.THIRD_PARTY,
+          details: { threadId }
         },
         error
       );
     }
   }
-  async updateSpan({
-    spanId,
-    traceId,
-    updates
-  }) {
+  async listThreads(args) {
+    const { page = 0, perPage: perPageInput, orderBy, filter } = args;
     try {
-      await this.operations.update({
-        tableName: TABLE_SPANS,
-        keys: { spanId, traceId },
-        data: { ...updates, updatedAt: (/* @__PURE__ */ new Date()).toISOString() }
-      });
+      this.validatePaginationInput(page, perPageInput ?? 100);
     } catch (error) {
       throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "UPDATE_SPAN", "FAILED"),
+          id: createStorageErrorId("LIBSQL", "LIST_THREADS", "INVALID_PAGE"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
-          details: {
-            spanId,
-            traceId
-          }
+          details: { page, ...perPageInput !== void 0 && { perPage: perPageInput } }
         },
-        error
+        error instanceof Error ? error : new Error("Invalid pagination parameters")
       );
     }
-  }
-  async getTracesPaginated({
-    filters,
-    pagination
-  }) {
-    const page = pagination?.page ?? 0;
-    const perPage = pagination?.perPage ?? 10;
-    const { entityId, entityType, ...actualFilters } = filters || {};
-    const filtersWithDateRange = {
-      ...actualFilters,
-      ...buildDateRangeFilter(pagination?.dateRange, "startedAt"),
-      parentSpanId: null
-    };
-    const whereClause = prepareWhereClause(filtersWithDateRange, SPAN_SCHEMA);
-    let actualWhereClause = whereClause.sql || "";
-    if (entityId && entityType) {
-      const statement = `name = ?`;
-      let name = "";
-      if (entityType === "workflow") {
-        name = `workflow run: '${entityId}'`;
-      } else if (entityType === "agent") {
-        name = `agent run: '${entityId}'`;
-      } else {
-        const error = new MastraError({
-          id: createStorageErrorId("LIBSQL", "GET_TRACES_PAGINATED", "INVALID_ENTITY_TYPE"),
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER,
-          details: {
-            entityType
-          },
-          text: `Cannot filter by entity type: ${entityType}`
-        });
-        this.logger?.trackException(error);
-        throw error;
-      }
-      whereClause.args.push(name);
-      if (actualWhereClause) {
-        actualWhereClause += ` AND ${statement}`;
-      } else {
-        actualWhereClause += `WHERE ${statement}`;
-      }
-    }
-    const orderBy = "startedAt DESC";
-    let count = 0;
+    const perPage = normalizePerPage(perPageInput, 100);
     try {
-      count = await this.operations.loadTotalCount({
-        tableName: TABLE_SPANS,
-        whereClause: { sql: actualWhereClause, args: whereClause.args }
-      });
+      this.validateMetadataKeys(filter?.metadata);
     } catch (error) {
       throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "GET_TRACES_PAGINATED", "COUNT_FAILED"),
+          id: createStorageErrorId("LIBSQL", "LIST_THREADS", "INVALID_METADATA_KEY"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER
+          category: ErrorCategory.USER,
+          details: { metadataKeys: filter?.metadata ? Object.keys(filter.metadata).join(", ") : "" }
         },
-        error
+        error instanceof Error ? error : new Error("Invalid metadata key")
       );
     }
-    if (count === 0) {
-      return {
-        pagination: {
+    const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+    const { field, direction } = this.parseOrderBy(orderBy);
+    try {
+      const whereClauses = [];
+      const queryParams = [];
+      if (filter?.resourceId) {
+        whereClauses.push("resourceId = ?");
+        queryParams.push(filter.resourceId);
+      }
+      if (filter?.metadata && Object.keys(filter.metadata).length > 0) {
+        for (const [key, value] of Object.entries(filter.metadata)) {
+          if (value === null) {
+            whereClauses.push(`json_extract(metadata, '$.${key}') IS NULL`);
+          } else if (typeof value === "boolean") {
+            whereClauses.push(`json_extract(metadata, '$.${key}') = ?`);
+            queryParams.push(value ? 1 : 0);
+          } else if (typeof value === "number") {
+            whereClauses.push(`json_extract(metadata, '$.${key}') = ?`);
+            queryParams.push(value);
+          } else if (typeof value === "string") {
+            whereClauses.push(`json_extract(metadata, '$.${key}') = ?`);
+            queryParams.push(value);
+          } else {
+            throw new MastraError({
+              id: createStorageErrorId("LIBSQL", "LIST_THREADS", "INVALID_METADATA_VALUE"),
+              domain: ErrorDomain.STORAGE,
+              category: ErrorCategory.USER,
+              text: `Metadata filter value for key "${key}" must be a scalar type (string, number, boolean, or null), got ${typeof value}`,
+              details: { key, valueType: typeof value }
+            });
+          }
+        }
+      }
+      const whereClause = whereClauses.length > 0 ? `WHERE ${whereClauses.join(" AND ")}` : "";
+      const baseQuery = `FROM ${TABLE_THREADS} ${whereClause}`;
+      const mapRowToStorageThreadType = (row) => ({
+        id: row.id,
+        resourceId: row.resourceId,
+        title: row.title,
+        createdAt: new Date(row.createdAt),
+        updatedAt: new Date(row.updatedAt),
+        metadata: typeof row.metadata === "string" ? JSON.parse(row.metadata) : row.metadata
+      });
+      const countResult = await this.#client.execute({
+        sql: `SELECT COUNT(*) as count ${baseQuery}`,
+        args: queryParams
+      });
+      const total = Number(countResult.rows?.[0]?.count ?? 0);
+      if (total === 0) {
+        return {
+          threads: [],
           total: 0,
           page,
-          perPage,
+          perPage: perPageForResponse,
           hasMore: false
-        },
-        spans: []
-      };
-    }
-    try {
-      const spans = await this.operations.loadMany({
-        tableName: TABLE_SPANS,
-        whereClause: {
-          sql: actualWhereClause,
-          args: whereClause.args
-        },
-        orderBy,
-        offset: page * perPage,
-        limit: perPage
+        };
+      }
+      const limitValue = perPageInput === false ? total : perPage;
+      const dataResult = await this.#client.execute({
+        sql: `SELECT ${buildSelectColumns(TABLE_THREADS)} ${baseQuery} ORDER BY "${field}" ${direction} LIMIT ? OFFSET ?`,
+        args: [...queryParams, limitValue, offset]
       });
+      const threads = (dataResult.rows || []).map(mapRowToStorageThreadType);
       return {
-        pagination: {
-          total: count,
-          page,
-          perPage,
-          hasMore: spans.length === perPage
-        },
-        spans: spans.map((span) => transformFromSqlRow({ tableName: TABLE_SPANS, sqlRow: span }))
+        threads,
+        total,
+        page,
+        perPage: perPageForResponse,
+        hasMore: perPageInput === false ? false : offset + perPage < total
       };
     } catch (error) {
-      throw new MastraError(
-        {
-          id: createStorageErrorId("LIBSQL", "GET_TRACES_PAGINATED", "FAILED"),
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER
-        },
-        error
-      );
-    }
-  }
-  async batchCreateSpans(args) {
-    try {
-      const now = (/* @__PURE__ */ new Date()).toISOString();
-      return this.operations.batchInsert({
-        tableName: TABLE_SPANS,
-        records: args.records.map((record) => ({
-          ...record,
-          createdAt: now,
-          updatedAt: now
-        }))
-      });
-    } catch (error) {
-      throw new MastraError(
+      if (error instanceof MastraError && error.category === ErrorCategory.USER) {
+        throw error;
+      }
+      const mastraError = new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "BATCH_CREATE_SPANS", "FAILED"),
+          id: createStorageErrorId("LIBSQL", "LIST_THREADS", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            ...filter?.resourceId && { resourceId: filter.resourceId },
+            hasMetadataFilter: !!filter?.metadata
+          }
         },
         error
       );
+      this.logger?.trackException?.(mastraError);
+      this.logger?.error?.(mastraError.toString());
+      return {
+        threads: [],
+        total: 0,
+        page,
+        perPage: perPageForResponse,
+        hasMore: false
+      };
     }
   }
-  async batchUpdateSpans(args) {
+  async saveThread({ thread }) {
     try {
-      return this.operations.batchUpdate({
-        tableName: TABLE_SPANS,
-        updates: args.records.map((record) => ({
-          keys: { spanId: record.spanId, traceId: record.traceId },
-          data: { ...record.updates, updatedAt: (/* @__PURE__ */ new Date()).toISOString() }
-        }))
+      await this.#db.insert({
+        tableName: TABLE_THREADS,
+        record: {
+          ...thread
+          // metadata is handled by prepareStatement which stringifies jsonb columns
+        }
       });
+      return thread;
     } catch (error) {
-      throw new MastraError(
+      const mastraError = new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "BATCH_UPDATE_SPANS", "FAILED"),
+          id: createStorageErrorId("LIBSQL", "SAVE_THREAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER
+          category: ErrorCategory.THIRD_PARTY,
+          details: { threadId: thread.id }
         },
         error
       );
+      this.logger?.trackException?.(mastraError);
+      this.logger?.error?.(mastraError.toString());
+      throw mastraError;
     }
   }
-  async batchDeleteTraces(args) {
+  async updateThread({
+    id,
+    title,
+    metadata
+  }) {
+    const thread = await this.getThreadById({ threadId: id });
+    if (!thread) {
+      throw new MastraError({
+        id: createStorageErrorId("LIBSQL", "UPDATE_THREAD", "NOT_FOUND"),
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: `Thread ${id} not found`,
+        details: {
+          status: 404,
+          threadId: id
+        }
+      });
+    }
+    const updatedThread = {
+      ...thread,
+      title,
+      metadata: {
+        ...thread.metadata,
+        ...metadata
+      }
+    };
     try {
-      const keys = args.traceIds.map((traceId) => ({ traceId }));
-      return this.operations.batchDelete({
-        tableName: TABLE_SPANS,
-        keys
+      await this.#client.execute({
+        sql: `UPDATE ${TABLE_THREADS} SET title = ?, metadata = jsonb(?) WHERE id = ?`,
+        args: [title, JSON.stringify(updatedThread.metadata), id]
       });
+      return updatedThread;
     } catch (error) {
       throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "BATCH_DELETE_TRACES", "FAILED"),
+          id: createStorageErrorId("LIBSQL", "UPDATE_THREAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to update thread ${id}`,
+          details: { threadId: id }
         },
         error
       );
     }
   }
-};
-var StoreOperationsLibSQL = class extends StoreOperations {
-  client;
-  /**
-   * Maximum number of retries for write operations if an SQLITE_BUSY error occurs.
-   * @default 5
-   */
-  maxRetries;
-  /**
-   * Initial backoff time in milliseconds for retrying write operations on SQLITE_BUSY.
-   * The backoff time will double with each retry (exponential backoff).
-   * @default 100
-   */
-  initialBackoffMs;
-  constructor({
-    client,
-    maxRetries,
-    initialBackoffMs
-  }) {
-    super();
-    this.client = client;
-    this.maxRetries = maxRetries ?? 5;
-    this.initialBackoffMs = initialBackoffMs ?? 100;
-  }
-  async hasColumn(table, column) {
-    const result = await this.client.execute({
-      sql: `PRAGMA table_info(${table})`
-    });
-    return (await result.rows)?.some((row) => row.name === column);
-  }
-  getCreateTableSQL(tableName, schema) {
-    const parsedTableName = parseSqlIdentifier(tableName, "table name");
-    const columns = Object.entries(schema).map(([name, col]) => {
-      const parsedColumnName = parseSqlIdentifier(name, "column name");
-      const type = this.getSqlType(col.type);
-      const nullable = col.nullable ? "" : "NOT NULL";
-      const primaryKey = col.primaryKey ? "PRIMARY KEY" : "";
-      return `${parsedColumnName} ${type} ${nullable} ${primaryKey}`.trim();
-    });
-    if (tableName === TABLE_WORKFLOW_SNAPSHOT) {
-      const stmnt = `CREATE TABLE IF NOT EXISTS ${parsedTableName} (
-                    ${columns.join(",\n")},
-                    PRIMARY KEY (workflow_name, run_id)
-                )`;
-      return stmnt;
-    }
-    if (tableName === TABLE_SPANS) {
-      const stmnt = `CREATE TABLE IF NOT EXISTS ${parsedTableName} (
-                    ${columns.join(",\n")},
-                    PRIMARY KEY (traceId, spanId)
-                )`;
-      return stmnt;
-    }
-    return `CREATE TABLE IF NOT EXISTS ${parsedTableName} (${columns.join(", ")})`;
-  }
-  async createTable({
-    tableName,
-    schema
-  }) {
+  async deleteThread({ threadId }) {
     try {
-      this.logger.debug(`Creating database table`, { tableName, operation: "schema init" });
-      const sql = this.getCreateTableSQL(tableName, schema);
-      await this.client.execute(sql);
+      await this.#client.execute({
+        sql: `DELETE FROM ${TABLE_MESSAGES} WHERE thread_id = ?`,
+        args: [threadId]
+      });
+      await this.#client.execute({
+        sql: `DELETE FROM ${TABLE_THREADS} WHERE id = ?`,
+        args: [threadId]
+      });
     } catch (error) {
       throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "CREATE_TABLE", "FAILED"),
+          id: createStorageErrorId("LIBSQL", "DELETE_THREAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: {
-            tableName
-          }
+          details: { threadId }
         },
         error
       );
     }
   }
-  getSqlType(type) {
-    switch (type) {
-      case "bigint":
-        return "INTEGER";
-      // SQLite uses INTEGER for all integer sizes
-      case "timestamp":
-        return "TEXT";
-      // Store timestamps as ISO strings in SQLite
-      // jsonb falls through to base class which returns 'JSONB'
-      // SQLite's flexible type system treats JSONB as TEXT affinity
-      default:
-        return super.getSqlType(type);
+  async cloneThread(args) {
+    const { sourceThreadId, newThreadId: providedThreadId, resourceId, title, metadata, options } = args;
+    const sourceThread = await this.getThreadById({ threadId: sourceThreadId });
+    if (!sourceThread) {
+      throw new MastraError({
+        id: createStorageErrorId("LIBSQL", "CLONE_THREAD", "SOURCE_NOT_FOUND"),
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: `Source thread with id ${sourceThreadId} not found`,
+        details: { sourceThreadId }
+      });
     }
-  }
-  async doInsert({
-    tableName,
-    record
-  }) {
-    await this.client.execute(
-      prepareStatement({
-        tableName,
-        record
-      })
-    );
-  }
-  insert(args) {
-    const executeWriteOperationWithRetry = createExecuteWriteOperationWithRetry({
-      logger: this.logger,
-      maxRetries: this.maxRetries,
-      initialBackoffMs: this.initialBackoffMs
-    });
-    return executeWriteOperationWithRetry(() => this.doInsert(args), `insert into table ${args.tableName}`);
-  }
-  async load({ tableName, keys }) {
-    const parsedTableName = parseSqlIdentifier(tableName, "table name");
-    const parsedKeys = Object.keys(keys).map((key) => parseSqlIdentifier(key, "column name"));
-    const conditions = parsedKeys.map((key) => `${key} = ?`).join(" AND ");
-    const values = Object.values(keys);
-    const result = await this.client.execute({
-      sql: `SELECT * FROM ${parsedTableName} WHERE ${conditions} ORDER BY createdAt DESC LIMIT 1`,
-      args: values
-    });
-    if (!result.rows || result.rows.length === 0) {
-      return null;
+    const newThreadId = providedThreadId || crypto.randomUUID();
+    const existingThread = await this.getThreadById({ threadId: newThreadId });
+    if (existingThread) {
+      throw new MastraError({
+        id: createStorageErrorId("LIBSQL", "CLONE_THREAD", "THREAD_EXISTS"),
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: `Thread with id ${newThreadId} already exists`,
+        details: { newThreadId }
+      });
     }
-    const row = result.rows[0];
-    const parsed = Object.fromEntries(
-      Object.entries(row || {}).map(([k, v]) => {
-        try {
-          return [k, typeof v === "string" ? v.startsWith("{") || v.startsWith("[") ? JSON.parse(v) : v : v];
-        } catch {
-          return [k, v];
+    try {
+      let messageQuery = `SELECT id, content, role, type, "createdAt", thread_id, "resourceId"
+                          FROM "${TABLE_MESSAGES}" WHERE thread_id = ?`;
+      const messageParams = [sourceThreadId];
+      if (options?.messageFilter?.startDate) {
+        messageQuery += ` AND "createdAt" >= ?`;
+        messageParams.push(
+          options.messageFilter.startDate instanceof Date ? options.messageFilter.startDate.toISOString() : options.messageFilter.startDate
+        );
+      }
+      if (options?.messageFilter?.endDate) {
+        messageQuery += ` AND "createdAt" <= ?`;
+        messageParams.push(
+          options.messageFilter.endDate instanceof Date ? options.messageFilter.endDate.toISOString() : options.messageFilter.endDate
+        );
+      }
+      if (options?.messageFilter?.messageIds && options.messageFilter.messageIds.length > 0) {
+        messageQuery += ` AND id IN (${options.messageFilter.messageIds.map(() => "?").join(", ")})`;
+        messageParams.push(...options.messageFilter.messageIds);
+      }
+      messageQuery += ` ORDER BY "createdAt" ASC`;
+      if (options?.messageLimit && options.messageLimit > 0) {
+        const limitQuery = `SELECT * FROM (${messageQuery.replace('ORDER BY "createdAt" ASC', 'ORDER BY "createdAt" DESC')} LIMIT ?) ORDER BY "createdAt" ASC`;
+        messageParams.push(options.messageLimit);
+        messageQuery = limitQuery;
+      }
+      const sourceMessagesResult = await this.#client.execute({ sql: messageQuery, args: messageParams });
+      const sourceMessages = sourceMessagesResult.rows || [];
+      const now = /* @__PURE__ */ new Date();
+      const nowStr = now.toISOString();
+      const lastMessageId = sourceMessages.length > 0 ? sourceMessages[sourceMessages.length - 1].id : void 0;
+      const cloneMetadata = {
+        sourceThreadId,
+        clonedAt: now,
+        ...lastMessageId && { lastMessageId }
+      };
+      const newThread = {
+        id: newThreadId,
+        resourceId: resourceId || sourceThread.resourceId,
+        title: title || (sourceThread.title ? `Clone of ${sourceThread.title}` : void 0),
+        metadata: {
+          ...metadata,
+          clone: cloneMetadata
+        },
+        createdAt: now,
+        updatedAt: now
+      };
+      const tx = await this.#client.transaction("write");
+      try {
+        await tx.execute({
+          sql: `INSERT INTO "${TABLE_THREADS}" (id, "resourceId", title, metadata, "createdAt", "updatedAt")
+                VALUES (?, ?, ?, jsonb(?), ?, ?)`,
+          args: [
+            newThread.id,
+            newThread.resourceId,
+            newThread.title || null,
+            JSON.stringify(newThread.metadata),
+            nowStr,
+            nowStr
+          ]
+        });
+        const clonedMessages = [];
+        const targetResourceId = resourceId || sourceThread.resourceId;
+        for (const sourceMsg of sourceMessages) {
+          const newMessageId = crypto.randomUUID();
+          const contentStr = sourceMsg.content;
+          let parsedContent;
+          try {
+            parsedContent = JSON.parse(contentStr);
+          } catch {
+            parsedContent = { format: 2, parts: [{ type: "text", text: contentStr }] };
+          }
+          await tx.execute({
+            sql: `INSERT INTO "${TABLE_MESSAGES}" (id, thread_id, content, role, type, "createdAt", "resourceId")
+                  VALUES (?, ?, ?, ?, ?, ?, ?)`,
+            args: [
+              newMessageId,
+              newThreadId,
+              contentStr,
+              sourceMsg.role,
+              sourceMsg.type || "v2",
+              sourceMsg.createdAt,
+              targetResourceId
+            ]
+          });
+          clonedMessages.push({
+            id: newMessageId,
+            threadId: newThreadId,
+            content: parsedContent,
+            role: sourceMsg.role,
+            type: sourceMsg.type || void 0,
+            createdAt: new Date(sourceMsg.createdAt),
+            resourceId: targetResourceId
+          });
         }
-      })
-    );
-    return parsed;
-  }
-  async loadMany({
-    tableName,
-    whereClause,
-    orderBy,
-    offset,
-    limit,
-    args
-  }) {
-    const parsedTableName = parseSqlIdentifier(tableName, "table name");
-    let statement = `SELECT * FROM ${parsedTableName}`;
-    if (whereClause?.sql) {
-      statement += `${whereClause.sql}`;
-    }
-    if (orderBy) {
-      statement += ` ORDER BY ${orderBy}`;
-    }
-    if (limit) {
-      statement += ` LIMIT ${limit}`;
-    }
-    if (offset) {
-      statement += ` OFFSET ${offset}`;
-    }
-    const result = await this.client.execute({
-      sql: statement,
-      args: [...whereClause?.args ?? [], ...args ?? []]
-    });
-    return result.rows;
-  }
-  async loadTotalCount({
-    tableName,
-    whereClause
-  }) {
-    const parsedTableName = parseSqlIdentifier(tableName, "table name");
-    const statement = `SELECT COUNT(*) as count FROM ${parsedTableName} ${whereClause ? `${whereClause.sql}` : ""}`;
-    const result = await this.client.execute({
-      sql: statement,
-      args: whereClause?.args ?? []
-    });
-    if (!result.rows || result.rows.length === 0) {
-      return 0;
-    }
-    return result.rows[0]?.count ?? 0;
-  }
-  update(args) {
-    const executeWriteOperationWithRetry = createExecuteWriteOperationWithRetry({
-      logger: this.logger,
-      maxRetries: this.maxRetries,
-      initialBackoffMs: this.initialBackoffMs
-    });
-    return executeWriteOperationWithRetry(() => this.executeUpdate(args), `update table ${args.tableName}`);
-  }
-  async executeUpdate({
-    tableName,
-    keys,
-    data
-  }) {
-    await this.client.execute(prepareUpdateStatement({ tableName, updates: data, keys }));
-  }
-  async doBatchInsert({
-    tableName,
-    records
-  }) {
-    if (records.length === 0) return;
-    const batchStatements = records.map((r) => prepareStatement({ tableName, record: r }));
-    await this.client.batch(batchStatements, "write");
-  }
-  batchInsert(args) {
-    const executeWriteOperationWithRetry = createExecuteWriteOperationWithRetry({
-      logger: this.logger,
-      maxRetries: this.maxRetries,
-      initialBackoffMs: this.initialBackoffMs
-    });
-    return executeWriteOperationWithRetry(
-      () => this.doBatchInsert(args),
-      `batch insert into table ${args.tableName}`
-    ).catch((error) => {
+        await tx.commit();
+        return {
+          thread: newThread,
+          clonedMessages
+        };
+      } catch (error) {
+        await tx.rollback();
+        throw error;
+      }
+    } catch (error) {
+      if (error instanceof MastraError) {
+        throw error;
+      }
       throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "BATCH_INSERT", "FAILED"),
+          id: createStorageErrorId("LIBSQL", "CLONE_THREAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: {
-            tableName: args.tableName
-          }
+          details: { sourceThreadId, newThreadId }
         },
         error
       );
-    });
+    }
+  }
+};
+var ObservabilityLibSQL = class extends ObservabilityStorage {
+  #db;
+  constructor(config) {
+    super();
+    const client = resolveClient(config);
+    this.#db = new LibSQLDB({ client, maxRetries: config.maxRetries, initialBackoffMs: config.initialBackoffMs });
+  }
+  async init() {
+    await this.#db.createTable({ tableName: TABLE_SPANS, schema: SPAN_SCHEMA });
+  }
+  async dangerouslyClearAll() {
+    await this.#db.deleteData({ tableName: TABLE_SPANS });
   }
   /**
-   * Public batch update method with retry logic
+   * Manually run the spans migration to deduplicate and add the unique constraint.
+   * This is intended to be called from the CLI when duplicates are detected.
+   *
+   * @returns Migration result with status and details
    */
-  batchUpdate(args) {
-    const executeWriteOperationWithRetry = createExecuteWriteOperationWithRetry({
-      logger: this.logger,
-      maxRetries: this.maxRetries,
-      initialBackoffMs: this.initialBackoffMs
-    });
-    return executeWriteOperationWithRetry(
-      () => this.executeBatchUpdate(args),
-      `batch update in table ${args.tableName}`
-    ).catch((error) => {
+  async migrateSpans() {
+    return this.#db.migrateSpans();
+  }
+  /**
+   * Check migration status for the spans table.
+   * Returns information about whether migration is needed.
+   */
+  async checkSpansMigrationStatus() {
+    return this.#db.checkSpansMigrationStatus();
+  }
+  get tracingStrategy() {
+    return {
+      preferred: "batch-with-updates",
+      supported: ["batch-with-updates", "insert-only"]
+    };
+  }
+  async createSpan(args) {
+    const { span } = args;
+    try {
+      const startedAt = span.startedAt instanceof Date ? span.startedAt.toISOString() : span.startedAt;
+      const endedAt = span.endedAt instanceof Date ? span.endedAt.toISOString() : span.endedAt;
+      const now = (/* @__PURE__ */ new Date()).toISOString();
+      const record = {
+        ...span,
+        startedAt,
+        endedAt,
+        createdAt: now,
+        updatedAt: now
+      };
+      return this.#db.insert({ tableName: TABLE_SPANS, record });
+    } catch (error) {
       throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "BATCH_UPDATE", "FAILED"),
+          id: createStorageErrorId("LIBSQL", "CREATE_SPAN", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
+          category: ErrorCategory.USER,
           details: {
-            tableName: args.tableName
+            spanId: span.spanId,
+            traceId: span.traceId,
+            spanType: span.spanType,
+            name: span.name
           }
         },
         error
       );
-    });
+    }
   }
-  /**
-   * Updates multiple records in batch. Each record can be updated based on single or composite keys.
-   */
-  async executeBatchUpdate({
-    tableName,
-    updates
-  }) {
-    if (updates.length === 0) return;
-    const batchStatements = updates.map(
-      ({ keys, data }) => prepareUpdateStatement({
-        tableName,
-        updates: data,
-        keys
-      })
-    );
-    await this.client.batch(batchStatements, "write");
+  async getSpan(args) {
+    const { traceId, spanId } = args;
+    try {
+      const rows = await this.#db.selectMany({
+        tableName: TABLE_SPANS,
+        whereClause: { sql: " WHERE traceId = ? AND spanId = ?", args: [traceId, spanId] },
+        limit: 1
+      });
+      if (!rows || rows.length === 0) {
+        return null;
+      }
+      return {
+        span: transformFromSqlRow({ tableName: TABLE_SPANS, sqlRow: rows[0] })
+      };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "GET_SPAN", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: { traceId, spanId }
+        },
+        error
+      );
+    }
   }
-  /**
-   * Public batch delete method with retry logic
-   */
-  batchDelete({ tableName, keys }) {
-    const executeWriteOperationWithRetry = createExecuteWriteOperationWithRetry({
-      logger: this.logger,
-      maxRetries: this.maxRetries,
-      initialBackoffMs: this.initialBackoffMs
-    });
-    return executeWriteOperationWithRetry(
-      () => this.executeBatchDelete({ tableName, keys }),
-      `batch delete from table ${tableName}`
-    ).catch((error) => {
+  async getRootSpan(args) {
+    const { traceId } = args;
+    try {
+      const rows = await this.#db.selectMany({
+        tableName: TABLE_SPANS,
+        whereClause: { sql: " WHERE traceId = ? AND parentSpanId IS NULL", args: [traceId] },
+        limit: 1
+      });
+      if (!rows || rows.length === 0) {
+        return null;
+      }
+      return {
+        span: transformFromSqlRow({ tableName: TABLE_SPANS, sqlRow: rows[0] })
+      };
+    } catch (error) {
       throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "BATCH_DELETE", "FAILED"),
+          id: createStorageErrorId("LIBSQL", "GET_ROOT_SPAN", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
+          category: ErrorCategory.USER,
+          details: { traceId }
+        },
+        error
+      );
+    }
+  }
+  async getTrace(args) {
+    const { traceId } = args;
+    try {
+      const spans = await this.#db.selectMany({
+        tableName: TABLE_SPANS,
+        whereClause: { sql: " WHERE traceId = ?", args: [traceId] },
+        orderBy: "startedAt ASC"
+      });
+      if (!spans || spans.length === 0) {
+        return null;
+      }
+      return {
+        traceId,
+        spans: spans.map((span) => transformFromSqlRow({ tableName: TABLE_SPANS, sqlRow: span }))
+      };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "GET_TRACE", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
           details: {
-            tableName
+            traceId
           }
         },
         error
       );
-    });
-  }
-  /**
-   * Deletes multiple records in batch. Each record can be deleted based on single or composite keys.
-   */
-  async executeBatchDelete({
-    tableName,
-    keys
-  }) {
-    if (keys.length === 0) return;
-    const batchStatements = keys.map(
-      (keyObj) => prepareDeleteStatement({
-        tableName,
-        keys: keyObj
-      })
-    );
-    await this.client.batch(batchStatements, "write");
+    }
   }
-  /**
-   * Alters table schema to add columns if they don't exist
-   * @param tableName Name of the table
-   * @param schema Schema of the table
-   * @param ifNotExists Array of column names to add if they don't exist
-   */
-  async alterTable({
-    tableName,
-    schema,
-    ifNotExists
-  }) {
-    const parsedTableName = parseSqlIdentifier(tableName, "table name");
+  async updateSpan(args) {
+    const { traceId, spanId, updates } = args;
     try {
-      const pragmaQuery = `PRAGMA table_info(${parsedTableName})`;
-      const result = await this.client.execute(pragmaQuery);
-      const existingColumnNames = new Set(result.rows.map((row) => row.name.toLowerCase()));
-      for (const columnName of ifNotExists) {
-        if (!existingColumnNames.has(columnName.toLowerCase()) && schema[columnName]) {
-          const columnDef = schema[columnName];
-          const sqlType = this.getSqlType(columnDef.type);
-          const nullable = columnDef.nullable === false ? "NOT NULL" : "";
-          const defaultValue = columnDef.nullable === false ? this.getDefaultValue(columnDef.type) : "";
-          const alterSql = `ALTER TABLE ${parsedTableName} ADD COLUMN "${columnName}" ${sqlType} ${nullable} ${defaultValue}`.trim();
-          await this.client.execute(alterSql);
-          this.logger?.debug?.(`Added column ${columnName} to table ${parsedTableName}`);
-        }
+      const data = { ...updates };
+      if (data.endedAt instanceof Date) {
+        data.endedAt = data.endedAt.toISOString();
+      }
+      if (data.startedAt instanceof Date) {
+        data.startedAt = data.startedAt.toISOString();
       }
+      data.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+      await this.#db.update({
+        tableName: TABLE_SPANS,
+        keys: { spanId, traceId },
+        data
+      });
     } catch (error) {
       throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "ALTER_TABLE", "FAILED"),
+          id: createStorageErrorId("LIBSQL", "UPDATE_SPAN", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
+          category: ErrorCategory.USER,
           details: {
-            tableName
+            spanId,
+            traceId
+          }
+        },
+        error
+      );
+    }
+  }
+  async listTraces(args) {
+    const { filters, pagination, orderBy } = listTracesArgsSchema.parse(args);
+    const { page, perPage } = pagination;
+    const tableName = parseSqlIdentifier(TABLE_SPANS, "table name");
+    try {
+      const conditions = ["parentSpanId IS NULL"];
+      const queryArgs = [];
+      if (filters) {
+        if (filters.startedAt?.start) {
+          conditions.push(`startedAt >= ?`);
+          queryArgs.push(filters.startedAt.start.toISOString());
+        }
+        if (filters.startedAt?.end) {
+          conditions.push(`startedAt <= ?`);
+          queryArgs.push(filters.startedAt.end.toISOString());
+        }
+        if (filters.endedAt?.start) {
+          conditions.push(`endedAt >= ?`);
+          queryArgs.push(filters.endedAt.start.toISOString());
+        }
+        if (filters.endedAt?.end) {
+          conditions.push(`endedAt <= ?`);
+          queryArgs.push(filters.endedAt.end.toISOString());
+        }
+        if (filters.spanType !== void 0) {
+          conditions.push(`spanType = ?`);
+          queryArgs.push(filters.spanType);
+        }
+        if (filters.entityType !== void 0) {
+          conditions.push(`entityType = ?`);
+          queryArgs.push(filters.entityType);
+        }
+        if (filters.entityId !== void 0) {
+          conditions.push(`entityId = ?`);
+          queryArgs.push(filters.entityId);
+        }
+        if (filters.entityName !== void 0) {
+          conditions.push(`entityName = ?`);
+          queryArgs.push(filters.entityName);
+        }
+        if (filters.userId !== void 0) {
+          conditions.push(`userId = ?`);
+          queryArgs.push(filters.userId);
+        }
+        if (filters.organizationId !== void 0) {
+          conditions.push(`organizationId = ?`);
+          queryArgs.push(filters.organizationId);
+        }
+        if (filters.resourceId !== void 0) {
+          conditions.push(`resourceId = ?`);
+          queryArgs.push(filters.resourceId);
+        }
+        if (filters.runId !== void 0) {
+          conditions.push(`runId = ?`);
+          queryArgs.push(filters.runId);
+        }
+        if (filters.sessionId !== void 0) {
+          conditions.push(`sessionId = ?`);
+          queryArgs.push(filters.sessionId);
+        }
+        if (filters.threadId !== void 0) {
+          conditions.push(`threadId = ?`);
+          queryArgs.push(filters.threadId);
+        }
+        if (filters.requestId !== void 0) {
+          conditions.push(`requestId = ?`);
+          queryArgs.push(filters.requestId);
+        }
+        if (filters.environment !== void 0) {
+          conditions.push(`environment = ?`);
+          queryArgs.push(filters.environment);
+        }
+        if (filters.source !== void 0) {
+          conditions.push(`source = ?`);
+          queryArgs.push(filters.source);
+        }
+        if (filters.serviceName !== void 0) {
+          conditions.push(`serviceName = ?`);
+          queryArgs.push(filters.serviceName);
+        }
+        if (filters.scope != null) {
+          for (const [key, value] of Object.entries(filters.scope)) {
+            if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(key)) {
+              throw new MastraError({
+                id: createStorageErrorId("LIBSQL", "LIST_TRACES", "INVALID_FILTER_KEY"),
+                domain: ErrorDomain.STORAGE,
+                category: ErrorCategory.USER,
+                details: { key }
+              });
+            }
+            conditions.push(`json_extract(scope, '$.${key}') = ?`);
+            queryArgs.push(typeof value === "string" ? value : JSON.stringify(value));
+          }
+        }
+        if (filters.metadata != null) {
+          for (const [key, value] of Object.entries(filters.metadata)) {
+            if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(key)) {
+              throw new MastraError({
+                id: createStorageErrorId("LIBSQL", "LIST_TRACES", "INVALID_FILTER_KEY"),
+                domain: ErrorDomain.STORAGE,
+                category: ErrorCategory.USER,
+                details: { key }
+              });
+            }
+            conditions.push(`json_extract(metadata, '$.${key}') = ?`);
+            queryArgs.push(typeof value === "string" ? value : JSON.stringify(value));
+          }
+        }
+        if (filters.tags != null && filters.tags.length > 0) {
+          for (const tag of filters.tags) {
+            conditions.push(`EXISTS (SELECT 1 FROM json_each(${tableName}.tags) WHERE value = ?)`);
+            queryArgs.push(tag);
+          }
+        }
+        if (filters.status !== void 0) {
+          switch (filters.status) {
+            case TraceStatus.ERROR:
+              conditions.push(`error IS NOT NULL`);
+              break;
+            case TraceStatus.RUNNING:
+              conditions.push(`endedAt IS NULL AND error IS NULL`);
+              break;
+            case TraceStatus.SUCCESS:
+              conditions.push(`endedAt IS NOT NULL AND error IS NULL`);
+              break;
+          }
+        }
+        if (filters.hasChildError !== void 0) {
+          if (filters.hasChildError) {
+            conditions.push(`EXISTS (
+              SELECT 1 FROM ${tableName} c
+              WHERE c.traceId = ${tableName}.traceId AND c.error IS NOT NULL
+            )`);
+          } else {
+            conditions.push(`NOT EXISTS (
+              SELECT 1 FROM ${tableName} c
+              WHERE c.traceId = ${tableName}.traceId AND c.error IS NOT NULL
+            )`);
           }
+        }
+      }
+      const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
+      const sortField = orderBy.field;
+      const sortDirection = orderBy.direction;
+      let orderByClause;
+      if (sortField === "endedAt") {
+        orderByClause = sortDirection === "DESC" ? `CASE WHEN ${sortField} IS NULL THEN 0 ELSE 1 END, ${sortField} DESC` : `CASE WHEN ${sortField} IS NULL THEN 1 ELSE 0 END, ${sortField} ASC`;
+      } else {
+        orderByClause = `${sortField} ${sortDirection}`;
+      }
+      const count = await this.#db.selectTotalCount({
+        tableName: TABLE_SPANS,
+        whereClause: { sql: whereClause, args: queryArgs }
+      });
+      if (count === 0) {
+        return {
+          pagination: {
+            total: 0,
+            page,
+            perPage,
+            hasMore: false
+          },
+          spans: []
+        };
+      }
+      const spans = await this.#db.selectMany({
+        tableName: TABLE_SPANS,
+        whereClause: { sql: whereClause, args: queryArgs },
+        orderBy: orderByClause,
+        offset: page * perPage,
+        limit: perPage
+      });
+      return {
+        pagination: {
+          total: count,
+          page,
+          perPage,
+          hasMore: (page + 1) * perPage < count
+        },
+        spans: spans.map((span) => transformFromSqlRow({ tableName: TABLE_SPANS, sqlRow: span }))
+      };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "LIST_TRACES", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER
+        },
+        error
+      );
+    }
+  }
+  async batchCreateSpans(args) {
+    try {
+      const now = (/* @__PURE__ */ new Date()).toISOString();
+      const records = args.records.map((record) => {
+        const startedAt = record.startedAt instanceof Date ? record.startedAt.toISOString() : record.startedAt;
+        const endedAt = record.endedAt instanceof Date ? record.endedAt.toISOString() : record.endedAt;
+        return {
+          ...record,
+          startedAt,
+          endedAt,
+          createdAt: now,
+          updatedAt: now
+        };
+      });
+      return this.#db.batchInsert({
+        tableName: TABLE_SPANS,
+        records
+      });
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "BATCH_CREATE_SPANS", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER
         },
         error
       );
     }
   }
-  async clearTable({ tableName }) {
-    const parsedTableName = parseSqlIdentifier(tableName, "table name");
+  async batchUpdateSpans(args) {
+    const now = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      await this.client.execute(`DELETE FROM ${parsedTableName}`);
-    } catch (e) {
-      const mastraError = new MastraError(
+      return this.#db.batchUpdate({
+        tableName: TABLE_SPANS,
+        updates: args.records.map((record) => {
+          const data = { ...record.updates };
+          if (data.endedAt instanceof Date) {
+            data.endedAt = data.endedAt.toISOString();
+          }
+          if (data.startedAt instanceof Date) {
+            data.startedAt = data.startedAt.toISOString();
+          }
+          data.updatedAt = now;
+          return {
+            keys: { spanId: record.spanId, traceId: record.traceId },
+            data
+          };
+        })
+      });
+    } catch (error) {
+      throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "CLEAR_TABLE", "FAILED"),
+          id: createStorageErrorId("LIBSQL", "BATCH_UPDATE_SPANS", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: {
-            tableName
-          }
+          category: ErrorCategory.USER
         },
-        e
+        error
       );
-      this.logger?.trackException?.(mastraError);
-      this.logger?.error?.(mastraError.toString());
     }
   }
-  async dropTable({ tableName }) {
-    const parsedTableName = parseSqlIdentifier(tableName, "table name");
+  async batchDeleteTraces(args) {
     try {
-      await this.client.execute(`DROP TABLE IF EXISTS ${parsedTableName}`);
-    } catch (e) {
+      const keys = args.traceIds.map((traceId) => ({ traceId }));
+      return this.#db.batchDelete({
+        tableName: TABLE_SPANS,
+        keys
+      });
+    } catch (error) {
       throw new MastraError(
         {
-          id: createStorageErrorId("LIBSQL", "DROP_TABLE", "FAILED"),
+          id: createStorageErrorId("LIBSQL", "BATCH_DELETE_TRACES", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: {
-            tableName
-          }
+          category: ErrorCategory.USER
         },
-        e
+        error
       );
     }
   }
 };
 var ScoresLibSQL = class extends ScoresStorage {
-  operations;
-  client;
-  constructor({ client, operations }) {
+  #db;
+  #client;
+  constructor(config) {
     super();
-    this.operations = operations;
-    this.client = client;
+    const client = resolveClient(config);
+    this.#client = client;
+    this.#db = new LibSQLDB({ client, maxRetries: config.maxRetries, initialBackoffMs: config.initialBackoffMs });
+  }
+  async init() {
+    await this.#db.createTable({ tableName: TABLE_SCORERS, schema: SCORERS_SCHEMA });
+    await this.#db.alterTable({
+      tableName: TABLE_SCORERS,
+      schema: SCORERS_SCHEMA,
+      ifNotExists: ["spanId", "requestContext"]
+    });
+  }
+  async dangerouslyClearAll() {
+    await this.#db.deleteData({ tableName: TABLE_SCORERS });
   }
   async listScoresByRunId({
     runId,
@@ -2900,7 +3674,7 @@ var ScoresLibSQL = class extends ScoresStorage {
   }) {
     try {
       const { page, perPage: perPageInput } = pagination;
-      const countResult = await this.client.execute({
+      const countResult = await this.#client.execute({
         sql: `SELECT COUNT(*) as count FROM ${TABLE_SCORERS} WHERE runId = ?`,
         args: [runId]
       });
@@ -2920,8 +3694,8 @@ var ScoresLibSQL = class extends ScoresStorage {
       const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
       const limitValue = perPageInput === false ? total : perPage;
       const end = perPageInput === false ? total : start + perPage;
-      const result = await this.client.execute({
-        sql: `SELECT * FROM ${TABLE_SCORERS} WHERE runId = ? ORDER BY createdAt DESC LIMIT ? OFFSET ?`,
+      const result = await this.#client.execute({
+        sql: `SELECT ${buildSelectColumns(TABLE_SCORERS)} FROM ${TABLE_SCORERS} WHERE runId = ? ORDER BY createdAt DESC LIMIT ? OFFSET ?`,
         args: [runId, limitValue, start]
       });
       const scores = result.rows?.map((row) => this.transformScoreRow(row)) ?? [];
@@ -2973,7 +3747,7 @@ var ScoresLibSQL = class extends ScoresStorage {
         queryParams.push(source);
       }
       const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
-      const countResult = await this.client.execute({
+      const countResult = await this.#client.execute({
         sql: `SELECT COUNT(*) as count FROM ${TABLE_SCORERS} ${whereClause}`,
         args: queryParams
       });
@@ -2993,8 +3767,8 @@ var ScoresLibSQL = class extends ScoresStorage {
       const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
       const limitValue = perPageInput === false ? total : perPage;
       const end = perPageInput === false ? total : start + perPage;
-      const result = await this.client.execute({
-        sql: `SELECT * FROM ${TABLE_SCORERS} ${whereClause} ORDER BY createdAt DESC LIMIT ? OFFSET ?`,
+      const result = await this.#client.execute({
+        sql: `SELECT ${buildSelectColumns(TABLE_SCORERS)} FROM ${TABLE_SCORERS} ${whereClause} ORDER BY createdAt DESC LIMIT ? OFFSET ?`,
         args: [...queryParams, limitValue, start]
       });
       const scores = result.rows?.map((row) => this.transformScoreRow(row)) ?? [];
@@ -3020,16 +3794,13 @@ var ScoresLibSQL = class extends ScoresStorage {
   }
   /**
    * LibSQL-specific score row transformation.
-   * Maps additionalLLMContext column to additionalContext field.
    */
   transformScoreRow(row) {
-    return transformScoreRow(row, {
-      fieldMappings: { additionalContext: "additionalLLMContext" }
-    });
+    return transformScoreRow(row);
   }
   async getScoreById({ id }) {
-    const result = await this.client.execute({
-      sql: `SELECT * FROM ${TABLE_SCORERS} WHERE id = ?`,
+    const result = await this.#client.execute({
+      sql: `SELECT ${buildSelectColumns(TABLE_SCORERS)} FROM ${TABLE_SCORERS} WHERE id = ?`,
       args: [id]
     });
     return result.rows?.[0] ? this.transformScoreRow(result.rows[0]) : null;
@@ -3045,7 +3816,7 @@ var ScoresLibSQL = class extends ScoresStorage {
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
           details: {
-            scorer: score.scorer?.id ?? "unknown",
+            scorer: typeof score.scorer?.id === "string" ? score.scorer.id : String(score.scorer?.id ?? "unknown"),
             entityId: score.entityId ?? "unknown",
             entityType: score.entityType ?? "unknown",
             traceId: score.traceId ?? "",
@@ -3058,7 +3829,7 @@ var ScoresLibSQL = class extends ScoresStorage {
     try {
       const id = crypto.randomUUID();
       const now = /* @__PURE__ */ new Date();
-      await this.operations.insert({
+      await this.#db.insert({
         tableName: TABLE_SCORERS,
         record: {
           ...parsedScore,
@@ -3086,7 +3857,7 @@ var ScoresLibSQL = class extends ScoresStorage {
   }) {
     try {
       const { page, perPage: perPageInput } = pagination;
-      const countResult = await this.client.execute({
+      const countResult = await this.#client.execute({
         sql: `SELECT COUNT(*) as count FROM ${TABLE_SCORERS} WHERE entityId = ? AND entityType = ?`,
         args: [entityId, entityType]
       });
@@ -3106,8 +3877,8 @@ var ScoresLibSQL = class extends ScoresStorage {
       const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
       const limitValue = perPageInput === false ? total : perPage;
       const end = perPageInput === false ? total : start + perPage;
-      const result = await this.client.execute({
-        sql: `SELECT * FROM ${TABLE_SCORERS} WHERE entityId = ? AND entityType = ? ORDER BY createdAt DESC LIMIT ? OFFSET ?`,
+      const result = await this.#client.execute({
+        sql: `SELECT ${buildSelectColumns(TABLE_SCORERS)} FROM ${TABLE_SCORERS} WHERE entityId = ? AND entityType = ? ORDER BY createdAt DESC LIMIT ? OFFSET ?`,
         args: [entityId, entityType, limitValue, start]
       });
       const scores = result.rows?.map((row) => this.transformScoreRow(row)) ?? [];
@@ -3140,15 +3911,15 @@ var ScoresLibSQL = class extends ScoresStorage {
       const { page, perPage: perPageInput } = pagination;
       const perPage = normalizePerPage(perPageInput, 100);
       const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
-      const countSQLResult = await this.client.execute({
+      const countSQLResult = await this.#client.execute({
         sql: `SELECT COUNT(*) as count FROM ${TABLE_SCORERS} WHERE traceId = ? AND spanId = ?`,
         args: [traceId, spanId]
       });
       const total = Number(countSQLResult.rows?.[0]?.count ?? 0);
       const limitValue = perPageInput === false ? total : perPage;
       const end = perPageInput === false ? total : start + perPage;
-      const result = await this.client.execute({
-        sql: `SELECT * FROM ${TABLE_SCORERS} WHERE traceId = ? AND spanId = ? ORDER BY createdAt DESC LIMIT ? OFFSET ?`,
+      const result = await this.#client.execute({
+        sql: `SELECT ${buildSelectColumns(TABLE_SCORERS)} FROM ${TABLE_SCORERS} WHERE traceId = ? AND spanId = ? ORDER BY createdAt DESC LIMIT ? OFFSET ?`,
         args: [traceId, spanId, limitValue, start]
       });
       const scores = result.rows?.map((row) => this.transformScoreRow(row)) ?? [];
@@ -3173,56 +3944,68 @@ var ScoresLibSQL = class extends ScoresStorage {
     }
   }
 };
-function 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,
-    resourceId: row.resourceId,
-    createdAt: new Date(row.createdAt),
-    updatedAt: new Date(row.updatedAt)
-  };
-}
 var WorkflowsLibSQL = class extends WorkflowsStorage {
-  operations;
-  client;
-  maxRetries;
-  initialBackoffMs;
-  constructor({
-    operations,
-    client,
-    maxRetries = 5,
-    initialBackoffMs = 500
-  }) {
+  #db;
+  #client;
+  executeWithRetry;
+  constructor(config) {
     super();
-    this.operations = operations;
-    this.client = client;
-    this.maxRetries = maxRetries;
-    this.initialBackoffMs = initialBackoffMs;
+    const client = resolveClient(config);
+    const maxRetries = config.maxRetries ?? 5;
+    const initialBackoffMs = config.initialBackoffMs ?? 500;
+    this.#client = client;
+    this.#db = new LibSQLDB({ client, maxRetries, initialBackoffMs });
+    this.executeWithRetry = createExecuteWriteOperationWithRetry({
+      logger: this.logger,
+      maxRetries,
+      initialBackoffMs
+    });
     this.setupPragmaSettings().catch(
       (err) => this.logger.warn("LibSQL Workflows: Failed to setup PRAGMA settings.", err)
     );
   }
+  parseWorkflowRun(row) {
+    let parsedSnapshot = row.snapshot;
+    if (typeof parsedSnapshot === "string") {
+      try {
+        parsedSnapshot = JSON.parse(row.snapshot);
+      } catch (e) {
+        this.logger.warn(`Failed to parse snapshot for workflow ${row.workflow_name}: ${e}`);
+      }
+    }
+    return {
+      workflowName: row.workflow_name,
+      runId: row.run_id,
+      snapshot: parsedSnapshot,
+      resourceId: row.resourceId,
+      createdAt: new Date(row.createdAt),
+      updatedAt: new Date(row.updatedAt)
+    };
+  }
+  async init() {
+    const schema = TABLE_SCHEMAS[TABLE_WORKFLOW_SNAPSHOT];
+    await this.#db.createTable({ tableName: TABLE_WORKFLOW_SNAPSHOT, schema });
+    await this.#db.alterTable({
+      tableName: TABLE_WORKFLOW_SNAPSHOT,
+      schema,
+      ifNotExists: ["resourceId"]
+    });
+  }
+  async dangerouslyClearAll() {
+    await this.#db.deleteData({ tableName: TABLE_WORKFLOW_SNAPSHOT });
+  }
   async setupPragmaSettings() {
     try {
-      await this.client.execute("PRAGMA busy_timeout = 10000;");
+      await this.#client.execute("PRAGMA busy_timeout = 10000;");
       this.logger.debug("LibSQL Workflows: PRAGMA busy_timeout=10000 set.");
       try {
-        await this.client.execute("PRAGMA journal_mode = WAL;");
+        await this.#client.execute("PRAGMA journal_mode = WAL;");
         this.logger.debug("LibSQL Workflows: PRAGMA journal_mode=WAL set.");
       } catch {
         this.logger.debug("LibSQL Workflows: WAL mode not supported, using default journal mode.");
       }
       try {
-        await this.client.execute("PRAGMA synchronous = NORMAL;");
+        await this.#client.execute("PRAGMA synchronous = NORMAL;");
         this.logger.debug("LibSQL Workflows: PRAGMA synchronous=NORMAL set.");
       } catch {
         this.logger.debug("LibSQL Workflows: Failed to set synchronous mode.");
@@ -3231,44 +4014,6 @@ var WorkflowsLibSQL = class extends WorkflowsStorage {
       this.logger.warn("LibSQL Workflows: Failed to set PRAGMA settings.", err);
     }
   }
-  async executeWithRetry(operation) {
-    let attempts = 0;
-    let backoff = this.initialBackoffMs;
-    while (attempts < this.maxRetries) {
-      try {
-        return await operation();
-      } catch (error) {
-        this.logger.debug("LibSQL Workflows: Error caught in retry loop", {
-          errorType: error.constructor.name,
-          errorCode: error.code,
-          errorMessage: error.message,
-          attempts,
-          maxRetries: this.maxRetries
-        });
-        const isLockError = error.code === "SQLITE_BUSY" || error.code === "SQLITE_LOCKED" || error.message?.toLowerCase().includes("database is locked") || error.message?.toLowerCase().includes("database table is locked") || error.message?.toLowerCase().includes("table is locked") || error.constructor.name === "SqliteError" && error.message?.toLowerCase().includes("locked");
-        if (isLockError) {
-          attempts++;
-          if (attempts >= this.maxRetries) {
-            this.logger.error(
-              `LibSQL Workflows: Operation failed after ${this.maxRetries} attempts due to database lock: ${error.message}`,
-              { error, attempts, maxRetries: this.maxRetries }
-            );
-            throw error;
-          }
-          this.logger.warn(
-            `LibSQL Workflows: Attempt ${attempts} failed due to database lock. Retrying in ${backoff}ms...`,
-            { errorMessage: error.message, attempts, backoff, maxRetries: this.maxRetries }
-          );
-          await new Promise((resolve) => setTimeout(resolve, backoff));
-          backoff *= 2;
-        } else {
-          this.logger.error("LibSQL Workflows: Non-lock error occurred, not retrying", { error });
-          throw error;
-        }
-      }
-    }
-    throw new Error("LibSQL Workflows: Max retries reached, but no error was re-thrown from the loop.");
-  }
   async updateWorkflowResults({
     workflowName,
     runId,
@@ -3277,10 +4022,10 @@ var WorkflowsLibSQL = class extends WorkflowsStorage {
     requestContext
   }) {
     return this.executeWithRetry(async () => {
-      const tx = await this.client.transaction("write");
+      const tx = await this.#client.transaction("write");
       try {
         const existingSnapshotResult = await tx.execute({
-          sql: `SELECT snapshot FROM ${TABLE_WORKFLOW_SNAPSHOT} WHERE workflow_name = ? AND run_id = ?`,
+          sql: `SELECT json(snapshot) as snapshot FROM ${TABLE_WORKFLOW_SNAPSHOT} WHERE workflow_name = ? AND run_id = ?`,
           args: [workflowName, runId]
         });
         let snapshot;
@@ -3305,9 +4050,13 @@ var WorkflowsLibSQL = class extends WorkflowsStorage {
         }
         snapshot.context[stepId] = result;
         snapshot.requestContext = { ...snapshot.requestContext, ...requestContext };
+        const now = (/* @__PURE__ */ new Date()).toISOString();
         await tx.execute({
-          sql: `UPDATE ${TABLE_WORKFLOW_SNAPSHOT} SET snapshot = ? WHERE workflow_name = ? AND run_id = ?`,
-          args: [JSON.stringify(snapshot), workflowName, runId]
+          sql: `INSERT INTO ${TABLE_WORKFLOW_SNAPSHOT} (workflow_name, run_id, snapshot, createdAt, updatedAt)
+                VALUES (?, ?, jsonb(?), ?, ?)
+                ON CONFLICT(workflow_name, run_id)
+                DO UPDATE SET snapshot = excluded.snapshot, updatedAt = excluded.updatedAt`,
+          args: [workflowName, runId, JSON.stringify(snapshot), now, now]
         });
         await tx.commit();
         return snapshot.context;
@@ -3317,7 +4066,7 @@ var WorkflowsLibSQL = class extends WorkflowsStorage {
         }
         throw error;
       }
-    });
+    }, "updateWorkflowResults");
   }
   async updateWorkflowState({
     workflowName,
@@ -3325,10 +4074,10 @@ var WorkflowsLibSQL = class extends WorkflowsStorage {
     opts
   }) {
     return this.executeWithRetry(async () => {
-      const tx = await this.client.transaction("write");
+      const tx = await this.#client.transaction("write");
       try {
         const existingSnapshotResult = await tx.execute({
-          sql: `SELECT snapshot FROM ${TABLE_WORKFLOW_SNAPSHOT} WHERE workflow_name = ? AND run_id = ?`,
+          sql: `SELECT json(snapshot) as snapshot FROM ${TABLE_WORKFLOW_SNAPSHOT} WHERE workflow_name = ? AND run_id = ?`,
           args: [workflowName, runId]
         });
         if (!existingSnapshotResult.rows?.[0]) {
@@ -3343,7 +4092,7 @@ var WorkflowsLibSQL = class extends WorkflowsStorage {
         }
         const updatedSnapshot = { ...snapshot, ...opts };
         await tx.execute({
-          sql: `UPDATE ${TABLE_WORKFLOW_SNAPSHOT} SET snapshot = ? WHERE workflow_name = ? AND run_id = ?`,
+          sql: `UPDATE ${TABLE_WORKFLOW_SNAPSHOT} SET snapshot = jsonb(?) WHERE workflow_name = ? AND run_id = ?`,
           args: [JSON.stringify(updatedSnapshot), workflowName, runId]
         });
         await tx.commit();
@@ -3354,24 +4103,27 @@ var WorkflowsLibSQL = class extends WorkflowsStorage {
         }
         throw error;
       }
-    });
+    }, "updateWorkflowState");
   }
   async persistWorkflowSnapshot({
     workflowName,
     runId,
     resourceId,
-    snapshot
+    snapshot,
+    createdAt,
+    updatedAt
   }) {
+    const now = /* @__PURE__ */ new Date();
     const data = {
       workflow_name: workflowName,
       run_id: runId,
       resourceId,
       snapshot,
-      createdAt: /* @__PURE__ */ new Date(),
-      updatedAt: /* @__PURE__ */ new Date()
+      createdAt: createdAt ?? now,
+      updatedAt: updatedAt ?? now
     };
     this.logger.debug("Persisting workflow snapshot", { workflowName, runId, data });
-    await this.operations.insert({
+    await this.#db.insert({
       tableName: TABLE_WORKFLOW_SNAPSHOT,
       record: data
     });
@@ -3381,7 +4133,7 @@ var WorkflowsLibSQL = class extends WorkflowsStorage {
     runId
   }) {
     this.logger.debug("Loading workflow snapshot", { workflowName, runId });
-    const d = await this.operations.load({
+    const d = await this.#db.select({
       tableName: TABLE_WORKFLOW_SNAPSHOT,
       keys: { workflow_name: workflowName, run_id: runId }
     });
@@ -3403,14 +4155,14 @@ var WorkflowsLibSQL = class extends WorkflowsStorage {
     }
     const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
     try {
-      const result = await this.client.execute({
-        sql: `SELECT * FROM ${TABLE_WORKFLOW_SNAPSHOT} ${whereClause} ORDER BY createdAt DESC LIMIT 1`,
+      const result = await this.#client.execute({
+        sql: `SELECT workflow_name, run_id, resourceId, json(snapshot) as snapshot, createdAt, updatedAt FROM ${TABLE_WORKFLOW_SNAPSHOT} ${whereClause} ORDER BY createdAt DESC LIMIT 1`,
         args
       });
       if (!result.rows?.[0]) {
         return null;
       }
-      return parseWorkflowRun(result.rows[0]);
+      return this.parseWorkflowRun(result.rows[0]);
     } catch (error) {
       throw new MastraError(
         {
@@ -3423,22 +4175,24 @@ var WorkflowsLibSQL = class extends WorkflowsStorage {
     }
   }
   async deleteWorkflowRunById({ runId, workflowName }) {
-    try {
-      await this.client.execute({
-        sql: `DELETE FROM ${TABLE_WORKFLOW_SNAPSHOT} WHERE workflow_name = ? AND run_id = ?`,
-        args: [workflowName, runId]
-      });
-    } catch (error) {
-      throw new MastraError(
-        {
-          id: createStorageErrorId("LIBSQL", "DELETE_WORKFLOW_RUN_BY_ID", "FAILED"),
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { runId, workflowName }
-        },
-        error
-      );
-    }
+    return this.executeWithRetry(async () => {
+      try {
+        await this.#client.execute({
+          sql: `DELETE FROM ${TABLE_WORKFLOW_SNAPSHOT} WHERE workflow_name = ? AND run_id = ?`,
+          args: [workflowName, runId]
+        });
+      } catch (error) {
+        throw new MastraError(
+          {
+            id: createStorageErrorId("LIBSQL", "DELETE_WORKFLOW_RUN_BY_ID", "FAILED"),
+            domain: ErrorDomain.STORAGE,
+            category: ErrorCategory.THIRD_PARTY,
+            details: { runId, workflowName }
+          },
+          error
+        );
+      }
+    }, "deleteWorkflowRunById");
   }
   async listWorkflowRuns({
     workflowName,
@@ -3469,19 +4223,19 @@ var WorkflowsLibSQL = class extends WorkflowsStorage {
         args.push(toDate.toISOString());
       }
       if (resourceId) {
-        const hasResourceId = await this.operations.hasColumn(TABLE_WORKFLOW_SNAPSHOT, "resourceId");
+        const hasResourceId = await this.#db.hasColumn(TABLE_WORKFLOW_SNAPSHOT, "resourceId");
         if (hasResourceId) {
           conditions.push("resourceId = ?");
           args.push(resourceId);
         } else {
-          console.warn(`[${TABLE_WORKFLOW_SNAPSHOT}] resourceId column not found. Skipping resourceId filter.`);
+          this.logger.warn(`[${TABLE_WORKFLOW_SNAPSHOT}] resourceId column not found. Skipping resourceId filter.`);
         }
       }
       const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
       let total = 0;
       const usePagination = typeof perPage === "number" && typeof page === "number";
       if (usePagination) {
-        const countResult = await this.client.execute({
+        const countResult = await this.#client.execute({
           sql: `SELECT COUNT(*) as count FROM ${TABLE_WORKFLOW_SNAPSHOT} ${whereClause}`,
           args
         });
@@ -3489,11 +4243,11 @@ var WorkflowsLibSQL = class extends WorkflowsStorage {
       }
       const normalizedPerPage = usePagination ? normalizePerPage(perPage, Number.MAX_SAFE_INTEGER) : 0;
       const offset = usePagination ? page * normalizedPerPage : 0;
-      const result = await this.client.execute({
-        sql: `SELECT * FROM ${TABLE_WORKFLOW_SNAPSHOT} ${whereClause} ORDER BY createdAt DESC${usePagination ? ` LIMIT ? OFFSET ?` : ""}`,
+      const result = await this.#client.execute({
+        sql: `SELECT workflow_name, run_id, resourceId, json(snapshot) as snapshot, createdAt, updatedAt FROM ${TABLE_WORKFLOW_SNAPSHOT} ${whereClause} ORDER BY createdAt DESC${usePagination ? ` LIMIT ? OFFSET ?` : ""}`,
         args: usePagination ? [...args, normalizedPerPage, offset] : args
       });
-      const runs = (result.rows || []).map((row) => parseWorkflowRun(row));
+      const runs = (result.rows || []).map((row) => this.parseWorkflowRun(row));
       return { runs, total: total || runs.length };
     } catch (error) {
       throw new MastraError(
@@ -3509,7 +4263,7 @@ var WorkflowsLibSQL = class extends WorkflowsStorage {
 };
 
 // src/storage/index.ts
-var LibSQLStore = class extends MastraStorage {
+var LibSQLStore = class extends MastraCompositeStore {
   client;
   maxRetries;
   initialBackoffMs;
@@ -3536,18 +4290,17 @@ var LibSQLStore = class extends MastraStorage {
     } else {
       this.client = config.client;
     }
-    const operations = new StoreOperationsLibSQL({
+    const domainConfig = {
       client: this.client,
       maxRetries: this.maxRetries,
       initialBackoffMs: this.initialBackoffMs
-    });
-    const scores = new ScoresLibSQL({ client: this.client, operations });
-    const workflows = new WorkflowsLibSQL({ client: this.client, operations });
-    const memory = new MemoryLibSQL({ client: this.client, operations });
-    const observability = new ObservabilityLibSQL({ operations });
-    const agents = new AgentsLibSQL({ client: this.client, operations });
+    };
+    const scores = new ScoresLibSQL(domainConfig);
+    const workflows = new WorkflowsLibSQL(domainConfig);
+    const memory = new MemoryLibSQL(domainConfig);
+    const observability = new ObservabilityLibSQL(domainConfig);
+    const agents = new AgentsLibSQL(domainConfig);
     this.stores = {
-      operations,
       scores,
       workflows,
       memory,
@@ -3555,194 +4308,6 @@ var LibSQLStore = class extends MastraStorage {
       agents
     };
   }
-  get supports() {
-    return {
-      selectByIncludeResourceScope: true,
-      resourceWorkingMemory: true,
-      hasColumn: true,
-      createTable: true,
-      deleteMessages: true,
-      observabilityInstance: true,
-      listScoresBySpan: true,
-      agents: true
-    };
-  }
-  async createTable({
-    tableName,
-    schema
-  }) {
-    await this.stores.operations.createTable({ tableName, schema });
-  }
-  /**
-   * Alters table schema to add columns if they don't exist
-   * @param tableName Name of the table
-   * @param schema Schema of the table
-   * @param ifNotExists Array of column names to add if they don't exist
-   */
-  async alterTable({
-    tableName,
-    schema,
-    ifNotExists
-  }) {
-    await this.stores.operations.alterTable({ tableName, schema, ifNotExists });
-  }
-  async clearTable({ tableName }) {
-    await this.stores.operations.clearTable({ tableName });
-  }
-  async dropTable({ tableName }) {
-    await this.stores.operations.dropTable({ tableName });
-  }
-  insert(args) {
-    return this.stores.operations.insert(args);
-  }
-  batchInsert(args) {
-    return this.stores.operations.batchInsert(args);
-  }
-  async load({ tableName, keys }) {
-    return this.stores.operations.load({ tableName, keys });
-  }
-  async getThreadById({ threadId }) {
-    return this.stores.memory.getThreadById({ threadId });
-  }
-  async saveThread({ thread }) {
-    return this.stores.memory.saveThread({ thread });
-  }
-  async updateThread({
-    id,
-    title,
-    metadata
-  }) {
-    return this.stores.memory.updateThread({ id, title, metadata });
-  }
-  async deleteThread({ threadId }) {
-    return this.stores.memory.deleteThread({ threadId });
-  }
-  async listMessagesById({ messageIds }) {
-    return this.stores.memory.listMessagesById({ messageIds });
-  }
-  async saveMessages(args) {
-    const result = await this.stores.memory.saveMessages({ messages: args.messages });
-    return { messages: result.messages };
-  }
-  async updateMessages({
-    messages
-  }) {
-    return this.stores.memory.updateMessages({ messages });
-  }
-  async deleteMessages(messageIds) {
-    return this.stores.memory.deleteMessages(messageIds);
-  }
-  async getScoreById({ id }) {
-    return this.stores.scores.getScoreById({ id });
-  }
-  async saveScore(score) {
-    return this.stores.scores.saveScore(score);
-  }
-  async listScoresByScorerId({
-    scorerId,
-    entityId,
-    entityType,
-    source,
-    pagination
-  }) {
-    return this.stores.scores.listScoresByScorerId({ scorerId, entityId, entityType, source, pagination });
-  }
-  async listScoresByRunId({
-    runId,
-    pagination
-  }) {
-    return this.stores.scores.listScoresByRunId({ runId, pagination });
-  }
-  async listScoresByEntityId({
-    entityId,
-    entityType,
-    pagination
-  }) {
-    return this.stores.scores.listScoresByEntityId({ entityId, entityType, pagination });
-  }
-  /**
-   * WORKFLOWS
-   */
-  async updateWorkflowResults({
-    workflowName,
-    runId,
-    stepId,
-    result,
-    requestContext
-  }) {
-    return this.stores.workflows.updateWorkflowResults({ workflowName, runId, stepId, result, requestContext });
-  }
-  async updateWorkflowState({
-    workflowName,
-    runId,
-    opts
-  }) {
-    return this.stores.workflows.updateWorkflowState({ workflowName, runId, opts });
-  }
-  async persistWorkflowSnapshot({
-    workflowName,
-    runId,
-    resourceId,
-    snapshot
-  }) {
-    return this.stores.workflows.persistWorkflowSnapshot({ workflowName, runId, resourceId, snapshot });
-  }
-  async loadWorkflowSnapshot({
-    workflowName,
-    runId
-  }) {
-    return this.stores.workflows.loadWorkflowSnapshot({ workflowName, runId });
-  }
-  async listWorkflowRuns(args = {}) {
-    return this.stores.workflows.listWorkflowRuns(args);
-  }
-  async getWorkflowRunById({
-    runId,
-    workflowName
-  }) {
-    return this.stores.workflows.getWorkflowRunById({ runId, workflowName });
-  }
-  async deleteWorkflowRunById({ runId, workflowName }) {
-    return this.stores.workflows.deleteWorkflowRunById({ runId, workflowName });
-  }
-  async getResourceById({ resourceId }) {
-    return this.stores.memory.getResourceById({ resourceId });
-  }
-  async saveResource({ resource }) {
-    return this.stores.memory.saveResource({ resource });
-  }
-  async updateResource({
-    resourceId,
-    workingMemory,
-    metadata
-  }) {
-    return this.stores.memory.updateResource({ resourceId, workingMemory, metadata });
-  }
-  async createSpan(span) {
-    return this.stores.observability.createSpan(span);
-  }
-  async updateSpan(params) {
-    return this.stores.observability.updateSpan(params);
-  }
-  async getTrace(traceId) {
-    return this.stores.observability.getTrace(traceId);
-  }
-  async getTracesPaginated(args) {
-    return this.stores.observability.getTracesPaginated(args);
-  }
-  async listScoresBySpan({
-    traceId,
-    spanId,
-    pagination
-  }) {
-    return this.stores.scores.listScoresBySpan({ traceId, spanId, pagination });
-  }
-  async batchCreateSpans(args) {
-    return this.stores.observability.batchCreateSpans(args);
-  }
-  async batchUpdateSpans(args) {
-    return this.stores.observability.batchUpdateSpans(args);
-  }
 };
 
 // src/vector/prompt.ts
@@ -3844,6 +4409,6 @@ Example Complex Query:
   ]
 }`;
 
-export { LibSQLStore as DefaultStorage, LIBSQL_PROMPT, LibSQLStore, LibSQLVector };
+export { AgentsLibSQL, LibSQLStore as DefaultStorage, LIBSQL_PROMPT, LibSQLStore, LibSQLVector, MemoryLibSQL, ObservabilityLibSQL, ScoresLibSQL, WorkflowsLibSQL };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map