@mastra/mongodb 0.14.9 → 0.14.10

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @mastra/mongodb
 
+## 0.14.10
+
+### Patch Changes
+
+- deleteVectors, deleteFilter when upserting, updateVector filter (#10244) ([#10526](https://github.com/mastra-ai/mastra/pull/10526))
+
+- fix: ensure score responses match saved payloads for Mastra Stores. ([#10570](https://github.com/mastra-ai/mastra/pull/10570))
+
+- Fix message sorting in getMessagesPaginated when using semantic recall (include parameter). Messages are now always sorted by createdAt after combining paginated and included messages, ensuring correct chronological ordering of conversation history. All stores now consistently use MessageList for deduplication followed by explicit sorting. ([#10573](https://github.com/mastra-ai/mastra/pull/10573))
+
+- Updated dependencies [[`5657314`](https://github.com/mastra-ai/mastra/commit/5657314a1f9d49019bb53f357fa48f75a69247ca), [`e5aca78`](https://github.com/mastra-ai/mastra/commit/e5aca78bb7f263bb8b470bedae81efe9805d7544), [`33a607a`](https://github.com/mastra-ai/mastra/commit/33a607a1f716c2029d4a1ff1603dd756129a33b3), [`cc10fc1`](https://github.com/mastra-ai/mastra/commit/cc10fc192d9f527c71a23cc9def10d8718935ee1), [`1f7ee84`](https://github.com/mastra-ai/mastra/commit/1f7ee841a643ef12d90392125881f06fdf877293), [`e7d5149`](https://github.com/mastra-ai/mastra/commit/e7d514995260b63b2108308e85c64de37dcd0f71), [`f195082`](https://github.com/mastra-ai/mastra/commit/f1950822a2425d5ccae78c5d010e02ddb027a869), [`d9986dd`](https://github.com/mastra-ai/mastra/commit/d9986dd3513f7ca3244a8e599a440ccf4d8bc28b), [`a45b0f0`](https://github.com/mastra-ai/mastra/commit/a45b0f0cd19eab1fe4deceae3abf029442c22f74), [`f6e8eb3`](https://github.com/mastra-ai/mastra/commit/f6e8eb3dac53b70b06e906b2818b1d2a5b0486d7), [`ce57a2b`](https://github.com/mastra-ai/mastra/commit/ce57a2b62fd0d5f6532e4ecd1ba9ba93ac9b95fc), [`3236f35`](https://github.com/mastra-ai/mastra/commit/3236f352ae13cc8552c2965164e97bd125dae48d), [`ce57a2b`](https://github.com/mastra-ai/mastra/commit/ce57a2b62fd0d5f6532e4ecd1ba9ba93ac9b95fc), [`0230321`](https://github.com/mastra-ai/mastra/commit/02303217870bedea0ef009bea9a952f24ed38aaf), [`7b541f4`](https://github.com/mastra-ai/mastra/commit/7b541f49eda6f5a87b738198edbd136927599475), [`0eea842`](https://github.com/mastra-ai/mastra/commit/0eea8423cbdd37f2111593c6f7d2efcde4b7e4ce), [`63ae8a2`](https://github.com/mastra-ai/mastra/commit/63ae8a22c0c09bbb8b9779f5f38934cd75f616af), [`bf810c5`](https://github.com/mastra-ai/mastra/commit/bf810c5c561bd8ef221c0f6bd84e69770b9a38cc), [`ac7ef07`](https://github.com/mastra-ai/mastra/commit/ac7ef07633caee89707142171d2873c888ffef85), [`522f0b4`](https://github.com/mastra-ai/mastra/commit/522f0b45330719858794eabffffde4f343f55549), [`bf810c5`](https://github.com/mastra-ai/mastra/commit/bf810c5c561bd8ef221c0f6bd84e69770b9a38cc), [`8b51d55`](https://github.com/mastra-ai/mastra/commit/8b51d55bae531edf7e383958d7ecee04df31f5d5), [`2131ac5`](https://github.com/mastra-ai/mastra/commit/2131ac571d5065f0a656c57494bca98691bb7609)]:
+  - @mastra/core@0.24.6
+
+## 0.14.10-alpha.0
+
+### Patch Changes
+
+- deleteVectors, deleteFilter when upserting, updateVector filter (#10244) ([#10526](https://github.com/mastra-ai/mastra/pull/10526))
+
+- fix: ensure score responses match saved payloads for Mastra Stores. ([#10570](https://github.com/mastra-ai/mastra/pull/10570))
+
+- Fix message sorting in getMessagesPaginated when using semantic recall (include parameter). Messages are now always sorted by createdAt after combining paginated and included messages, ensuring correct chronological ordering of conversation history. All stores now consistently use MessageList for deduplication followed by explicit sorting. ([#10573](https://github.com/mastra-ai/mastra/pull/10573))
+
+- Updated dependencies [[`5657314`](https://github.com/mastra-ai/mastra/commit/5657314a1f9d49019bb53f357fa48f75a69247ca), [`e5aca78`](https://github.com/mastra-ai/mastra/commit/e5aca78bb7f263bb8b470bedae81efe9805d7544), [`33a607a`](https://github.com/mastra-ai/mastra/commit/33a607a1f716c2029d4a1ff1603dd756129a33b3), [`cc10fc1`](https://github.com/mastra-ai/mastra/commit/cc10fc192d9f527c71a23cc9def10d8718935ee1), [`1f7ee84`](https://github.com/mastra-ai/mastra/commit/1f7ee841a643ef12d90392125881f06fdf877293), [`e7d5149`](https://github.com/mastra-ai/mastra/commit/e7d514995260b63b2108308e85c64de37dcd0f71), [`f195082`](https://github.com/mastra-ai/mastra/commit/f1950822a2425d5ccae78c5d010e02ddb027a869), [`d9986dd`](https://github.com/mastra-ai/mastra/commit/d9986dd3513f7ca3244a8e599a440ccf4d8bc28b), [`a45b0f0`](https://github.com/mastra-ai/mastra/commit/a45b0f0cd19eab1fe4deceae3abf029442c22f74), [`f6e8eb3`](https://github.com/mastra-ai/mastra/commit/f6e8eb3dac53b70b06e906b2818b1d2a5b0486d7), [`ce57a2b`](https://github.com/mastra-ai/mastra/commit/ce57a2b62fd0d5f6532e4ecd1ba9ba93ac9b95fc), [`3236f35`](https://github.com/mastra-ai/mastra/commit/3236f352ae13cc8552c2965164e97bd125dae48d), [`ce57a2b`](https://github.com/mastra-ai/mastra/commit/ce57a2b62fd0d5f6532e4ecd1ba9ba93ac9b95fc), [`0230321`](https://github.com/mastra-ai/mastra/commit/02303217870bedea0ef009bea9a952f24ed38aaf), [`7b541f4`](https://github.com/mastra-ai/mastra/commit/7b541f49eda6f5a87b738198edbd136927599475), [`0eea842`](https://github.com/mastra-ai/mastra/commit/0eea8423cbdd37f2111593c6f7d2efcde4b7e4ce), [`63ae8a2`](https://github.com/mastra-ai/mastra/commit/63ae8a22c0c09bbb8b9779f5f38934cd75f616af), [`bf810c5`](https://github.com/mastra-ai/mastra/commit/bf810c5c561bd8ef221c0f6bd84e69770b9a38cc), [`ac7ef07`](https://github.com/mastra-ai/mastra/commit/ac7ef07633caee89707142171d2873c888ffef85), [`522f0b4`](https://github.com/mastra-ai/mastra/commit/522f0b45330719858794eabffffde4f343f55549), [`bf810c5`](https://github.com/mastra-ai/mastra/commit/bf810c5c561bd8ef221c0f6bd84e69770b9a38cc), [`8b51d55`](https://github.com/mastra-ai/mastra/commit/8b51d55bae531edf7e383958d7ecee04df31f5d5), [`2131ac5`](https://github.com/mastra-ai/mastra/commit/2131ac571d5065f0a656c57494bca98691bb7609)]:
+  - @mastra/core@0.24.6-alpha.0
+
 ## 0.14.9
 
 ### Patch Changes

package/dist/index.cjs

@@ -13,7 +13,7 @@ var scores = require('@mastra/core/scores');
 
 // package.json
 var package_default = {
-  version: "0.14.9"};
+  version: "0.14.10"};
 var MongoDBFilterTranslator = class extends filter.BaseFilterTranslator {
   getSupportedOperators() {
     return {
@@ -355,12 +355,17 @@ var MongoDBVector = class extends vector.MastraVector {
         limit: topK
       };
       if (Object.keys(combinedFilter).length > 0) {
-        const candidateIds = await collection.aggregate([{ $match: combinedFilter }, { $project: { _id: 1 } }]).map((doc) => doc._id).toArray();
+        const filterWithExclusion = {
+          $and: [{ _id: { $ne: "__index_metadata__" } }, combinedFilter]
+        };
+        const candidateIds = await collection.aggregate([{ $match: filterWithExclusion }, { $project: { _id: 1 } }]).map((doc) => doc._id).toArray();
         if (candidateIds.length > 0) {
           vectorSearch.filter = { _id: { $in: candidateIds } };
         } else {
           return [];
         }
+      } else {
+        vectorSearch.filter = { _id: { $ne: "__index_metadata__" } };
       }
       const pipeline = [
         {
@@ -481,7 +486,26 @@ var MongoDBVector = class extends vector.MastraVector {
    * @returns A promise that resolves when the update is complete.
    * @throws Will throw an error if no updates are provided or if the update operation fails.
    */
-  async updateVector({ indexName, id, update }) {
+  async updateVector(params) {
+    const { indexName, update } = params;
+    if ("id" in params && params.id && "filter" in params && params.filter) {
+      throw new error.MastraError({
+        id: "STORAGE_MONGODB_VECTOR_UPDATE_MUTUALLY_EXCLUSIVE_PARAMS",
+        domain: error.ErrorDomain.STORAGE,
+        category: error.ErrorCategory.USER,
+        details: { indexName },
+        text: "id and filter are mutually exclusive - provide only one"
+      });
+    }
+    if (!("id" in params || "filter" in params) || !params.id && !params.filter) {
+      throw new error.MastraError({
+        id: "STORAGE_MONGODB_VECTOR_UPDATE_MISSING_PARAMS",
+        domain: error.ErrorDomain.STORAGE,
+        category: error.ErrorCategory.USER,
+        text: "Either id or filter must be provided",
+        details: { indexName }
+      });
+    }
     try {
       if (!update.vector && !update.metadata) {
         throw new Error("No updates provided");
@@ -503,17 +527,49 @@ var MongoDBVector = class extends vector.MastraVector {
         );
         updateDoc[this.metadataFieldName] = normalizedMeta;
       }
-      await collection.findOneAndUpdate({ _id: id }, { $set: updateDoc });
+      if ("id" in params && params.id) {
+        await collection.findOneAndUpdate({ _id: params.id }, { $set: updateDoc });
+      } else if ("filter" in params && params.filter) {
+        const filter = params.filter;
+        if (!filter || Object.keys(filter).length === 0) {
+          throw new error.MastraError({
+            id: "STORAGE_MONGODB_VECTOR_UPDATE_EMPTY_FILTER",
+            domain: error.ErrorDomain.STORAGE,
+            category: error.ErrorCategory.USER,
+            details: { indexName },
+            text: "Cannot update with empty filter"
+          });
+        }
+        const mongoFilter = this.transformFilter(filter);
+        const transformedFilter = this.transformMetadataFilter(mongoFilter);
+        if (!transformedFilter || Object.keys(transformedFilter).length === 0) {
+          throw new error.MastraError({
+            id: "STORAGE_MONGODB_VECTOR_UPDATE_INVALID_FILTER",
+            domain: error.ErrorDomain.STORAGE,
+            category: error.ErrorCategory.USER,
+            details: { indexName },
+            text: "Filter produced empty query"
+          });
+        }
+        await collection.updateMany(transformedFilter, { $set: updateDoc });
+      }
     } catch (error$1) {
+      if (error$1 instanceof error.MastraError) {
+        throw error$1;
+      }
+      const errorDetails = { indexName };
+      if ("id" in params && params.id) {
+        errorDetails.id = params.id;
+      }
+      if ("filter" in params && params.filter) {
+        errorDetails.filter = JSON.stringify(params.filter);
+      }
       throw new error.MastraError(
         {
           id: "STORAGE_MONGODB_VECTOR_UPDATE_VECTOR_FAILED",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
-          details: {
-            indexName,
-            id
-          }
+          details: errorDetails
         },
         error$1
       );
@@ -545,6 +601,83 @@ var MongoDBVector = class extends vector.MastraVector {
       );
     }
   }
+  async deleteVectors({ indexName, filter, ids }) {
+    if (!filter && !ids) {
+      throw new error.MastraError({
+        id: "STORAGE_MONGODB_VECTOR_DELETE_MISSING_PARAMS",
+        domain: error.ErrorDomain.STORAGE,
+        category: error.ErrorCategory.USER,
+        details: { indexName },
+        text: "Either filter or ids must be provided"
+      });
+    }
+    if (filter && ids) {
+      throw new error.MastraError({
+        id: "STORAGE_MONGODB_VECTOR_DELETE_CONFLICTING_PARAMS",
+        domain: error.ErrorDomain.STORAGE,
+        category: error.ErrorCategory.USER,
+        details: { indexName },
+        text: "Cannot provide both filter and ids - they are mutually exclusive"
+      });
+    }
+    try {
+      const collection = await this.getCollection(indexName, true);
+      if (ids) {
+        if (ids.length === 0) {
+          throw new error.MastraError({
+            id: "STORAGE_MONGODB_VECTOR_DELETE_EMPTY_IDS",
+            domain: error.ErrorDomain.STORAGE,
+            category: error.ErrorCategory.USER,
+            details: { indexName },
+            text: "Cannot delete with empty ids array"
+          });
+        }
+        await collection.deleteMany({ _id: { $in: ids } });
+      } else {
+        if (!filter || Object.keys(filter).length === 0) {
+          throw new error.MastraError({
+            id: "STORAGE_MONGODB_VECTOR_DELETE_EMPTY_FILTER",
+            domain: error.ErrorDomain.STORAGE,
+            category: error.ErrorCategory.USER,
+            details: { indexName },
+            text: "Cannot delete with empty filter"
+          });
+        }
+        const mongoFilter = this.transformFilter(filter);
+        const transformedFilter = this.transformMetadataFilter(mongoFilter);
+        if (!transformedFilter || Object.keys(transformedFilter).length === 0) {
+          throw new error.MastraError({
+            id: "STORAGE_MONGODB_VECTOR_DELETE_INVALID_FILTER",
+            domain: error.ErrorDomain.STORAGE,
+            category: error.ErrorCategory.USER,
+            details: { indexName },
+            text: "Filter produced empty query"
+          });
+        }
+        const finalFilter = {
+          $and: [{ _id: { $ne: "__index_metadata__" } }, transformedFilter]
+        };
+        await collection.deleteMany(finalFilter);
+      }
+    } catch (error$1) {
+      if (error$1 instanceof error.MastraError) {
+        throw error$1;
+      }
+      throw new error.MastraError(
+        {
+          id: "STORAGE_MONGODB_VECTOR_DELETE_VECTORS_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: {
+            indexName,
+            ...filter && { filter: JSON.stringify(filter) },
+            ...ids && { idsCount: ids.length }
+          }
+        },
+        error$1
+      );
+    }
+  }
   // Private methods
   async getCollection(indexName, throwIfNotExists = true) {
     if (this.collections.has(indexName)) {
@@ -592,16 +725,26 @@ var MongoDBVector = class extends vector.MastraVector {
    */
   transformMetadataFilter(filter) {
     if (!filter || typeof filter !== "object") return filter;
+    if (Array.isArray(filter)) {
+      return filter.map((item) => this.transformMetadataFilter(item));
+    }
     const transformed = {};
     for (const [key, value] of Object.entries(filter)) {
       if (key.startsWith("$")) {
         if (Array.isArray(value)) {
           transformed[key] = value.map((item) => this.transformMetadataFilter(item));
-        } else {
+        } else if (typeof value === "object" && value !== null) {
           transformed[key] = this.transformMetadataFilter(value);
+        } else {
+          transformed[key] = value;
         }
       } else if (key.startsWith("metadata.")) {
-        transformed[key] = value;
+        if (typeof value === "object" && value !== null && !Array.isArray(value)) {
+          const hasOperator = Object.keys(value).some((k) => k.startsWith("$"));
+          transformed[key] = hasOperator ? value : value;
+        } else {
+          transformed[key] = value;
+        }
       } else if (this.isMetadataField(key)) {
         transformed[`metadata.${key}`] = value;
       } else {
@@ -844,11 +987,27 @@ var LegacyEvalsMongoDB = class extends storage.LegacyEvalsStorage {
     }
   }
 };
-
-// src/storage/domains/utils.ts
 function formatDateForMongoDB(date) {
   return typeof date === "string" ? new Date(date) : date;
 }
+var transformRow = ({ row, tableName }) => {
+  const tableSchema = storage.TABLE_SCHEMAS[tableName];
+  const result = {};
+  Object.entries(tableSchema).forEach(([key, columnSchema]) => {
+    const value = row[key];
+    if (value === void 0 || value === null) {
+      return;
+    }
+    if (columnSchema.type === "jsonb" && typeof value === "string") {
+      result[key] = storage.safelyParseJSON(value);
+    } else if (columnSchema.type === "timestamp" && typeof value === "string") {
+      result[key] = new Date(value);
+    } else {
+      result[key] = value;
+    }
+  });
+  return result;
+};
 
 // src/storage/domains/memory/index.ts
 var MemoryStorageMongoDB = class extends storage.MemoryStorage {
@@ -1022,7 +1181,11 @@ var MemoryStorageMongoDB = class extends storage.MemoryStorage {
       }
       const dataResult = await collection.find(query).sort({ createdAt: -1 }).skip(currentOffset).limit(perPage).toArray();
       messages.push(...dataResult.map((row) => this.parseRow(row)));
-      const messagesToReturn = format === "v1" ? new agent.MessageList().add(messages, "memory").get.all.v1() : new agent.MessageList().add(messages, "memory").get.all.v2();
+      const list = new agent.MessageList().add(messages, "memory");
+      let messagesToReturn = format === "v1" ? list.get.all.v1() : list.get.all.v2();
+      messagesToReturn = messagesToReturn.sort(
+        (a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()
+      );
       return {
         messages: messagesToReturn,
         total,
@@ -1907,98 +2070,8 @@ var StoreOperationsMongoDB = class extends storage.StoreOperations {
   }
 };
 function transformScoreRow(row) {
-  let scorerValue = null;
-  if (row.scorer) {
-    try {
-      scorerValue = typeof row.scorer === "string" ? storage.safelyParseJSON(row.scorer) : row.scorer;
-    } catch (e) {
-      console.warn("Failed to parse scorer:", e);
-    }
-  }
-  let preprocessStepResultValue = null;
-  if (row.preprocessStepResult) {
-    try {
-      preprocessStepResultValue = typeof row.preprocessStepResult === "string" ? storage.safelyParseJSON(row.preprocessStepResult) : row.preprocessStepResult;
-    } catch (e) {
-      console.warn("Failed to parse preprocessStepResult:", e);
-    }
-  }
-  let analyzeStepResultValue = null;
-  if (row.analyzeStepResult) {
-    try {
-      analyzeStepResultValue = typeof row.analyzeStepResult === "string" ? storage.safelyParseJSON(row.analyzeStepResult) : row.analyzeStepResult;
-    } catch (e) {
-      console.warn("Failed to parse analyzeStepResult:", e);
-    }
-  }
-  let inputValue = null;
-  if (row.input) {
-    try {
-      inputValue = typeof row.input === "string" ? storage.safelyParseJSON(row.input) : row.input;
-    } catch (e) {
-      console.warn("Failed to parse input:", e);
-    }
-  }
-  let outputValue = null;
-  if (row.output) {
-    try {
-      outputValue = typeof row.output === "string" ? storage.safelyParseJSON(row.output) : row.output;
-    } catch (e) {
-      console.warn("Failed to parse output:", e);
-    }
-  }
-  let entityValue = null;
-  if (row.entity) {
-    try {
-      entityValue = typeof row.entity === "string" ? storage.safelyParseJSON(row.entity) : row.entity;
-    } catch (e) {
-      console.warn("Failed to parse entity:", e);
-    }
-  }
-  let runtimeContextValue = null;
-  if (row.runtimeContext) {
-    try {
-      runtimeContextValue = typeof row.runtimeContext === "string" ? storage.safelyParseJSON(row.runtimeContext) : row.runtimeContext;
-    } catch (e) {
-      console.warn("Failed to parse runtimeContext:", e);
-    }
-  }
-  let metadataValue = null;
-  if (row.metadata) {
-    try {
-      metadataValue = typeof row.metadata === "string" ? storage.safelyParseJSON(row.metadata) : row.metadata;
-    } catch (e) {
-      console.warn("Failed to parse metadata:", e);
-    }
-  }
-  return {
-    id: row.id,
-    entityId: row.entityId,
-    entityType: row.entityType,
-    scorerId: row.scorerId,
-    traceId: row.traceId,
-    spanId: row.spanId,
-    runId: row.runId,
-    scorer: scorerValue,
-    preprocessStepResult: preprocessStepResultValue,
-    preprocessPrompt: row.preprocessPrompt,
-    analyzeStepResult: analyzeStepResultValue,
-    generateScorePrompt: row.generateScorePrompt,
-    score: row.score,
-    analyzePrompt: row.analyzePrompt,
-    reasonPrompt: row.reasonPrompt,
-    metadata: metadataValue,
-    input: inputValue,
-    output: outputValue,
-    additionalContext: row.additionalContext,
-    runtimeContext: runtimeContextValue,
-    entity: entityValue,
-    source: row.source,
-    resourceId: row.resourceId,
-    threadId: row.threadId,
-    createdAt: new Date(row.createdAt),
-    updatedAt: new Date(row.updatedAt)
-  };
+  const transformedRow = transformRow({ row, tableName: storage.TABLE_SCORERS });
+  return transformedRow;
 }
 var ScoresStorageMongoDB = class extends storage.ScoresStorage {
   operations;
@@ -2043,36 +2116,29 @@ var ScoresStorageMongoDB = class extends storage.ScoresStorage {
     try {
       const now = /* @__PURE__ */ new Date();
       const scoreId = `score-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
-      const scoreData = {
-        id: scoreId,
-        entityId: validatedScore.entityId,
-        entityType: validatedScore.entityType,
-        scorerId: validatedScore.scorerId,
-        traceId: validatedScore.traceId || "",
-        spanId: validatedScore.spanId || "",
-        runId: validatedScore.runId,
-        scorer: typeof validatedScore.scorer === "string" ? storage.safelyParseJSON(validatedScore.scorer) : validatedScore.scorer,
-        preprocessStepResult: typeof validatedScore.preprocessStepResult === "string" ? storage.safelyParseJSON(validatedScore.preprocessStepResult) : validatedScore.preprocessStepResult,
-        analyzeStepResult: typeof validatedScore.analyzeStepResult === "string" ? storage.safelyParseJSON(validatedScore.analyzeStepResult) : validatedScore.analyzeStepResult,
-        score: validatedScore.score,
-        reason: validatedScore.reason,
-        preprocessPrompt: validatedScore.preprocessPrompt,
-        generateScorePrompt: validatedScore.generateScorePrompt,
-        generateReasonPrompt: validatedScore.generateReasonPrompt,
-        analyzePrompt: validatedScore.analyzePrompt,
-        input: typeof validatedScore.input === "string" ? storage.safelyParseJSON(validatedScore.input) : validatedScore.input,
-        output: typeof validatedScore.output === "string" ? storage.safelyParseJSON(validatedScore.output) : validatedScore.output,
-        additionalContext: validatedScore.additionalContext,
-        runtimeContext: typeof validatedScore.runtimeContext === "string" ? storage.safelyParseJSON(validatedScore.runtimeContext) : validatedScore.runtimeContext,
-        entity: typeof validatedScore.entity === "string" ? storage.safelyParseJSON(validatedScore.entity) : validatedScore.entity,
-        source: validatedScore.source,
-        resourceId: validatedScore.resourceId || "",
-        threadId: validatedScore.threadId || "",
-        createdAt: now,
-        updatedAt: now
+      const scorer = typeof validatedScore.scorer === "string" ? storage.safelyParseJSON(validatedScore.scorer) : validatedScore.scorer;
+      const preprocessStepResult = typeof validatedScore.preprocessStepResult === "string" ? storage.safelyParseJSON(validatedScore.preprocessStepResult) : validatedScore.preprocessStepResult;
+      const analyzeStepResult = typeof validatedScore.analyzeStepResult === "string" ? storage.safelyParseJSON(validatedScore.analyzeStepResult) : validatedScore.analyzeStepResult;
+      const input = typeof validatedScore.input === "string" ? storage.safelyParseJSON(validatedScore.input) : validatedScore.input;
+      const output = typeof validatedScore.output === "string" ? storage.safelyParseJSON(validatedScore.output) : validatedScore.output;
+      const runtimeContext = typeof validatedScore.runtimeContext === "string" ? storage.safelyParseJSON(validatedScore.runtimeContext) : validatedScore.runtimeContext;
+      const entity = typeof validatedScore.entity === "string" ? storage.safelyParseJSON(validatedScore.entity) : validatedScore.entity;
+      const createdAt = now;
+      const updatedAt = now;
+      const dataToSave = {
+        ...validatedScore,
+        scorer,
+        preprocessStepResult,
+        analyzeStepResult,
+        input,
+        output,
+        runtimeContext,
+        entity,
+        createdAt,
+        updatedAt
       };
       const collection = await this.operations.getCollection(storage.TABLE_SCORERS);
-      await collection.insertOne(scoreData);
+      await collection.insertOne(dataToSave);
       const savedScore = {
         ...score,
         id: scoreId,