@mastra/libsql 1.6.4-alpha.0 → 1.7.0-alpha.0

package/dist/index.js

@@ -1,6 +1,6 @@
 import { createClient } from '@libsql/client';
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { createVectorErrorId, AgentsStorage, AGENTS_SCHEMA, TABLE_AGENTS, AGENT_VERSIONS_SCHEMA, TABLE_AGENT_VERSIONS, createStorageErrorId, normalizePerPage, calculatePagination, BlobStore, TABLE_SKILL_BLOBS, SKILL_BLOBS_SCHEMA, DatasetsStorage, DATASETS_SCHEMA, TABLE_DATASETS, DATASET_ITEMS_SCHEMA, TABLE_DATASET_ITEMS, DATASET_VERSIONS_SCHEMA, TABLE_DATASET_VERSIONS, ensureDate, safelyParseJSON, TABLE_EXPERIMENT_RESULTS, TABLE_EXPERIMENTS, ExperimentsStorage, EXPERIMENTS_SCHEMA, EXPERIMENT_RESULTS_SCHEMA, MCPClientsStorage, MCP_CLIENTS_SCHEMA, TABLE_MCP_CLIENTS, MCP_CLIENT_VERSIONS_SCHEMA, TABLE_MCP_CLIENT_VERSIONS, MCPServersStorage, MCP_SERVERS_SCHEMA, TABLE_MCP_SERVERS, MCP_SERVER_VERSIONS_SCHEMA, TABLE_MCP_SERVER_VERSIONS, MemoryStorage, TABLE_SCHEMAS, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, ObservabilityStorage, SPAN_SCHEMA, TABLE_SPANS, listTracesArgsSchema, toTraceSpans, PromptBlocksStorage, PROMPT_BLOCKS_SCHEMA, TABLE_PROMPT_BLOCKS, PROMPT_BLOCK_VERSIONS_SCHEMA, TABLE_PROMPT_BLOCK_VERSIONS, ScorerDefinitionsStorage, SCORER_DEFINITIONS_SCHEMA, TABLE_SCORER_DEFINITIONS, SCORER_DEFINITION_VERSIONS_SCHEMA, TABLE_SCORER_DEFINITION_VERSIONS, ScoresStorage, SCORERS_SCHEMA, TABLE_SCORERS, transformScoreRow, SkillsStorage, SKILLS_SCHEMA, TABLE_SKILLS, SKILL_VERSIONS_SCHEMA, TABLE_SKILL_VERSIONS, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, WorkspacesStorage, WORKSPACES_SCHEMA, TABLE_WORKSPACES, WORKSPACE_VERSIONS_SCHEMA, TABLE_WORKSPACE_VERSIONS, MastraCompositeStore, TraceStatus, getSqlType } from '@mastra/core/storage';
+import { createVectorErrorId, AgentsStorage, AGENTS_SCHEMA, TABLE_AGENTS, AGENT_VERSIONS_SCHEMA, TABLE_AGENT_VERSIONS, createStorageErrorId, normalizePerPage, calculatePagination, BlobStore, TABLE_SKILL_BLOBS, SKILL_BLOBS_SCHEMA, DatasetsStorage, DATASETS_SCHEMA, TABLE_DATASETS, DATASET_ITEMS_SCHEMA, TABLE_DATASET_ITEMS, DATASET_VERSIONS_SCHEMA, TABLE_DATASET_VERSIONS, ensureDate, safelyParseJSON, TABLE_EXPERIMENT_RESULTS, TABLE_EXPERIMENTS, ExperimentsStorage, EXPERIMENTS_SCHEMA, EXPERIMENT_RESULTS_SCHEMA, MCPClientsStorage, MCP_CLIENTS_SCHEMA, TABLE_MCP_CLIENTS, MCP_CLIENT_VERSIONS_SCHEMA, TABLE_MCP_CLIENT_VERSIONS, MCPServersStorage, MCP_SERVERS_SCHEMA, TABLE_MCP_SERVERS, MCP_SERVER_VERSIONS_SCHEMA, TABLE_MCP_SERVER_VERSIONS, MemoryStorage, TABLE_SCHEMAS, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, ObservabilityStorage, SPAN_SCHEMA, TABLE_SPANS, listTracesArgsSchema, toTraceSpans, PromptBlocksStorage, PROMPT_BLOCKS_SCHEMA, TABLE_PROMPT_BLOCKS, PROMPT_BLOCK_VERSIONS_SCHEMA, TABLE_PROMPT_BLOCK_VERSIONS, ScorerDefinitionsStorage, SCORER_DEFINITIONS_SCHEMA, TABLE_SCORER_DEFINITIONS, SCORER_DEFINITION_VERSIONS_SCHEMA, TABLE_SCORER_DEFINITION_VERSIONS, ScoresStorage, SCORERS_SCHEMA, TABLE_SCORERS, transformScoreRow, SkillsStorage, SKILLS_SCHEMA, TABLE_SKILLS, SKILL_VERSIONS_SCHEMA, TABLE_SKILL_VERSIONS, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, WorkspacesStorage, WORKSPACES_SCHEMA, TABLE_WORKSPACES, WORKSPACE_VERSIONS_SCHEMA, TABLE_WORKSPACE_VERSIONS, MastraCompositeStore, getSqlType, TraceStatus } from '@mastra/core/storage';
 import { parseSqlIdentifier, parseFieldKey } from '@mastra/core/utils';
 import { MastraVector, validateTopK, validateUpsertInput } from '@mastra/core/vector';
 import { BaseFilterTranslator } from '@mastra/core/vector/filter';
@@ -1318,6 +1318,8 @@ var LibSQLDB = class extends MastraBase {
   maxRetries;
   initialBackoffMs;
   executeWriteOperationWithRetry;
+  /** Cache of actual table columns: tableName -> Promise<Set<columnName>> (stores in-flight promise to coalesce concurrent calls) */
+  tableColumnsCache = /* @__PURE__ */ new Map();
   constructor({
     client,
     maxRetries,
@@ -1336,6 +1338,47 @@ var LibSQLDB = class extends MastraBase {
       initialBackoffMs: this.initialBackoffMs
     });
   }
+  /**
+   * Gets the set of column names that actually exist in the database table.
+   * Results are cached; the cache is invalidated when alterTable() adds new columns.
+   */
+  async getTableColumns(tableName) {
+    const cached = this.tableColumnsCache.get(tableName);
+    if (cached) return cached;
+    const promise = (async () => {
+      try {
+        const sanitizedTable = parseSqlIdentifier(tableName, "table name");
+        const result = await this.client.execute({
+          sql: `PRAGMA table_info("${sanitizedTable}")`
+        });
+        const columns = new Set((result.rows || []).map((row) => row.name));
+        if (columns.size === 0) {
+          this.tableColumnsCache.delete(tableName);
+        }
+        return columns;
+      } catch (error) {
+        this.tableColumnsCache.delete(tableName);
+        throw error;
+      }
+    })();
+    this.tableColumnsCache.set(tableName, promise);
+    return promise;
+  }
+  /**
+   * Filters a record to only include columns that exist in the actual database table.
+   * Unknown columns are silently dropped to ensure forward compatibility.
+   */
+  async filterRecordToKnownColumns(tableName, record) {
+    const knownColumns = await this.getTableColumns(tableName);
+    if (knownColumns.size === 0) return record;
+    const filtered = {};
+    for (const [key, value] of Object.entries(record)) {
+      if (knownColumns.has(key)) {
+        filtered[key] = value;
+      }
+    }
+    return filtered;
+  }
   /**
    * Checks if a column exists in the specified table.
    *
@@ -1357,10 +1400,12 @@ var LibSQLDB = class extends MastraBase {
     tableName,
     record
   }) {
+    const filteredRecord = await this.filterRecordToKnownColumns(tableName, record);
+    if (Object.keys(filteredRecord).length === 0) return;
     await this.client.execute(
       prepareStatement({
         tableName,
-        record
+        record: filteredRecord
       })
     );
   }
@@ -1382,7 +1427,9 @@ var LibSQLDB = class extends MastraBase {
     keys,
     data
   }) {
-    await this.client.execute(prepareUpdateStatement({ tableName, updates: data, keys }));
+    const filteredData = await this.filterRecordToKnownColumns(tableName, data);
+    if (Object.keys(filteredData).length === 0) return;
+    await this.client.execute(prepareUpdateStatement({ tableName, updates: filteredData, keys }));
   }
   /**
    * Updates a record in the specified table with automatic retry on lock errors.
@@ -1403,7 +1450,10 @@ var LibSQLDB = class extends MastraBase {
     records
   }) {
     if (records.length === 0) return;
-    const batchStatements = records.map((r) => prepareStatement({ tableName, record: r }));
+    const filteredRecords = await Promise.all(records.map((r) => this.filterRecordToKnownColumns(tableName, r)));
+    const nonEmptyRecords = filteredRecords.filter((r) => Object.keys(r).length > 0);
+    if (nonEmptyRecords.length === 0) return;
+    const batchStatements = nonEmptyRecords.map((r) => prepareStatement({ tableName, record: r }));
     await this.client.batch(batchStatements, "write");
   }
   /**
@@ -1441,7 +1491,15 @@ var LibSQLDB = class extends MastraBase {
     updates
   }) {
     if (updates.length === 0) return;
-    const batchStatements = updates.map(
+    const filteredUpdates = [];
+    for (const { keys, data } of updates) {
+      const filteredData = await this.filterRecordToKnownColumns(tableName, data);
+      if (Object.keys(filteredData).length > 0) {
+        filteredUpdates.push({ keys, data: filteredData });
+      }
+    }
+    if (filteredUpdates.length === 0) return;
+    const batchStatements = filteredUpdates.map(
       ({ keys, data }) => prepareUpdateStatement({
         tableName,
         updates: data,
@@ -1751,6 +1809,8 @@ var LibSQLDB = class extends MastraBase {
         },
         error
       );
+    } finally {
+      this.tableColumnsCache.delete(tableName);
     }
   }
   /**
@@ -2030,6 +2090,8 @@ Note: This migration may take some time for large tables.
         },
         error
       );
+    } finally {
+      this.tableColumnsCache.delete(tableName);
     }
   }
   /**
@@ -2922,6 +2984,8 @@ var DatasetsLibSQL = class extends DatasetsStorage {
     await this.#db.createTable({ tableName: TABLE_DATASETS, schema: DATASETS_SCHEMA });
     await this.#db.createTable({ tableName: TABLE_DATASET_ITEMS, schema: DATASET_ITEMS_SCHEMA });
     await this.#db.createTable({ tableName: TABLE_DATASET_VERSIONS, schema: DATASET_VERSIONS_SCHEMA });
+    await this.#addColumnIfNotExists(TABLE_DATASETS, "requestContextSchema", "TEXT");
+    await this.#addColumnIfNotExists(TABLE_DATASET_ITEMS, "requestContext", "TEXT");
     await this.#client.execute({
       sql: `CREATE INDEX IF NOT EXISTS idx_dataset_items_dataset_validto ON "${TABLE_DATASET_ITEMS}" ("datasetId", "validTo")`,
       args: []
@@ -2943,6 +3007,12 @@ var DatasetsLibSQL = class extends DatasetsStorage {
       args: []
     });
   }
+  async #addColumnIfNotExists(table, column, sqlType) {
+    const exists = await this.#db.hasColumn(table, column);
+    if (!exists) {
+      await this.#client.execute({ sql: `ALTER TABLE "${table}" ADD COLUMN "${column}" ${sqlType}`, args: [] });
+    }
+  }
   async dangerouslyClearAll() {
     await this.#db.deleteData({ tableName: TABLE_DATASET_VERSIONS });
     await this.#db.deleteData({ tableName: TABLE_DATASET_ITEMS });
@@ -2957,6 +3027,7 @@ var DatasetsLibSQL = class extends DatasetsStorage {
       metadata: row.metadata ? safelyParseJSON(row.metadata) : void 0,
       inputSchema: row.inputSchema ? safelyParseJSON(row.inputSchema) : void 0,
       groundTruthSchema: row.groundTruthSchema ? safelyParseJSON(row.groundTruthSchema) : void 0,
+      requestContextSchema: row.requestContextSchema ? safelyParseJSON(row.requestContextSchema) : void 0,
       version: row.version,
       createdAt: ensureDate(row.createdAt),
       updatedAt: ensureDate(row.updatedAt)
@@ -2969,6 +3040,7 @@ var DatasetsLibSQL = class extends DatasetsStorage {
       datasetVersion: row.datasetVersion,
       input: safelyParseJSON(row.input),
       groundTruth: row.groundTruth ? safelyParseJSON(row.groundTruth) : void 0,
+      requestContext: row.requestContext ? safelyParseJSON(row.requestContext) : void 0,
       metadata: row.metadata ? safelyParseJSON(row.metadata) : void 0,
       createdAt: ensureDate(row.createdAt),
       updatedAt: ensureDate(row.updatedAt)
@@ -2983,6 +3055,7 @@ var DatasetsLibSQL = class extends DatasetsStorage {
       isDeleted: Boolean(row.isDeleted),
       input: safelyParseJSON(row.input),
       groundTruth: row.groundTruth ? safelyParseJSON(row.groundTruth) : void 0,
+      requestContext: row.requestContext ? safelyParseJSON(row.requestContext) : void 0,
       metadata: row.metadata ? safelyParseJSON(row.metadata) : void 0,
       createdAt: ensureDate(row.createdAt),
       updatedAt: ensureDate(row.updatedAt)
@@ -3011,6 +3084,7 @@ var DatasetsLibSQL = class extends DatasetsStorage {
           metadata: input.metadata,
           inputSchema: input.inputSchema ?? null,
           groundTruthSchema: input.groundTruthSchema ?? null,
+          requestContextSchema: input.requestContextSchema ?? null,
           version: 0,
           createdAt: nowIso,
           updatedAt: nowIso
@@ -3023,6 +3097,7 @@ var DatasetsLibSQL = class extends DatasetsStorage {
         metadata: input.metadata,
         inputSchema: input.inputSchema ?? void 0,
         groundTruthSchema: input.groundTruthSchema ?? void 0,
+        requestContextSchema: input.requestContextSchema ?? void 0,
         version: 0,
         createdAt: now,
         updatedAt: now
@@ -3090,6 +3165,10 @@ var DatasetsLibSQL = class extends DatasetsStorage {
         updates.push("groundTruthSchema = ?");
         values.push(args.groundTruthSchema === null ? null : JSON.stringify(args.groundTruthSchema));
       }
+      if (args.requestContextSchema !== void 0) {
+        updates.push("requestContextSchema = ?");
+        values.push(args.requestContextSchema === null ? null : JSON.stringify(args.requestContextSchema));
+      }
       values.push(args.id);
       await this.#client.execute({
         sql: `UPDATE ${TABLE_DATASETS} SET ${updates.join(", ")} WHERE id = ?`,
@@ -3102,6 +3181,7 @@ var DatasetsLibSQL = class extends DatasetsStorage {
         metadata: args.metadata ?? existing.metadata,
         inputSchema: (args.inputSchema !== void 0 ? args.inputSchema : existing.inputSchema) ?? void 0,
         groundTruthSchema: (args.groundTruthSchema !== void 0 ? args.groundTruthSchema : existing.groundTruthSchema) ?? void 0,
+        requestContextSchema: (args.requestContextSchema !== void 0 ? args.requestContextSchema : existing.requestContextSchema) ?? void 0,
         updatedAt: new Date(now)
       };
     } catch (error) {
@@ -3207,13 +3287,14 @@ var DatasetsLibSQL = class extends DatasetsStorage {
             args: [args.datasetId]
           },
           {
-            sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, validTo, isDeleted, input, groundTruth, metadata, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 0, jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
+            sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, validTo, isDeleted, input, groundTruth, requestContext, metadata, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 0, jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
             args: [
               id,
               args.datasetId,
               args.datasetId,
               jsonbArg(args.input),
               jsonbArg(args.groundTruth),
+              jsonbArg(args.requestContext),
               jsonbArg(args.metadata),
               nowIso,
               nowIso
@@ -3233,6 +3314,7 @@ var DatasetsLibSQL = class extends DatasetsStorage {
         datasetVersion: newVersion,
         input: args.input,
         groundTruth: args.groundTruth,
+        requestContext: args.requestContext,
         metadata: args.metadata,
         createdAt: now,
         updatedAt: now
@@ -3273,6 +3355,7 @@ var DatasetsLibSQL = class extends DatasetsStorage {
       const nowIso = now.toISOString();
       const mergedInput = args.input ?? existing.input;
       const mergedGroundTruth = args.groundTruth ?? existing.groundTruth;
+      const mergedRequestContext = args.requestContext ?? existing.requestContext;
       const mergedMetadata = args.metadata ?? existing.metadata;
       const results = await this.#client.batch(
         [
@@ -3285,13 +3368,14 @@ var DatasetsLibSQL = class extends DatasetsStorage {
             args: [args.datasetId, args.id]
           },
           {
-            sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, validTo, isDeleted, input, groundTruth, metadata, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 0, jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
+            sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, validTo, isDeleted, input, groundTruth, requestContext, metadata, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 0, jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
             args: [
               args.id,
               args.datasetId,
               args.datasetId,
               jsonbArg(mergedInput),
               jsonbArg(mergedGroundTruth),
+              jsonbArg(mergedRequestContext),
               jsonbArg(mergedMetadata),
               existing.createdAt.toISOString(),
               nowIso
@@ -3310,6 +3394,7 @@ var DatasetsLibSQL = class extends DatasetsStorage {
         datasetVersion: newVersion,
         input: mergedInput,
         groundTruth: mergedGroundTruth,
+        requestContext: mergedRequestContext,
         metadata: mergedMetadata,
         updatedAt: now
       };
@@ -3350,13 +3435,14 @@ var DatasetsLibSQL = class extends DatasetsStorage {
             args: [datasetId, id]
           },
           {
-            sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, validTo, isDeleted, input, groundTruth, metadata, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 1, jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
+            sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, validTo, isDeleted, input, groundTruth, requestContext, metadata, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 1, jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
             args: [
               id,
               datasetId,
               datasetId,
               jsonbArg(existing.input),
               jsonbArg(existing.groundTruth),
+              jsonbArg(existing.requestContext),
               jsonbArg(existing.metadata),
               existing.createdAt.toISOString(),
               nowIso
@@ -3637,13 +3723,14 @@ var DatasetsLibSQL = class extends DatasetsStorage {
         const id = crypto.randomUUID();
         items.push({ id, input: itemInput });
         statements.push({
-          sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, validTo, isDeleted, input, groundTruth, metadata, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 0, jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
+          sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, validTo, isDeleted, input, groundTruth, requestContext, metadata, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 0, jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
           args: [
             id,
             input.datasetId,
             input.datasetId,
             jsonbArg(itemInput.input),
             jsonbArg(itemInput.groundTruth),
+            jsonbArg(itemInput.requestContext),
             jsonbArg(itemInput.metadata),
             nowIso,
             nowIso
@@ -3662,6 +3749,7 @@ var DatasetsLibSQL = class extends DatasetsStorage {
         datasetVersion: newVersion,
         input: itemInput.input,
         groundTruth: itemInput.groundTruth,
+        requestContext: itemInput.requestContext,
         metadata: itemInput.metadata,
         createdAt: now,
         updatedAt: now
@@ -3711,13 +3799,14 @@ var DatasetsLibSQL = class extends DatasetsStorage {
           args: [input.datasetId, item.id]
         });
         statements.push({
-          sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, validTo, isDeleted, input, groundTruth, metadata, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 1, jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
+          sql: `INSERT INTO ${TABLE_DATASET_ITEMS} (id, datasetId, datasetVersion, validTo, isDeleted, input, groundTruth, requestContext, metadata, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 1, jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
           args: [
             item.id,
             input.datasetId,
             input.datasetId,
             jsonbArg(item.input),
             jsonbArg(item.groundTruth),
+            jsonbArg(item.requestContext),
             jsonbArg(item.metadata),
             item.createdAt.toISOString(),
             nowIso
@@ -5212,41 +5301,64 @@ var MemoryLibSQL = class extends MemoryStorage {
     if (row.type && row.type !== `v2`) result.type = row.type;
     return result;
   }
+  _sortMessages(messages, field, direction) {
+    return messages.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));
+    });
+  }
   async _getIncludedMessages({ include }) {
     if (!include || include.length === 0) return null;
+    const targetIds = include.map((inc) => inc.id).filter(Boolean);
+    if (targetIds.length === 0) return null;
+    const idPlaceholders = targetIds.map(() => "?").join(", ");
+    const targetResult = await this.#client.execute({
+      sql: `SELECT id, thread_id, "createdAt" FROM "${TABLE_MESSAGES}" WHERE id IN (${idPlaceholders})`,
+      args: targetIds
+    });
+    if (!targetResult.rows || targetResult.rows.length === 0) return null;
+    const targetMap = new Map(
+      targetResult.rows.map((r) => [r.id, { threadId: r.thread_id, createdAt: r.createdAt }])
+    );
     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 target = targetMap.get(id);
+      if (!target) continue;
+      unionQueries.push(`SELECT * FROM (
+        SELECT id, content, role, type, "createdAt", thread_id, "resourceId"
+        FROM "${TABLE_MESSAGES}"
+        WHERE thread_id = ?
+          AND "createdAt" <= ?
+        ORDER BY "createdAt" DESC, id DESC
+        LIMIT ?
+      )`);
+      params.push(target.threadId, target.createdAt, withPreviousMessages + 1);
+      if (withNextMessages > 0) {
+        unionQueries.push(`SELECT * FROM (
+          SELECT id, content, role, type, "createdAt", thread_id, "resourceId"
+          FROM "${TABLE_MESSAGES}"
+          WHERE thread_id = ?
+            AND "createdAt" > ?
+          ORDER BY "createdAt" ASC, id ASC
+          LIMIT ?
+        )`);
+        params.push(target.threadId, target.createdAt, withNextMessages);
+      }
+    }
+    if (unionQueries.length === 0) return null;
+    let finalQuery;
+    if (unionQueries.length === 1) {
+      finalQuery = unionQueries[0];
+    } else {
+      finalQuery = `${unionQueries.join(" UNION ALL ")} ORDER BY "createdAt" ASC, id 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();
@@ -5341,6 +5453,23 @@ var MemoryLibSQL = class extends MemoryStorage {
         );
       }
       const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
+      if (perPage === 0 && (!include || include.length === 0)) {
+        return { messages: [], total: 0, page, perPage: perPageForResponse, hasMore: false };
+      }
+      if (perPage === 0 && include && include.length > 0) {
+        const includeMessages = await this._getIncludedMessages({ include });
+        if (!includeMessages || includeMessages.length === 0) {
+          return { messages: [], total: 0, page, perPage: perPageForResponse, hasMore: false };
+        }
+        const list2 = new MessageList().add(includeMessages, "memory");
+        return {
+          messages: this._sortMessages(list2.get.all.db(), field, direction),
+          total: 0,
+          page,
+          perPage: perPageForResponse,
+          hasMore: false
+        };
+      }
       const countResult = await this.#client.execute({
         sql: `SELECT COUNT(*) as count FROM ${TABLE_MESSAGES} ${whereClause}`,
         args: queryParams
@@ -5374,16 +5503,7 @@ var MemoryLibSQL = class extends MemoryStorage {
         }
       }
       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 finalMessages = this._sortMessages(list.get.all.db(), field, direction);
       const threadIdSet = new Set(threadIds);
       const returnedThreadMessageIds = new Set(
         finalMessages.filter((m) => m.threadId && threadIdSet.has(m.threadId)).map((m) => m.id)
@@ -5469,6 +5589,23 @@ var MemoryLibSQL = class extends MemoryStorage {
         );
       }
       const whereClause = `WHERE ${conditions.join(" AND ")}`;
+      if (perPage === 0 && (!include || include.length === 0)) {
+        return { messages: [], total: 0, page, perPage: perPageForResponse, hasMore: false };
+      }
+      if (perPage === 0 && include && include.length > 0) {
+        const includeMessages = await this._getIncludedMessages({ include });
+        if (!includeMessages || includeMessages.length === 0) {
+          return { messages: [], total: 0, page, perPage: perPageForResponse, hasMore: false };
+        }
+        const list2 = new MessageList().add(includeMessages, "memory");
+        return {
+          messages: this._sortMessages(list2.get.all.db(), field, direction),
+          total: 0,
+          page,
+          perPage: perPageForResponse,
+          hasMore: false
+        };
+      }
       const countResult = await this.#client.execute({
         sql: `SELECT COUNT(*) as count FROM ${TABLE_MESSAGES} ${whereClause}`,
         args: queryParams
@@ -5502,16 +5639,7 @@ var MemoryLibSQL = class extends MemoryStorage {
         }
       }
       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 finalMessages = this._sortMessages(list.get.all.db(), field, direction);
       const hasMore = perPageInput !== false && offset + perPage < total;
       return {
         messages: finalMessages,
@@ -7091,6 +7219,11 @@ var ObservabilityLibSQL = class extends ObservabilityStorage {
   }
   async init() {
     await this.#db.createTable({ tableName: TABLE_SPANS, schema: SPAN_SCHEMA });
+    await this.#db.alterTable({
+      tableName: TABLE_SPANS,
+      schema: SPAN_SCHEMA,
+      ifNotExists: ["requestContext"]
+    });
   }
   async dangerouslyClearAll() {
     await this.#db.deleteData({ tableName: TABLE_SPANS });
@@ -7262,7 +7395,8 @@ var ObservabilityLibSQL = class extends ObservabilityStorage {
   }
   async listTraces(args) {
     const { filters, pagination, orderBy } = listTracesArgsSchema.parse(args);
-    const { page, perPage } = pagination;
+    const page = pagination?.page ?? 0;
+    const perPage = pagination?.perPage ?? 10;
     const tableName = parseSqlIdentifier(TABLE_SPANS, "table name");
     try {
       const conditions = ["parentSpanId IS NULL"];
@@ -7402,8 +7536,8 @@ var ObservabilityLibSQL = class extends ObservabilityStorage {
         }
       }
       const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
-      const sortField = orderBy.field;
-      const sortDirection = orderBy.direction;
+      const sortField = orderBy?.field ?? "startedAt";
+      const sortDirection = orderBy?.direction ?? "DESC";
       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`;