@mastra/memory 1.17.0 → 1.17.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @mastra/memory
 
+## 1.17.1
+
+### Patch Changes
+
+- Fixed streamed tool results being replayed when observational memory runs mid-stream. ([#15701](https://github.com/mastra-ai/mastra/pull/15701))
+  Fixed observational memory markers being saved as separate empty assistant messages.
+- Updated dependencies [[`733bf53`](https://github.com/mastra-ai/mastra/commit/733bf53d9352aedd3ef38c3d501edb275b65b43c), [`5405b3b`](https://github.com/mastra-ai/mastra/commit/5405b3b35325c5b8fb34fc7ac109bd2feb7bb6fe), [`45e29cb`](https://github.com/mastra-ai/mastra/commit/45e29cb5b5737f3083eb3852db02b944b9cf37ed), [`750b4d3`](https://github.com/mastra-ai/mastra/commit/750b4d3d8231f92e769b2c485921ac5a8ca639b9), [`c321127`](https://github.com/mastra-ai/mastra/commit/c3211275fc195de9ad1ead2746b354beb8eae6e8), [`a07bcef`](https://github.com/mastra-ai/mastra/commit/a07bcefea77c03d6d322caad973dca49b4b15fa1), [`696694e`](https://github.com/mastra-ai/mastra/commit/696694e00f29241a25dd1a1b749afa06c3a626b4), [`b084a80`](https://github.com/mastra-ai/mastra/commit/b084a800db0f82d62e1fc3d6e3e3480da1ba5a53), [`82b7a96`](https://github.com/mastra-ai/mastra/commit/82b7a964169636c1d1e0c694fc892a213b0179d5), [`df97812`](https://github.com/mastra-ai/mastra/commit/df97812bd949dcafeb074b80ecab501724b49c3b), [`8bbe360`](https://github.com/mastra-ai/mastra/commit/8bbe36042af7fc4be0244dffd8913f6795179421), [`f6b8ba8`](https://github.com/mastra-ai/mastra/commit/f6b8ba8dbf533b7a8db90c72b6805ddc804a3a72), [`a07bcef`](https://github.com/mastra-ai/mastra/commit/a07bcefea77c03d6d322caad973dca49b4b15fa1)]:
+  - @mastra/core@1.28.0
+
+## 1.17.1-alpha.0
+
+### Patch Changes
+
+- Fixed observational memory message boundaries so streamed tool results continue in a fresh assistant message instead of being filtered out mid-run, and OM lifecycle markers persist through memory without creating data-only database messages. ([#15701](https://github.com/mastra-ai/mastra/pull/15701))
+
+- Updated dependencies [[`750b4d3`](https://github.com/mastra-ai/mastra/commit/750b4d3d8231f92e769b2c485921ac5a8ca639b9)]:
+  - @mastra/core@1.28.0-alpha.1
+
 ## 1.17.0
 
 ### Minor Changes

package/dist/{chunk-MPBMHIAQ.js → chunk-7742VTN5.js}

@@ -1088,9 +1088,11 @@ var ObservationStrategy = class _ObservationStrategy {
   }
   async streamMarker(marker) {
     if (this.opts.writer) {
-      await this.opts.writer.custom(marker).catch(() => {
+      await this.opts.writer.custom({ ...marker, transient: true }).catch(() => {
       });
     }
+    const markerThreadId = marker.data?.threadId ?? this.opts.threadId;
+    await this.persistMarkerToStorage(marker, markerThreadId, this.opts.resourceId);
   }
   getObservationMarkerConfig() {
     return {
@@ -1596,7 +1598,7 @@ var AsyncBufferObservationStrategy = class extends ObservationStrategy {
     }
   }
   async emitEndMarkers(_cycleId, processed) {
-    if (!processed.observations || !this.opts.writer) return;
+    if (!processed.observations) return;
     const { record, threadId, messages } = this.opts;
     const tokensBuffered = await this.tokenCounter.countMessagesAsync(messages);
     const updatedRecord = await this.storage.getObservationalMemory(record.threadId, record.resourceId);
@@ -1612,12 +1614,13 @@ var AsyncBufferObservationStrategy = class extends ObservationStrategy {
       threadId,
       observations: processed.observations
     });
-    void this.opts.writer.custom(endMarker).catch(() => {
-    });
+    if (this.opts.writer) {
+      void this.opts.writer.custom({ ...endMarker, transient: true }).catch(() => {
+      });
+    }
     await this.persistMarkerToStorage(endMarker, threadId, record.resourceId ?? void 0);
   }
   async emitFailedMarkers(_cycleId, error) {
-    if (!this.opts.writer) return;
     const { record, threadId, messages } = this.opts;
     const tokensAttempted = await this.tokenCounter.countMessagesAsync(messages);
     const failedMarker = createBufferingFailedMarker({
@@ -1629,8 +1632,10 @@ var AsyncBufferObservationStrategy = class extends ObservationStrategy {
       recordId: record.id,
       threadId
     });
-    void this.opts.writer.custom(failedMarker).catch(() => {
-    });
+    if (this.opts.writer) {
+      void this.opts.writer.custom({ ...failedMarker, transient: true }).catch(() => {
+      });
+    }
     await this.persistMarkerToStorage(failedMarker, threadId, record.resourceId ?? void 0);
   }
 };
@@ -2095,7 +2100,11 @@ var ObservationStep = class {
     }
     const allMsgsForToolCheck = messageList.get.all.db();
     const lastMessage = allMsgsForToolCheck[allMsgsForToolCheck.length - 1];
-    const latestStepParts = getLatestStepParts(lastMessage?.content?.parts ?? []);
+    const pendingStepMessages = [...messageList.get.input.db(), ...messageList.get.response.db()];
+    const latestStepParts = [
+      ...getLatestStepParts(lastMessage?.content?.parts ?? []),
+      ...pendingStepMessages.flatMap((msg) => getLatestStepParts(msg.content?.parts ?? []))
+    ];
     const hasIncompleteToolCalls = latestStepParts.some(
       (part) => part?.type === "tool-invocation" && part.toolInvocation?.state === "call"
     );
@@ -2282,6 +2291,31 @@ var ObservationStep = class {
       writer: this.turn.writer,
       observabilityContext: this.turn.observabilityContext
     });
+    if (obsResult.observed) {
+      const observedMessageIds = new Set(obsResult.record.observedMessageIds ?? []);
+      const liveMessages = messageList.get.all.db();
+      let latestObservedIndex = -1;
+      for (let i = liveMessages.length - 1; i >= 0; i--) {
+        const message = liveMessages[i];
+        if (message && observedMessageIds.has(message.id)) {
+          latestObservedIndex = i;
+          break;
+        }
+      }
+      const messageToSeal = latestObservedIndex >= 0 ? liveMessages[latestObservedIndex] : void 0;
+      const messagesToSeal = messageToSeal ? [messageToSeal] : [];
+      om.sealMessagesForBuffering(messagesToSeal);
+      try {
+        await this.turn.hooks?.onSyncObservationComplete?.();
+      } catch (error) {
+        omDebug(
+          `[OM:observe] onSyncObservationComplete hook failed: ${error instanceof Error ? error.message : String(error)}`
+        );
+      }
+      if (messagesToSeal.length > 0) {
+        await om.persistMessages(messagesToSeal, threadId, resourceId);
+      }
+    }
     return {
       succeeded: obsResult.observed,
       record: obsResult.record,
@@ -2309,7 +2343,7 @@ var ObservationTurn = class {
   observabilityContext;
   /** Current actor model for this step. Updated by the processor before prepare(). */
   actorModelContext;
-  /** Optional processor-provided hooks for turn/step lifecycle integration. */
+  /** Processor-provided hooks for turn/step lifecycle integration. */
   hooks;
   constructor(opts) {
     this.om = opts.om;
@@ -2317,7 +2351,7 @@ var ObservationTurn = class {
     this.resourceId = opts.resourceId;
     this.messageList = opts.messageList;
     this.observabilityContext = opts.observabilityContext;
-    this.hooks = opts.hooks;
+    this.hooks = opts.hooks ?? {};
   }
   om;
   threadId;
@@ -2337,6 +2371,10 @@ var ObservationTurn = class {
   get currentStep() {
     return this._currentStep;
   }
+  addHooks(hooks) {
+    if (!hooks) return;
+    Object.assign(this.hooks, hooks);
+  }
   /**
    * Load context and cache the record. Call once at the start of the turn.
    *
@@ -4406,8 +4444,9 @@ var ReflectorRunner = class {
           recordId: streamContext.recordId,
           threadId: streamContext.threadId
         });
-        await streamContext.writer.custom(failedMarker).catch(() => {
+        await streamContext.writer.custom({ ...failedMarker, transient: true }).catch(() => {
         });
+        await this.persistMarkerToStorage(failedMarker, streamContext.threadId, streamContext.resourceId);
         const retryCycleId = crypto.randomUUID();
         streamContext.cycleId = retryCycleId;
         const startMarker = createObservationStartMarker({
@@ -4420,8 +4459,9 @@ var ReflectorRunner = class {
           config: this.getObservationMarkerConfig()
         });
         streamContext.startedAt = startMarker.data.startedAt;
-        await streamContext.writer.custom(startMarker).catch(() => {
+        await streamContext.writer.custom({ ...startMarker, transient: true }).catch(() => {
         });
+        await this.persistMarkerToStorage(startMarker, streamContext.threadId, streamContext.resourceId);
       }
       currentLevel = Math.min(currentLevel + 1, maxLevel);
     }
@@ -4458,7 +4498,7 @@ var ReflectorRunner = class {
           recordId: record.id,
           threadId: record.threadId ?? ""
         });
-        void writer.custom(failedMarker).catch(() => {
+        void writer.custom({ ...failedMarker, transient: true }).catch(() => {
         });
         await this.persistMarkerToStorage(failedMarker, record.threadId ?? "", record.resourceId ?? void 0);
       }
@@ -4516,8 +4556,13 @@ var ReflectorRunner = class {
         threadIds: record.threadId ? [record.threadId] : [],
         config: this.getObservationMarkerConfig(currentRecord)
       });
-      void writer.custom(startMarker).catch(() => {
+      void writer.custom({ ...startMarker, transient: true }).catch(() => {
       });
+      await this.persistMarkerToStorage(
+        startMarker,
+        currentRecord.threadId ?? "",
+        currentRecord.resourceId ?? void 0
+      );
     }
     const compressionStartLevel = await this.getCompressionStartLevel(requestContext);
     const reflectResult = await this.call(
@@ -4556,7 +4601,7 @@ var ReflectorRunner = class {
         threadId: currentRecord.threadId ?? "",
         observations: reflectResult.observations
       });
-      void writer.custom(endMarker).catch(() => {
+      void writer.custom({ ...endMarker, transient: true }).catch(() => {
       });
       await this.persistMarkerToStorage(endMarker, currentRecord.threadId ?? "", currentRecord.resourceId ?? void 0);
     }
@@ -4655,7 +4700,7 @@ ${unreflectedContent}` : freshRecord.bufferedReflection;
         currentModel: activationMetadata?.currentModel,
         config: this.getObservationMarkerConfig(freshRecord)
       });
-      void writer.custom(activationMarker).catch(() => {
+      void writer.custom({ ...activationMarker, transient: true }).catch(() => {
       });
       await this.persistMarkerToMessage(
         activationMarker,
@@ -4794,8 +4839,9 @@ ${unreflectedContent}` : freshRecord.bufferedReflection;
         threadIds: [threadId],
         config: this.getObservationMarkerConfig(record)
       });
-      await writer.custom(startMarker).catch(() => {
+      await writer.custom({ ...startMarker, transient: true }).catch(() => {
       });
+      await this.persistMarkerToStorage(startMarker, threadId, record.resourceId ?? void 0);
     }
     this.emitDebugEvent({
       type: "reflection_triggered",
@@ -4810,7 +4856,8 @@ ${unreflectedContent}` : freshRecord.bufferedReflection;
       cycleId,
       startedAt,
       recordId: record.id,
-      threadId
+      threadId,
+      resourceId: record.resourceId ?? void 0
     } : void 0;
     let reflectionUsage;
     let reflectionError;
@@ -4845,8 +4892,9 @@ ${unreflectedContent}` : freshRecord.bufferedReflection;
           recordId: record.id,
           threadId
         });
-        await writer.custom(endMarker).catch(() => {
+        await writer.custom({ ...endMarker, transient: true }).catch(() => {
         });
+        await this.persistMarkerToStorage(endMarker, threadId, record.resourceId ?? void 0);
       }
       this.emitDebugEvent({
         type: "reflection_complete",
@@ -4869,8 +4917,9 @@ ${unreflectedContent}` : freshRecord.bufferedReflection;
           recordId: record.id,
           threadId
         });
-        await writer.custom(failedMarker).catch(() => {
+        await writer.custom({ ...failedMarker, transient: true }).catch(() => {
         });
+        await this.persistMarkerToStorage(failedMarker, threadId, record.resourceId ?? void 0);
       }
       reflectionError = error instanceof Error ? error : new Error(String(error));
       if (abortSignal?.aborted) {
@@ -7799,17 +7848,18 @@ ${grouped}` : grouped;
     const cycleId = `buffer-obs-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`;
     const startedAt = (/* @__PURE__ */ new Date()).toISOString();
     const tokensToBuffer = await this.tokenCounter.countMessagesAsync(messagesToBuffer);
+    const startMarker = createBufferingStartMarker({
+      cycleId,
+      operationType: "observation",
+      tokensToBuffer,
+      recordId: freshRecord.id,
+      threadId,
+      threadIds: [threadId],
+      config: this.getObservationMarkerConfig()
+    });
+    await this.persistMarkerToStorage(startMarker, threadId, freshRecord.resourceId ?? void 0);
     if (writer) {
-      const startMarker = createBufferingStartMarker({
-        cycleId,
-        operationType: "observation",
-        tokensToBuffer,
-        recordId: freshRecord.id,
-        threadId,
-        threadIds: [threadId],
-        config: this.getObservationMarkerConfig()
-      });
-      void writer.custom(startMarker).catch(() => {
+      void writer.custom({ ...startMarker, transient: true }).catch(() => {
       });
     }
     omDebug(
@@ -8469,18 +8519,19 @@ ${grouped}` : grouped;
       }
       const cycleId = `buffer-obs-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`;
       const startedAt = (/* @__PURE__ */ new Date()).toISOString();
+      const startMarker = createBufferingStartMarker({
+        cycleId,
+        operationType: "observation",
+        tokensToBuffer: newTokens,
+        recordId: record.id,
+        threadId,
+        threadIds: [threadId],
+        config: this.getObservationMarkerConfig()
+      });
+      await this.persistMarkerToStorage(startMarker, threadId, record.resourceId ?? void 0);
       const writer = opts.writer;
       if (writer) {
-        const startMarker = createBufferingStartMarker({
-          cycleId,
-          operationType: "observation",
-          tokensToBuffer: newTokens,
-          recordId: record.id,
-          threadId,
-          threadIds: [threadId],
-          config: this.getObservationMarkerConfig()
-        });
-        void writer.custom(startMarker).catch(() => {
+        void writer.custom({ ...startMarker, transient: true }).catch(() => {
         });
       }
       await ObservationStrategy.create(this, {
@@ -8673,7 +8724,7 @@ ${grouped}` : grouped;
           currentModel,
           config: this.getObservationMarkerConfig()
         });
-        void opts.writer.custom(activationMarker).catch(() => {
+        void opts.writer.custom({ ...activationMarker, transient: true }).catch(() => {
         });
         await this.persistMarkerToMessage(
           activationMarker,
@@ -9124,7 +9175,8 @@ var ObservationalMemoryProcessor = class {
           messageList,
           observabilityContext: getOmObservabilityContext(args),
           hooks: {
-            onBufferChunkSealed: rotateResponseMessageId
+            onBufferChunkSealed: rotateResponseMessageId,
+            onSyncObservationComplete: rotateResponseMessageId
           }
         });
         this.turn.writer = writer;
@@ -9135,6 +9187,10 @@ var ObservationalMemoryProcessor = class {
         }
         state.__omTurn = this.turn;
       }
+      this.turn.addHooks({
+        onBufferChunkSealed: rotateResponseMessageId,
+        onSyncObservationComplete: rotateResponseMessageId
+      });
       const observabilityContext = getOmObservabilityContext(args);
       state.__omObservabilityContext = observabilityContext;
       this.turn.observabilityContext = observabilityContext;
@@ -9272,5 +9328,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-MPBMHIAQ.js.map
-//# sourceMappingURL=chunk-MPBMHIAQ.js.map
+//# sourceMappingURL=chunk-7742VTN5.js.map
+//# sourceMappingURL=chunk-7742VTN5.js.map