@mastra/memory 1.2.0-alpha.0 → 1.2.0-alpha.1

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

@@ -1415,6 +1415,30 @@ var ObservationalMemory = class _ObservationalMemory {
       _ObservationalMemory.reflectionBufferCycleIds.delete(obsBufKey);
     }
   }
+  /**
+   * Await any in-flight async buffering operations for a given thread/resource.
+   * Returns once all buffering promises have settled (or after timeout).
+   */
+  static async awaitBuffering(threadId, resourceId, scope, timeoutMs = 3e4) {
+    const lockKey = scope === "resource" && resourceId ? `resource:${resourceId}` : `thread:${threadId ?? "unknown"}`;
+    const obsKey = `obs:${lockKey}`;
+    const reflKey = `refl:${lockKey}`;
+    const promises = [];
+    const obsOp = _ObservationalMemory.asyncBufferingOps.get(obsKey);
+    if (obsOp) promises.push(obsOp);
+    const reflOp = _ObservationalMemory.asyncBufferingOps.get(reflKey);
+    if (reflOp) promises.push(reflOp);
+    if (promises.length === 0) {
+      return;
+    }
+    try {
+      await Promise.race([
+        Promise.all(promises),
+        new Promise((_, reject) => setTimeout(() => reject(new Error("Timeout")), timeoutMs))
+      ]);
+    } catch {
+    }
+  }
   /**
    * Safely get bufferedObservationChunks as an array.
    * Handles cases where it might be a JSON string or undefined.
@@ -1674,6 +1698,13 @@ Async buffering is enabled by default \u2014 this opt-out is only needed when us
       }
     };
   }
+  /**
+   * Wait for any in-flight async buffering operations for the given thread/resource.
+   * Used by server endpoints to block until buffering completes so the UI can get final state.
+   */
+  async waitForBuffering(threadId, resourceId, timeoutMs = 3e4) {
+    return _ObservationalMemory.awaitBuffering(threadId, resourceId, this.scope, timeoutMs);
+  }
   /**
    * Get the full config including resolved model names.
    * This is async because it needs to resolve the model configs.
@@ -2107,6 +2138,34 @@ Async buffering is enabled by default \u2014 this opt-out is only needed when us
       }
     }
   }
+  /**
+   * Persist a marker to the last assistant message in storage.
+   * Unlike persistMarkerToMessage, this fetches messages directly from the DB
+   * so it works even when no MessageList is available (e.g. async buffering ops).
+   */
+  async persistMarkerToStorage(marker, threadId, resourceId) {
+    try {
+      const result = await this.storage.listMessages({
+        threadId,
+        perPage: 20,
+        orderBy: { field: "createdAt", direction: "DESC" }
+      });
+      const messages = result?.messages ?? [];
+      for (const msg of messages) {
+        if (msg?.role === "assistant" && msg.content?.parts && Array.isArray(msg.content.parts)) {
+          msg.content.parts.push(marker);
+          await this.messageHistory.persistMessages({
+            messages: [msg],
+            threadId,
+            resourceId
+          });
+          return;
+        }
+      }
+    } catch (e) {
+      omDebug(`[OM:persistMarkerToStorage] failed to save marker to DB: ${e}`);
+    }
+  }
   /**
    * Find the last completed observation boundary in a message's parts.
    * A completed observation is a start marker followed by an end marker.
@@ -3251,6 +3310,8 @@ NOTE: Any messages following this system reminder are newer than your memories.
         },
         currentObservationTokens
       );
+      this.storage.setPendingMessageTokens(freshRecord.id, totalPendingTokens).catch(() => {
+      });
     }
     return messageList;
   }
@@ -3791,6 +3852,7 @@ ${result.observations}` : result.observations;
         });
         void writer.custom(failedMarker).catch(() => {
         });
+        await this.persistMarkerToStorage(failedMarker, threadId, freshRecord.resourceId ?? void 0);
       }
       omError("[OM] Async buffered observation failed", error);
     }
@@ -3853,6 +3915,7 @@ ${result.observations}` : result.observations;
       });
       void writer.custom(endMarker).catch(() => {
       });
+      await this.persistMarkerToStorage(endMarker, threadId, record.resourceId ?? void 0);
     }
   }
   /**
@@ -3979,7 +4042,7 @@ ${bufferedObservations}`;
     this.storage.setBufferingReflectionFlag(record.id, true).catch((err) => {
       omError("[OM] Failed to set buffering reflection flag", err);
     });
-    const asyncOp = this.doAsyncBufferedReflection(record, bufferKey, writer).catch((error) => {
+    const asyncOp = this.doAsyncBufferedReflection(record, bufferKey, writer).catch(async (error) => {
       if (writer) {
         const failedMarker = this.createBufferingFailedMarker({
           cycleId: `reflect-buf-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`,
@@ -3992,6 +4055,7 @@ ${bufferedObservations}`;
         });
         void writer.custom(failedMarker).catch(() => {
         });
+        await this.persistMarkerToStorage(failedMarker, record.threadId ?? "", record.resourceId ?? void 0);
       }
       omError("[OM] Async buffered reflection failed", error);
     }).finally(() => {
@@ -4085,6 +4149,7 @@ ${bufferedObservations}`;
       });
       void writer.custom(endMarker).catch(() => {
       });
+      await this.persistMarkerToStorage(endMarker, currentRecord.threadId ?? "", currentRecord.resourceId ?? void 0);
     }
   }
   /**
@@ -4773,5 +4838,5 @@ exports.formatMessagesForObserver = formatMessagesForObserver;
 exports.hasCurrentTaskSection = hasCurrentTaskSection;
 exports.optimizeObservationsForContext = optimizeObservationsForContext;
 exports.parseObserverOutput = parseObserverOutput;
-//# sourceMappingURL=chunk-AWE2QQPI.cjs.map
-//# sourceMappingURL=chunk-AWE2QQPI.cjs.map
+//# sourceMappingURL=chunk-7SCXX4S7.cjs.map
+//# sourceMappingURL=chunk-7SCXX4S7.cjs.map