@mastra/upstash 0.10.3-alpha.1 → 0.10.3-alpha.3

package/dist/index.cjs

@@ -363,36 +363,36 @@ var init_version = chunkU74OJRHU_cjs.__esm({
   }
 });
 
-// ../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.34.0/node_modules/@opentelemetry/semantic-conventions/build/esm/trace/SemanticAttributes.js
+// ../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.33.0/node_modules/@opentelemetry/semantic-conventions/build/esm/trace/SemanticAttributes.js
 var init_SemanticAttributes = chunkU74OJRHU_cjs.__esm({
-  "../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.34.0/node_modules/@opentelemetry/semantic-conventions/build/esm/trace/SemanticAttributes.js"() {
+  "../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.33.0/node_modules/@opentelemetry/semantic-conventions/build/esm/trace/SemanticAttributes.js"() {
   }
 });
 
-// ../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.34.0/node_modules/@opentelemetry/semantic-conventions/build/esm/trace/index.js
+// ../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.33.0/node_modules/@opentelemetry/semantic-conventions/build/esm/trace/index.js
 var init_trace = chunkU74OJRHU_cjs.__esm({
-  "../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.34.0/node_modules/@opentelemetry/semantic-conventions/build/esm/trace/index.js"() {
+  "../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.33.0/node_modules/@opentelemetry/semantic-conventions/build/esm/trace/index.js"() {
     init_SemanticAttributes();
   }
 });
 
-// ../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.34.0/node_modules/@opentelemetry/semantic-conventions/build/esm/resource/SemanticResourceAttributes.js
+// ../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.33.0/node_modules/@opentelemetry/semantic-conventions/build/esm/resource/SemanticResourceAttributes.js
 var init_SemanticResourceAttributes = chunkU74OJRHU_cjs.__esm({
-  "../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.34.0/node_modules/@opentelemetry/semantic-conventions/build/esm/resource/SemanticResourceAttributes.js"() {
+  "../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.33.0/node_modules/@opentelemetry/semantic-conventions/build/esm/resource/SemanticResourceAttributes.js"() {
   }
 });
 
-// ../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.34.0/node_modules/@opentelemetry/semantic-conventions/build/esm/resource/index.js
+// ../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.33.0/node_modules/@opentelemetry/semantic-conventions/build/esm/resource/index.js
 var init_resource = chunkU74OJRHU_cjs.__esm({
-  "../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.34.0/node_modules/@opentelemetry/semantic-conventions/build/esm/resource/index.js"() {
+  "../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.33.0/node_modules/@opentelemetry/semantic-conventions/build/esm/resource/index.js"() {
     init_SemanticResourceAttributes();
   }
 });
 
-// ../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.34.0/node_modules/@opentelemetry/semantic-conventions/build/esm/stable_attributes.js
+// ../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.33.0/node_modules/@opentelemetry/semantic-conventions/build/esm/stable_attributes.js
 var ATTR_TELEMETRY_SDK_LANGUAGE, TELEMETRY_SDK_LANGUAGE_VALUE_NODEJS, ATTR_TELEMETRY_SDK_NAME, ATTR_TELEMETRY_SDK_VERSION;
 var init_stable_attributes = chunkU74OJRHU_cjs.__esm({
-  "../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.34.0/node_modules/@opentelemetry/semantic-conventions/build/esm/stable_attributes.js"() {
+  "../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.33.0/node_modules/@opentelemetry/semantic-conventions/build/esm/stable_attributes.js"() {
     ATTR_TELEMETRY_SDK_LANGUAGE = "telemetry.sdk.language";
     TELEMETRY_SDK_LANGUAGE_VALUE_NODEJS = "nodejs";
     ATTR_TELEMETRY_SDK_NAME = "telemetry.sdk.name";
@@ -400,15 +400,15 @@ var init_stable_attributes = chunkU74OJRHU_cjs.__esm({
   }
 });
 
-// ../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.34.0/node_modules/@opentelemetry/semantic-conventions/build/esm/stable_metrics.js
+// ../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.33.0/node_modules/@opentelemetry/semantic-conventions/build/esm/stable_metrics.js
 var init_stable_metrics = chunkU74OJRHU_cjs.__esm({
-  "../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.34.0/node_modules/@opentelemetry/semantic-conventions/build/esm/stable_metrics.js"() {
+  "../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.33.0/node_modules/@opentelemetry/semantic-conventions/build/esm/stable_metrics.js"() {
   }
 });
 
-// ../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.34.0/node_modules/@opentelemetry/semantic-conventions/build/esm/index.js
+// ../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.33.0/node_modules/@opentelemetry/semantic-conventions/build/esm/index.js
 var init_esm2 = chunkU74OJRHU_cjs.__esm({
-  "../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.34.0/node_modules/@opentelemetry/semantic-conventions/build/esm/index.js"() {
+  "../../node_modules/.pnpm/@opentelemetry+semantic-conventions@1.33.0/node_modules/@opentelemetry/semantic-conventions/build/esm/index.js"() {
     init_trace();
     init_resource();
     init_stable_attributes();
@@ -1697,9 +1697,9 @@ var require_pool = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/src/util/longbits.js
+// ../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/src/util/longbits.js
 var require_longbits = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/src/util/longbits.js"(exports2, module2) {
+  "../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/src/util/longbits.js"(exports2, module2) {
     module2.exports = LongBits;
     var util = require_minimal();
     function LongBits(lo, hi) {
@@ -1798,9 +1798,9 @@ var require_longbits = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/src/util/minimal.js
+// ../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/src/util/minimal.js
 var require_minimal = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/src/util/minimal.js"(exports2) {
+  "../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/src/util/minimal.js"(exports2) {
     var util = exports2;
     util.asPromise = require_aspromise();
     util.base64 = require_base64();
@@ -1972,9 +1972,9 @@ var require_minimal = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/src/writer.js
+// ../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/src/writer.js
 var require_writer = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/src/writer.js"(exports2, module2) {
+  "../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/src/writer.js"(exports2, module2) {
     module2.exports = Writer;
     var util = require_minimal();
     var BufferWriter;
@@ -2162,9 +2162,9 @@ var require_writer = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/src/writer_buffer.js
+// ../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/src/writer_buffer.js
 var require_writer_buffer = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/src/writer_buffer.js"(exports2, module2) {
+  "../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/src/writer_buffer.js"(exports2, module2) {
     module2.exports = BufferWriter;
     var Writer = require_writer();
     (BufferWriter.prototype = Object.create(Writer.prototype)).constructor = BufferWriter;
@@ -2211,9 +2211,9 @@ var require_writer_buffer = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/src/reader.js
+// ../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/src/reader.js
 var require_reader = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/src/reader.js"(exports2, module2) {
+  "../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/src/reader.js"(exports2, module2) {
     module2.exports = Reader;
     var util = require_minimal();
     var BufferReader;
@@ -2434,9 +2434,9 @@ var require_reader = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/src/reader_buffer.js
+// ../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/src/reader_buffer.js
 var require_reader_buffer = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/src/reader_buffer.js"(exports2, module2) {
+  "../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/src/reader_buffer.js"(exports2, module2) {
     module2.exports = BufferReader;
     var Reader = require_reader();
     (BufferReader.prototype = Object.create(Reader.prototype)).constructor = BufferReader;
@@ -2456,9 +2456,9 @@ var require_reader_buffer = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/src/rpc/service.js
+// ../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/src/rpc/service.js
 var require_service = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/src/rpc/service.js"(exports2, module2) {
+  "../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/src/rpc/service.js"(exports2, module2) {
     module2.exports = Service;
     var util = require_minimal();
     (Service.prototype = Object.create(util.EventEmitter.prototype)).constructor = Service;
@@ -2530,24 +2530,24 @@ var require_service = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/src/rpc.js
+// ../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/src/rpc.js
 var require_rpc = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/src/rpc.js"(exports2) {
+  "../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/src/rpc.js"(exports2) {
     var rpc = exports2;
     rpc.Service = require_service();
   }
 });
 
-// ../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/src/roots.js
+// ../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/src/roots.js
 var require_roots = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/src/roots.js"(exports2, module2) {
+  "../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/src/roots.js"(exports2, module2) {
     module2.exports = {};
   }
 });
 
-// ../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/src/index-minimal.js
+// ../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/src/index-minimal.js
 var require_index_minimal = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/src/index-minimal.js"(exports2) {
+  "../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/src/index-minimal.js"(exports2) {
     var protobuf = exports2;
     protobuf.build = "minimal";
     protobuf.Writer = require_writer();
@@ -2567,9 +2567,9 @@ var require_index_minimal = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/minimal.js
+// ../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/minimal.js
 var require_minimal2 = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/protobufjs@7.5.3/node_modules/protobufjs/minimal.js"(exports2, module2) {
+  "../../node_modules/.pnpm/protobufjs@7.4.0/node_modules/protobufjs/minimal.js"(exports2, module2) {
     module2.exports = require_index_minimal();
   }
 });
@@ -12228,16 +12228,16 @@ var require_chunk_LABUWBKX = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/Types.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/Types.js
 var require_Types = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/Types.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/Types.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseAnyOf.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseAnyOf.js
 var require_parseAnyOf = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseAnyOf.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseAnyOf.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseAnyOf = void 0;
     var parseSchema_js_1 = require_parseSchema();
@@ -12251,9 +12251,9 @@ var require_parseAnyOf = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseBoolean.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseBoolean.js
 var require_parseBoolean = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseBoolean.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseBoolean.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseBoolean = void 0;
     var parseBoolean = (_schema) => {
@@ -12263,9 +12263,9 @@ var require_parseBoolean = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseDefault.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseDefault.js
 var require_parseDefault = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseDefault.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseDefault.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseDefault = void 0;
     var parseDefault = (_schema) => {
@@ -12275,22 +12275,22 @@ var require_parseDefault = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseMultipleType.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseMultipleType.js
 var require_parseMultipleType = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseMultipleType.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseMultipleType.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseMultipleType = void 0;
     var parseSchema_js_1 = require_parseSchema();
     var parseMultipleType = (schema, refs) => {
-      return `z.union([${schema.type.map((type) => (0, parseSchema_js_1.parseSchema)({ ...schema, type }, { ...refs, withoutDefaults: true })).join(", ")}])`;
+      return `z.union([${schema.type.map((type) => (0, parseSchema_js_1.parseSchema)({ ...schema, type }, refs)).join(", ")}])`;
     };
     exports2.parseMultipleType = parseMultipleType;
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseNot.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseNot.js
 var require_parseNot = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseNot.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseNot.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseNot = void 0;
     var parseSchema_js_1 = require_parseSchema();
@@ -12304,9 +12304,9 @@ var require_parseNot = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseNull.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseNull.js
 var require_parseNull = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseNull.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseNull.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseNull = void 0;
     var parseNull = (_schema) => {
@@ -12316,9 +12316,9 @@ var require_parseNull = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/utils/half.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/utils/half.js
 var require_half = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/utils/half.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/utils/half.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.half = void 0;
     var half = (arr) => {
@@ -12328,9 +12328,9 @@ var require_half = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseAllOf.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseAllOf.js
 var require_parseAllOf = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseAllOf.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseAllOf.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseAllOf = void 0;
     var parseSchema_js_1 = require_parseSchema();
@@ -12370,9 +12370,9 @@ var require_parseAllOf = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/utils/withMessage.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/utils/withMessage.js
 var require_withMessage = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/utils/withMessage.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/utils/withMessage.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.withMessage = void 0;
     function withMessage(schema, key, get) {
@@ -12397,9 +12397,9 @@ var require_withMessage = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseArray.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseArray.js
 var require_parseArray = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseArray.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseArray.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseArray = void 0;
     var withMessage_js_1 = require_withMessage();
@@ -12428,9 +12428,9 @@ var require_parseArray = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseConst.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseConst.js
 var require_parseConst = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseConst.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseConst.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseConst = void 0;
     var parseConst = (schema) => {
@@ -12440,9 +12440,9 @@ var require_parseConst = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseEnum.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseEnum.js
 var require_parseEnum = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseEnum.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseEnum.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseEnum = void 0;
     var parseEnum = (schema) => {
@@ -12460,9 +12460,9 @@ var require_parseEnum = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseIfThenElse.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseIfThenElse.js
 var require_parseIfThenElse = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseIfThenElse.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseIfThenElse.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseIfThenElse = void 0;
     var parseSchema_js_1 = require_parseSchema();
@@ -12489,9 +12489,9 @@ var require_parseIfThenElse = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseNumber.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseNumber.js
 var require_parseNumber = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseNumber.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseNumber.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseNumber = void 0;
     var withMessage_js_1 = require_withMessage();
@@ -12563,9 +12563,9 @@ var require_parseNumber = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseOneOf.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseOneOf.js
 var require_parseOneOf = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseOneOf.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseOneOf.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseOneOf = void 0;
     var parseSchema_js_1 = require_parseSchema();
@@ -12600,9 +12600,9 @@ var require_parseOneOf = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/utils/jsdocs.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/utils/jsdocs.js
 var require_jsdocs = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/utils/jsdocs.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/utils/jsdocs.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.addJsdocs = exports2.expandJsdocs = void 0;
     var expandJsdocs = (jsdocs) => {
@@ -12626,9 +12626,9 @@ ${(0, exports2.expandJsdocs)(description)}${parsed}`;
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseObject.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseObject.js
 var require_parseObject = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseObject.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseObject.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseObject = void 0;
     var parseAnyOf_js_1 = require_parseAnyOf();
@@ -12773,9 +12773,9 @@ var require_parseObject = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseString.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseString.js
 var require_parseString = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseString.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseString.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseString = void 0;
     var withMessage_js_1 = require_withMessage();
@@ -12855,9 +12855,9 @@ var require_parseString = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/utils/omit.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/utils/omit.js
 var require_omit = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/utils/omit.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/utils/omit.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.omit = void 0;
     var omit = (obj, ...keys) => Object.keys(obj).reduce((acc, key) => {
@@ -12870,9 +12870,9 @@ var require_omit = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseNullable.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseNullable.js
 var require_parseNullable = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseNullable.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseNullable.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseNullable = void 0;
     var omit_js_1 = require_omit();
@@ -12884,9 +12884,9 @@ var require_parseNullable = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseSchema.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseSchema.js
 var require_parseSchema = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/parsers/parseSchema.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/parsers/parseSchema.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.its = exports2.parseSchema = void 0;
     var parseAnyOf_js_1 = require_parseAnyOf();
@@ -13015,9 +13015,9 @@ var require_parseSchema = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/jsonSchemaToZod.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/jsonSchemaToZod.js
 var require_jsonSchemaToZod = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/jsonSchemaToZod.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/jsonSchemaToZod.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.jsonSchemaToZod = void 0;
     var parseSchema_js_1 = require_parseSchema();
@@ -13064,9 +13064,9 @@ ${result}`;
   }
 });
 
-// ../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/index.js
+// ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/index.js
 var require_cjs = chunkU74OJRHU_cjs.__commonJS({
-  "../../node_modules/.pnpm/json-schema-to-zod@2.6.1/node_modules/json-schema-to-zod/dist/cjs/index.js"(exports2) {
+  "../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/cjs/index.js"(exports2) {
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0) k2 = k;
       var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -31172,9 +31172,9 @@ var require_chunk_QVROTSA5 = chunkU74OJRHU_cjs.__commonJS({
   }
 });
 
-// ../../packages/core/dist/chunk-H5IRI46R.cjs
-var require_chunk_H5IRI46R = chunkU74OJRHU_cjs.__commonJS({
-  "../../packages/core/dist/chunk-H5IRI46R.cjs"(exports2) {
+// ../../packages/core/dist/chunk-XUODQRSL.cjs
+var require_chunk_XUODQRSL = chunkU74OJRHU_cjs.__commonJS({
+  "../../packages/core/dist/chunk-XUODQRSL.cjs"(exports2) {
     var chunkQVROTSA5_cjs = require_chunk_QVROTSA5();
     var crypto2 = chunkU74OJRHU_cjs.__require("crypto");
     var ai = require_dist4();
@@ -31746,7 +31746,7 @@ ${JSON.stringify(message, null, 2)}`
         }
         const latestMessagePartType = latestMessage?.content?.parts?.filter((p) => p.type !== `step-start`)?.at?.(-1)?.type;
         const newMessageFirstPartType = messageV2.content.parts.filter((p) => p.type !== `step-start`).at(0)?.type;
-        const shouldAppendToLastAssistantMessage = latestMessage?.role === "assistant" && messageV2.role === "assistant";
+        const shouldAppendToLastAssistantMessage = latestMessage?.role === "assistant" && messageV2.role === "assistant" && latestMessage.threadId === messageV2.threadId;
         const shouldAppendToLastAssistantMessageParts = shouldAppendToLastAssistantMessage && newMessageFirstPartType && (newMessageFirstPartType === `tool-invocation` && latestMessagePartType !== `text` || newMessageFirstPartType === latestMessagePartType);
         if (
           // backwards compat check!
@@ -31824,7 +31824,11 @@ ${JSON.stringify(message, null, 2)}`
         return this;
       }
       inputToMastraMessageV2(message, messageSource) {
-        if (`threadId` in message && message.threadId && this.memoryInfo && message.threadId !== this.memoryInfo.threadId) {
+        if (
+          // we can't throw if the threadId doesn't match and this message came from memory
+          // this is because per-user semantic recall can retrieve messages from other threads
+          messageSource !== `memory` && `threadId` in message && message.threadId && this.memoryInfo && message.threadId !== this.memoryInfo.threadId
+        ) {
           throw new Error(
             `Received input message with wrong threadId. Input ${message.threadId}, expected ${this.memoryInfo.threadId}`
           );
@@ -34705,7 +34709,7 @@ var init_es5m = chunkU74OJRHU_cjs.__esm({
   }
 });
 
-// ../../node_modules/.pnpm/xstate@5.19.4/node_modules/xstate/dev/dist/xstate-dev.esm.js
+// ../../node_modules/.pnpm/xstate@5.19.2/node_modules/xstate/dev/dist/xstate-dev.esm.js
 function getGlobal() {
   if (typeof globalThis !== "undefined") {
     return globalThis;
@@ -34729,7 +34733,7 @@ function getDevTools() {
 }
 var devToolsAdapter;
 var init_xstate_dev_esm = chunkU74OJRHU_cjs.__esm({
-  "../../node_modules/.pnpm/xstate@5.19.4/node_modules/xstate/dev/dist/xstate-dev.esm.js"() {
+  "../../node_modules/.pnpm/xstate@5.19.2/node_modules/xstate/dev/dist/xstate-dev.esm.js"() {
     devToolsAdapter = (service) => {
       if (typeof window === "undefined") {
         return;
@@ -34742,7 +34746,7 @@ var init_xstate_dev_esm = chunkU74OJRHU_cjs.__esm({
   }
 });
 
-// ../../node_modules/.pnpm/xstate@5.19.4/node_modules/xstate/dist/raise-3e01e82a.esm.js
+// ../../node_modules/.pnpm/xstate@5.19.2/node_modules/xstate/dist/raise-c17ec2bc.esm.js
 function createAfterEvent(delayRef, id) {
   return {
     type: `xstate.after.${delayRef}.${id}`
@@ -36220,21 +36224,6 @@ function cloneMachineSnapshot(snapshot, config = {}) {
     ...config
   }, snapshot.machine);
 }
-function serializeHistoryValue(historyValue) {
-  if (typeof historyValue !== "object" || historyValue === null) {
-    return {};
-  }
-  const result = {};
-  for (const key in historyValue) {
-    const value = historyValue[key];
-    if (Array.isArray(value)) {
-      result[key] = value.map((item) => ({
-        id: item.id
-      }));
-    }
-  }
-  return result;
-}
 function getPersistedSnapshot(snapshot, options) {
   const {
     _nodes: nodes,
@@ -36262,8 +36251,7 @@ function getPersistedSnapshot(snapshot, options) {
   const persisted = {
     ...jsonValues,
     context: persistContext(context2),
-    children: childrenJson,
-    historyValue: serializeHistoryValue(jsonValues.historyValue)
+    children: childrenJson
   };
   return persisted;
 }
@@ -36350,8 +36338,8 @@ function raise(eventOrExpr, options) {
   return raise2;
 }
 var Mailbox, STATE_DELIMITER, TARGETLESS_KEY, NULL_EVENT, STATE_IDENTIFIER, WILDCARD, XSTATE_INIT, XSTATE_ERROR, XSTATE_STOP, symbolObservable, idCounter, $$ACTOR_TYPE, ProcessingStatus, defaultOptions, Actor, interpret, stop, isAtomicStateNode, isStateId, machineSnapshotMatches, machineSnapshotHasTag, machineSnapshotCan, machineSnapshotToJSON, machineSnapshotGetMeta;
-var init_raise_3e01e82a_esm = chunkU74OJRHU_cjs.__esm({
-  "../../node_modules/.pnpm/xstate@5.19.4/node_modules/xstate/dist/raise-3e01e82a.esm.js"() {
+var init_raise_c17ec2bc_esm = chunkU74OJRHU_cjs.__esm({
+  "../../node_modules/.pnpm/xstate@5.19.2/node_modules/xstate/dist/raise-c17ec2bc.esm.js"() {
     init_xstate_dev_esm();
     Mailbox = class {
       constructor(_process) {
@@ -36993,7 +36981,7 @@ var init_raise_3e01e82a_esm = chunkU74OJRHU_cjs.__esm({
   }
 });
 
-// ../../node_modules/.pnpm/xstate@5.19.4/node_modules/xstate/actors/dist/xstate-actors.esm.js
+// ../../node_modules/.pnpm/xstate@5.19.2/node_modules/xstate/actors/dist/xstate-actors.esm.js
 function fromTransition(transition2, initialContext) {
   return {
     config: transition2,
@@ -37352,8 +37340,8 @@ function createEmptyActor() {
 }
 var instanceStates, XSTATE_OBSERVABLE_NEXT, XSTATE_OBSERVABLE_ERROR, XSTATE_OBSERVABLE_COMPLETE, XSTATE_PROMISE_RESOLVE, XSTATE_PROMISE_REJECT, controllerMap, emptyLogic;
 var init_xstate_actors_esm = chunkU74OJRHU_cjs.__esm({
-  "../../node_modules/.pnpm/xstate@5.19.4/node_modules/xstate/actors/dist/xstate-actors.esm.js"() {
-    init_raise_3e01e82a_esm();
+  "../../node_modules/.pnpm/xstate@5.19.2/node_modules/xstate/actors/dist/xstate-actors.esm.js"() {
+    init_raise_c17ec2bc_esm();
     init_xstate_dev_esm();
     instanceStates = /* @__PURE__ */ new WeakMap();
     XSTATE_OBSERVABLE_NEXT = "xstate.observable.next";
@@ -37366,7 +37354,7 @@ var init_xstate_actors_esm = chunkU74OJRHU_cjs.__esm({
   }
 });
 
-// ../../node_modules/.pnpm/xstate@5.19.4/node_modules/xstate/dist/log-655aa404.esm.js
+// ../../node_modules/.pnpm/xstate@5.19.2/node_modules/xstate/dist/log-3d9d72a9.esm.js
 function createSpawner(actorScope, {
   machine,
   context: context2
@@ -37658,9 +37646,9 @@ function log(value = ({
   return log2;
 }
 var SpecialTargets;
-var init_log_655aa404_esm = chunkU74OJRHU_cjs.__esm({
-  "../../node_modules/.pnpm/xstate@5.19.4/node_modules/xstate/dist/log-655aa404.esm.js"() {
-    init_raise_3e01e82a_esm();
+var init_log_3d9d72a9_esm = chunkU74OJRHU_cjs.__esm({
+  "../../node_modules/.pnpm/xstate@5.19.2/node_modules/xstate/dist/log-3d9d72a9.esm.js"() {
+    init_raise_c17ec2bc_esm();
     SpecialTargets = /* @__PURE__ */ function(SpecialTargets2) {
       SpecialTargets2["Parent"] = "#_parent";
       SpecialTargets2["Internal"] = "#_internal";
@@ -37669,7 +37657,7 @@ var init_log_655aa404_esm = chunkU74OJRHU_cjs.__esm({
   }
 });
 
-// ../../node_modules/.pnpm/xstate@5.19.4/node_modules/xstate/dist/xstate.esm.js
+// ../../node_modules/.pnpm/xstate@5.19.2/node_modules/xstate/dist/xstate.esm.js
 var xstate_esm_exports = {};
 chunkU74OJRHU_cjs.__export(xstate_esm_exports, {
   Actor: () => Actor,
@@ -37878,12 +37866,12 @@ function waitFor(actorRef, predicate, options) {
 }
 var cache, EMPTY_OBJECT, toSerializableAction, StateNode, STATE_IDENTIFIER2, StateMachine, SimulatedClock, defaultWaitForOptions;
 var init_xstate_esm = chunkU74OJRHU_cjs.__esm({
-  "../../node_modules/.pnpm/xstate@5.19.4/node_modules/xstate/dist/xstate.esm.js"() {
+  "../../node_modules/.pnpm/xstate@5.19.2/node_modules/xstate/dist/xstate.esm.js"() {
     init_xstate_actors_esm();
-    init_raise_3e01e82a_esm();
-    init_raise_3e01e82a_esm();
-    init_log_655aa404_esm();
-    init_log_655aa404_esm();
+    init_raise_c17ec2bc_esm();
+    init_raise_c17ec2bc_esm();
+    init_log_3d9d72a9_esm();
+    init_log_3d9d72a9_esm();
     init_xstate_dev_esm();
     cache = /* @__PURE__ */ new WeakMap();
     EMPTY_OBJECT = {};
@@ -38145,10 +38133,11 @@ ${err.message}`);
         this.events = this.root.events;
       }
       /**
-       * Clones this state machine with the provided implementations.
+       * Clones this state machine with the provided implementations and merges the
+       * `context` (if provided).
        *
-       * @param implementations Options (`actions`, `guards`, `actors`, `delays`)
-       *   to recursively merge with the existing options.
+       * @param implementations Options (`actions`, `guards`, `actors`, `delays`,
+       *   `context`) to recursively merge with the existing options.
        * @returns A new `StateMachine` instance with the provided implementations.
        */
       provide(implementations) {
@@ -38310,39 +38299,10 @@ ${err.message}`);
           });
           children[actorId] = actorRef;
         });
-        function resolveHistoryReferencedState(root4, referenced) {
-          if (referenced instanceof StateNode) {
-            return referenced;
-          }
-          try {
-            return root4.machine.getStateNodeById(referenced.id);
-          } catch {
-          }
-        }
-        function reviveHistoryValue(root4, historyValue) {
-          if (!historyValue || typeof historyValue !== "object") {
-            return {};
-          }
-          const revived = {};
-          for (const key in historyValue) {
-            const arr = historyValue[key];
-            for (const item of arr) {
-              const resolved = resolveHistoryReferencedState(root4, item);
-              if (!resolved) {
-                continue;
-              }
-              revived[key] ??= [];
-              revived[key].push(resolved);
-            }
-          }
-          return revived;
-        }
-        const revivedHistoryValue = reviveHistoryValue(this.root, snapshot.historyValue);
         const restoredSnapshot = createMachineSnapshot({
           ...snapshot,
           children,
-          _nodes: Array.from(getAllStateNodes(getStateNodes(this.root, snapshot.value))),
-          historyValue: revivedHistoryValue
+          _nodes: Array.from(getAllStateNodes(getStateNodes(this.root, snapshot.value)))
         }, this);
         const seen = /* @__PURE__ */ new Set();
         function reviveContext(contextPart, children2) {
@@ -38437,11 +38397,11 @@ ${err.message}`);
   }
 });
 
-// ../../packages/core/dist/chunk-OKHKG5C7.cjs
-var require_chunk_OKHKG5C7 = chunkU74OJRHU_cjs.__commonJS({
-  "../../packages/core/dist/chunk-OKHKG5C7.cjs"(exports2) {
+// ../../packages/core/dist/chunk-ZWYZGIV3.cjs
+var require_chunk_ZWYZGIV3 = chunkU74OJRHU_cjs.__commonJS({
+  "../../packages/core/dist/chunk-ZWYZGIV3.cjs"(exports2) {
     var chunkJYLH5IY3_cjs = require_chunk_JYLH5IY3();
-    var chunkH5IRI46R_cjs = require_chunk_H5IRI46R();
+    var chunkXUODQRSL_cjs = require_chunk_XUODQRSL();
     var chunkST5RMVLG_cjs = require_chunk_ST5RMVLG();
     var chunkRO5VPM3P_cjs = require_chunk_RO5VPM3P();
     var chunkZAXPU6F2_cjs = require_chunk_ZAXPU6F2();
@@ -38847,7 +38807,7 @@ var require_chunk_OKHKG5C7 = chunkU74OJRHU_cjs.__commonJS({
         memoryConfig,
         resourceId,
         runId,
-        messageList = new chunkH5IRI46R_cjs.MessageList({
+        messageList = new chunkXUODQRSL_cjs.MessageList({
           threadId,
           resourceId
         })
@@ -38862,14 +38822,11 @@ var require_chunk_OKHKG5C7 = chunkU74OJRHU_cjs.__commonJS({
               threadId: threadId || ""
             };
           }
-          const allUIMessages = messageList.get.all.ui();
-          const currentUserMessages = allUIMessages.filter((m) => m.role === "user");
-          const lastUserMessageContent = currentUserMessages.at(-1)?.content ?? "";
           const [memoryMessages, memorySystemMessage] = threadId && memory ? await Promise.all([memory.rememberMessages({
             threadId,
             resourceId,
             config: memoryConfig,
-            vectorMessageSearch: lastUserMessageContent
+            vectorMessageSearch: messageList.getLatestUserContent() || ""
           }).then((r) => r.messagesV2), memory.getSystemMessage({
             threadId,
             memoryConfig
@@ -39218,7 +39175,7 @@ var require_chunk_OKHKG5C7 = chunkU74OJRHU_cjs.__commonJS({
               runId,
               runtimeContext
             });
-            const messageList = new chunkH5IRI46R_cjs.MessageList({
+            const messageList = new chunkXUODQRSL_cjs.MessageList({
               threadId,
               resourceId,
               generateMessageId
@@ -39251,12 +39208,13 @@ var require_chunk_OKHKG5C7 = chunkU74OJRHU_cjs.__commonJS({
               resourceId,
               memoryConfig
             });
-            const [memoryMessages, memorySystemMessage] = threadId && memory ? await Promise.all([memory.rememberMessages({
+            let [memoryMessages, memorySystemMessage] = threadId && memory ? await Promise.all([memory.rememberMessages({
               threadId,
               resourceId,
               config: memoryConfig,
-              vectorMessageSearch: messageList.getLatestUserContent() || ""
-            }).then((r) => r.messages), memory.getSystemMessage({
+              // The new user messages aren't in the list yet cause we add memory messages first to try to make sure ordering is correct (memory comes before new user messages)
+              vectorMessageSearch: new chunkXUODQRSL_cjs.MessageList().add(messages, `user`).getLatestUserContent() || ""
+            }).then((r) => r.messagesV2), memory.getSystemMessage({
               threadId,
               memoryConfig
             })]) : [[], null];
@@ -39265,10 +39223,28 @@ var require_chunk_OKHKG5C7 = chunkU74OJRHU_cjs.__commonJS({
               runId,
               fetchedCount: memoryMessages.length
             });
+            const resultsFromOtherThreads = memoryMessages.filter((m) => m.threadId !== threadId);
+            if (resultsFromOtherThreads.length && !memorySystemMessage) {
+              memorySystemMessage = ``;
+            }
+            if (resultsFromOtherThreads.length) {
+              memorySystemMessage += `
+The following messages were remembered from a different conversation:
+<remembered_from_other_conversation>
+${JSON.stringify(
+                // get v1 since they're closer to CoreMessages (which get sent to the LLM) but also include timestamps
+                new chunkXUODQRSL_cjs.MessageList().add(resultsFromOtherThreads, "memory").get.all.v1()
+              )}
+<end_remembered_from_other_conversation>`;
+            }
             if (memorySystemMessage) {
               messageList.addSystem(memorySystemMessage, "memory");
             }
-            messageList.add(memoryMessages, "memory").add(messages, "user");
+            messageList.add(
+              memoryMessages.filter((m) => m.threadId === threadId),
+              // filter out messages from other threads. those are added to system message above
+              "memory"
+            ).add(messages, "user");
             const systemMessage = messageList.getSystemMessages()?.map((m) => m.content)?.join(`
 `) ?? void 0;
             const processedMemoryMessages = memory.processMessages({
@@ -39280,7 +39256,7 @@ var require_chunk_OKHKG5C7 = chunkU74OJRHU_cjs.__commonJS({
               systemMessage,
               memorySystemMessage: memorySystemMessage || void 0
             });
-            const processedList = new chunkH5IRI46R_cjs.MessageList({
+            const processedList = new chunkXUODQRSL_cjs.MessageList({
               threadId,
               resourceId
             }).addSystem(instructions || `${this.instructions}.`).addSystem(memorySystemMessage).add(context2 || [], "context").add(processedMemoryMessages, "memory").add(messageList.get.input.v2(), "user").get.all.prompt();
@@ -42755,18 +42731,18 @@ var require_chunk_OKHKG5C7 = chunkU74OJRHU_cjs.__commonJS({
 // ../../packages/core/dist/agent/index.cjs
 var require_agent = chunkU74OJRHU_cjs.__commonJS({
   "../../packages/core/dist/agent/index.cjs"(exports2) {
-    var chunkOKHKG5C7_cjs = require_chunk_OKHKG5C7();
-    var chunkH5IRI46R_cjs = require_chunk_H5IRI46R();
+    var chunkZWYZGIV3_cjs = require_chunk_ZWYZGIV3();
+    var chunkXUODQRSL_cjs = require_chunk_XUODQRSL();
     Object.defineProperty(exports2, "Agent", {
       enumerable: true,
       get: function() {
-        return chunkOKHKG5C7_cjs.Agent;
+        return chunkZWYZGIV3_cjs.Agent;
       }
     });
     Object.defineProperty(exports2, "MessageList", {
       enumerable: true,
       get: function() {
-        return chunkH5IRI46R_cjs.MessageList;
+        return chunkXUODQRSL_cjs.MessageList;
       }
     });
   }
@@ -42783,6 +42759,11 @@ var UpstashStore = class extends storage.MastraStorage {
       token: config.token
     });
   }
+  get supports() {
+    return {
+      selectByIncludeResourceScope: true
+    };
+  }
   transformEvalRecord(record) {
     let result = record.result;
     if (typeof result === "string") {
@@ -42867,7 +42848,8 @@ var UpstashStore = class extends storage.MastraStorage {
     return totalDeleted;
   }
   getMessageKey(threadId, messageId) {
-    return this.getKey(storage.TABLE_MESSAGES, { threadId, id: messageId });
+    const key = this.getKey(storage.TABLE_MESSAGES, { threadId, id: messageId });
+    return key;
   }
   getThreadMessagesKey(threadId) {
     return `thread:${threadId}:messages`;
@@ -42963,33 +42945,34 @@ var UpstashStore = class extends storage.MastraStorage {
       return [];
     }
   }
+  /**
+   * @deprecated use getTracesPaginated instead
+   */
   async getTraces(args) {
-    const {
-      name,
-      scope,
-      page,
-      perPage: perPageInput,
-      attributes,
-      filters,
-      fromDate,
-      toDate,
-      returnPaginationResults
-    } = args;
-    const perPage = perPageInput !== void 0 ? perPageInput : 100;
+    if (args.fromDate || args.toDate) {
+      args.dateRange = {
+        start: args.fromDate,
+        end: args.toDate
+      };
+    }
+    const { traces } = await this.getTracesPaginated(args);
+    return traces;
+  }
+  async getTracesPaginated(args) {
+    const { name, scope, page = 0, perPage = 100, attributes, filters, dateRange } = args;
+    const fromDate = dateRange?.start;
+    const toDate = dateRange?.end;
     try {
       const pattern = `${storage.TABLE_TRACES}:*`;
       const keys = await this.scanKeys(pattern);
       if (keys.length === 0) {
-        if (returnPaginationResults) {
-          return {
-            traces: [],
-            total: 0,
-            page,
-            perPage: perPage || 100,
-            hasMore: false
-          };
-        }
-        return [];
+        return {
+          traces: [],
+          total: 0,
+          page,
+          perPage: perPage || 100,
+          hasMore: false
+        };
       }
       const pipeline = this.redis.pipeline();
       keys.forEach((key) => pipeline.get(key));
@@ -43049,29 +43032,22 @@ var UpstashStore = class extends storage.MastraStorage {
       const end = start + resolvedPerPage;
       const paginatedTraces = transformedTraces.slice(start, end);
       const hasMore = end < total;
-      if (returnPaginationResults) {
-        return {
-          traces: paginatedTraces,
-          total,
-          page,
-          perPage: resolvedPerPage,
-          hasMore
-        };
-      } else {
-        return paginatedTraces;
-      }
+      return {
+        traces: paginatedTraces,
+        total,
+        page,
+        perPage: resolvedPerPage,
+        hasMore
+      };
     } catch (error) {
       console.error("Failed to get traces:", error);
-      if (returnPaginationResults) {
-        return {
-          traces: [],
-          total: 0,
-          page,
-          perPage: perPage || 100,
-          hasMore: false
-        };
-      }
-      return [];
+      return {
+        traces: [],
+        total: 0,
+        page,
+        perPage: perPage || 100,
+        hasMore: false
+      };
     }
   }
   async createTable({
@@ -43128,24 +43104,14 @@ var UpstashStore = class extends storage.MastraStorage {
       metadata: typeof thread.metadata === "string" ? JSON.parse(thread.metadata) : thread.metadata
     };
   }
-  async getThreadsByResourceId(args) {
-    const resourceId = args.resourceId;
-    const page = args.page;
-    const perPage = page !== void 0 ? args.perPage !== void 0 ? args.perPage : 100 : 100;
+  /**
+   * @deprecated use getThreadsByResourceIdPaginated instead
+   */
+  async getThreadsByResourceId({ resourceId }) {
     try {
       const pattern = `${storage.TABLE_THREADS}:*`;
       const keys = await this.scanKeys(pattern);
       if (keys.length === 0) {
-        if (page !== void 0) {
-          return {
-            threads: [],
-            total: 0,
-            page,
-            perPage,
-            // perPage is number here
-            hasMore: false
-          };
-        }
         return [];
       }
       const allThreads = [];
@@ -43164,37 +43130,39 @@ var UpstashStore = class extends storage.MastraStorage {
         }
       }
       allThreads.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime());
-      if (page !== void 0) {
-        const total = allThreads.length;
-        const start = page * perPage;
-        const end = start + perPage;
-        const paginatedThreads = allThreads.slice(start, end);
-        const hasMore = end < total;
-        return {
-          threads: paginatedThreads,
-          total,
-          page,
-          perPage,
-          hasMore
-        };
-      } else {
-        return allThreads;
-      }
+      return allThreads;
     } catch (error) {
       console.error("Error in getThreadsByResourceId:", error);
-      if (page !== void 0) {
-        return {
-          threads: [],
-          total: 0,
-          page,
-          perPage,
-          // perPage is number here
-          hasMore: false
-        };
-      }
       return [];
     }
   }
+  async getThreadsByResourceIdPaginated(args) {
+    const { resourceId, page = 0, perPage = 100 } = args;
+    try {
+      const allThreads = await this.getThreadsByResourceId({ resourceId });
+      const total = allThreads.length;
+      const start = page * perPage;
+      const end = start + perPage;
+      const paginatedThreads = allThreads.slice(start, end);
+      const hasMore = end < total;
+      return {
+        threads: paginatedThreads,
+        total,
+        page,
+        perPage,
+        hasMore
+      };
+    } catch (error) {
+      console.error("Error in getThreadsByResourceIdPaginated:", error);
+      return {
+        threads: [],
+        total: 0,
+        page,
+        perPage,
+        hasMore: false
+      };
+    }
+  }
   async saveThread({ thread }) {
     await this.insert({
       tableName: storage.TABLE_THREADS,
@@ -43240,6 +43208,14 @@ var UpstashStore = class extends storage.MastraStorage {
   async saveMessages(args) {
     const { messages, format = "v1" } = args;
     if (messages.length === 0) return [];
+    const threadId = messages[0]?.threadId;
+    if (!threadId) {
+      throw new Error("Thread ID is required");
+    }
+    const thread = await this.getThreadById({ threadId });
+    if (!thread) {
+      throw new Error(`Thread ${threadId} not found`);
+    }
     const messagesWithIndex = messages.map((message, index) => ({
       ...message,
       _index: index
@@ -43250,7 +43226,8 @@ var UpstashStore = class extends storage.MastraStorage {
       const pipeline = this.redis.pipeline();
       for (const message of batch) {
         const key = this.getMessageKey(message.threadId, message.id);
-        const score = message._index !== void 0 ? message._index : new Date(message.createdAt).getTime();
+        const createdAtScore = new Date(message.createdAt).getTime();
+        const score = message._index !== void 0 ? message._index : createdAtScore;
         pipeline.set(key, message);
         pipeline.zadd(this.getThreadMessagesKey(message.threadId), {
           score,
@@ -43263,79 +43240,50 @@ var UpstashStore = class extends storage.MastraStorage {
     if (format === `v2`) return list.get.all.v2();
     return list.get.all.v1();
   }
+  async _getIncludedMessages(threadId, selectBy) {
+    const messageIds = /* @__PURE__ */ new Set();
+    const messageIdToThreadIds = {};
+    if (selectBy?.include?.length) {
+      for (const item of selectBy.include) {
+        messageIds.add(item.id);
+        const itemThreadId = item.threadId || threadId;
+        messageIdToThreadIds[item.id] = itemThreadId;
+        const itemThreadMessagesKey = this.getThreadMessagesKey(itemThreadId);
+        const rank = await this.redis.zrank(itemThreadMessagesKey, item.id);
+        if (rank === null) continue;
+        if (item.withPreviousMessages) {
+          const start = Math.max(0, rank - item.withPreviousMessages);
+          const prevIds = rank === 0 ? [] : await this.redis.zrange(itemThreadMessagesKey, start, rank - 1);
+          prevIds.forEach((id) => {
+            messageIds.add(id);
+            messageIdToThreadIds[id] = itemThreadId;
+          });
+        }
+        if (item.withNextMessages) {
+          const nextIds = await this.redis.zrange(itemThreadMessagesKey, rank + 1, rank + item.withNextMessages);
+          nextIds.forEach((id) => {
+            messageIds.add(id);
+            messageIdToThreadIds[id] = itemThreadId;
+          });
+        }
+      }
+      const pipeline = this.redis.pipeline();
+      Array.from(messageIds).forEach((id) => {
+        const tId = messageIdToThreadIds[id] || threadId;
+        pipeline.get(this.getMessageKey(tId, id));
+      });
+      const results = await pipeline.exec();
+      return results.filter((result) => result !== null);
+    }
+    return [];
+  }
   async getMessages({
     threadId,
     selectBy,
-    format,
-    page,
-    perPage = 40,
-    fromDate,
-    toDate
+    format
   }) {
     const threadMessagesKey = this.getThreadMessagesKey(threadId);
     const allMessageIds = await this.redis.zrange(threadMessagesKey, 0, -1);
-    if (page !== void 0) {
-      try {
-        if (allMessageIds.length === 0) {
-          return {
-            messages: [],
-            total: 0,
-            page,
-            perPage,
-            hasMore: false
-          };
-        }
-        const pipeline = this.redis.pipeline();
-        allMessageIds.forEach((id) => pipeline.get(this.getMessageKey(threadId, id)));
-        const results = await pipeline.exec();
-        let messages2 = results.map((result) => result).filter((msg) => msg !== null);
-        if (fromDate) {
-          messages2 = messages2.filter((msg) => msg && new Date(msg.createdAt).getTime() >= fromDate.getTime());
-        }
-        if (toDate) {
-          messages2 = messages2.filter((msg) => msg && new Date(msg.createdAt).getTime() <= toDate.getTime());
-        }
-        messages2.sort((a, b) => allMessageIds.indexOf(a.id) - allMessageIds.indexOf(b.id));
-        const total = messages2.length;
-        const start = page * perPage;
-        const end = start + perPage;
-        const hasMore = end < total;
-        const paginatedMessages = messages2.slice(start, end);
-        const prepared2 = paginatedMessages.filter((message) => message !== null && message !== void 0).map((message) => {
-          const { _index, ...messageWithoutIndex } = message;
-          return messageWithoutIndex;
-        });
-        if (format === "v2") {
-          const v2Messages = prepared2.map((msg) => ({
-            ...msg,
-            content: msg.content || { format: 2, parts: [{ type: "text", text: "" }] }
-          }));
-          return {
-            messages: v2Messages,
-            total,
-            page,
-            perPage,
-            hasMore
-          };
-        }
-        return {
-          messages: prepared2,
-          total,
-          page,
-          perPage,
-          hasMore
-        };
-      } catch (error) {
-        console.error("Failed to get paginated messages:", error);
-        return {
-          messages: [],
-          total: 0,
-          page,
-          perPage,
-          hasMore: false
-        };
-      }
-    }
     let limit;
     if (typeof selectBy?.last === "number") {
       limit = Math.max(0, selectBy.last);
@@ -43345,41 +43293,43 @@ var UpstashStore = class extends storage.MastraStorage {
       limit = Number.MAX_SAFE_INTEGER;
     }
     const messageIds = /* @__PURE__ */ new Set();
+    const messageIdToThreadIds = {};
     if (limit === 0 && !selectBy?.include) {
       return [];
     }
-    if (selectBy?.include?.length) {
-      for (const item of selectBy.include) {
-        messageIds.add(item.id);
-        if (item.withPreviousMessages || item.withNextMessages) {
-          const rank = await this.redis.zrank(threadMessagesKey, item.id);
-          if (rank === null) continue;
-          if (item.withPreviousMessages) {
-            const start = Math.max(0, rank - item.withPreviousMessages);
-            const prevIds = rank === 0 ? [] : await this.redis.zrange(threadMessagesKey, start, rank - 1);
-            prevIds.forEach((id) => messageIds.add(id));
-          }
-          if (item.withNextMessages) {
-            const nextIds = await this.redis.zrange(threadMessagesKey, rank + 1, rank + item.withNextMessages);
-            nextIds.forEach((id) => messageIds.add(id));
-          }
-        }
-      }
-    }
     if (limit === Number.MAX_SAFE_INTEGER) {
       const allIds = await this.redis.zrange(threadMessagesKey, 0, -1);
-      allIds.forEach((id) => messageIds.add(id));
+      allIds.forEach((id) => {
+        messageIds.add(id);
+        messageIdToThreadIds[id] = threadId;
+      });
     } else if (limit > 0) {
       const latestIds = await this.redis.zrange(threadMessagesKey, -limit, -1);
-      latestIds.forEach((id) => messageIds.add(id));
+      latestIds.forEach((id) => {
+        messageIds.add(id);
+        messageIdToThreadIds[id] = threadId;
+      });
     }
-    const messages = (await Promise.all(
-      Array.from(messageIds).map(
-        async (id) => this.redis.get(this.getMessageKey(threadId, id))
-      )
-    )).filter((msg) => msg !== null);
+    const includedMessages = await this._getIncludedMessages(threadId, selectBy);
+    const messages = [
+      ...includedMessages,
+      ...(await Promise.all(
+        Array.from(messageIds).map(async (id) => {
+          const tId = messageIdToThreadIds[id] || threadId;
+          const byThreadId = await this.redis.get(this.getMessageKey(tId, id));
+          if (byThreadId) return byThreadId;
+          return null;
+        })
+      )).filter((msg) => msg !== null)
+    ];
     messages.sort((a, b) => allMessageIds.indexOf(a.id) - allMessageIds.indexOf(b.id));
-    const prepared = messages.filter((message) => message !== null && message !== void 0).map((message) => {
+    const seen = /* @__PURE__ */ new Set();
+    const dedupedMessages = messages.filter((row) => {
+      if (seen.has(row.id)) return false;
+      seen.add(row.id);
+      return true;
+    });
+    const prepared = dedupedMessages.filter((message) => message !== null && message !== void 0).map((message) => {
       const { _index, ...messageWithoutIndex } = message;
       return messageWithoutIndex;
     });
@@ -43391,6 +43341,63 @@ var UpstashStore = class extends storage.MastraStorage {
     }
     return prepared;
   }
+  async getMessagesPaginated(args) {
+    const { threadId, selectBy, format } = args;
+    const { page = 0, perPage = 40, dateRange } = selectBy?.pagination || {};
+    const fromDate = dateRange?.start;
+    const toDate = dateRange?.end;
+    const threadMessagesKey = this.getThreadMessagesKey(threadId);
+    const messages = [];
+    const includedMessages = await this._getIncludedMessages(threadId, selectBy);
+    messages.push(...includedMessages);
+    try {
+      const allMessageIds = await this.redis.zrange(threadMessagesKey, 0, -1);
+      if (allMessageIds.length === 0) {
+        return {
+          messages: [],
+          total: 0,
+          page,
+          perPage,
+          hasMore: false
+        };
+      }
+      const pipeline = this.redis.pipeline();
+      allMessageIds.forEach((id) => pipeline.get(this.getMessageKey(threadId, id)));
+      const results = await pipeline.exec();
+      let messagesData = results.filter((msg) => msg !== null);
+      if (fromDate) {
+        messagesData = messagesData.filter((msg) => msg && new Date(msg.createdAt).getTime() >= fromDate.getTime());
+      }
+      if (toDate) {
+        messagesData = messagesData.filter((msg) => msg && new Date(msg.createdAt).getTime() <= toDate.getTime());
+      }
+      messagesData.sort((a, b) => allMessageIds.indexOf(a.id) - allMessageIds.indexOf(b.id));
+      const total = messagesData.length;
+      const start = page * perPage;
+      const end = start + perPage;
+      const hasMore = end < total;
+      const paginatedMessages = messagesData.slice(start, end);
+      messages.push(...paginatedMessages);
+      const list = new import_agent.MessageList().add(messages, "memory");
+      const finalMessages = format === `v2` ? list.get.all.v2() : list.get.all.v1();
+      return {
+        messages: finalMessages,
+        total,
+        page,
+        perPage,
+        hasMore
+      };
+    } catch (error) {
+      console.error("Failed to get paginated messages:", error);
+      return {
+        messages: [],
+        total: 0,
+        page,
+        perPage,
+        hasMore: false
+      };
+    }
+  }
   async persistWorkflowSnapshot(params) {
     const { namespace = "workflows", workflowName, runId, snapshot } = params;
     await this.insert({
@@ -43423,18 +43430,17 @@ var UpstashStore = class extends storage.MastraStorage {
    */
   async getEvals(options) {
     try {
-      const page = options?.page ?? 0;
-      const perPage = options?.perPage ?? 100;
-      const limit = options?.limit;
-      const offset = options?.offset;
+      const { agentName, type, page = 0, perPage = 100, dateRange } = options || {};
+      const fromDate = dateRange?.start;
+      const toDate = dateRange?.end;
       const pattern = `${storage.TABLE_EVALS}:*`;
       const keys = await this.scanKeys(pattern);
       if (keys.length === 0) {
         return {
           evals: [],
           total: 0,
-          page: options?.page ?? 0,
-          perPage: options?.perPage ?? 100,
+          page,
+          perPage,
           hasMore: false
         };
       }
@@ -43442,10 +43448,10 @@ var UpstashStore = class extends storage.MastraStorage {
       keys.forEach((key) => pipeline.get(key));
       const results = await pipeline.exec();
       let filteredEvals = results.map((result) => result).filter((record) => record !== null && typeof record === "object");
-      if (options?.agentName) {
-        filteredEvals = filteredEvals.filter((record) => record.agent_name === options.agentName);
+      if (agentName) {
+        filteredEvals = filteredEvals.filter((record) => record.agent_name === agentName);
       }
-      if (options?.type === "test") {
+      if (type === "test") {
         filteredEvals = filteredEvals.filter((record) => {
           if (!record.test_info) return false;
           try {
@@ -43458,7 +43464,7 @@ var UpstashStore = class extends storage.MastraStorage {
             return false;
           }
         });
-      } else if (options?.type === "live") {
+      } else if (type === "live") {
         filteredEvals = filteredEvals.filter((record) => {
           if (!record.test_info) return true;
           try {
@@ -43472,16 +43478,16 @@ var UpstashStore = class extends storage.MastraStorage {
           }
         });
       }
-      if (options?.fromDate) {
+      if (fromDate) {
         filteredEvals = filteredEvals.filter((record) => {
           const createdAt = new Date(record.created_at || record.createdAt || 0);
-          return createdAt.getTime() >= options.fromDate.getTime();
+          return createdAt.getTime() >= fromDate.getTime();
         });
       }
-      if (options?.toDate) {
+      if (toDate) {
         filteredEvals = filteredEvals.filter((record) => {
           const createdAt = new Date(record.created_at || record.createdAt || 0);
-          return createdAt.getTime() <= options.toDate.getTime();
+          return createdAt.getTime() <= toDate.getTime();
         });
       }
       filteredEvals.sort((a, b) => {
@@ -43490,32 +43496,26 @@ var UpstashStore = class extends storage.MastraStorage {
         return dateB - dateA;
       });
       const total = filteredEvals.length;
-      let paginatedEvals;
-      let hasMore = false;
-      if (limit !== void 0 && offset !== void 0) {
-        paginatedEvals = filteredEvals.slice(offset, offset + limit);
-        hasMore = offset + limit < total;
-      } else {
-        const start = page * perPage;
-        const end = start + perPage;
-        paginatedEvals = filteredEvals.slice(start, end);
-        hasMore = end < total;
-      }
+      const start = page * perPage;
+      const end = start + perPage;
+      const paginatedEvals = filteredEvals.slice(start, end);
+      const hasMore = end < total;
       const evals = paginatedEvals.map((record) => this.transformEvalRecord(record));
       return {
         evals,
         total,
-        page: limit !== void 0 ? void 0 : page,
-        perPage: limit !== void 0 ? void 0 : perPage,
+        page,
+        perPage,
         hasMore
       };
     } catch (error) {
+      const { page = 0, perPage = 100 } = options || {};
       console.error("Failed to get evals:", error);
       return {
         evals: [],
         total: 0,
-        page: options?.page ?? 0,
-        perPage: options?.perPage ?? 100,
+        page,
+        perPage,
         hasMore: false
       };
     }