@mastra/memory 1.20.3-alpha.0 → 1.20.5

package/dist/{chunk-YJJXL5KY.js → chunk-3I6H2ABM.js}

@@ -9,6 +9,7 @@ import { join } from 'path';
 import { createHash, randomBytes, randomUUID } from 'crypto';
 import { estimateTokenCount } from 'tokenx';
 import { Agent } from '@mastra/core/agent';
+import { MASTRA_THREAD_ID_KEY, RequestContext } from '@mastra/core/request-context';
 import { getOrCreateSpan, EntityType, SpanType, createObservabilityContext } from '@mastra/core/observability';
 import { inspect } from 'util';
 import { AsyncLocalStorage } from 'async_hooks';
@@ -243,16 +244,23 @@ var BufferingCoordinator = class _BufferingCoordinator {
 };
 
 // src/processors/observational-memory/model-context.ts
+function parseComparableModelContext(model) {
+  const slashIndex = model.indexOf("/");
+  if (slashIndex === -1) return { modelId: model };
+  return {
+    provider: model.slice(0, slashIndex).split(".")[0],
+    modelId: model.slice(slashIndex + 1)
+  };
+}
 function didProviderChange(actorModel, lastModel) {
   if (actorModel === void 0 || lastModel === void 0) return false;
-  const actorHasSlash = actorModel.includes("/");
-  const lastHasSlash = lastModel.includes("/");
-  if (actorHasSlash && lastHasSlash) {
-    return actorModel !== lastModel;
+  const actorContext = parseComparableModelContext(actorModel);
+  const lastContext = parseComparableModelContext(lastModel);
+  if (actorContext.modelId !== lastContext.modelId) return true;
+  if (actorContext.provider && lastContext.provider) {
+    return actorContext.provider !== lastContext.provider;
   }
-  const actorModelId = actorHasSlash ? actorModel.slice(actorModel.indexOf("/") + 1) : actorModel;
-  const lastModelId = lastHasSlash ? lastModel.slice(lastModel.indexOf("/") + 1) : lastModel;
-  return actorModelId !== lastModelId;
+  return false;
 }
 
 // src/processors/observational-memory/date-utils.ts
@@ -3906,6 +3914,14 @@ function optimizeObservationsForContext(observations) {
   optimized = optimized.replace(/\n{3,}/g, "\n\n");
   return optimized.trim();
 }
+function withOmInternalThreadId(requestContext, omAgentId) {
+  if (!requestContext) return void 0;
+  const parentThreadId = requestContext.get(MASTRA_THREAD_ID_KEY);
+  if (typeof parentThreadId !== "string" || !parentThreadId) return requestContext;
+  const internalRequestContext = new RequestContext(requestContext.entries());
+  internalRequestContext.set(MASTRA_THREAD_ID_KEY, `${parentThreadId}-${omAgentId}`);
+  return internalRequestContext;
+}
 
 // src/processors/observational-memory/retry.ts
 var RETRY_CONFIG = {
@@ -4167,6 +4183,7 @@ var ObserverRunner = class {
     const inputTokens = this.tokenCounter.countMessages(messagesToObserve);
     const resolvedModel = options?.model ? { model: options.model } : this.resolveModel(inputTokens);
     const agent = this.createAgent(resolvedModel.model);
+    const internalRequestContext = withOmInternalThreadId(options?.requestContext, agent.id);
     const attachmentFilter = this.resolveAttachmentFilter(resolvedModel.model, options?.requestContext);
     const observerMessages = [
       {
@@ -4202,7 +4219,7 @@ var ObserverRunner = class {
               modelSettings: { ...this.observationConfig.modelSettings },
               providerOptions: this.observationConfig.providerOptions,
               ...abortSignal ? { abortSignal } : {},
-              ...options?.requestContext ? { requestContext: options.requestContext } : {},
+              ...internalRequestContext ? { requestContext: internalRequestContext } : {},
               ...childObservabilityContext
             });
             return streamResult.getFullOutput();
@@ -4264,6 +4281,7 @@ var ObserverRunner = class {
     );
     const resolvedModel = model ? { model } : this.resolveModel(inputTokens);
     const agent = this.createAgent(resolvedModel.model, true);
+    const internalRequestContext = withOmInternalThreadId(requestContext, agent.id);
     const multiThreadAttachmentFilter = this.resolveAttachmentFilter(resolvedModel.model, requestContext);
     const observerMessages = [
       {
@@ -4306,7 +4324,7 @@ var ObserverRunner = class {
               modelSettings: { ...this.observationConfig.modelSettings },
               providerOptions: this.observationConfig.providerOptions,
               ...abortSignal ? { abortSignal } : {},
-              ...requestContext ? { requestContext } : {},
+              ...internalRequestContext ? { requestContext: internalRequestContext } : {},
               ...childObservabilityContext
             });
             return streamResult.getFullOutput();
@@ -4741,6 +4759,7 @@ var ReflectorRunner = class {
     const originalTokens = this.tokenCounter.countObservations(observations);
     const resolvedModel = model ? { model } : this.resolveModel(originalTokens);
     const agent = this.createAgent(resolvedModel.model);
+    const internalRequestContext = withOmInternalThreadId(requestContext, agent.id);
     const targetThreshold = observationTokensThreshold ?? getMaxThreshold(this.reflectionConfig.observationTokens);
     let totalUsage = { inputTokens: 0, outputTokens: 0, totalTokens: 0 };
     const startLevel = compressionStartLevel ?? 0;
@@ -4781,7 +4800,7 @@ var ReflectorRunner = class {
               },
               providerOptions: this.reflectionConfig.providerOptions,
               ...abortSignal ? { abortSignal } : {},
-              ...requestContext ? { requestContext } : {},
+              ...internalRequestContext ? { requestContext: internalRequestContext } : {},
               ...childObservabilityContext,
               ...attemptNumber === 1 ? {
                 onChunk(chunk) {
@@ -9987,5 +10006,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-YJJXL5KY.js.map
-//# sourceMappingURL=chunk-YJJXL5KY.js.map
+//# sourceMappingURL=chunk-3I6H2ABM.js.map
+//# sourceMappingURL=chunk-3I6H2ABM.js.map