@mastra/memory 1.2.0 → 1.3.0

package/dist/{chunk-7SCXX4S7.cjs → chunk-LXATBJ2L.cjs}

@@ -1033,7 +1033,7 @@ var TokenCounter = class _TokenCounter {
     if (toolResultCount > 0) {
       overhead += toolResultCount * _TokenCounter.TOKENS_PER_MESSAGE;
     }
-    return this.encoder.encode(tokenString, "all").length + overhead;
+    return Math.round(this.encoder.encode(tokenString, "all").length + overhead);
   }
   /**
    * Count tokens in an array of messages
@@ -1287,6 +1287,17 @@ var OBSERVATIONAL_MEMORY_DEFAULTS = {
     // Start buffering at 50% of observationTokens
   }
 };
+var OBSERVATION_CONTINUATION_HINT = `This message is not from the user, the conversation history grew too long and wouldn't fit in context! Thankfully the entire conversation is stored in your memory observations. Please continue from where the observations left off. Do not refer to your "memory observations" directly, the user doesn't know about them, they are your memories! Just respond naturally as if you're remembering the conversation (you are!). Do not say "Hi there!" or "based on our previous conversation" as if the conversation is just starting, this is not a new conversation. This is an ongoing conversation, keep continuity by responding based on your memory. For example do not say "I understand. I've reviewed my memory observations", or "I remember [...]". Answer naturally following the suggestion from your memory. Note that your memory may contain a suggested first response, which you should follow.
+
+IMPORTANT: this system reminder is NOT from the user. The system placed it here as part of your memory system. This message is part of you remembering your conversation with the user.
+
+NOTE: Any messages following this system reminder are newer than your memories.`;
+var OBSERVATION_CONTEXT_PROMPT = `The following observations block contains your memory of past conversations with this user.`;
+var OBSERVATION_CONTEXT_INSTRUCTIONS = `IMPORTANT: When responding, reference specific details from these observations. Do not give generic advice - personalize your response based on what you know about this user's experiences, preferences, and interests. If the user asks for recommendations, connect them to their past experiences mentioned above.
+
+KNOWLEDGE UPDATES: When asked about current state (e.g., "where do I currently...", "what is my current..."), always prefer the MOST RECENT information. Observations include dates - if you see conflicting information, the newer observation supersedes the older one. Look for phrases like "will start", "is switching", "changed to", "moved to" as indicators that previous information has been updated.
+
+PLANNED ACTIONS: If the user stated they planned to do something (e.g., "I'm going to...", "I'm looking forward to...", "I will...") and the date they planned to do it is now in the past (check the relative time like "3 weeks ago"), assume they completed the action unless there's evidence they didn't. For example, if someone said "I'll start my new diet on Monday" and that was 2 weeks ago, assume they started the diet.`;
 var ObservationalMemory = class _ObservationalMemory {
   id = "observational-memory";
   name = "Observational Memory";
@@ -1874,6 +1885,16 @@ Async buffering is enabled by default \u2014 this opt-out is only needed when us
     const effectiveThreshold = Math.max(totalBudget - currentObservationTokens, baseThreshold);
     return Math.round(effectiveThreshold);
   }
+  /**
+   * Check whether the unobserved message tokens meet the observation threshold.
+   */
+  meetsObservationThreshold(opts) {
+    const { record, unobservedTokens, extraTokens = 0 } = opts;
+    const pendingTokens = (record.pendingMessageTokens ?? 0) + unobservedTokens + extraTokens;
+    const currentObservationTokens = record.observationTokenCount ?? 0;
+    const threshold = this.calculateDynamicThreshold(this.observationConfig.messageTokens, currentObservationTokens);
+    return pendingTokens >= threshold;
+  }
   /**
    * Get or create the Observer agent
    */
@@ -1920,7 +1941,8 @@ Async buffering is enabled by default \u2014 this opt-out is only needed when us
     };
   }
   /**
-   * Get or create the observational memory record
+   * Get or create the observational memory record.
+   * Returns the existing record if one exists, otherwise initializes a new one.
    */
   async getOrCreateRecord(threadId, resourceId) {
     const ids = this.getStorageIds(threadId, resourceId);
@@ -2589,17 +2611,13 @@ Async buffering is enabled by default \u2014 this opt-out is only needed when us
       optimized = addRelativeTimeToObservations(optimized, currentDate);
     }
     let content = `
-The following observations block contains your memory of past conversations with this user.
+${OBSERVATION_CONTEXT_PROMPT}
 
 <observations>
 ${optimized}
 </observations>
 
-IMPORTANT: When responding, reference specific details from these observations. Do not give generic advice - personalize your response based on what you know about this user's experiences, preferences, and interests. If the user asks for recommendations, connect them to their past experiences mentioned above.
-
-KNOWLEDGE UPDATES: When asked about current state (e.g., "where do I currently...", "what is my current..."), always prefer the MOST RECENT information. Observations include dates - if you see conflicting information, the newer observation supersedes the older one. Look for phrases like "will start", "is switching", "changed to", "moved to" as indicators that previous information has been updated.
-
-PLANNED ACTIONS: If the user stated they planned to do something (e.g., "I'm going to...", "I'm looking forward to...", "I will...") and the date they planned to do it is now in the past (check the relative time like "3 weeks ago"), assume they completed the action unless there's evidence they didn't. For example, if someone said "I'll start my new diet on Monday" and that was 2 weeks ago, assume they started the diet.`;
+${OBSERVATION_CONTEXT_INSTRUCTIONS}`;
     if (unobservedContextBlocks) {
       content += `
 
@@ -2863,16 +2881,22 @@ ${suggestedResponse}
       if (freshUnobservedMessages.length > 0) {
         try {
           if (this.scope === "resource" && resourceId) {
-            await this.doResourceScopedObservation(
-              freshRecord,
-              threadId,
+            await this.doResourceScopedObservation({
+              record: freshRecord,
+              currentThreadId: threadId,
               resourceId,
-              freshUnobservedMessages,
+              currentThreadMessages: freshUnobservedMessages,
               writer,
               abortSignal
-            );
+            });
           } else {
-            await this.doSynchronousObservation(freshRecord, threadId, freshUnobservedMessages, writer, abortSignal);
+            await this.doSynchronousObservation({
+              record: freshRecord,
+              threadId,
+              unobservedMessages: freshUnobservedMessages,
+              writer,
+              abortSignal
+            });
           }
           updatedRecord = await this.getOrCreateRecord(threadId, resourceId);
           const updatedTime = updatedRecord.lastObservedAt?.getTime() ?? 0;
@@ -3012,12 +3036,7 @@ ${suggestedResponse}
         parts: [
           {
             type: "text",
-            text: `<system-reminder>This message is not from the user, the conversation history grew too long and wouldn't fit in context! Thankfully the entire conversation is stored in your memory observations. Please continue from where the observations left off. Do not refer to your "memory observations" directly, the user doesn't know about them, they are your memories! Just respond naturally as if you're remembering the conversation (you are!). Do not say "Hi there!" or "based on our previous conversation" as if the conversation is just starting, this is not a new conversation. This is an ongoing conversation, keep continuity by responding based on your memory. For example do not say "I understand. I've reviewed my memory observations", or "I remember [...]". Answer naturally following the suggestion from your memory. Note that your memory may contain a suggested first response, which you should follow.
-
-IMPORTANT: this system reminder is NOT from the user. The system placed it here as part of your memory system. This message is part of you remembering your conversation with the user.
-
-NOTE: Any messages following this system reminder are newer than your memories.
-</system-reminder>`
+            text: `<system-reminder>${OBSERVATION_CONTINUATION_HINT}</system-reminder>`
           }
         ]
       },
@@ -3174,14 +3193,13 @@ NOTE: Any messages following this system reminder are newer than your memories.
             _ObservationalMemory.lastBufferedBoundary.set(bufKey, 0);
             this.storage.setBufferingObservationFlag(record.id, false, 0).catch(() => {
             });
-            await this.maybeReflect(
+            await this.maybeReflect({
               record,
-              record.observationTokenCount ?? 0,
+              observationTokens: record.observationTokenCount ?? 0,
               threadId,
               writer,
-              void 0,
               messageList
-            );
+            });
             record = await this.getOrCreateRecord(threadId, resourceId);
           }
         }
@@ -3191,7 +3209,7 @@ NOTE: Any messages following this system reminder are newer than your memories.
       const obsTokens = record.observationTokenCount ?? 0;
       if (this.shouldReflect(obsTokens)) {
         omDebug(`[OM:step0-reflect] obsTokens=${obsTokens} over reflectThreshold, triggering reflection`);
-        await this.maybeReflect(record, obsTokens, threadId, writer, void 0, messageList);
+        await this.maybeReflect({ record, observationTokens: obsTokens, threadId, writer, messageList });
         record = await this.getOrCreateRecord(threadId, resourceId);
       } else if (this.isAsyncReflectionEnabled()) {
         const lockKey = this.getLockKey(threadId, resourceId);
@@ -3531,21 +3549,35 @@ ${newThreadSection}`;
     }
     const newThreadId = threadIdMatch[1];
     const newDate = dateMatch[1];
-    const existingPattern = new RegExp(
-      `<thread id="${newThreadId}">\\s*Date:\\s*${newDate.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}([\\s\\S]*?)</thread>`
-    );
-    const existingMatch = existingObservations.match(existingPattern);
-    if (existingMatch) {
-      const newObsMatch = newThreadSection.match(/<thread id="[^"]+">[\s\S]*?Date:[^\n]*\n([\s\S]*?)\n<\/thread>/);
-      if (newObsMatch && newObsMatch[1]) {
-        const newObsContent = newObsMatch[1].trim();
-        const mergedSection = existingObservations.replace(existingPattern, (match) => {
-          const withoutClose = match.replace(/<\/thread>$/, "").trimEnd();
-          return `${withoutClose}
+    const threadOpen = `<thread id="${newThreadId}">`;
+    const threadClose = "</thread>";
+    const startIdx = existingObservations.indexOf(threadOpen);
+    let existingSection = null;
+    let existingSectionStart = -1;
+    let existingSectionEnd = -1;
+    if (startIdx !== -1) {
+      const closeIdx = existingObservations.indexOf(threadClose, startIdx);
+      if (closeIdx !== -1) {
+        existingSectionEnd = closeIdx + threadClose.length;
+        existingSectionStart = startIdx;
+        const section = existingObservations.slice(startIdx, existingSectionEnd);
+        if (section.includes(`Date: ${newDate}`) || section.includes(`Date:${newDate}`)) {
+          existingSection = section;
+        }
+      }
+    }
+    if (existingSection) {
+      const dateLineEnd = newThreadSection.indexOf("\n", newThreadSection.indexOf("Date:"));
+      const newCloseIdx = newThreadSection.lastIndexOf(threadClose);
+      if (dateLineEnd !== -1 && newCloseIdx !== -1) {
+        const newObsContent = newThreadSection.slice(dateLineEnd + 1, newCloseIdx).trim();
+        if (newObsContent) {
+          const withoutClose = existingSection.slice(0, existingSection.length - threadClose.length).trimEnd();
+          const merged = `${withoutClose}
 ${newObsContent}
-</thread>`;
-        });
-        return mergedSection;
+${threadClose}`;
+          return existingObservations.slice(0, existingSectionStart) + merged + existingObservations.slice(existingSectionEnd);
+        }
       }
     }
     return `${existingObservations}
@@ -3569,7 +3601,8 @@ ${newThreadSection}`;
   /**
    * Do synchronous observation (fallback when no buffering)
    */
-  async doSynchronousObservation(record, threadId, unobservedMessages, writer, abortSignal) {
+  async doSynchronousObservation(opts) {
+    const { record, threadId, unobservedMessages, writer, abortSignal, reflectionHooks } = opts;
     this.emitDebugEvent({
       type: "observation_triggered",
       timestamp: /* @__PURE__ */ new Date(),
@@ -3694,13 +3727,14 @@ ${result.observations}` : result.observations;
         })),
         usage: result.usage
       });
-      await this.maybeReflect(
-        { ...record, activeObservations: newObservations },
-        totalTokenCount,
+      await this.maybeReflect({
+        record: { ...record, activeObservations: newObservations },
+        observationTokens: totalTokenCount,
         threadId,
         writer,
-        abortSignal
-      );
+        abortSignal,
+        reflectionHooks
+      });
     } catch (error) {
       if (lastMessage?.id) {
         const failedMarker = this.createObservationFailedMarker({
@@ -4243,7 +4277,8 @@ ${unreflectedContent}` : freshRecord.bufferedReflection;
    * 3. Only updates lastObservedAt AFTER all threads are observed
    * 4. Only triggers reflection AFTER all threads are observed
    */
-  async doResourceScopedObservation(record, currentThreadId, resourceId, currentThreadMessages, writer, abortSignal) {
+  async doResourceScopedObservation(opts) {
+    const { record, currentThreadId, resourceId, currentThreadMessages, writer, abortSignal, reflectionHooks } = opts;
     const { threads: allThreads } = await this.storage.listThreads({ filter: { resourceId } });
     const threadMetadataMap = /* @__PURE__ */ new Map();
     for (const thread of allThreads) {
@@ -4505,13 +4540,14 @@ ${unreflectedContent}` : freshRecord.bufferedReflection;
           }
         }
       }
-      await this.maybeReflect(
-        { ...record, activeObservations: currentObservations },
-        totalTokenCount,
-        currentThreadId,
+      await this.maybeReflect({
+        record: { ...record, activeObservations: currentObservations },
+        observationTokens: totalTokenCount,
+        threadId: currentThreadId,
         writer,
-        abortSignal
-      );
+        abortSignal,
+        reflectionHooks
+      });
     } catch (error) {
       for (const [threadId, msgs] of threadsWithMessages) {
         const lastMessage = msgs[msgs.length - 1];
@@ -4582,7 +4618,8 @@ ${unreflectedContent}` : freshRecord.bufferedReflection;
    * When async buffering is enabled via `bufferTokens`, reflection is triggered
    * in the background at intervals, and activated when the threshold is reached.
    */
-  async maybeReflect(record, observationTokens, _threadId, writer, abortSignal, messageList) {
+  async maybeReflect(opts) {
+    const { record, observationTokens, writer, abortSignal, messageList, reflectionHooks } = opts;
     const lockKey = this.getLockKey(record.threadId, record.resourceId);
     const reflectThreshold = this.getMaxThreshold(this.reflectionConfig.observationTokens);
     if (this.isAsyncReflectionEnabled() && observationTokens < reflectThreshold) {
@@ -4618,11 +4655,12 @@ ${unreflectedContent}` : freshRecord.bufferedReflection;
         return;
       }
     }
+    reflectionHooks?.onReflectionStart?.();
     await this.storage.setReflectingFlag(record.id, true);
     registerOp(record.id, "reflecting");
     const cycleId = crypto.randomUUID();
     const startedAt = (/* @__PURE__ */ new Date()).toISOString();
-    const threadId = _threadId ?? "unknown";
+    const threadId = opts.threadId ?? "unknown";
     if (writer) {
       const startMarker = this.createObservationStartMarker({
         cycleId,
@@ -4708,26 +4746,45 @@ ${unreflectedContent}` : freshRecord.bufferedReflection;
       omError("[OM] Reflection failed", error);
     } finally {
       await this.storage.setReflectingFlag(record.id, false);
+      reflectionHooks?.onReflectionEnd?.();
       unregisterOp(record.id, "reflecting");
     }
   }
   /**
    * Manually trigger observation.
+   *
+   * When `messages` is provided, those are used directly (filtered for unobserved)
+   * instead of reading from storage. This allows external systems (e.g., opencode)
+   * to pass conversation messages without duplicating them into Mastra's DB.
    */
-  async observe(threadId, resourceId, _prompt) {
+  async observe(opts) {
+    const { threadId, resourceId, messages, hooks } = opts;
     const lockKey = this.getLockKey(threadId, resourceId);
+    const reflectionHooks = hooks ? { onReflectionStart: hooks.onReflectionStart, onReflectionEnd: hooks.onReflectionEnd } : void 0;
     await this.withLock(lockKey, async () => {
       const freshRecord = await this.getOrCreateRecord(threadId, resourceId);
       if (this.scope === "resource" && resourceId) {
-        await this.doResourceScopedObservation(
-          freshRecord,
-          threadId,
-          resourceId,
-          []
-          // no in-flight messages — everything is already in the DB
-        );
+        const currentMessages = messages ?? [];
+        if (!this.meetsObservationThreshold({
+          record: freshRecord,
+          unobservedTokens: this.tokenCounter.countMessages(currentMessages)
+        })) {
+          return;
+        }
+        hooks?.onObservationStart?.();
+        try {
+          await this.doResourceScopedObservation({
+            record: freshRecord,
+            currentThreadId: threadId,
+            resourceId,
+            currentThreadMessages: currentMessages,
+            reflectionHooks
+          });
+        } finally {
+          hooks?.onObservationEnd?.();
+        }
       } else {
-        const unobservedMessages = await this.loadUnobservedMessages(
+        const unobservedMessages = messages ? this.getUnobservedMessages(messages, freshRecord) : await this.loadUnobservedMessages(
           threadId,
           resourceId,
           freshRecord.lastObservedAt ? new Date(freshRecord.lastObservedAt) : void 0
@@ -4735,7 +4792,18 @@ ${unreflectedContent}` : freshRecord.bufferedReflection;
         if (unobservedMessages.length === 0) {
           return;
         }
-        await this.doSynchronousObservation(freshRecord, threadId, unobservedMessages);
+        if (!this.meetsObservationThreshold({
+          record: freshRecord,
+          unobservedTokens: this.tokenCounter.countMessages(unobservedMessages)
+        })) {
+          return;
+        }
+        hooks?.onObservationStart?.();
+        try {
+          await this.doSynchronousObservation({ record: freshRecord, threadId, unobservedMessages, reflectionHooks });
+        } finally {
+          hooks?.onObservationEnd?.();
+        }
       }
     });
   }
@@ -4828,6 +4896,9 @@ ${unreflectedContent}` : freshRecord.bufferedReflection;
 };
 
 exports.OBSERVATIONAL_MEMORY_DEFAULTS = OBSERVATIONAL_MEMORY_DEFAULTS;
+exports.OBSERVATION_CONTEXT_INSTRUCTIONS = OBSERVATION_CONTEXT_INSTRUCTIONS;
+exports.OBSERVATION_CONTEXT_PROMPT = OBSERVATION_CONTEXT_PROMPT;
+exports.OBSERVATION_CONTINUATION_HINT = OBSERVATION_CONTINUATION_HINT;
 exports.OBSERVER_SYSTEM_PROMPT = OBSERVER_SYSTEM_PROMPT;
 exports.ObservationalMemory = ObservationalMemory;
 exports.TokenCounter = TokenCounter;
@@ -4838,5 +4909,5 @@ exports.formatMessagesForObserver = formatMessagesForObserver;
 exports.hasCurrentTaskSection = hasCurrentTaskSection;
 exports.optimizeObservationsForContext = optimizeObservationsForContext;
 exports.parseObserverOutput = parseObserverOutput;
-//# sourceMappingURL=chunk-7SCXX4S7.cjs.map
-//# sourceMappingURL=chunk-7SCXX4S7.cjs.map
+//# sourceMappingURL=chunk-LXATBJ2L.cjs.map
+//# sourceMappingURL=chunk-LXATBJ2L.cjs.map