@mastra/memory 1.17.6-alpha.0 → 1.18.0-alpha.2

package/dist/{chunk-NUYSX3DD.js → chunk-PBZHHKPE.js}

@@ -1689,8 +1689,9 @@ var ResourceScopedObservationStrategy = class extends ObservationStrategy {
         orderBy: { field: "createdAt", direction: "ASC" },
         filter: startDate ? { dateRange: { start: startDate } } : void 0
       });
-      if (result.messages.length > 0) {
-        this.messagesByThread.set(thread.id, result.messages);
+      const messages = result.messages.filter((msg) => msg.role !== "system");
+      if (messages.length > 0) {
+        this.messagesByThread.set(thread.id, messages);
       }
     }
     if (currentThreadMessages.length > 0) {
@@ -2021,6 +2022,22 @@ ObservationStrategy.create = ((om, opts) => {
   if (deps.scope === "resource" && opts.resourceId) return new ResourceScopedObservationStrategy(deps, opts);
   return new SyncObservationStrategy(deps, opts);
 });
+
+// src/processors/observational-memory/observation-turn/load-memory-context.ts
+async function loadMemoryContextMessages({
+  memory,
+  messageList,
+  threadId,
+  resourceId
+}) {
+  const ctx = await memory.getContext({ threadId, resourceId });
+  for (const msg of ctx.messages) {
+    if (msg.role !== "system") {
+      messageList.add(msg, "memory");
+    }
+  }
+  return ctx;
+}
 var ObservationStep = class {
   constructor(turn, stepNumber) {
     this.turn = turn;
@@ -2388,12 +2405,12 @@ var ObservationTurn = class {
     this._generationCountAtStart = this._record.generationCount;
     this.memory = memory;
     if (memory) {
-      const ctx = await memory.getContext({ threadId: this.threadId, resourceId: this.resourceId });
-      for (const msg of ctx.messages) {
-        if (msg.role !== "system") {
-          this.messageList.add(msg, "memory");
-        }
-      }
+      const ctx = await loadMemoryContextMessages({
+        memory,
+        messageList: this.messageList,
+        threadId: this.threadId,
+        resourceId: this.resourceId
+      });
       this._context = {
         messages: ctx.messages,
         systemMessage: ctx.systemMessage,
@@ -7419,6 +7436,9 @@ Async buffering is enabled by default \u2014 this opt-out is only needed when us
     }
     const result = [];
     for (const msg of allMessages) {
+      if (msg.role === "system") {
+        continue;
+      }
       if (observedMessageIds?.has(msg.id)) {
         continue;
       }
@@ -7729,7 +7749,7 @@ ${suggestedResponse}
         } : void 0
       });
     }
-    return result.messages;
+    return result.messages.filter((msg) => msg.role !== "system");
   }
   /**
    * Format unobserved messages from other threads as <unobserved-context> blocks.
@@ -9212,6 +9232,33 @@ var GATEWAY_STATE_KEY = "__isGatewayModel";
 function isMastraGatewayModel(model) {
   return typeof model === "object" && model !== null && "gatewayId" in model && model.gatewayId === "mastra";
 }
+function injectObservationContextMessages({
+  messageList,
+  systemMessages,
+  continuationMessage,
+  threadId,
+  resourceId
+}) {
+  if (!systemMessages?.length) {
+    return;
+  }
+  messageList.clearSystemMessages("observational-memory");
+  for (const msg of systemMessages) {
+    messageList.addSystem(msg, "observational-memory");
+  }
+  const contMsg = continuationMessage ?? {
+    id: "om-continuation",
+    role: "user",
+    createdAt: /* @__PURE__ */ new Date(0),
+    content: {
+      format: 2,
+      parts: [{ type: "text", text: `<system-reminder>${OBSERVATION_CONTINUATION_HINT}</system-reminder>` }]
+    },
+    threadId,
+    resourceId
+  };
+  messageList.add(contMsg, "memory");
+}
 var ObservationalMemoryProcessor = class {
   id = "observational-memory";
   name = "Observational Memory";
@@ -9266,6 +9313,25 @@ var ObservationalMemoryProcessor = class {
       const preMessagesSnapshot = reproCaptureEnabled ? safeCaptureJson(messageList.get.all.db()) : null;
       const preSerializedMessageList = reproCaptureEnabled ? safeCaptureJson(messageList.serialize()) : null;
       if (readOnly) {
+        const ctx = await loadMemoryContextMessages({
+          memory: this.memory,
+          messageList,
+          threadId,
+          resourceId
+        });
+        const systemMessages = ctx.hasObservations && ctx.omRecord ? await this.engine.buildContextSystemMessages({
+          threadId,
+          resourceId,
+          record: ctx.omRecord,
+          unobservedContextBlocks: ctx.otherThreadsContext
+        }) : void 0;
+        injectObservationContextMessages({
+          messageList,
+          systemMessages,
+          continuationMessage: ctx.continuationMessage,
+          threadId,
+          resourceId
+        });
         return messageList;
       }
       const activeTurn = state.__omTurn ?? this.turn;
@@ -9321,26 +9387,13 @@ var ObservationalMemoryProcessor = class {
           }
           throw err;
         }
-        if (ctx.systemMessage) {
-          messageList.clearSystemMessages("observational-memory");
-          for (const msg of ctx.systemMessage) {
-            messageList.addSystem(msg, "observational-memory");
-          }
-          const contMsg = this.turn.context.continuation ?? {
-            id: "om-continuation",
-            role: "user",
-            createdAt: /* @__PURE__ */ new Date(0),
-            content: {
-              format: 2,
-              parts: [
-                { type: "text", text: `<system-reminder>${OBSERVATION_CONTINUATION_HINT}</system-reminder>` }
-              ]
-            },
-            threadId,
-            resourceId
-          };
-          messageList.add(contMsg, "memory");
-        }
+        injectObservationContextMessages({
+          messageList,
+          systemMessages: ctx.systemMessage,
+          continuationMessage: this.turn.context.continuation,
+          threadId,
+          resourceId
+        });
         const freshRecord = await this.engine.getOrCreateRecord(threadId, resourceId);
         await this.engine.emitProgress({
           record: freshRecord,
@@ -9441,5 +9494,5 @@ function getObservationsAsOf(activeObservations, asOf) {
 }
 
 export { ModelByInputTokens, OBSERVER_SYSTEM_PROMPT, ObservationalMemory, ObservationalMemoryProcessor, TokenCounter, buildObserverPrompt, buildObserverSystemPrompt, combineObservationGroupRanges, deriveObservationGroupProvenance, extractCurrentTask, formatMessagesForObserver, formatToolResultForObserver, getObservationsAsOf, hasCurrentTaskSection, injectAnchorIds, optimizeObservationsForContext, parseAnchorId, parseObservationGroups, parseObserverOutput, reconcileObservationGroupsFromReflection, renderObservationGroupsForReflection, resolveToolResultValue, stripEphemeralAnchorIds, stripObservationGroups, truncateStringByTokens, wrapInObservationGroup };
-//# sourceMappingURL=chunk-NUYSX3DD.js.map
-//# sourceMappingURL=chunk-NUYSX3DD.js.map
+//# sourceMappingURL=chunk-PBZHHKPE.js.map
+//# sourceMappingURL=chunk-PBZHHKPE.js.map