@mastra/server 1.70.0-alpha.1 → 1.70.0-alpha.3

package/dist/{dist-1bGgLbxg.cjs → dist-pojdOe9l.cjs}

@@ -4638,7 +4638,7 @@ function splitLines(text) {
 	return result;
 }
 //#endregion
-//#region ../memory/dist/src-2UN5fCQ5.js
+//#region ../memory/dist/src-B0ISVOJX.js
 var __defProp$3 = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
 	let target = {};
@@ -22886,7 +22886,9 @@ var constants_exports = /* @__PURE__ */ __exportAll({
 	OBSERVATIONAL_MEMORY_DEFAULTS: () => OBSERVATIONAL_MEMORY_DEFAULTS,
 	OBSERVATION_CONTEXT_INSTRUCTIONS: () => OBSERVATION_CONTEXT_INSTRUCTIONS,
 	OBSERVATION_CONTEXT_PROMPT: () => OBSERVATION_CONTEXT_PROMPT,
+	OBSERVATION_CONTEXT_PROMPT_THREAD: () => OBSERVATION_CONTEXT_PROMPT_THREAD,
 	OBSERVATION_CONTINUATION_HINT: () => OBSERVATION_CONTINUATION_HINT,
+	getObservationContextPrompt: () => getObservationContextPrompt,
 	getRetrievalInstructions: () => getRetrievalInstructions
 });
 /**
@@ -22936,6 +22938,19 @@ Any messages following this reminder are newer and should take priority.`;
 */
 const OBSERVATION_CONTEXT_PROMPT = `The following observations block contains your memory of past conversations with this user.`;
 /**
+* Preamble used when observations are thread-scoped: they describe earlier parts
+* of the current conversation, not other conversations.
+*/
+const OBSERVATION_CONTEXT_PROMPT_THREAD = `The following observations block contains your memory of earlier parts of this current conversation. Everything recorded here (including IDs, artifacts, and tool results) came from this conversation and is available for you to reuse.`;
+/**
+* Returns the observations preamble matching the memory scope.
+* - `'thread'`: observations are earlier parts of the current conversation.
+* - `'resource'`: observations span past conversations with this user.
+*/
+function getObservationContextPrompt(scope = "thread") {
+	return scope === "resource" ? OBSERVATION_CONTEXT_PROMPT : OBSERVATION_CONTEXT_PROMPT_THREAD;
+}
+/**
 * Instructions that tell the model how to interpret and use observations.
 * Place AFTER the `<observations>` block so the model sees the data before the rules.
 */
@@ -23209,7 +23224,7 @@ async function applyExtractorHooks(opts) {
 		failures: mergeExtractionFailures(failures)
 	};
 }
-function isRecord$4(value) {
+function isRecord$5(value) {
 	return typeof value === "object" && value !== null;
 }
 /** Keep provider diagnostics in streamed/persisted markers, not whole API request/response objects. */
@@ -23221,7 +23236,7 @@ function formatOmError(error) {
 	};
 	function collectErrorDetails(value, depth) {
 		if (depth > 5) return;
-		if (!isRecord$4(value)) {
+		if (!isRecord$5(value)) {
 			if (value !== void 0) add(String(value));
 			return;
 		}
@@ -23231,10 +23246,10 @@ function formatOmError(error) {
 		if (typeof value.statusCode === "number") add(`HTTP ${value.statusCode}`);
 		if (typeof value.responseBody === "string") try {
 			const body = JSON.parse(value.responseBody);
-			if (isRecord$4(body)) {
+			if (isRecord$5(body)) {
 				add(body.message);
 				add(body.detail);
-				if (isRecord$4(body.error)) add(body.error.message);
+				if (isRecord$5(body.error)) add(body.error.message);
 				else add(body.error);
 			}
 		} catch {}
@@ -23337,6 +23352,19 @@ ${extractorInstructions}${priorLines.length > 0 ? `\n\n## Prior Extracted Values
 		failures
 	};
 }
+const LEGACY_SYSTEM_REMINDER_METADATA_KEY = "dynamicAgentsMdReminder";
+function isRecord$4(value) {
+	return typeof value === "object" && value !== null;
+}
+function isSystemReminderMessage(message) {
+	if (!isRecord$4(message.content)) return false;
+	const metadata = message.content.metadata;
+	if (message.role === "signal") return isRecord$4(metadata) && isRecord$4(metadata.signal) && (metadata.signal.type === "system-reminder" || metadata.signal.type === "reactive");
+	if (message.role !== "user") return false;
+	if (isRecord$4(metadata) && (isRecord$4(metadata.systemReminder) || LEGACY_SYSTEM_REMINDER_METADATA_KEY in metadata)) return true;
+	const firstTextPart = message.content.parts.find((part) => part.type === "text");
+	return typeof firstTextPart?.text === "string" && firstTextPart.text.startsWith("<system-reminder");
+}
 const ANCHOR_ID_PATTERN = /^\[(O\d+(?:-N\d+)?)\]\s*/;
 const OBSERVATION_DATE_HEADER_PATTERN = /^\s*Date:\s+/;
 const XML_TAG_PATTERN = /^\s*<\/?[a-z][^>]*>\s*$/i;
@@ -24820,11 +24848,23 @@ function formatObserverToolArguments(args, maxCharacters) {
 	if (args === void 0) return maybeTruncate("[arguments unavailable]", maxCharacters);
 	return formatToolArgumentsForObserver(args, { maxCharacters: maxCharacters || void 0 });
 }
+/**
+* Labels signals and system reminders by their tag instead of as "User", so the Observer
+* does not record runtime instructions as things the user said (#22195).
+*/
+function getObserverMessageLabel(msg) {
+	if (msg.role === "signal") {
+		const signal = msg.content?.metadata?.signal;
+		return signal?.type === "user" ? "User" : signal?.tagName ?? signal?.type ?? "Signal";
+	}
+	if (isSystemReminderMessage(msg)) return "system-reminder";
+	return msg.role.charAt(0).toUpperCase() + msg.role.slice(1);
+}
 function formatObserverMessage(msg, counter, toolFormatting, options) {
 	const maxLen = options?.maxPartLength;
 	const maxToolResultTokens = options?.maxToolResultTokens ?? 5e3;
 	const attachmentFilter = options?.attachmentFilter;
-	const role = msg.role.charAt(0).toUpperCase() + msg.role.slice(1);
+	const role = getObserverMessageLabel(msg);
 	const attachments = [];
 	const messageCreatedAt = normalizeObserverCreatedAt(msg.createdAt);
 	let lines = [];
@@ -24998,7 +25038,36 @@ function buildMultiThreadObserverHistoryMessage(messagesByThread, threadOrder, o
 		content
 	};
 }
-function buildMultiThreadObserverTaskPrompt(existingObservations, threadOrder, priorMetadataByThread, wasTruncated, includeThreadTitle, extractors = []) {
+/**
+* Build the Observer's single multi-thread request message: prior memory first, then the
+* thread histories, then the task. Keeping everything in one user message, with the task
+* after the history, stops the Observer from reading its own instructions as something
+* the user said (#22195).
+*/
+function buildMultiThreadObserverRequestMessage(existingObservations, messagesByThread, threadOrder, priorMetadataByThread, wasTruncated, includeThreadTitle, extractors = [], formatOptions) {
+	return surroundObserverHistory(buildMultiThreadObserverHistoryMessage(messagesByThread, threadOrder, formatOptions), buildMultiThreadObserverContextPrompt(existingObservations, threadOrder, priorMetadataByThread, wasTruncated, includeThreadTitle, extractors), buildMultiThreadObserverTaskInstructions(includeThreadTitle));
+}
+function surroundObserverHistory(history, contextPrompt, taskInstructions) {
+	const historyContent = history.content;
+	return {
+		role: "user",
+		content: [
+			...contextPrompt ? [{
+				type: "text",
+				text: contextPrompt
+			}] : [],
+			...historyContent,
+			{
+				type: "text",
+				text: `\n\n---\n\n${taskInstructions}`
+			}
+		]
+	};
+}
+function buildMultiThreadObserverTaskInstructions(includeThreadTitle) {
+	return `## Your Task\n\nExtract new observations from each thread. Output your observations grouped by thread using <thread id="..."> tags inside your <observations> block. Each thread block should contain that thread's observations, current-task, suggested-response${includeThreadTitle ? ", and thread-title" : ""}, in the format specified in your instructions.`;
+}
+function buildMultiThreadObserverContextPrompt(existingObservations, threadOrder, priorMetadataByThread, wasTruncated, includeThreadTitle, extractors = []) {
 	let prompt = "";
 	if (existingObservations) {
 		prompt += `## Previous Observations\n\n${existingObservations}\n\n---\n\n`;
@@ -25024,25 +25093,6 @@ function buildMultiThreadObserverTaskPrompt(existingObservations, threadOrder, p
 		}
 		prompt += `Use each thread's prior current-task, suggested-response${includeThreadTitle ? ", and thread-title" : ""} as continuity hints, then update them based on that thread's new messages.\n\n---\n\n`;
 	}
-	prompt += `## Your Task\n\n`;
-	prompt += `Extract new observations from each thread. Output your observations grouped by thread using <thread id="..."> tags inside your <observations> block. Each thread block should contain that thread's observations, current-task, suggested-response${includeThreadTitle ? ", and thread-title" : ""}.\n\n`;
-	prompt += `Example output format:\n`;
-	prompt += `<observations>\n`;
-	prompt += `<thread id="thread1">\n`;
-	prompt += `Date: Dec 4, 2025\n`;
-	prompt += `* 🔴 (14:30) User prefers direct answers\n`;
-	prompt += `<current-task>Working on feature X</current-task>\n`;
-	prompt += `<suggested-response>Continue with the implementation</suggested-response>\n`;
-	if (includeThreadTitle) prompt += `<thread-title>Feature X implementation</thread-title>\n`;
-	prompt += `</thread>\n`;
-	prompt += `<thread id="thread2">\n`;
-	prompt += `Date: Dec 5, 2025\n`;
-	prompt += `* 🔴 (09:15) User asked about deployment\n`;
-	prompt += `<current-task>Discussing deployment options</current-task>\n`;
-	prompt += `<suggested-response>Explain the deployment process</suggested-response>\n`;
-	if (includeThreadTitle) prompt += `<thread-title>Deployment setup</thread-title>\n`;
-	prompt += `</thread>\n`;
-	prompt += `</observations>`;
 	return prompt;
 }
 /**
@@ -25100,6 +25150,24 @@ function parseMultiThreadObserverOutput(output, extractors = []) {
 	};
 }
 function buildObserverTaskPrompt(existingObservations, options) {
+	return buildObserverContextPrompt(existingObservations, options) + buildObserverTaskInstructions(options);
+}
+/**
+* Build the Observer's single request message: prior memory first, then the message
+* history, then the task. Keeping everything in one user message, with the task after
+* the history, stops the Observer from reading its own instructions as something the
+* user said (#22195).
+*/
+function buildObserverRequestMessage(existingObservations, messagesToObserve, options, formatOptions) {
+	return surroundObserverHistory(buildObserverHistoryMessage(messagesToObserve, formatOptions), buildObserverContextPrompt(existingObservations, options), buildObserverTaskInstructions(options));
+}
+function buildObserverTaskInstructions(options) {
+	let prompt = `## Your Task\n\n`;
+	prompt += `Extract new observations from the message history above. Do not repeat observations that are already in the previous observations. Add your new observations in the format specified in your instructions.`;
+	if (options?.skipContinuationHints) prompt += `\n\nOutput <observations> every time.`;
+	return prompt;
+}
+function buildObserverContextPrompt(existingObservations, options) {
 	let prompt = "";
 	if (existingObservations) {
 		prompt += `## Previous Observations\n\n${existingObservations}\n\n---\n\n`;
@@ -25120,9 +25188,6 @@ function buildObserverTaskPrompt(existingObservations, options) {
 		const titleHint = options?.includeThreadTitle ? ", and thread-title" : "";
 		prompt += `Use the prior current-task, suggested-response${titleHint} as continuity hints, then update them based on the new messages.\n\n---\n\n`;
 	}
-	prompt += `## Your Task\n\n`;
-	prompt += `Extract new observations from the message history above. Do not repeat observations that are already in the previous observations. Add your new observations in the format specified in your instructions.`;
-	if (options?.skipContinuationHints) prompt += `\n\nOutput <observations> every time.`;
 	return prompt;
 }
 /**
@@ -25751,14 +25816,11 @@ var ObserverRunner = class {
 		const agent = temporaryMemory ? this.createAgent(resolvedModel.model, false, temporaryMemory.memory, activeExtractors) : this.createAgent(resolvedModel.model, false, void 0, activeExtractors);
 		const internalRequestContext = withOmInternalThreadId(options?.requestContext, agent.id);
 		const attachmentFilter = this.resolveAttachmentFilter(resolvedModel.model, options?.requestContext);
-		const observerMessages = [{
-			role: "user",
-			content: buildObserverTaskPrompt(existingObservations, {
-				...options,
-				includeThreadTitle: this.observationConfig.threadTitle,
-				extractors: activeExtractors
-			})
-		}, buildObserverHistoryMessage(messagesToObserve, { attachmentFilter })];
+		const observerMessages = [buildObserverRequestMessage(existingObservations, messagesToObserve, {
+			...options,
+			includeThreadTitle: this.observationConfig.threadTitle,
+			extractors: activeExtractors
+		}, { attachmentFilter })];
 		const doGenerate = async () => {
 			return withRetry(() => withOmTracingSpan({
 				phase: "observer",
@@ -25958,10 +26020,7 @@ var ObserverRunner = class {
 		const agent = this.createAgent(resolvedModel.model, true, void 0, activeExtractors);
 		const internalRequestContext = withOmInternalThreadId(requestContext, agent.id);
 		const multiThreadAttachmentFilter = this.resolveAttachmentFilter(resolvedModel.model, requestContext);
-		const observerMessages = [{
-			role: "user",
-			content: buildMultiThreadObserverTaskPrompt(existingObservations, threadOrder, priorMetadataByThread, void 0, this.observationConfig.threadTitle, activeExtractors)
-		}, buildMultiThreadObserverHistoryMessage(messagesByThread, threadOrder, { attachmentFilter: multiThreadAttachmentFilter })];
+		const observerMessages = [buildMultiThreadObserverRequestMessage(existingObservations, messagesByThread, threadOrder, priorMetadataByThread, void 0, this.observationConfig.threadTitle, activeExtractors, { attachmentFilter: multiThreadAttachmentFilter })];
 		for (const msgs of messagesByThread.values()) for (const msg of msgs) this.observedMessageIds.add(msg.id);
 		const doGenerate = async () => {
 			return withRetry(() => withOmTracingSpan({
@@ -34120,7 +34179,7 @@ var ObservationalMemory = class ObservationalMemory {
 	formatObservationsForContext(observations, currentTask, suggestedResponse, extractedValues, unobservedContextBlocks, currentDate, retrieval = false) {
 		let optimized = retrieval ? renderObservationGroupsForReflection(observations) ?? optimizeObservationsForContext(observations) : optimizeObservationsForContext(observations);
 		if (currentDate) optimized = addRelativeTimeToObservations(optimized, currentDate);
-		const messages = [`${OBSERVATION_CONTEXT_PROMPT}\n\n${OBSERVATION_CONTEXT_INSTRUCTIONS}${retrieval ? `\n\n${getRetrievalInstructions(this.retrievalScope, this.retrievalInstructions, this.retrievalSearch)}` : ""}`];
+		const messages = [`${getObservationContextPrompt(this.scope)}\n\n${OBSERVATION_CONTEXT_INSTRUCTIONS}${retrieval ? `\n\n${getRetrievalInstructions(this.retrievalScope, this.retrievalInstructions, this.retrievalSearch)}` : ""}`];
 		if (unobservedContextBlocks) messages.push(`The following content is from OTHER conversations different from the current conversation, they're here for reference,  but they're not necessarily your focus:\nSTART_OTHER_CONVERSATIONS_BLOCK\n${unobservedContextBlocks}\nEND_OTHER_CONVERSATIONS_BLOCK`);
 		const observationChunks = this.splitObservationContextChunks(optimized);
 		if (observationChunks.length > 0) messages.push("<observations>", ...observationChunks);
@@ -36056,6 +36115,7 @@ var observational_memory_exports = /* @__PURE__ */ __exportAll({
 	OBSERVATIONAL_MEMORY_DEFAULTS: () => OBSERVATIONAL_MEMORY_DEFAULTS,
 	OBSERVATION_CONTEXT_INSTRUCTIONS: () => OBSERVATION_CONTEXT_INSTRUCTIONS,
 	OBSERVATION_CONTEXT_PROMPT: () => OBSERVATION_CONTEXT_PROMPT,
+	OBSERVATION_CONTEXT_PROMPT_THREAD: () => OBSERVATION_CONTEXT_PROMPT_THREAD,
 	OBSERVATION_CONTINUATION_HINT: () => OBSERVATION_CONTINUATION_HINT,
 	OBSERVER_SYSTEM_PROMPT: () => OBSERVER_SYSTEM_PROMPT,
 	ObservationalMemory: () => ObservationalMemory,
@@ -36073,6 +36133,7 @@ var observational_memory_exports = /* @__PURE__ */ __exportAll({
 	deriveObservationGroupProvenance: () => deriveObservationGroupProvenance,
 	extractCurrentTask: () => extractCurrentTask,
 	formatMessagesForObserver: () => formatMessagesForObserver,
+	getObservationContextPrompt: () => getObservationContextPrompt,
 	getObservationsAsOf: () => getObservationsAsOf,
 	hasCurrentTaskSection: () => hasCurrentTaskSection,
 	injectAnchorIds: () => injectAnchorIds,
@@ -36096,7 +36157,6 @@ var working_memory_state_exports = /* @__PURE__ */ __exportAll({
 });
 const WORKING_MEMORY_START_TAG = "<working_memory>";
 const WORKING_MEMORY_END_TAG = "</working_memory>";
-const LEGACY_SYSTEM_REMINDER_METADATA_KEY = "dynamicAgentsMdReminder";
 function isRecord(value) {
 	return typeof value === "object" && value !== null;
 }
@@ -36127,15 +36187,6 @@ function extractWorkingMemoryContent(text) {
 	if (end === -1) return null;
 	return text.substring(contentStart, end);
 }
-function isSystemReminderMessage(message) {
-	if (!isRecord(message.content)) return false;
-	const metadata = message.content.metadata;
-	if (message.role === "signal") return isRecord(metadata) && isRecord(metadata.signal) && (metadata.signal.type === "system-reminder" || metadata.signal.type === "reactive");
-	if (message.role !== "user") return false;
-	if (isRecord(metadata) && (isRecord(metadata.systemReminder) || LEGACY_SYSTEM_REMINDER_METADATA_KEY in metadata)) return true;
-	const firstTextPart = message.content.parts.find((part) => part.type === "text");
-	return typeof firstTextPart?.text === "string" && firstTextPart.text.startsWith("<system-reminder");
-}
 function isRecallSignalType(type) {
 	return type === "user" || type === "state" || type === "reactive" || type === "notification" || type === "user-message" || type === "system-reminder";
 }
@@ -49156,4 +49207,4 @@ const agentBuilderWorkflows = {
 //#endregion
 exports.agentBuilderWorkflows = agentBuilderWorkflows;
 
-//# sourceMappingURL=dist-1bGgLbxg.cjs.map
+//# sourceMappingURL=dist-pojdOe9l.cjs.map