@mastra/libsql 1.0.0-beta.2 → 1.0.0-beta.3

package/dist/index.js

@@ -3,7 +3,7 @@ import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
 import { parseSqlIdentifier, parseFieldKey } from '@mastra/core/utils';
 import { MastraVector } from '@mastra/core/vector';
 import { BaseFilterTranslator } from '@mastra/core/vector/filter';
-import { MastraStorage, StoreOperations, TABLE_WORKFLOW_SNAPSHOT, TABLE_SPANS, ScoresStorage, TABLE_SCORERS, normalizePerPage, calculatePagination, safelyParseJSON, WorkflowsStorage, MemoryStorage, TABLE_MESSAGES, TABLE_THREADS, TABLE_RESOURCES, ObservabilityStorage, TABLE_SCHEMAS, SPAN_SCHEMA } from '@mastra/core/storage';
+import { MastraStorage, StoreOperations, TABLE_WORKFLOW_SNAPSHOT, TABLE_SPANS, ScoresStorage, TABLE_SCORERS, normalizePerPage, calculatePagination, transformScoreRow, WorkflowsStorage, MemoryStorage, TABLE_MESSAGES, TABLE_THREADS, TABLE_RESOURCES, ObservabilityStorage, TABLE_SCHEMAS, safelyParseJSON, SPAN_SCHEMA } from '@mastra/core/storage';
 import { MessageList } from '@mastra/core/agent';
 import { saveScorePayloadSchema } from '@mastra/core/evals';
 
@@ -1117,26 +1117,24 @@ var MemoryLibSQL = class extends MemoryStorage {
     if (row.type && row.type !== `v2`) result.type = row.type;
     return result;
   }
-  async _getIncludedMessages({
-    threadId,
-    include
-  }) {
-    if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
-    if (!include) return null;
+  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;
-      const searchId = inc.threadId || threadId;
       unionQueries.push(
         `
                 SELECT * FROM (
-                  WITH numbered_messages AS (
+                  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 = ?
+                    WHERE thread_id = (SELECT thread_id FROM target_thread)
                   ),
                   target_positions AS (
                     SELECT row_num as target_pos
@@ -1151,7 +1149,7 @@ var MemoryLibSQL = class extends MemoryStorage {
                 `
         // Keep ASC for final sorting after fetching context
       );
-      params.push(searchId, id, withPreviousMessages, withNextMessages);
+      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 });
@@ -1198,15 +1196,16 @@ var MemoryLibSQL = class extends MemoryStorage {
   }
   async listMessages(args) {
     const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
-    if (!threadId.trim()) {
+    const threadIds = Array.isArray(threadId) ? threadId : [threadId];
+    if (threadIds.length === 0 || threadIds.some((id) => !id.trim())) {
       throw new MastraError(
         {
           id: "STORAGE_LIBSQL_LIST_MESSAGES_INVALID_THREAD_ID",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { threadId }
+          details: { threadId: Array.isArray(threadId) ? threadId.join(",") : threadId }
         },
-        new Error("threadId must be a non-empty string")
+        new Error("threadId must be a non-empty string or array of non-empty strings")
       );
     }
     if (page < 0) {
@@ -1225,8 +1224,9 @@ var MemoryLibSQL = class extends MemoryStorage {
     try {
       const { field, direction } = this.parseOrderBy(orderBy, "ASC");
       const orderByStatement = `ORDER BY "${field}" ${direction}`;
-      const conditions = [`thread_id = ?`];
-      const queryParams = [threadId];
+      const threadPlaceholders = threadIds.map(() => "?").join(", ");
+      const conditions = [`thread_id IN (${threadPlaceholders})`];
+      const queryParams = [...threadIds];
       if (resourceId) {
         conditions.push(`"resourceId" = ?`);
         queryParams.push(resourceId);
@@ -1266,7 +1266,7 @@ var MemoryLibSQL = class extends MemoryStorage {
       }
       const messageIds = new Set(messages.map((m) => m.id));
       if (include && include.length > 0) {
-        const includeMessages = await this._getIncludedMessages({ threadId, include });
+        const includeMessages = await this._getIncludedMessages({ include });
         if (includeMessages) {
           for (const includeMsg of includeMessages) {
             if (!messageIds.has(includeMsg.id)) {
@@ -1287,7 +1287,10 @@ var MemoryLibSQL = class extends MemoryStorage {
         }
         return direction === "ASC" ? String(aValue).localeCompare(String(bValue)) : String(bValue).localeCompare(String(aValue));
       });
-      const returnedThreadMessageIds = new Set(finalMessages.filter((m) => m.threadId === threadId).map((m) => m.id));
+      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 {
@@ -1304,7 +1307,7 @@ var MemoryLibSQL = class extends MemoryStorage {
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
-            threadId,
+            threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
             resourceId: resourceId ?? ""
           }
         },
@@ -2723,45 +2726,14 @@ var ScoresLibSQL = class extends ScoresStorage {
       );
     }
   }
+  /**
+   * LibSQL-specific score row transformation.
+   * Maps additionalLLMContext column to additionalContext field.
+   */
   transformScoreRow(row) {
-    const scorerValue = safelyParseJSON(row.scorer);
-    const inputValue = safelyParseJSON(row.input ?? "{}");
-    const outputValue = safelyParseJSON(row.output ?? "{}");
-    const additionalLLMContextValue = row.additionalLLMContext ? safelyParseJSON(row.additionalLLMContext) : null;
-    const requestContextValue = row.requestContext ? safelyParseJSON(row.requestContext) : null;
-    const metadataValue = row.metadata ? safelyParseJSON(row.metadata) : null;
-    const entityValue = row.entity ? safelyParseJSON(row.entity) : null;
-    const preprocessStepResultValue = row.preprocessStepResult ? safelyParseJSON(row.preprocessStepResult) : null;
-    const analyzeStepResultValue = row.analyzeStepResult ? safelyParseJSON(row.analyzeStepResult) : null;
-    return {
-      id: row.id,
-      traceId: row.traceId,
-      spanId: row.spanId,
-      runId: row.runId,
-      scorer: scorerValue,
-      score: row.score,
-      reason: row.reason,
-      preprocessStepResult: preprocessStepResultValue,
-      analyzeStepResult: analyzeStepResultValue,
-      analyzePrompt: row.analyzePrompt,
-      preprocessPrompt: row.preprocessPrompt,
-      generateScorePrompt: row.generateScorePrompt,
-      generateReasonPrompt: row.generateReasonPrompt,
-      metadata: metadataValue,
-      input: inputValue,
-      output: outputValue,
-      additionalContext: additionalLLMContextValue,
-      requestContext: requestContextValue,
-      entityType: row.entityType,
-      entity: entityValue,
-      entityId: row.entityId,
-      scorerId: row.scorerId,
-      source: row.source,
-      resourceId: row.resourceId,
-      threadId: row.threadId,
-      createdAt: row.createdAt,
-      updatedAt: row.updatedAt
-    };
+    return transformScoreRow(row, {
+      fieldMappings: { additionalContext: "additionalLLMContext" }
+    });
   }
   async getScoreById({ id }) {
     const result = await this.client.execute({