@mastra/server 1.33.0-alpha.1 → 1.33.0-alpha.13

package/dist/{chunk-DTCRA7JS.js → chunk-MU5LIFIL.js}

@@ -1,12 +1,12 @@
-import { LIST_WORKFLOWS_ROUTE, GET_WORKFLOW_BY_ID_ROUTE, LIST_WORKFLOW_RUNS_ROUTE, GET_WORKFLOW_RUN_BY_ID_ROUTE, CREATE_WORKFLOW_RUN_ROUTE, STREAM_WORKFLOW_ROUTE, START_ASYNC_WORKFLOW_ROUTE, START_WORKFLOW_RUN_ROUTE, OBSERVE_STREAM_WORKFLOW_ROUTE, RESUME_ASYNC_WORKFLOW_ROUTE, RESUME_WORKFLOW_ROUTE, RESUME_STREAM_WORKFLOW_ROUTE, CANCEL_WORKFLOW_RUN_ROUTE, STREAM_LEGACY_WORKFLOW_ROUTE, OBSERVE_STREAM_LEGACY_WORKFLOW_ROUTE } from './chunk-DSJM7F5A.js';
+import { LIST_WORKFLOWS_ROUTE, GET_WORKFLOW_BY_ID_ROUTE, LIST_WORKFLOW_RUNS_ROUTE, GET_WORKFLOW_RUN_BY_ID_ROUTE, CREATE_WORKFLOW_RUN_ROUTE, STREAM_WORKFLOW_ROUTE, START_ASYNC_WORKFLOW_ROUTE, START_WORKFLOW_RUN_ROUTE, OBSERVE_STREAM_WORKFLOW_ROUTE, RESUME_ASYNC_WORKFLOW_ROUTE, RESUME_WORKFLOW_ROUTE, RESUME_STREAM_WORKFLOW_ROUTE, CANCEL_WORKFLOW_RUN_ROUTE, STREAM_LEGACY_WORKFLOW_ROUTE, OBSERVE_STREAM_LEGACY_WORKFLOW_ROUTE } from './chunk-JH5BL5V2.js';
 import { actionIdPathParams, actionRunPathParams, streamAgentBuilderBodySchema, startAsyncAgentBuilderBodySchema, resumeAgentBuilderBodySchema, streamLegacyAgentBuilderBodySchema } from './chunk-GEXJ4LPZ.js';
 import { listWorkflowsResponseSchema, workflowInfoSchema, workflowRunsResponseSchema, listWorkflowRunsQuerySchema, workflowRunResultSchema, workflowRunResultQuerySchema, createWorkflowRunResponseSchema, workflowExecutionResultSchema, workflowControlResponseSchema } from './chunk-5OOYXBPG.js';
-import { e, truncateStringByTokens, estimateTokenCount, resolveToolResultValue, formatToolResultForObserver } from './chunk-S65AMBAF.js';
+import { e, truncateStringByTokens, estimateTokenCount, resolveToolResultValue, formatToolResultForObserver } from './chunk-MQIZJZCT.js';
 import { openai } from './chunk-PALNMAC6.js';
-import { streamResponseSchema } from './chunk-43CWQ4M3.js';
-import { WorkflowRegistry } from './chunk-X2LYM3QK.js';
+import { streamResponseSchema } from './chunk-EQUOHUYY.js';
+import { WorkflowRegistry } from './chunk-DYHG4LMH.js';
 import { optionalRunIdSchema, runIdSchema } from './chunk-2YY3EMMS.js';
-import { standardSchemaToJSONSchema, createRoute, isStandardSchemaWithJSON, toStandardSchema5 } from './chunk-KDUX3YN3.js';
+import { standardSchemaToJSONSchema, createRoute, isStandardSchemaWithJSON, toStandardSchema5 } from './chunk-SW5NAE22.js';
 import { handleError } from './chunk-P23KBWKB.js';
 import { HTTPException } from './chunk-6QWQZI4Q.js';
 import { __commonJS, __export, __toESM } from './chunk-PR4QN5HX.js';
@@ -40,7 +40,7 @@ var require_ignore = __commonJS({
     }
     var UNDEFINED = void 0;
     var EMPTY = "";
-    var SPACE = " ";
+    var SPACE2 = " ";
     var ESCAPE = "\\";
     var REGEX_TEST_BLANK_LINE = /^\s+$/;
     var REGEX_INVALID_TRAILING_BACKSLASH = /(?:[^\\]|^)\\$/;
@@ -84,7 +84,7 @@ var require_ignore = __commonJS({
         // (a ) -> (a)
         // (a \ ) -> (a  )
         /((?:\\\\)*?)(\\?\s+)$/,
-        (_, m1, m2) => m1 + (m2.indexOf("\\") === 0 ? SPACE : EMPTY)
+        (_, m1, m2) => m1 + (m2.indexOf("\\") === 0 ? SPACE2 : EMPTY)
       ],
       // Replace (\ ) with ' '
       // (\ ) -> ' '
@@ -94,7 +94,7 @@ var require_ignore = __commonJS({
         /(\\+?)\s/g,
         (_, m1) => {
           const { length } = m1;
-          return m1.slice(0, length - length % 2) + SPACE;
+          return m1.slice(0, length - length % 2) + SPACE2;
         }
       ],
       // Escape metacharacters
@@ -5253,7 +5253,7 @@ function withUserAgentSuffix(headers, ...userAgentSuffixParts) {
   );
   return Object.fromEntries(normalizedHeaders.entries());
 }
-var VERSION2 = "3.0.23";
+var VERSION2 = "3.0.25";
 var getOriginalFetch = () => globalThis.fetch;
 var getFromApi = async ({
   url,
@@ -5722,6 +5722,33 @@ var createJsonResponseHandler = (responseSchema) => async ({ response, url, requ
     rawValue: parsedResult.rawValue
   };
 };
+var schemaSymbol2 = /* @__PURE__ */ Symbol.for("vercel.ai.schema");
+function lazySchema(createSchema) {
+  let schema;
+  return () => {
+    if (schema == null) {
+      schema = createSchema();
+    }
+    return schema;
+  };
+}
+function jsonSchema2(jsonSchema22, {
+  validate
+} = {}) {
+  return {
+    [schemaSymbol2]: true,
+    _type: void 0,
+    // should never be used directly
+    [validatorSymbol2]: true,
+    get jsonSchema() {
+      if (typeof jsonSchema22 === "function") {
+        jsonSchema22 = jsonSchema22();
+      }
+      return jsonSchema22;
+    },
+    validate
+  };
+}
 function addAdditionalPropertiesToJsonSchema(jsonSchema22) {
   if (jsonSchema22.type === "object") {
     jsonSchema22.additionalProperties = false;
@@ -5747,13 +5774,6 @@ function addAdditionalPropertiesToJsonSchema(jsonSchema22) {
   }
   return jsonSchema22;
 }
-var getRelativePath2 = (pathA, pathB) => {
-  let i = 0;
-  for (; i < pathA.length && i < pathB.length; i++) {
-    if (pathA[i] !== pathB[i]) break;
-  }
-  return [(pathA.length - i).toString(), ...pathB.slice(i)].join("/");
-};
 var ignoreOverride2 = /* @__PURE__ */ Symbol(
   "Let zodToJsonSchema decide on which parser to use"
 );
@@ -6697,6 +6717,13 @@ var selectParser2 = (def, typeName, refs) => {
       return /* @__PURE__ */ ((_) => void 0)();
   }
 };
+var getRelativePath2 = (pathA, pathB) => {
+  let i = 0;
+  for (; i < pathA.length && i < pathB.length; i++) {
+    if (pathA[i] !== pathB[i]) break;
+  }
+  return [(pathA.length - i).toString(), ...pathB.slice(i)].join("/");
+};
 function parseDef2(def, refs, forceResolution = false) {
   var _a224;
   const seenItem = refs.seen.get(def);
@@ -6876,33 +6903,6 @@ function zodSchema2(zodSchema22, options) {
     return zod3Schema(zodSchema22);
   }
 }
-var schemaSymbol2 = /* @__PURE__ */ Symbol.for("vercel.ai.schema");
-function lazySchema(createSchema) {
-  let schema;
-  return () => {
-    if (schema == null) {
-      schema = createSchema();
-    }
-    return schema;
-  };
-}
-function jsonSchema2(jsonSchema22, {
-  validate
-} = {}) {
-  return {
-    [schemaSymbol2]: true,
-    _type: void 0,
-    // should never be used directly
-    [validatorSymbol2]: true,
-    get jsonSchema() {
-      if (typeof jsonSchema22 === "function") {
-        jsonSchema22 = jsonSchema22();
-      }
-      return jsonSchema22;
-    },
-    validate
-  };
-}
 function isSchema2(value) {
   return typeof value === "object" && value !== null && schemaSymbol2 in value && value[schemaSymbol2] === true && "jsonSchema" in value && "validate" in value;
 }
@@ -7190,6 +7190,19 @@ var gatewayErrorResponseSchema = lazyValidator(
     })
   )
 );
+function extractApiCallResponse(error) {
+  if (error.data !== void 0) {
+    return error.data;
+  }
+  if (error.responseBody != null) {
+    try {
+      return JSON.parse(error.responseBody);
+    } catch (e2) {
+      return error.responseBody;
+    }
+  }
+  return {};
+}
 var name74 = "GatewayTimeoutError";
 var marker84 = `vercel.ai.gateway.error.${name74}`;
 var symbol84 = Symbol.for(marker84);
@@ -7276,19 +7289,6 @@ async function asGatewayError(error, authMethod) {
     authMethod
   });
 }
-function extractApiCallResponse(error) {
-  if (error.data !== void 0) {
-    return error.data;
-  }
-  if (error.responseBody != null) {
-    try {
-      return JSON.parse(error.responseBody);
-    } catch (e2) {
-      return error.responseBody;
-    }
-  }
-  return {};
-}
 var GATEWAY_AUTH_METHOD_HEADER = "ai-gateway-auth-method";
 async function parseAuthMethod(headers) {
   const result = await safeValidateTypes2({
@@ -8075,7 +8075,7 @@ async function getVercelRequestId() {
   var _a932;
   return (_a932 = getContext().headers) == null ? void 0 : _a932["x-vercel-id"];
 }
-var VERSION3 = "2.0.82";
+var VERSION3 = "2.0.88";
 var AI_GATEWAY_PROTOCOL_VERSION = "0.0.1";
 function createGatewayProvider(options = {}) {
   var _a932, _b93;
@@ -9062,7 +9062,7 @@ function getGlobalProvider() {
   var _a163;
   return (_a163 = globalThis.AI_SDK_DEFAULT_PROVIDER) != null ? _a163 : gateway;
 }
-var VERSION32 = "5.0.179";
+var VERSION32 = "5.0.186";
 var dataContentSchema2 = z$1.union([
   z$1.string(),
   z$1.instanceof(Uint8Array),
@@ -10367,6 +10367,9 @@ var ParseError2 = class extends Error {
     super(message), this.name = "ParseError", this.type = options.type, this.field = options.field, this.value = options.value, this.line = options.line;
   }
 };
+var LF = 10;
+var CR = 13;
+var SPACE = 32;
 function noop2(_arg) {
 }
 function createParser2(callbacks) {
@@ -10374,39 +10377,109 @@ function createParser2(callbacks) {
     throw new TypeError(
       "`callbacks` must be an object, got a function instead. Did you mean `{onEvent: fn}`?"
     );
-  const { onEvent = noop2, onError = noop2, onRetry = noop2, onComment } = callbacks;
-  let incompleteLine = "", isFirstChunk = true, id, data = "", eventType = "";
-  function feed(newChunk) {
-    const chunk = isFirstChunk ? newChunk.replace(/^\xEF\xBB\xBF/, "") : newChunk, [complete, incomplete] = splitLines2(`${incompleteLine}${chunk}`);
-    for (const line of complete)
-      parseLine(line);
-    incompleteLine = incomplete, isFirstChunk = false;
+  const { onEvent = noop2, onError = noop2, onRetry = noop2, onComment } = callbacks, pendingFragments = [];
+  let isFirstChunk = true, id, data = "", dataLines = 0, eventType;
+  function feed(chunk) {
+    if (isFirstChunk && (isFirstChunk = false, chunk.charCodeAt(0) === 239 && chunk.charCodeAt(1) === 187 && chunk.charCodeAt(2) === 191 && (chunk = chunk.slice(3))), pendingFragments.length === 0) {
+      const trailing2 = processLines(chunk);
+      trailing2 !== "" && pendingFragments.push(trailing2);
+      return;
+    }
+    if (chunk.indexOf(`
+`) === -1 && chunk.indexOf("\r") === -1) {
+      pendingFragments.push(chunk);
+      return;
+    }
+    pendingFragments.push(chunk);
+    const input = pendingFragments.join("");
+    pendingFragments.length = 0;
+    const trailing = processLines(input);
+    trailing !== "" && pendingFragments.push(trailing);
   }
-  function parseLine(line) {
-    if (line === "") {
+  function processLines(chunk) {
+    let searchIndex = 0;
+    if (chunk.indexOf("\r") === -1) {
+      let lfIndex = chunk.indexOf(`
+`, searchIndex);
+      for (; lfIndex !== -1; ) {
+        if (searchIndex === lfIndex) {
+          dataLines > 0 && onEvent({ id, event: eventType, data }), id = void 0, data = "", dataLines = 0, eventType = void 0, searchIndex = lfIndex + 1, lfIndex = chunk.indexOf(`
+`, searchIndex);
+          continue;
+        }
+        const firstCharCode = chunk.charCodeAt(searchIndex);
+        if (isDataPrefix(chunk, searchIndex, firstCharCode)) {
+          const valueStart = chunk.charCodeAt(searchIndex + 5) === SPACE ? searchIndex + 6 : searchIndex + 5, value = chunk.slice(valueStart, lfIndex);
+          if (dataLines === 0 && chunk.charCodeAt(lfIndex + 1) === LF) {
+            onEvent({ id, event: eventType, data: value }), id = void 0, data = "", eventType = void 0, searchIndex = lfIndex + 2, lfIndex = chunk.indexOf(`
+`, searchIndex);
+            continue;
+          }
+          data = dataLines === 0 ? value : `${data}
+${value}`, dataLines++;
+        } else isEventPrefix(chunk, searchIndex, firstCharCode) ? eventType = chunk.slice(
+          chunk.charCodeAt(searchIndex + 6) === SPACE ? searchIndex + 7 : searchIndex + 6,
+          lfIndex
+        ) || void 0 : parseLine(chunk, searchIndex, lfIndex);
+        searchIndex = lfIndex + 1, lfIndex = chunk.indexOf(`
+`, searchIndex);
+      }
+      return chunk.slice(searchIndex);
+    }
+    for (; searchIndex < chunk.length; ) {
+      const crIndex = chunk.indexOf("\r", searchIndex), lfIndex = chunk.indexOf(`
+`, searchIndex);
+      let lineEnd = -1;
+      if (crIndex !== -1 && lfIndex !== -1 ? lineEnd = crIndex < lfIndex ? crIndex : lfIndex : crIndex !== -1 ? crIndex === chunk.length - 1 ? lineEnd = -1 : lineEnd = crIndex : lfIndex !== -1 && (lineEnd = lfIndex), lineEnd === -1)
+        break;
+      parseLine(chunk, searchIndex, lineEnd), searchIndex = lineEnd + 1, chunk.charCodeAt(searchIndex - 1) === CR && chunk.charCodeAt(searchIndex) === LF && searchIndex++;
+    }
+    return chunk.slice(searchIndex);
+  }
+  function parseLine(chunk, start, end) {
+    if (start === end) {
       dispatchEvent();
       return;
     }
-    if (line.startsWith(":")) {
-      onComment && onComment(line.slice(line.startsWith(": ") ? 2 : 1));
+    const firstCharCode = chunk.charCodeAt(start);
+    if (isDataPrefix(chunk, start, firstCharCode)) {
+      const valueStart = chunk.charCodeAt(start + 5) === SPACE ? start + 6 : start + 5, value2 = chunk.slice(valueStart, end);
+      data = dataLines === 0 ? value2 : `${data}
+${value2}`, dataLines++;
       return;
     }
-    const fieldSeparatorIndex = line.indexOf(":");
-    if (fieldSeparatorIndex !== -1) {
-      const field = line.slice(0, fieldSeparatorIndex), offset = line[fieldSeparatorIndex + 1] === " " ? 2 : 1, value = line.slice(fieldSeparatorIndex + offset);
-      processField(field, value, line);
+    if (isEventPrefix(chunk, start, firstCharCode)) {
+      eventType = chunk.slice(chunk.charCodeAt(start + 6) === SPACE ? start + 7 : start + 6, end) || void 0;
       return;
     }
-    processField(line, "", line);
+    if (firstCharCode === 105 && chunk.charCodeAt(start + 1) === 100 && chunk.charCodeAt(start + 2) === 58) {
+      const value2 = chunk.slice(chunk.charCodeAt(start + 3) === SPACE ? start + 4 : start + 3, end);
+      id = value2.includes("\0") ? void 0 : value2;
+      return;
+    }
+    if (firstCharCode === 58) {
+      if (onComment) {
+        const line2 = chunk.slice(start, end);
+        onComment(line2.slice(chunk.charCodeAt(start + 1) === SPACE ? 2 : 1));
+      }
+      return;
+    }
+    const line = chunk.slice(start, end), fieldSeparatorIndex = line.indexOf(":");
+    if (fieldSeparatorIndex === -1) {
+      processField(line, "", line);
+      return;
+    }
+    const field = line.slice(0, fieldSeparatorIndex), offset = line.charCodeAt(fieldSeparatorIndex + 1) === SPACE ? 2 : 1, value = line.slice(fieldSeparatorIndex + offset);
+    processField(field, value, line);
   }
   function processField(field, value, line) {
     switch (field) {
       case "event":
-        eventType = value;
+        eventType = value || void 0;
         break;
       case "data":
-        data = `${data}${value}
-`;
+        data = dataLines === 0 ? value : `${data}
+${value}`, dataLines++;
         break;
       case "id":
         id = value.includes("\0") ? void 0 : value;
@@ -10431,37 +10504,26 @@ function createParser2(callbacks) {
     }
   }
   function dispatchEvent() {
-    data.length > 0 && onEvent({
+    dataLines > 0 && onEvent({
       id,
-      event: eventType || void 0,
-      // If the data buffer's last character is a U+000A LINE FEED (LF) character,
-      // then remove the last character from the data buffer.
-      data: data.endsWith(`
-`) ? data.slice(0, -1) : data
-    }), id = void 0, data = "", eventType = "";
+      event: eventType,
+      data
+    }), id = void 0, data = "", dataLines = 0, eventType = void 0;
   }
   function reset(options = {}) {
-    incompleteLine && options.consume && parseLine(incompleteLine), isFirstChunk = true, id = void 0, data = "", eventType = "", incompleteLine = "";
+    if (options.consume && pendingFragments.length > 0) {
+      const incompleteLine = pendingFragments.join("");
+      parseLine(incompleteLine, 0, incompleteLine.length);
+    }
+    isFirstChunk = true, id = void 0, data = "", dataLines = 0, eventType = void 0, pendingFragments.length = 0;
   }
   return { feed, reset };
 }
-function splitLines2(chunk) {
-  const lines = [];
-  let incompleteLine = "", searchIndex = 0;
-  for (; searchIndex < chunk.length; ) {
-    const crIndex = chunk.indexOf("\r", searchIndex), lfIndex = chunk.indexOf(`
-`, searchIndex);
-    let lineEnd = -1;
-    if (crIndex !== -1 && lfIndex !== -1 ? lineEnd = Math.min(crIndex, lfIndex) : crIndex !== -1 ? crIndex === chunk.length - 1 ? lineEnd = -1 : lineEnd = crIndex : lfIndex !== -1 && (lineEnd = lfIndex), lineEnd === -1) {
-      incompleteLine = chunk.slice(searchIndex);
-      break;
-    } else {
-      const line = chunk.slice(searchIndex, lineEnd);
-      lines.push(line), searchIndex = lineEnd + 1, chunk[searchIndex - 1] === "\r" && chunk[searchIndex] === `
-` && searchIndex++;
-    }
-  }
-  return [lines, incompleteLine];
+function isDataPrefix(chunk, i, firstCharCode) {
+  return firstCharCode === 100 && chunk.charCodeAt(i + 1) === 97 && chunk.charCodeAt(i + 2) === 116 && chunk.charCodeAt(i + 3) === 97 && chunk.charCodeAt(i + 4) === 58;
+}
+function isEventPrefix(chunk, i, firstCharCode) {
+  return firstCharCode === 101 && chunk.charCodeAt(i + 1) === 118 && chunk.charCodeAt(i + 2) === 101 && chunk.charCodeAt(i + 3) === 110 && chunk.charCodeAt(i + 4) === 116 && chunk.charCodeAt(i + 5) === 58;
 }
 var EventSourceParserStream2 = class extends TransformStream {
   constructor({ onError, onRetry, onComment } = {}) {
@@ -10673,7 +10735,7 @@ function withUserAgentSuffix2(headers, ...userAgentSuffixParts) {
   );
   return Object.fromEntries(normalizedHeaders.entries());
 }
-var VERSION4 = "4.0.23";
+var VERSION4 = "4.0.27";
 var getOriginalFetch3 = () => globalThis.fetch;
 var getFromApi2 = async ({
   url,
@@ -12645,6 +12707,19 @@ var gatewayErrorResponseSchema2 = lazySchema2(
     })
   )
 );
+function extractApiCallResponse2(error) {
+  if (error.data !== void 0) {
+    return error.data;
+  }
+  if (error.responseBody != null) {
+    try {
+      return JSON.parse(error.responseBody);
+    } catch (e2) {
+      return error.responseBody;
+    }
+  }
+  return {};
+}
 var name76 = "GatewayTimeoutError";
 var marker86 = `vercel.ai.gateway.error.${name76}`;
 var symbol86 = Symbol.for(marker86);
@@ -12734,19 +12809,6 @@ async function asGatewayError2(error, authMethod) {
     authMethod
   });
 }
-function extractApiCallResponse2(error) {
-  if (error.data !== void 0) {
-    return error.data;
-  }
-  if (error.responseBody != null) {
-    try {
-      return JSON.parse(error.responseBody);
-    } catch (e2) {
-      return error.responseBody;
-    }
-  }
-  return {};
-}
 var GATEWAY_AUTH_METHOD_HEADER2 = "ai-gateway-auth-method";
 async function parseAuthMethod2(headers) {
   const result = await safeValidateTypes3({
@@ -13840,7 +13902,7 @@ async function getVercelRequestId2() {
   var _a932;
   return (_a932 = getContext2().headers) == null ? void 0 : _a932["x-vercel-id"];
 }
-var VERSION5 = "3.0.104";
+var VERSION5 = "3.0.112";
 var AI_GATEWAY_PROTOCOL_VERSION2 = "0.0.1";
 function createGatewayProvider2(options = {}) {
   var _a932, _b93;
@@ -14950,7 +15012,7 @@ function getTotalTimeoutMs(timeout) {
   }
   return timeout.totalMs;
 }
-var VERSION33 = "6.0.168";
+var VERSION33 = "6.0.177";
 var dataContentSchema3 = z$1.union([
   z$1.string(),
   z$1.instanceof(Uint8Array),
@@ -16131,10 +16193,18 @@ createIdGenerator3({
   prefix: "aitxt",
   size: 24
 });
+z$1.record(
+  z$1.string(),
+  jsonValueSchema3.optional()
+);
 createIdGenerator3({
   prefix: "aitxt",
   size: 24
 });
+z$1.record(
+  z$1.string(),
+  jsonValueSchema3.optional()
+);
 function splitArray3(array2, chunkSize) {
   if (chunkSize <= 0) {
     throw new Error("chunkSize must be greater than 0");
@@ -17687,10 +17757,16 @@ function extractWorkingMemoryContent(text42) {
   return text42.substring(contentStart, end);
 }
 function isSystemReminderMessage(message) {
-  if (message.role !== "user" || !isRecord(message.content)) {
+  if (!isRecord(message.content)) {
     return false;
   }
   const metadata = message.content.metadata;
+  if (message.role === "signal") {
+    return isRecord(metadata) && isRecord(metadata.signal) && metadata.signal.type === "system-reminder";
+  }
+  if (message.role !== "user") {
+    return false;
+  }
   if (isRecord(metadata) && (isRecord(metadata.systemReminder) || LEGACY_SYSTEM_REMINDER_METADATA_KEY in metadata)) {
     return true;
   }
@@ -17884,16 +17960,15 @@ var Memory = class extends MastraMemory {
                 `Tried to query vector index ${indexName} but this Memory instance doesn't have an attached vector db.`
               );
             }
+            const scopeFilter = resourceScope ? { resource_id: resourceId } : { thread_id: threadId };
+            const userFilter = typeof config.semanticRecall === "object" ? config.semanticRecall.filter : void 0;
+            const combinedFilter = userFilter ? { $and: [scopeFilter, userFilter] } : scopeFilter;
             vectorResults.push(
               ...await this.vector.query({
                 indexName,
                 queryVector: embedding,
                 topK: vectorConfig.topK,
-                filter: resourceScope ? {
-                  resource_id: resourceId
-                } : {
-                  thread_id: threadId
-                }
+                filter: combinedFilter
               })
             );
           })
@@ -17936,9 +18011,12 @@ var Memory = class extends MastraMemory {
       throw error;
     }
   }
-  async getThreadById({ threadId }) {
+  async getThreadById({
+    threadId,
+    resourceId
+  }) {
     const memoryStore = await this.getMemoryStore();
-    return memoryStore.getThreadById({ threadId });
+    return memoryStore.getThreadById({ threadId, resourceId });
   }
   async listThreads(args) {
     const memoryStore = await this.getMemoryStore();
@@ -18282,7 +18360,7 @@ ${workingMemory}`;
       messageCount: messages.length
     });
     try {
-      const updatedMessages = messages.map((m) => {
+      const updatedMessages = messages.filter((m) => m.role !== "system").map((m) => {
         return this.updateMessageToHideWorkingMemoryV2(m);
       }).filter((m) => Boolean(m));
       const config = this.getMergedThreadConfig(memoryConfig);
@@ -18295,6 +18373,31 @@ ${workingMemory}`;
       });
       let totalTokens = 0;
       if (this.vector && config.semanticRecall) {
+        const messagesByThread = /* @__PURE__ */ new Map();
+        updatedMessages.forEach((message) => {
+          if (message.threadId) {
+            if (!messagesByThread.has(message.threadId)) {
+              messagesByThread.set(message.threadId, []);
+            }
+            messagesByThread.get(message.threadId).push(message);
+          }
+        });
+        const threadMetadataMap = /* @__PURE__ */ new Map();
+        await Promise.all(
+          Array.from(messagesByThread.keys()).map(async (threadId) => {
+            try {
+              const thread = await memoryStore.getThreadById({ threadId });
+              if (thread?.metadata) {
+                threadMetadataMap.set(threadId, thread.metadata);
+              }
+            } catch (error) {
+              const message = error instanceof Error ? error.message : String(error);
+              throw new Error(
+                `Could not fetch metadata for thread ${threadId} while saving semantic recall embeddings: ${message}`
+              );
+            }
+          })
+        );
         const embeddingData = [];
         let dimension;
         await Promise.all(
@@ -18312,9 +18415,11 @@ ${workingMemory}`;
             if (result2.usage?.tokens) {
               totalTokens += result2.usage.tokens;
             }
+            const threadMetadata = message.threadId ? threadMetadataMap.get(message.threadId) || {} : {};
             embeddingData.push({
               embeddings: result2.embeddings,
               metadata: result2.chunks.map(() => ({
+                ...threadMetadata,
                 message_id: message.id,
                 thread_id: message.threadId,
                 resource_id: message.resourceId
@@ -18597,8 +18702,10 @@ ${workingMemory}`;
    */
   async persistMessages(messages) {
     if (messages.length === 0) return;
+    const persistableMessages = messages.filter((m) => m.role !== "system");
+    if (persistableMessages.length === 0) return;
     const memoryStore = await this.getMemoryStore();
-    await memoryStore.saveMessages({ messages });
+    await memoryStore.saveMessages({ messages: persistableMessages });
   }
   /**
    * One-time initialization of the shared ObservationalMemory engine.
@@ -18625,7 +18732,7 @@ ${workingMemory}`;
         "Observational memory requires @mastra/core support for request-response-id-rotation. Please bump @mastra/core to a newer version."
       );
     }
-    const { ObservationalMemory: OMClass } = await import('./observational-memory-KH7G7Y6B-QKEOJZME.js');
+    const { ObservationalMemory: OMClass } = await import('./observational-memory-NL7AQHZV-24ODMDOC.js');
     const onIndexObservations = this.hasRetrievalSearch(omConfig.retrieval) ? async (observation) => {
       await this.indexObservation(observation);
     } : void 0;
@@ -19551,7 +19658,7 @@ Notes:
     if (!effectiveConfig) return null;
     const engine = await this.omEngine;
     if (!engine) return null;
-    const { ObservationalMemoryProcessor } = await import('./observational-memory-KH7G7Y6B-QKEOJZME.js');
+    const { ObservationalMemoryProcessor } = await import('./observational-memory-NL7AQHZV-24ODMDOC.js');
     return new ObservationalMemoryProcessor(engine, this, {
       temporalMarkers: effectiveConfig.temporalMarkers
     });
@@ -24484,7 +24591,7 @@ function createParser3(callbacks) {
   const { onEvent = noop3, onError = noop3, onRetry = noop3, onComment } = callbacks;
   let incompleteLine = "", isFirstChunk = true, id, data = "", eventType = "";
   function feed(newChunk) {
-    const chunk = isFirstChunk ? newChunk.replace(/^\xEF\xBB\xBF/, "") : newChunk, [complete, incomplete] = splitLines3(`${incompleteLine}${chunk}`);
+    const chunk = isFirstChunk ? newChunk.replace(/^\xEF\xBB\xBF/, "") : newChunk, [complete, incomplete] = splitLines2(`${incompleteLine}${chunk}`);
     for (const line of complete)
       parseLine(line);
     incompleteLine = incomplete, isFirstChunk = false;
@@ -24552,7 +24659,7 @@ function createParser3(callbacks) {
   }
   return { feed, reset };
 }
-function splitLines3(chunk) {
+function splitLines2(chunk) {
   const lines = [];
   let incompleteLine = "", searchIndex = 0;
   for (; searchIndex < chunk.length; ) {
@@ -24704,7 +24811,7 @@ function withUserAgentSuffix3(headers, ...userAgentSuffixParts) {
   );
   return Object.fromEntries(normalizedHeaders.entries());
 }
-var VERSION6 = "3.0.23";
+var VERSION6 = "3.0.25";
 var getOriginalFetch4 = () => globalThis.fetch;
 var getFromApi3 = async ({
   url,
@@ -25173,6 +25280,33 @@ var createJsonResponseHandler3 = (responseSchema) => async ({ response, url, req
     rawValue: parsedResult.rawValue
   };
 };
+var schemaSymbol4 = /* @__PURE__ */ Symbol.for("vercel.ai.schema");
+function lazySchema3(createSchema) {
+  let schema;
+  return () => {
+    if (schema == null) {
+      schema = createSchema();
+    }
+    return schema;
+  };
+}
+function jsonSchema4(jsonSchema22, {
+  validate
+} = {}) {
+  return {
+    [schemaSymbol4]: true,
+    _type: void 0,
+    // should never be used directly
+    [validatorSymbol3]: true,
+    get jsonSchema() {
+      if (typeof jsonSchema22 === "function") {
+        jsonSchema22 = jsonSchema22();
+      }
+      return jsonSchema22;
+    },
+    validate
+  };
+}
 function addAdditionalPropertiesToJsonSchema3(jsonSchema22) {
   if (jsonSchema22.type === "object") {
     jsonSchema22.additionalProperties = false;
@@ -25198,13 +25332,6 @@ function addAdditionalPropertiesToJsonSchema3(jsonSchema22) {
   }
   return jsonSchema22;
 }
-var getRelativePath4 = (pathA, pathB) => {
-  let i = 0;
-  for (; i < pathA.length && i < pathB.length; i++) {
-    if (pathA[i] !== pathB[i]) break;
-  }
-  return [(pathA.length - i).toString(), ...pathB.slice(i)].join("/");
-};
 var ignoreOverride4 = /* @__PURE__ */ Symbol(
   "Let zodToJsonSchema decide on which parser to use"
 );
@@ -26148,6 +26275,13 @@ var selectParser4 = (def, typeName, refs) => {
       return /* @__PURE__ */ ((_) => void 0)();
   }
 };
+var getRelativePath4 = (pathA, pathB) => {
+  let i = 0;
+  for (; i < pathA.length && i < pathB.length; i++) {
+    if (pathA[i] !== pathB[i]) break;
+  }
+  return [(pathA.length - i).toString(), ...pathB.slice(i)].join("/");
+};
 function parseDef4(def, refs, forceResolution = false) {
   var _a2232;
   const seenItem = refs.seen.get(def);
@@ -26327,33 +26461,6 @@ function zodSchema4(zodSchema22, options) {
     return zod3Schema3(zodSchema22);
   }
 }
-var schemaSymbol4 = /* @__PURE__ */ Symbol.for("vercel.ai.schema");
-function lazySchema3(createSchema) {
-  let schema;
-  return () => {
-    if (schema == null) {
-      schema = createSchema();
-    }
-    return schema;
-  };
-}
-function jsonSchema4(jsonSchema22, {
-  validate
-} = {}) {
-  return {
-    [schemaSymbol4]: true,
-    _type: void 0,
-    // should never be used directly
-    [validatorSymbol3]: true,
-    get jsonSchema() {
-      if (typeof jsonSchema22 === "function") {
-        jsonSchema22 = jsonSchema22();
-      }
-      return jsonSchema22;
-    },
-    validate
-  };
-}
 function isSchema4(value) {
   return typeof value === "object" && value !== null && schemaSymbol4 in value && value[schemaSymbol4] === true && "jsonSchema" in value && "validate" in value;
 }
@@ -26641,6 +26748,19 @@ var gatewayErrorResponseSchema3 = lazyValidator2(
     })
   )
 );
+function extractApiCallResponse3(error) {
+  if (error.data !== void 0) {
+    return error.data;
+  }
+  if (error.responseBody != null) {
+    try {
+      return JSON.parse(error.responseBody);
+    } catch (e2) {
+      return error.responseBody;
+    }
+  }
+  return {};
+}
 var name72 = "GatewayTimeoutError";
 var marker82 = `vercel.ai.gateway.error.${name72}`;
 var symbol82 = Symbol.for(marker82);
@@ -26727,19 +26847,6 @@ async function asGatewayError3(error, authMethod) {
     authMethod
   });
 }
-function extractApiCallResponse3(error) {
-  if (error.data !== void 0) {
-    return error.data;
-  }
-  if (error.responseBody != null) {
-    try {
-      return JSON.parse(error.responseBody);
-    } catch (e2) {
-      return error.responseBody;
-    }
-  }
-  return {};
-}
 var GATEWAY_AUTH_METHOD_HEADER3 = "ai-gateway-auth-method";
 async function parseAuthMethod3(headers) {
   const result = await safeValidateTypes4({
@@ -27526,7 +27633,7 @@ async function getVercelRequestId3() {
   var _a93;
   return (_a93 = getContext3().headers) == null ? void 0 : _a93["x-vercel-id"];
 }
-var VERSION24 = "2.0.82";
+var VERSION24 = "2.0.88";
 var AI_GATEWAY_PROTOCOL_VERSION3 = "0.0.1";
 function createGatewayProvider3(options = {}) {
   var _a93, _b92;
@@ -30849,5 +30956,5 @@ var OBSERVE_STREAM_LEGACY_AGENT_BUILDER_ACTION_ROUTE = createRoute({
 });
 
 export { CANCEL_AGENT_BUILDER_ACTION_RUN_ROUTE, CREATE_AGENT_BUILDER_ACTION_RUN_ROUTE, GET_AGENT_BUILDER_ACTION_BY_ID_ROUTE, GET_AGENT_BUILDER_ACTION_RUN_BY_ID_ROUTE, LIST_AGENT_BUILDER_ACTIONS_ROUTE, LIST_AGENT_BUILDER_ACTION_RUNS_ROUTE, OBSERVE_STREAM_AGENT_BUILDER_ACTION_ROUTE, OBSERVE_STREAM_LEGACY_AGENT_BUILDER_ACTION_ROUTE, RESUME_AGENT_BUILDER_ACTION_ROUTE, RESUME_ASYNC_AGENT_BUILDER_ACTION_ROUTE, RESUME_STREAM_AGENT_BUILDER_ACTION_ROUTE, START_AGENT_BUILDER_ACTION_RUN_ROUTE, START_ASYNC_AGENT_BUILDER_ACTION_ROUTE, STREAM_AGENT_BUILDER_ACTION_ROUTE, STREAM_LEGACY_AGENT_BUILDER_ACTION_ROUTE, agent_builder_exports };
-//# sourceMappingURL=chunk-DTCRA7JS.js.map
-//# sourceMappingURL=chunk-DTCRA7JS.js.map
+//# sourceMappingURL=chunk-MU5LIFIL.js.map
+//# sourceMappingURL=chunk-MU5LIFIL.js.map