@mastra/memory 1.36.0-alpha.4 → 1.36.0-alpha.6

package/dist/{src-BPHEGTkT.js → src-yhShj4JX.js}

@@ -20052,8 +20052,9 @@ function stringifyToolResult(value) {
 }
 function resolveToolResultValue(part, invocationResult) {
 	const mastraMetadata = part?.providerMetadata?.mastra;
-	if (mastraMetadata && typeof mastraMetadata === "object" && "modelOutput" in mastraMetadata) return {
-		value: mastraMetadata.modelOutput,
+	const modelOutput = mastraMetadata && typeof mastraMetadata === "object" ? mastraMetadata.modelOutput : void 0;
+	if (modelOutput != null) return {
+		value: modelOutput,
 		usingStoredModelOutput: true
 	};
 	return {
@@ -21096,7 +21097,7 @@ function buildMultiThreadObserverContextPrompt(existingObservations, threadOrder
 */
 function parseMultiThreadObserverOutput(output, extractors = []) {
 	const threads = /* @__PURE__ */ new Map();
-	if (detectDegenerateRepetition(output)) return {
+	if (detectDegenerateRepetition(sanitizeObservationLines(output))) return {
 		threads,
 		rawOutput: output,
 		degenerate: true
@@ -21202,7 +21203,7 @@ function getStringExtractedValue$1(values, slug) {
 	return typeof value === "string" && value.trim() ? value.trim() : void 0;
 }
 function parseObserverOutput(output, extractors = []) {
-	if (detectDegenerateRepetition(output)) return {
+	if (detectDegenerateRepetition(sanitizeObservationLines(output))) return {
 		observations: "",
 		rawOutput: output,
 		degenerate: true
@@ -21265,6 +21266,34 @@ const MAX_OBSERVATION_LINE_CHARS = 1e4;
 */
 const MIN_DUPLICATE_LINE_CHARS = 24;
 /**
+* Collapse a run of back-to-back identical lines to a single line when that
+* run is the line's only occurrence and is no bigger than one maximum-length
+* observation line. A faithful summary of a repetitive tool loop (e.g. 30×
+* "pnpm --filter … build → ok") produces exactly that shape at any line
+* length. Loops are left intact: a model stuck on one line runs far past the
+* size bound, and a line that keeps recurring between other lines has more
+* than one run.
+*/
+function collapseBoundedLineRuns(lines) {
+	const runs = [];
+	for (const line of lines) {
+		const last = runs[runs.length - 1];
+		if (last && last.line === line) last.count++;
+		else runs.push({
+			line,
+			count: 1
+		});
+	}
+	const runsPerLine = /* @__PURE__ */ new Map();
+	for (const run of runs) runsPerLine.set(run.line, (runsPerLine.get(run.line) ?? 0) + 1);
+	const result = [];
+	for (const run of runs) {
+		const collapse = runsPerLine.get(run.line) === 1 && run.count * (run.line.length + 1) <= MAX_OBSERVATION_LINE_CHARS;
+		for (let j = 0; j < (collapse ? 1 : run.count); j++) result.push(run.line);
+	}
+	return result;
+}
+/**
 * Truncate individual observation lines that exceed the maximum length.
 */
 function sanitizeObservationLines(observations) {
@@ -21277,31 +21306,28 @@ function sanitizeObservationLines(observations) {
 	}
 	return changed ? lines.join("\n") : observations;
 }
-/**
-* Detect degenerate repetition in observer/reflector output.
-* Returns true if the text contains suspicious levels of repeated content,
-* which indicates an LLM repeat-penalty bug (e.g., Gemini Flash looping).
-*
-* Strategy: sample sequential chunks of the text and check if a high
-* proportion are near-identical to previous chunks.
-*/
-function detectDegenerateRepetition(text) {
-	if (!text || text.length < 2e3) return false;
+function analyzeDegenerateRepetition(text) {
+	const lines = collapseBoundedLineRuns(text.split("\n"));
+	const windowText = lines.filter((line) => line.trim().length >= MIN_DUPLICATE_LINE_CHARS && line.length <= MAX_OBSERVATION_LINE_CHARS).join("\n");
 	const windowSize = 200;
-	const step = Math.max(1, Math.floor(text.length / 50));
+	const step = Math.max(1, Math.floor(windowText.length / 50));
 	const seen = /* @__PURE__ */ new Map();
 	let duplicateWindows = 0;
 	let totalWindows = 0;
-	for (let i = 0; i + windowSize <= text.length; i += step) {
-		const window = text.slice(i, i + windowSize);
+	let topWindow = "";
+	let topWindowCount = 0;
+	for (let i = 0; i + windowSize <= windowText.length; i += step) {
+		const window = windowText.slice(i, i + windowSize);
 		totalWindows++;
 		const count = (seen.get(window) ?? 0) + 1;
 		seen.set(window, count);
 		if (count > 1) duplicateWindows++;
+		if (count > topWindowCount) {
+			topWindowCount = count;
+			topWindow = window;
+		}
 	}
-	if (totalWindows > 5 && duplicateWindows / totalWindows > .4) return true;
-	const lines = text.split("\n");
-	for (const line of lines) if (line.length > 5e4) return true;
+	const windowFired = windowText.length >= 2e3 && totalWindows > 5 && duplicateWindows / totalWindows > .4;
 	const seenLines = /* @__PURE__ */ new Map();
 	let duplicateLines = 0;
 	let totalCountedLines = 0;
@@ -21313,8 +21339,50 @@ function detectDegenerateRepetition(text) {
 		seenLines.set(trimmed, count);
 		if (count > 1) duplicateLines++;
 	}
-	if (totalCountedLines >= 20 && duplicateLines / totalCountedLines > .5) return true;
-	return false;
+	const lineFired = totalCountedLines >= 20 && duplicateLines / totalCountedLines > .5;
+	let shortLineFired = false;
+	let shortLineCounts = /* @__PURE__ */ new Map();
+	const runExceedsBudget = () => {
+		let repeatedShortChars = 0;
+		for (const { count, chars } of shortLineCounts.values()) if (count > 1) repeatedShortChars += chars;
+		return repeatedShortChars - 1 > MAX_OBSERVATION_LINE_CHARS;
+	};
+	for (const line of lines) {
+		const trimmed = line.trim();
+		if (!trimmed) continue;
+		if (trimmed.length >= MIN_DUPLICATE_LINE_CHARS) {
+			if (runExceedsBudget()) shortLineFired = true;
+			shortLineCounts = /* @__PURE__ */ new Map();
+			continue;
+		}
+		if (/^<\/?[A-Za-z][\w-]*(?:\s[^<>]*)?>$/.test(trimmed) || trimmed.startsWith("Date:")) continue;
+		const entry = shortLineCounts.get(trimmed) ?? {
+			count: 0,
+			chars: 0
+		};
+		entry.count++;
+		entry.chars += line.length + 1;
+		shortLineCounts.set(trimmed, entry);
+	}
+	if (runExceedsBudget()) shortLineFired = true;
+	const eligible = text.length >= 2e3;
+	return {
+		windowText,
+		totalWindows,
+		duplicateWindows,
+		topWindow,
+		topWindowCount,
+		totalCountedLines,
+		duplicateLines,
+		windowFired: eligible && windowFired,
+		lineFired: eligible && lineFired,
+		shortLineFired: eligible && shortLineFired
+	};
+}
+function detectDegenerateRepetition(text) {
+	if (!text || text.length < 2e3) return false;
+	const analysis = analyzeDegenerateRepetition(text);
+	return analysis.windowFired || analysis.lineFired || analysis.shortLineFired;
 }
 /**
 * Build a single-line diagnostic description of output flagged by
@@ -21323,55 +21391,35 @@ function detectDegenerateRepetition(text) {
 * without it there is no way to tell a real repetition loop apart from a
 * detector false-positive on legitimately repetitive content.
 *
-* Reuses the detector's sampling parameters (200-char windows, ~50 samples)
-* so the reported duplicate ratio and most-repeated window match what
-* triggered the detection. Snippets are JSON-escaped so the result stays on
-* one line.
+* Runs the detector's analysis on the same sanitized text the detector judges
+* (giant lines truncated), so `strategy=` names what triggered the rejection.
+* For a short-line loop the window and line ratios read n/a or low, because
+* short lines are excluded from both. `length` and `longestLine` describe the
+* raw output. Snippets are JSON-escaped so the result stays on one line.
 */
 function describeDegenerateOutput(text, snippetChars = 400) {
-	const windowSize = 200;
-	const step = Math.max(1, Math.floor(text.length / 50));
-	const seen = /* @__PURE__ */ new Map();
-	let duplicateWindows = 0;
-	let totalWindows = 0;
-	for (let i = 0; i + windowSize <= text.length; i += step) {
-		const window = text.slice(i, i + windowSize);
-		totalWindows++;
-		const count = (seen.get(window) ?? 0) + 1;
-		seen.set(window, count);
-		if (count > 1) duplicateWindows++;
-	}
-	let topWindow = "";
-	let topCount = 0;
-	for (const [window, count] of seen) if (count > topCount) {
-		topCount = count;
-		topWindow = window;
-	}
+	const a = analyzeDegenerateRepetition(sanitizeObservationLines(text));
 	let longestLine = 0;
-	const seenLines = /* @__PURE__ */ new Map();
-	let duplicateLines = 0;
-	let totalCountedLines = 0;
-	for (const line of text.split("\n")) {
-		if (line.length > longestLine) longestLine = line.length;
-		const trimmed = line.trim();
-		if (trimmed.length < MIN_DUPLICATE_LINE_CHARS) continue;
-		totalCountedLines++;
-		const count = (seenLines.get(trimmed) ?? 0) + 1;
-		seenLines.set(trimmed, count);
-		if (count > 1) duplicateLines++;
-	}
-	const duplicateRatio = totalWindows > 0 ? (duplicateWindows / totalWindows).toFixed(2) : "n/a";
-	const duplicateLineRatio = totalCountedLines > 0 ? (duplicateLines / totalCountedLines).toFixed(2) : "n/a";
+	for (const line of text.split("\n")) if (line.length > longestLine) longestLine = line.length;
+	const fired = [
+		a.windowFired && "window",
+		a.lineFired && "duplicateLines",
+		a.shortLineFired && "shortLineLoop"
+	].filter(Boolean).join("+") || "none";
+	const duplicateRatio = a.totalWindows > 0 ? (a.duplicateWindows / a.totalWindows).toFixed(2) : "n/a";
+	const duplicateLineRatio = a.totalCountedLines > 0 ? (a.duplicateLines / a.totalCountedLines).toFixed(2) : "n/a";
 	const parts = [
+		`strategy=${fired}`,
 		`length=${text.length}`,
-		`sampledWindows=${totalWindows}`,
+		`windowTextLength=${a.windowText.length}`,
+		`sampledWindows=${a.totalWindows}`,
 		`duplicateRatio=${duplicateRatio}`,
 		`duplicateLineRatio=${duplicateLineRatio}`,
-		`countedLines=${totalCountedLines}`,
+		`countedLines=${a.totalCountedLines}`,
 		`longestLine=${longestLine}`,
-		`topWindowCount=${topCount}`
+		`topWindowCount=${a.topWindowCount}`
 	];
-	if (topCount > 1) parts.push(`topWindow=${JSON.stringify(topWindow)}`);
+	if (a.topWindowCount > 1) parts.push(`topWindow=${JSON.stringify(a.topWindow)}`);
 	parts.push(`head=${JSON.stringify(text.slice(0, snippetChars))}`);
 	if (text.length > snippetChars * 2) parts.push(`tail=${JSON.stringify(text.slice(-snippetChars))}`);
 	return parts.join(" ");
@@ -26431,6 +26479,7 @@ function createObservationFailedMarker(params) {
 			tokensAttempted: params.tokensAttempted,
 			error: formatOmError(params.error),
 			...getOmFailureMetadata(params.error, params.failurePolicy ?? "abort"),
+			...params.retrying ? { retrying: true } : {},
 			recordId: params.recordId,
 			threadId: params.threadId
 		}
@@ -28727,7 +28776,7 @@ function getStringExtractedValue(values, slug) {
 	return typeof value === "string" && value.trim() ? value.trim() : void 0;
 }
 function parseReflectorOutput(output, sourceObservations, extractors = []) {
-	if (detectDegenerateRepetition(output)) return {
+	if (detectDegenerateRepetition(sanitizeObservationLines(output))) return {
 		observations: "",
 		degenerate: true
 	};
@@ -29072,6 +29121,7 @@ var ReflectorRunner = class {
 					startedAt: streamContext.startedAt,
 					tokensAttempted: originalTokens,
 					error: `Did not compress below threshold (${originalTokens} → ${reflectedTokens}, target: ${targetThreshold}), retrying at level ${currentLevel + 1}`,
+					retrying: true,
 					recordId: streamContext.recordId,
 					threadId: streamContext.threadId
 				});
@@ -35336,4 +35386,4 @@ Notes:
 //#endregion
 export { formatMessagesForObserver as A, OBSERVATION_CONTEXT_PROMPT_THREAD as B, SUMMARIZE_THREAD_DEFAULTS as C, buildObserverPrompt as D, OBSERVER_SYSTEM_PROMPT as E, parseAnchorId as F, StaleKnowledgeSemanticIndexError as G, getObservationContextPrompt as H, stripEphemeralAnchorIds as I, SUBCONSCIOUS_ACTIVITY_STATE_ID as J, SubconsciousRemindExtractor as K, OBSERVATIONAL_MEMORY_DEFAULTS as L, optimizeObservationsForContext as M, parseObserverOutput as N, buildObserverSystemPrompt as O, injectAnchorIds as P, Extractor as Q, OBSERVATION_CONTEXT_INSTRUCTIONS as R, deepMergeWorkingMemory as S, TokenCounter as T, Subconscious as U, OBSERVATION_CONTINUATION_HINT as V, KnowledgeSemanticIndexCoordinator as W, publishSubconsciousActivity as X, buildSubconsciousActivitySnapshot as Y, renderSubconsciousActivity as Z, reconcileObservationGroupsFromReflection as _, extractWorkingMemoryContent as a, wrapInObservationGroup as b, getObservationsAsOf as c, WORKING_MEMORY_STATE_ID as d, WORKING_MEMORY_STATE_PROCESSOR_ID as f, parseObservationGroups as g, deriveObservationGroupProvenance as h, WorkingMemory as i, hasCurrentTaskSection as j, extractCurrentTask as k, ObservationalMemoryProcessor as l, combineObservationGroupRanges as m, MessageHistory$1 as n, extractWorkingMemoryTags as o, WorkingMemoryStateProcessor as p, ModelByInputTokens as q, SemanticRecall as r, removeWorkingMemoryTags as s, Memory as t, ObservationalMemory as u, renderObservationGroupsForReflection as v, summarizeConversation as w, WorkingMemoryExtractor as x, stripObservationGroups as y, OBSERVATION_CONTEXT_PROMPT as z };
 
-//# sourceMappingURL=src-BPHEGTkT.js.map
+//# sourceMappingURL=src-yhShj4JX.js.map