@mastra/libsql 0.0.0-structured-output-issue-20260227214155 → 0.0.0-structured-output-errors-20260409185629

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,14 @@ 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_DATASETS, "tags", "TEXT");
+    await this.#addColumnIfNotExists(TABLE_DATASETS, "targetType", "TEXT");
+    await this.#addColumnIfNotExists(TABLE_DATASETS, "targetIds", "TEXT");
+    await this.#addColumnIfNotExists(TABLE_DATASETS, "scorerIds", "TEXT");
+    await this.#addColumnIfNotExists(TABLE_DATASET_ITEMS, "requestContext", "TEXT");
+    await this.#addColumnIfNotExists(TABLE_DATASET_ITEMS, "source", "TEXT");
+    await this.#addColumnIfNotExists(TABLE_DATASET_ITEMS, "expectedTrajectory", "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 +3013,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 +3033,11 @@ 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,
+      tags: row.tags ? safelyParseJSON(row.tags) : void 0,
+      targetType: row.targetType || void 0,
+      targetIds: row.targetIds ? safelyParseJSON(row.targetIds) : void 0,
+      scorerIds: row.scorerIds ? safelyParseJSON(row.scorerIds) : void 0,
       version: row.version,
       createdAt: ensureDate(row.createdAt),
       updatedAt: ensureDate(row.updatedAt)
@@ -2969,7 +3050,10 @@ var DatasetsLibSQL = class extends DatasetsStorage {
       datasetVersion: row.datasetVersion,
       input: safelyParseJSON(row.input),
       groundTruth: row.groundTruth ? safelyParseJSON(row.groundTruth) : void 0,
+      expectedTrajectory: row.expectedTrajectory ? safelyParseJSON(row.expectedTrajectory) : void 0,
+      requestContext: row.requestContext ? safelyParseJSON(row.requestContext) : void 0,
       metadata: row.metadata ? safelyParseJSON(row.metadata) : void 0,
+      source: row.source ? safelyParseJSON(row.source) : void 0,
       createdAt: ensureDate(row.createdAt),
       updatedAt: ensureDate(row.updatedAt)
     };
@@ -2983,7 +3067,10 @@ var DatasetsLibSQL = class extends DatasetsStorage {
       isDeleted: Boolean(row.isDeleted),
       input: safelyParseJSON(row.input),
       groundTruth: row.groundTruth ? safelyParseJSON(row.groundTruth) : void 0,
+      expectedTrajectory: row.expectedTrajectory ? safelyParseJSON(row.expectedTrajectory) : void 0,
+      requestContext: row.requestContext ? safelyParseJSON(row.requestContext) : void 0,
       metadata: row.metadata ? safelyParseJSON(row.metadata) : void 0,
+      source: row.source ? safelyParseJSON(row.source) : void 0,
       createdAt: ensureDate(row.createdAt),
       updatedAt: ensureDate(row.updatedAt)
     };
@@ -3011,6 +3098,10 @@ var DatasetsLibSQL = class extends DatasetsStorage {
           metadata: input.metadata,
           inputSchema: input.inputSchema ?? null,
           groundTruthSchema: input.groundTruthSchema ?? null,
+          requestContextSchema: input.requestContextSchema ?? null,
+          targetType: input.targetType ?? null,
+          targetIds: input.targetIds ? JSON.stringify(input.targetIds) : null,
+          scorerIds: input.scorerIds ? JSON.stringify(input.scorerIds) : null,
           version: 0,
           createdAt: nowIso,
           updatedAt: nowIso
@@ -3023,6 +3114,10 @@ var DatasetsLibSQL = class extends DatasetsStorage {
         metadata: input.metadata,
         inputSchema: input.inputSchema ?? void 0,
         groundTruthSchema: input.groundTruthSchema ?? void 0,
+        requestContextSchema: input.requestContextSchema ?? void 0,
+        targetType: input.targetType ?? void 0,
+        targetIds: input.targetIds ?? void 0,
+        scorerIds: input.scorerIds ?? void 0,
         version: 0,
         createdAt: now,
         updatedAt: now
@@ -3090,6 +3185,26 @@ 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));
+      }
+      if (args.tags !== void 0) {
+        updates.push("tags = ?");
+        values.push(args.tags === null ? null : JSON.stringify(args.tags));
+      }
+      if (args.targetType !== void 0) {
+        updates.push("targetType = ?");
+        values.push(args.targetType === null ? null : args.targetType);
+      }
+      if (args.targetIds !== void 0) {
+        updates.push("targetIds = ?");
+        values.push(args.targetIds === null ? null : JSON.stringify(args.targetIds));
+      }
+      if (args.scorerIds !== void 0) {
+        updates.push("scorerIds = ?");
+        values.push(args.scorerIds === null ? null : JSON.stringify(args.scorerIds));
+      }
       values.push(args.id);
       await this.#client.execute({
         sql: `UPDATE ${TABLE_DATASETS} SET ${updates.join(", ")} WHERE id = ?`,
@@ -3102,6 +3217,11 @@ 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,
+        tags: (args.tags !== void 0 ? args.tags : existing.tags) ?? void 0,
+        targetType: (args.targetType !== void 0 ? args.targetType : existing.targetType) ?? void 0,
+        targetIds: (args.targetIds !== void 0 ? args.targetIds : existing.targetIds) ?? void 0,
+        scorerIds: (args.scorerIds !== void 0 ? args.scorerIds : existing.scorerIds) ?? void 0,
         updatedAt: new Date(now)
       };
     } catch (error) {
@@ -3207,14 +3327,17 @@ 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, expectedTrajectory, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 0, jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
             args: [
               id,
               args.datasetId,
               args.datasetId,
               jsonbArg(args.input),
               jsonbArg(args.groundTruth),
+              jsonbArg(args.expectedTrajectory),
+              jsonbArg(args.requestContext),
               jsonbArg(args.metadata),
+              jsonbArg(args.source),
               nowIso,
               nowIso
             ]
@@ -3233,7 +3356,10 @@ var DatasetsLibSQL = class extends DatasetsStorage {
         datasetVersion: newVersion,
         input: args.input,
         groundTruth: args.groundTruth,
+        expectedTrajectory: args.expectedTrajectory,
+        requestContext: args.requestContext,
         metadata: args.metadata,
+        source: args.source,
         createdAt: now,
         updatedAt: now
       };
@@ -3271,9 +3397,12 @@ var DatasetsLibSQL = class extends DatasetsStorage {
       const versionId = crypto.randomUUID();
       const now = /* @__PURE__ */ new Date();
       const nowIso = now.toISOString();
-      const mergedInput = args.input ?? existing.input;
-      const mergedGroundTruth = args.groundTruth ?? existing.groundTruth;
-      const mergedMetadata = args.metadata ?? existing.metadata;
+      const mergedInput = args.input !== void 0 ? args.input : existing.input;
+      const mergedGroundTruth = args.groundTruth !== void 0 ? args.groundTruth : existing.groundTruth;
+      const mergedExpectedTrajectory = args.expectedTrajectory !== void 0 ? args.expectedTrajectory : existing.expectedTrajectory;
+      const mergedRequestContext = args.requestContext !== void 0 ? args.requestContext : existing.requestContext;
+      const mergedMetadata = args.metadata !== void 0 ? args.metadata : existing.metadata;
+      const mergedSource = args.source !== void 0 ? args.source : existing.source;
       const results = await this.#client.batch(
         [
           {
@@ -3285,14 +3414,17 @@ 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, expectedTrajectory, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 0, jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
             args: [
               args.id,
               args.datasetId,
               args.datasetId,
               jsonbArg(mergedInput),
               jsonbArg(mergedGroundTruth),
+              jsonbArg(mergedExpectedTrajectory),
+              jsonbArg(mergedRequestContext),
               jsonbArg(mergedMetadata),
+              jsonbArg(mergedSource),
               existing.createdAt.toISOString(),
               nowIso
             ]
@@ -3310,7 +3442,10 @@ var DatasetsLibSQL = class extends DatasetsStorage {
         datasetVersion: newVersion,
         input: mergedInput,
         groundTruth: mergedGroundTruth,
+        expectedTrajectory: mergedExpectedTrajectory,
+        requestContext: mergedRequestContext,
         metadata: mergedMetadata,
+        source: mergedSource,
         updatedAt: now
       };
     } catch (error) {
@@ -3350,14 +3485,16 @@ 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, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 1, jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
             args: [
               id,
               datasetId,
               datasetId,
               jsonbArg(existing.input),
               jsonbArg(existing.groundTruth),
+              jsonbArg(existing.requestContext),
               jsonbArg(existing.metadata),
+              jsonbArg(existing.source),
               existing.createdAt.toISOString(),
               nowIso
             ]
@@ -3637,14 +3774,17 @@ 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, expectedTrajectory, requestContext, metadata, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 0, jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
           args: [
             id,
             input.datasetId,
             input.datasetId,
             jsonbArg(itemInput.input),
             jsonbArg(itemInput.groundTruth),
+            jsonbArg(itemInput.expectedTrajectory),
+            jsonbArg(itemInput.requestContext),
             jsonbArg(itemInput.metadata),
+            jsonbArg(itemInput.source),
             nowIso,
             nowIso
           ]
@@ -3662,7 +3802,10 @@ var DatasetsLibSQL = class extends DatasetsStorage {
         datasetVersion: newVersion,
         input: itemInput.input,
         groundTruth: itemInput.groundTruth,
+        expectedTrajectory: itemInput.expectedTrajectory,
+        requestContext: itemInput.requestContext,
         metadata: itemInput.metadata,
+        source: itemInput.source,
         createdAt: now,
         updatedAt: now
       }));
@@ -3711,14 +3854,16 @@ 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, source, createdAt, updatedAt) VALUES (?, ?, (SELECT version FROM ${TABLE_DATASETS} WHERE id = ?), NULL, 1, jsonb(?), jsonb(?), jsonb(?), jsonb(?), jsonb(?), ?, ?)`,
           args: [
             item.id,
             input.datasetId,
             input.datasetId,
             jsonbArg(item.input),
             jsonbArg(item.groundTruth),
+            jsonbArg(item.requestContext),
             jsonbArg(item.metadata),
+            jsonbArg(item.source),
             item.createdAt.toISOString(),
             nowIso
           ]
@@ -3780,6 +3925,7 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
       id: row.id,
       datasetId: row.datasetId ?? null,
       datasetVersion: row.datasetVersion != null ? row.datasetVersion : null,
+      agentVersion: row.agentVersion ?? null,
       targetType: row.targetType,
       targetId: row.targetId,
       name: row.name ?? void 0,
@@ -3811,6 +3957,8 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
       completedAt: ensureDate(row.completedAt),
       retryCount: row.retryCount,
       traceId: row.traceId ?? null,
+      status: row.status ?? null,
+      tags: row.tags ? safelyParseJSON(row.tags) : null,
       createdAt: ensureDate(row.createdAt)
     };
   }
@@ -3826,6 +3974,7 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
           id,
           datasetId: input.datasetId ?? null,
           datasetVersion: input.datasetVersion ?? null,
+          agentVersion: input.agentVersion ?? null,
           targetType: input.targetType,
           targetId: input.targetId,
           name: input.name ?? null,
@@ -3846,6 +3995,7 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
         id,
         datasetId: input.datasetId,
         datasetVersion: input.datasetVersion,
+        agentVersion: input.agentVersion ?? null,
         targetType: input.targetType,
         targetId: input.targetId,
         name: input.name,
@@ -3898,6 +4048,10 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
         updates.push("failedCount = ?");
         values.push(input.failedCount);
       }
+      if (input.totalItems !== void 0) {
+        updates.push("totalItems = ?");
+        values.push(input.totalItems);
+      }
       if (input.startedAt !== void 0) {
         updates.push("startedAt = ?");
         values.push(input.startedAt?.toISOString() ?? null);
@@ -4050,6 +4204,8 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
           completedAt: input.completedAt.toISOString(),
           retryCount: input.retryCount,
           traceId: input.traceId ?? null,
+          status: input.status ?? null,
+          tags: input.tags !== void 0 && input.tags !== null ? JSON.stringify(input.tags) : null,
           createdAt: nowIso
         }
       });
@@ -4066,6 +4222,8 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
         completedAt: input.completedAt,
         retryCount: input.retryCount,
         traceId: input.traceId ?? null,
+        status: input.status ?? null,
+        tags: input.tags ?? null,
         createdAt: now
       };
     } catch (error) {
@@ -4079,6 +4237,70 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
       );
     }
   }
+  async updateExperimentResult(input) {
+    try {
+      const setClauses = [];
+      const values = [];
+      if (input.status !== void 0) {
+        setClauses.push(`"status" = ?`);
+        values.push(input.status);
+      }
+      if (input.tags !== void 0) {
+        setClauses.push(`"tags" = ?`);
+        values.push(JSON.stringify(input.tags));
+      }
+      if (setClauses.length === 0) {
+        const existing = await this.getExperimentResultById({ id: input.id });
+        if (!existing) {
+          throw new MastraError({
+            id: createStorageErrorId("LIBSQL", "UPDATE_EXPERIMENT_RESULT", "NOT_FOUND"),
+            domain: ErrorDomain.STORAGE,
+            category: ErrorCategory.USER,
+            details: { resultId: input.id }
+          });
+        }
+        return existing;
+      }
+      values.push(input.id);
+      let whereClause = `"id" = ?`;
+      if (input.experimentId) {
+        values.push(input.experimentId);
+        whereClause += ` AND "experimentId" = ?`;
+      }
+      const updateResult = await this.#client.execute({
+        sql: `UPDATE ${TABLE_EXPERIMENT_RESULTS} SET ${setClauses.join(", ")} WHERE ${whereClause}`,
+        args: values
+      });
+      if (updateResult.rowsAffected === 0) {
+        throw new MastraError({
+          id: createStorageErrorId("LIBSQL", "UPDATE_EXPERIMENT_RESULT", "NOT_FOUND"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: { resultId: input.id, ...input.experimentId ? { experimentId: input.experimentId } : {} }
+        });
+      }
+      const result = await this.getExperimentResultById({ id: input.id });
+      if (!result) {
+        throw new MastraError({
+          id: createStorageErrorId("LIBSQL", "UPDATE_EXPERIMENT_RESULT", "NOT_FOUND"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: { resultId: input.id }
+        });
+      }
+      return result;
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "UPDATE_EXPERIMENT_RESULT", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+    }
+  }
   async getExperimentResultById(args) {
     try {
       const result = await this.#client.execute({
@@ -4159,6 +4381,37 @@ var ExperimentsLibSQL = class extends ExperimentsStorage {
       );
     }
   }
+  async getReviewSummary() {
+    try {
+      const result = await this.#client.execute({
+        sql: `SELECT
+          "experimentId",
+          COUNT(*) as total,
+          SUM(CASE WHEN status = 'needs-review' THEN 1 ELSE 0 END) as "needsReview",
+          SUM(CASE WHEN status = 'reviewed' THEN 1 ELSE 0 END) as reviewed,
+          SUM(CASE WHEN status = 'complete' THEN 1 ELSE 0 END) as complete
+        FROM ${TABLE_EXPERIMENT_RESULTS}
+        GROUP BY "experimentId"`,
+        args: []
+      });
+      return (result.rows ?? []).map((row) => ({
+        experimentId: row.experimentId,
+        total: Number(row.total ?? 0),
+        needsReview: Number(row.needsReview ?? 0),
+        reviewed: Number(row.reviewed ?? 0),
+        complete: Number(row.complete ?? 0)
+      }));
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "GET_REVIEW_SUMMARY", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+    }
+  }
 };
 var MCPClientsLibSQL = class extends MCPClientsStorage {
   #db;
@@ -5166,7 +5419,8 @@ var MemoryLibSQL = class extends MemoryStorage {
           "isBufferingObservation",
           "isBufferingReflection",
           "lastBufferedAtTokens",
-          "lastBufferedAtTime"
+          "lastBufferedAtTime",
+          "metadata"
         ]
       });
     }
@@ -5207,41 +5461,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();
@@ -5336,6 +5613,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
@@ -5369,16 +5663,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)
@@ -5464,6 +5749,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
@@ -5497,16 +5799,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,
@@ -6136,9 +6429,11 @@ var MemoryLibSQL = class extends MemoryStorage {
           ]
         });
         const clonedMessages = [];
+        const messageIdMap = {};
         const targetResourceId = resourceId || sourceThread.resourceId;
         for (const sourceMsg of sourceMessages) {
           const newMessageId = crypto.randomUUID();
+          messageIdMap[sourceMsg.id] = newMessageId;
           const contentStr = sourceMsg.content;
           let parsedContent;
           try {
@@ -6172,7 +6467,8 @@ var MemoryLibSQL = class extends MemoryStorage {
         await tx.commit();
         return {
           thread: newThread,
-          clonedMessages
+          clonedMessages,
+          messageIdMap
         };
       } catch (error) {
         await tx.rollback();
@@ -6259,14 +6555,26 @@ var MemoryLibSQL = class extends MemoryStorage {
       );
     }
   }
-  async getObservationalMemoryHistory(threadId, resourceId, limit = 10) {
+  async getObservationalMemoryHistory(threadId, resourceId, limit = 10, options) {
     try {
       const lookupKey = this.getOMKey(threadId, resourceId);
-      const result = await this.#client.execute({
-        // Use generationCount DESC for reliable ordering (incremented for each new record)
-        sql: `SELECT * FROM "${OM_TABLE}" WHERE "lookupKey" = ? ORDER BY "generationCount" DESC LIMIT ?`,
-        args: [lookupKey, limit]
-      });
+      const conditions = [`"lookupKey" = ?`];
+      const args = [lookupKey];
+      if (options?.from) {
+        conditions.push(`"createdAt" >= ?`);
+        args.push(options.from.toISOString());
+      }
+      if (options?.to) {
+        conditions.push(`"createdAt" <= ?`);
+        args.push(options.to.toISOString());
+      }
+      args.push(limit);
+      let sql = `SELECT * FROM "${OM_TABLE}" WHERE ${conditions.join(" AND ")} ORDER BY "generationCount" DESC LIMIT ?`;
+      if (options?.offset != null) {
+        args.push(options.offset);
+        sql += ` OFFSET ?`;
+      }
+      const result = await this.#client.execute({ sql, args });
       if (!result.rows) return [];
       return result.rows.map((row) => this.parseOMRow(row));
     } catch (error) {
@@ -6362,6 +6670,68 @@ var MemoryLibSQL = class extends MemoryStorage {
       );
     }
   }
+  async insertObservationalMemoryRecord(record) {
+    try {
+      const lookupKey = this.getOMKey(record.threadId, record.resourceId);
+      await this.#client.execute({
+        sql: `INSERT INTO "${OM_TABLE}" (
+          id, "lookupKey", scope, "resourceId", "threadId",
+          "activeObservations", "activeObservationsPendingUpdate",
+          "originType", config, "generationCount", "lastObservedAt", "lastReflectionAt",
+          "pendingMessageTokens", "totalTokensObserved", "observationTokenCount",
+          "observedMessageIds", "bufferedObservationChunks",
+          "bufferedReflection", "bufferedReflectionTokens", "bufferedReflectionInputTokens",
+          "reflectedObservationLineCount",
+          "isObserving", "isReflecting", "isBufferingObservation", "isBufferingReflection",
+          "lastBufferedAtTokens", "lastBufferedAtTime",
+          "observedTimezone", metadata, "createdAt", "updatedAt"
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+        args: [
+          record.id,
+          lookupKey,
+          record.scope,
+          record.resourceId,
+          record.threadId || null,
+          record.activeObservations || "",
+          null,
+          record.originType || "initial",
+          record.config ? JSON.stringify(record.config) : null,
+          record.generationCount || 0,
+          record.lastObservedAt ? record.lastObservedAt.toISOString() : null,
+          null,
+          record.pendingMessageTokens || 0,
+          record.totalTokensObserved || 0,
+          record.observationTokenCount || 0,
+          record.observedMessageIds ? JSON.stringify(record.observedMessageIds) : null,
+          record.bufferedObservationChunks ? JSON.stringify(record.bufferedObservationChunks) : null,
+          record.bufferedReflection || null,
+          record.bufferedReflectionTokens ?? null,
+          record.bufferedReflectionInputTokens ?? null,
+          record.reflectedObservationLineCount ?? null,
+          record.isObserving || false,
+          record.isReflecting || false,
+          record.isBufferingObservation || false,
+          record.isBufferingReflection || false,
+          record.lastBufferedAtTokens || 0,
+          record.lastBufferedAtTime ? record.lastBufferedAtTime.toISOString() : null,
+          record.observedTimezone || null,
+          record.metadata ? JSON.stringify(record.metadata) : null,
+          record.createdAt.toISOString(),
+          record.updatedAt.toISOString()
+        ]
+      });
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "INSERT_OBSERVATIONAL_MEMORY_RECORD", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { id: record.id, threadId: record.threadId, resourceId: record.resourceId }
+        },
+        error
+      );
+    }
+  }
   async updateActiveObservations(input) {
     try {
       const now = /* @__PURE__ */ new Date();
@@ -6446,8 +6816,8 @@ var MemoryLibSQL = class extends MemoryStorage {
           "originType", config, "generationCount", "lastObservedAt", "lastReflectionAt",
           "pendingMessageTokens", "totalTokensObserved", "observationTokenCount",
           "isObserving", "isReflecting", "isBufferingObservation", "isBufferingReflection", "lastBufferedAtTokens", "lastBufferedAtTime",
-          "observedTimezone", "createdAt", "updatedAt"
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+          "observedTimezone", metadata, "createdAt", "updatedAt"
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
         args: [
           id,
           lookupKey,
@@ -6477,6 +6847,7 @@ var MemoryLibSQL = class extends MemoryStorage {
           null,
           // lastBufferedAtTime
           record.observedTimezone || null,
+          record.metadata ? JSON.stringify(record.metadata) : null,
           now.toISOString(),
           now.toISOString()
         ]
@@ -6673,6 +7044,43 @@ var MemoryLibSQL = class extends MemoryStorage {
       );
     }
   }
+  async updateObservationalMemoryConfig(input) {
+    try {
+      const selectResult = await this.#client.execute({
+        sql: `SELECT config FROM "${OM_TABLE}" WHERE id = ?`,
+        args: [input.id]
+      });
+      if (selectResult.rows.length === 0) {
+        throw new MastraError({
+          id: createStorageErrorId("LIBSQL", "UPDATE_OM_CONFIG", "NOT_FOUND"),
+          text: `Observational memory record not found: ${input.id}`,
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { id: input.id }
+        });
+      }
+      const row = selectResult.rows[0];
+      const existing = row.config ? JSON.parse(row.config) : {};
+      const merged = this.deepMergeConfig(existing, input.config);
+      await this.#client.execute({
+        sql: `UPDATE "${OM_TABLE}" SET config = ?, "updatedAt" = ? WHERE id = ?`,
+        args: [JSON.stringify(merged), (/* @__PURE__ */ new Date()).toISOString(), input.id]
+      });
+    } catch (error) {
+      if (error instanceof MastraError) {
+        throw error;
+      }
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LIBSQL", "UPDATE_OM_CONFIG", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { id: input.id }
+        },
+        error
+      );
+    }
+  }
   // ============================================
   // Async Buffering Methods
   // ============================================
@@ -6712,7 +7120,8 @@ var MemoryLibSQL = class extends MemoryStorage {
         lastObservedAt: input.chunk.lastObservedAt,
         createdAt: /* @__PURE__ */ new Date(),
         suggestedContinuation: input.chunk.suggestedContinuation,
-        currentTask: input.chunk.currentTask
+        currentTask: input.chunk.currentTask,
+        threadTitle: input.chunk.threadTitle
       };
       const newChunks = [...existingChunks, newChunk];
       const lastBufferedAtTime = input.lastBufferedAtTime ? input.lastBufferedAtTime.toISOString() : null;
@@ -6793,15 +7202,15 @@ var MemoryLibSQL = class extends MemoryStorage {
       let bestUnderTokens = 0;
       for (let i = 0; i < chunks.length; i++) {
         cumulativeMessageTokens += chunks[i].messageTokens ?? 0;
-        const boundary = i + 1;
+        const boundary2 = i + 1;
         if (cumulativeMessageTokens >= targetMessageTokens) {
           if (bestOverBoundary === 0 || cumulativeMessageTokens < bestOverTokens) {
-            bestOverBoundary = boundary;
+            bestOverBoundary = boundary2;
             bestOverTokens = cumulativeMessageTokens;
           }
         } else {
           if (cumulativeMessageTokens > bestUnderTokens) {
-            bestUnderBoundary = boundary;
+            bestUnderBoundary = boundary2;
             bestUnderTokens = cumulativeMessageTokens;
           }
         }
@@ -6836,13 +7245,16 @@ var MemoryLibSQL = class extends MemoryStorage {
       const lastObservedAtStr = lastObservedAt.toISOString();
       const existingActive = row.activeObservations || "";
       const existingTokenCount = Number(row.observationTokenCount || 0);
-      const newActive = existingActive ? `${existingActive}
+      const boundary = `
+
+--- message boundary (${lastObservedAt.toISOString()}) ---
 
-${activatedContent}` : activatedContent;
+`;
+      const newActive = existingActive ? `${existingActive}${boundary}${activatedContent}` : activatedContent;
       const newTokenCount = existingTokenCount + activatedTokens;
       const existingPending = Number(row.pendingMessageTokens || 0);
       const newPending = Math.max(0, existingPending - activatedMessageTokens);
-      await this.#client.execute({
+      const updateResult = await this.#client.execute({
         sql: `UPDATE "${OM_TABLE}" SET
           "activeObservations" = ?,
           "observationTokenCount" = ?,
@@ -6850,7 +7262,9 @@ ${activatedContent}` : activatedContent;
           "bufferedObservationChunks" = ?,
           "lastObservedAt" = ?,
           "updatedAt" = ?
-        WHERE id = ?`,
+        WHERE id = ?
+          AND "bufferedObservationChunks" IS NOT NULL
+          AND "bufferedObservationChunks" != '[]'`,
         args: [
           newActive,
           newTokenCount,
@@ -6861,6 +7275,16 @@ ${activatedContent}` : activatedContent;
           input.id
         ]
       });
+      if (updateResult.rowsAffected === 0) {
+        return {
+          chunksActivated: 0,
+          messageTokensActivated: 0,
+          observationTokensActivated: 0,
+          messagesActivated: 0,
+          activatedCycleIds: [],
+          activatedMessageIds: []
+        };
+      }
       const latestChunkHints = activatedChunks[activatedChunks.length - 1];
       return {
         chunksActivated: activatedChunks.length,
@@ -7020,6 +7444,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 });
@@ -7191,7 +7620,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"];
@@ -7331,8 +7761,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`;