fix(core): preserve speaker names in prior dialogue context

Author: NubsCarson

packages/core/src/__tests__/message-runtime-stage1.test.ts

@@ -2100,6 +2100,98 @@ android smoke model works`,
 		);
 	});
 
+	it("keeps speaker names on structured prior dialogue", async () => {
+		const runtime = makeRuntime([
+			stage1Response({
+				contexts: ["simple"],
+				replyText: "I see the prior chat context.",
+				extra: { requiresTool: false },
+			}),
+		]);
+		const state: State = {
+			values: {
+				availableContexts: "simple, general",
+			},
+			data: {
+				providers: {
+					RECENT_MESSAGES: {
+						text: "# Conversation Messages\nprovider text should not render",
+						data: {
+							recentMessages: [
+								{
+									id: "00000000-0000-0000-0000-00000000bb01" as UUID,
+									entityId: "00000000-0000-0000-0000-00000000bb11" as UUID,
+									agentId: runtime.agentId,
+									roomId: "00000000-0000-0000-0000-000000001111" as UUID,
+									createdAt: 1,
+									content: {
+										text: "Hey, nice to meet shebotdick.",
+										source: "discord",
+									},
+									metadata: {
+										type: "message",
+										sender: {
+											id: "discord-botdick",
+											name: "botdick",
+											username: "botdick",
+										},
+									},
+								},
+								{
+									id: "00000000-0000-0000-0000-00000000bb02" as UUID,
+									entityId: "00000000-0000-0000-0000-00000000bb12" as UUID,
+									agentId: runtime.agentId,
+									roomId: "00000000-0000-0000-0000-000000001111" as UUID,
+									createdAt: 2,
+									content: {
+										text: "i was asking about shedick",
+										source: "discord",
+									},
+									metadata: {
+										type: "message",
+										sender: {
+											id: "discord-1gig",
+											name: "1gig",
+											username: "1gig",
+										},
+									},
+								},
+							],
+						},
+						providerName: "RECENT_MESSAGES",
+					},
+				},
+			},
+			text: "fallback text should not be needed",
+		};
+
+		await runV5MessageRuntimeStage1({
+			runtime,
+			message: makeMessage({
+				text: "whats the compatibility between her and botdick",
+			}),
+			state,
+			responseId: "00000000-0000-0000-0000-000000000005" as UUID,
+		});
+
+		const firstCall = useModelCalls(runtime)[0];
+		const params = firstCall?.[1] as {
+			messages?: Array<{ role?: string; content?: string | null }>;
+		};
+		const userContent = params.messages?.[1]?.content ?? "";
+		expect(userContent).not.toContain("# Conversation Messages");
+		expect(userContent).not.toContain("provider text should not render");
+		expect(userContent).toContain(
+			"prior_message:user:\nbotdick: Hey, nice to meet shebotdick.",
+		);
+		expect(userContent).toContain(
+			"prior_message:user:\n1gig: i was asking about shedick",
+		);
+		expect(userContent).toContain(
+			"message:user:\nwhats the compatibility between her and botdick",
+		);
+	});
+
 	it("recomposes planner state with selected context providers but excludes catalogs", async () => {
 		const runtime = makeRuntime([
 			stage1Response({

packages/core/src/services/message.ts

@@ -1599,6 +1599,61 @@ function asProviderRecord(value: unknown):
 	};
 }
 
+function asPlainRecord(value: unknown): Record<string, unknown> | undefined {
+	if (!value || typeof value !== "object" || Array.isArray(value)) {
+		return undefined;
+	}
+	return value as Record<string, unknown>;
+}
+
+function cleanPriorDialogueSpeakerName(value: unknown): string | undefined {
+	if (typeof value !== "string") return undefined;
+	const normalized = value.trim().split(/\s+/).join(" ");
+	if (!normalized) return undefined;
+	return normalized.length > 80 ? `${normalized.slice(0, 77)}...` : normalized;
+}
+
+function senderIdentityName(value: unknown): string | undefined {
+	const record = asPlainRecord(value);
+	if (!record) return undefined;
+	return (
+		cleanPriorDialogueSpeakerName(record.name) ??
+		cleanPriorDialogueSpeakerName(record.username) ??
+		cleanPriorDialogueSpeakerName(record.tag)
+	);
+}
+
+function priorDialogueSpeakerName(memory: Memory): string | undefined {
+	const metadata = asPlainRecord(memory.metadata);
+	const content = asPlainRecord(memory.content);
+	const contentMetadata = asPlainRecord(content?.metadata);
+	const sender =
+		senderIdentityName(metadata?.sender) ??
+		senderIdentityName(contentMetadata?.sender);
+	if (sender) return sender;
+	for (const record of [metadata, contentMetadata, content]) {
+		const name =
+			cleanPriorDialogueSpeakerName(record?.entityName) ??
+			cleanPriorDialogueSpeakerName(record?.senderName) ??
+			cleanPriorDialogueSpeakerName(record?.authorName) ??
+			cleanPriorDialogueSpeakerName(record?.displayName) ??
+			cleanPriorDialogueSpeakerName(record?.userName) ??
+			cleanPriorDialogueSpeakerName(record?.username) ??
+			cleanPriorDialogueSpeakerName(record?.name);
+		if (name) return name;
+	}
+	return undefined;
+}
+
+function priorDialogueContent(text: string, speaker?: string): string {
+	if (!speaker) return text;
+	const trimmedStart = text.trimStart();
+	if (trimmedStart.toLowerCase().startsWith(`${speaker.toLowerCase()}:`)) {
+		return text;
+	}
+	return `${speaker}: ${text}`;
+}
+
 function appendPriorDialogueEvents(
 	events: ContextEvent[],
 	runtime: IAgentRuntime,
@@ -1657,6 +1712,7 @@ function appendPriorDialogueEvents(
 	for (const memory of dialogue) {
 		const text = getUserMessageText(memory);
 		if (!text) continue;
+		const speakerName = priorDialogueSpeakerName(memory);
 		events.push({
 			id: `history:${memory.id}`,
 			type: "segment",
@@ -1665,11 +1721,12 @@ function appendPriorDialogueEvents(
 			segment: {
 				id: `history:${memory.id}`,
 				label: "prior_message:user",
-				content: text,
+				content: priorDialogueContent(text, speakerName),
 				stable: false,
 				metadata: {
 					roomId: memory.roomId,
 					entityId: memory.entityId,
+					...(speakerName ? { speakerName } : {}),
 				},
 			},
 		});