@mastra/memory 1.20.0 → 1.20.1-alpha.1

package/dist/{chunk-SMKIROLC.cjs → chunk-P4BYW7GY.cjs}

@@ -2411,6 +2411,8 @@ var ObservationTurn = class {
   requestContext;
   /** Optional observability context for nested OM spans. */
   observabilityContext;
+  /** Optional signal sender for processor-originated notifications. */
+  sendSignal;
   /** Current actor model for this step. Updated by the processor before prepare(). */
   actorModelContext;
   /** Processor-provided hooks for turn/step lifecycle integration. */
@@ -2420,6 +2422,8 @@ var ObservationTurn = class {
     this.threadId = opts.threadId;
     this.resourceId = opts.resourceId;
     this.messageList = opts.messageList;
+    this.sendSignal = opts.sendSignal;
+    this.requestContext = opts.requestContext;
     this.observabilityContext = opts.observabilityContext;
     this.hooks = opts.hooks ?? {};
   }
@@ -2509,7 +2513,9 @@ var ObservationTurn = class {
     if (unsavedMessages.length > 0) {
       await this.om.persistMessages(unsavedMessages, this.threadId, this.resourceId);
     }
-    if (this.om.buffering.isAsyncObservationEnabled()) {
+    const asyncObservationEnabled = this.om.buffering.isAsyncObservationEnabled();
+    const bufferOnIdle = this.om.getObservationConfig().bufferOnIdle;
+    if (asyncObservationEnabled && bufferOnIdle) {
       const allMessages = this.messageList.get.all.db();
       const record = this._record;
       const unobservedMessages = this.om.getUnobservedMessages(allMessages, record);
@@ -2520,8 +2526,11 @@ var ObservationTurn = class {
           messages: unobservedMessages,
           record,
           writer: this.writer,
+          sendSignal: this.sendSignal,
           requestContext: this.requestContext,
-          observabilityContext: this.observabilityContext
+          currentModel: this.actorModelContext,
+          observabilityContext: this.observabilityContext,
+          skipMinimumTokenCheck: true
         }).catch((err) => {
           omDebug(`[OM:turn.end] idle buffer failed: ${err?.message}`);
         });
@@ -5753,7 +5762,7 @@ function ensureMessageMastraMetadata(message) {
   return typedMessage.metadata.mastra;
 }
 function buildEstimateKey(kind, text) {
-  const payloadHash = crypto$1.createHash("sha1").update(text).digest("hex");
+  const payloadHash = crypto$1.createHash("sha256").update(text).digest("hex");
   return `${kind}:${payloadHash}`;
 }
 function resolveEstimatorId() {
@@ -6296,7 +6305,7 @@ function getAttachmentFingerprint(asset) {
   }
   const base64 = encodeAttachmentBase64(asset);
   if (base64) {
-    return { contentHash: crypto$1.createHash("sha1").update(base64).digest("hex") };
+    return { contentHash: crypto$1.createHash("sha256").update(base64).digest("hex") };
   }
   return {};
 }
@@ -6575,6 +6584,116 @@ var TokenCounter = class _TokenCounter {
   resolveToolResultForTokenCounting(part, invocationResult) {
     return resolveToolResultValue(part, invocationResult);
   }
+  countMultimodalToolResultContent(part, toolResult) {
+    if (!toolResult || typeof toolResult !== "object") {
+      return void 0;
+    }
+    const output = toolResult;
+    const content = output.type === "content" && Array.isArray(output.value) ? output.value : output.content;
+    if (!Array.isArray(content)) {
+      return void 0;
+    }
+    let hasAttachment = false;
+    let tokens = 0;
+    const cacheParts = [];
+    const countJsonContentPart = (contentPart) => {
+      const formatted = formatToolResultForObserver(contentPart);
+      tokens += this.countString(formatted);
+      cacheParts.push({ type: "json", valueHash: crypto$1.createHash("sha256").update(formatted).digest("hex") });
+    };
+    for (const item of content) {
+      if (!item || typeof item !== "object") {
+        continue;
+      }
+      const contentPart = item;
+      const partType = contentPart.type;
+      if (partType === "text") {
+        const text = typeof contentPart.text === "string" ? contentPart.text : String(contentPart.value ?? "");
+        tokens += this.countString(text);
+        cacheParts.push({ type: "text", textHash: crypto$1.createHash("sha256").update(text).digest("hex") });
+        continue;
+      }
+      if (partType === "image" || partType === "image-data" || partType === "media" && String(contentPart.mediaType ?? "").startsWith("image/")) {
+        if (typeof contentPart.data !== "string") {
+          countJsonContentPart(contentPart);
+          continue;
+        }
+        hasAttachment = true;
+        const imagePart = {
+          type: "image",
+          image: contentPart.data,
+          mimeType: contentPart.mediaType ?? contentPart.mimeType,
+          providerOptions: contentPart.providerOptions,
+          providerMetadata: contentPart.providerMetadata
+        };
+        const clientEstimate = getClientPartTokenEstimate(imagePart);
+        if (clientEstimate) {
+          tokens += clientEstimate.tokens;
+          cacheParts.push({
+            type: "image-data-client-estimate",
+            key: clientEstimate.key,
+            tokens: clientEstimate.tokens
+          });
+          continue;
+        }
+        const estimate = this.estimateImageTokens(imagePart);
+        tokens += estimate.tokens;
+        cacheParts.push({ type: "image-data", estimate: JSON.parse(estimate.cachePayload) });
+        continue;
+      }
+      if (partType === "audio" || partType === "file-data" || partType === "media") {
+        if (typeof contentPart.data !== "string") {
+          countJsonContentPart(contentPart);
+          continue;
+        }
+        hasAttachment = true;
+        const filePart = {
+          type: "file",
+          data: contentPart.data,
+          mimeType: contentPart.mediaType ?? contentPart.mimeType,
+          filename: contentPart.filename,
+          providerOptions: contentPart.providerOptions,
+          providerMetadata: contentPart.providerMetadata
+        };
+        const clientEstimate = getClientPartTokenEstimate(filePart);
+        if (clientEstimate) {
+          tokens += clientEstimate.tokens;
+          cacheParts.push({
+            type: "file-data-client-estimate",
+            key: clientEstimate.key,
+            tokens: clientEstimate.tokens
+          });
+          continue;
+        }
+        if (isImageLikeFilePart(filePart)) {
+          const estimate = this.estimateImageLikeFileTokens(filePart);
+          tokens += estimate.tokens;
+          cacheParts.push({ type: "image-like-file-data", estimate: JSON.parse(estimate.cachePayload) });
+          continue;
+        }
+        const byteEstimate = estimateNonImageFileTokens(this.getModelContext(), filePart);
+        if (byteEstimate) {
+          tokens += byteEstimate.tokens;
+          cacheParts.push({ type: "file-data", estimate: JSON.parse(byteEstimate.cachePayload) });
+          continue;
+        }
+        const descriptor = serializeNonImageFilePartForTokenCounting(filePart);
+        tokens += this.countString(descriptor);
+        cacheParts.push({ type: "file-data-descriptor", descriptor });
+        continue;
+      }
+      countJsonContentPart(contentPart);
+    }
+    if (!hasAttachment) {
+      return void 0;
+    }
+    return this.readOrPersistFixedPartEstimate(
+      part,
+      "tool-result-multimodal-content",
+      JSON.stringify({ type: "content", value: cacheParts }),
+      tokens
+    );
+  }
   estimateImageAssetTokens(part, asset, kind) {
     const modelContext = this.getModelContext();
     const provider = resolveProviderId(modelContext);
@@ -6833,12 +6952,17 @@ var TokenCounter = class _TokenCounter {
           invocation.result
         );
         if (resultForCounting !== void 0) {
-          const formattedResult = formatToolResultForObserver(resultForCounting);
-          tokens += this.readOrPersistPartEstimate(
-            part,
-            usingStoredModelOutput ? "tool-result-model-output-json" : "tool-result-json",
-            formattedResult
-          );
+          const contentTokens = this.countMultimodalToolResultContent(part, resultForCounting);
+          if (contentTokens !== void 0) {
+            tokens += contentTokens;
+          } else {
+            const formattedResult = formatToolResultForObserver(resultForCounting);
+            tokens += this.readOrPersistPartEstimate(
+              part,
+              usingStoredModelOutput ? "tool-result-model-output-json" : "tool-result-json",
+              formattedResult
+            );
+          }
           if (typeof resultForCounting !== "string") {
             overheadDelta -= 12;
           }
@@ -7193,6 +7317,7 @@ Async buffering is enabled by default \u2014 this opt-out is only needed when us
         config.observation?.bufferTokens ?? chunk3Q3LOVQP_cjs.OBSERVATIONAL_MEMORY_DEFAULTS.observation.bufferTokens,
         config.observation?.messageTokens ?? chunk3Q3LOVQP_cjs.OBSERVATIONAL_MEMORY_DEFAULTS.observation.messageTokens
       ),
+      bufferOnIdle: config.observation?.bufferOnIdle ?? false,
       bufferActivation: asyncBufferingDisabled ? void 0 : config.observation?.bufferActivation ?? chunk3Q3LOVQP_cjs.OBSERVATIONAL_MEMORY_DEFAULTS.observation.bufferActivation,
       activateAfterIdle: parseActivationTTL(observationActivateAfterIdle, observationActivateAfterIdlePath),
       activateOnProviderChange: config.observation?.activateOnProviderChange ?? config.activateOnProviderChange ?? false,
@@ -9004,7 +9129,7 @@ ${grouped}` : grouped;
       const bufferTokens = this.observationConfig.bufferTokens ?? 5e3;
       const minNewTokens = bufferTokens / 2;
       const newTokens = await this.tokenCounter.countMessagesAsync(candidateMessages);
-      if (newTokens < minNewTokens || candidateMessages.length === 0) {
+      if (candidateMessages.length === 0 || !opts.skipMinimumTokenCheck && newTokens < minNewTokens) {
         return { buffered: false, record };
       }
       if (opts.beforeBuffer) {
@@ -9037,7 +9162,9 @@ ${grouped}` : grouped;
         cycleId,
         startedAt,
         writer,
+        sendSignal: opts.sendSignal,
         requestContext,
+        currentModel: opts.currentModel,
         observabilityContext
       }).run();
       if (isOmReproCaptureEnabled()) {
@@ -9571,7 +9698,8 @@ async function insertTemporalGapMarkers({
   }
   await sendSignal?.({
     id: `__temporal_gap_${crypto.randomUUID()}`,
-    type: "system-reminder",
+    type: "reactive",
+    tagName: "system-reminder",
     contents: getTemporalGapReminderText(gapText, timestamp),
     createdAt: new Date(timestamp - 1),
     acceptedAt: new Date(timestamp),
@@ -9723,6 +9851,7 @@ var ObservationalMemoryProcessor = class {
           }
         });
         this.turn.writer = writer;
+        this.turn.sendSignal = args.sendSignal;
         this.turn.requestContext = requestContext;
         await this.turn.start(this.memory);
         if (stepNumber === 0 && this.temporalMarkers) {
@@ -9883,5 +10012,5 @@ exports.stripEphemeralAnchorIds = stripEphemeralAnchorIds;
 exports.stripObservationGroups = stripObservationGroups;
 exports.truncateStringByTokens = truncateStringByTokens;
 exports.wrapInObservationGroup = wrapInObservationGroup;
-//# sourceMappingURL=chunk-SMKIROLC.cjs.map
-//# sourceMappingURL=chunk-SMKIROLC.cjs.map
+//# sourceMappingURL=chunk-P4BYW7GY.cjs.map
+//# sourceMappingURL=chunk-P4BYW7GY.cjs.map