From 08bb78e7bfe1cebcdd64fb6ca20ab4bd2ca44773 Mon Sep 17 00:00:00 2001 From: Tyler Barnes Date: Thu, 17 Apr 2025 18:10:25 -0700 Subject: [PATCH] fix(@mastra/core): extra safety for message ordering (#3672) Yesterday I merged https://github.com/mastra-ai/mastra/pull/3654 and today it occurred to me we can do this in an even safer way. This doesn't fix any reported bug but it should make it even more likely there isn't one lurking --- .changeset/clever-lions-strive.md | 5 +++++ packages/core/src/agent/index.ts | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 .changeset/clever-lions-strive.md diff --git a/.changeset/clever-lions-strive.md b/.changeset/clever-lions-strive.md new file mode 100644 index 00000000000..3ae3b4593c6 --- /dev/null +++ b/.changeset/clever-lions-strive.md @@ -0,0 +1,5 @@ +--- +'@mastra/core': patch +--- + +Added an extra safety for Memory message ordering diff --git a/packages/core/src/agent/index.ts b/packages/core/src/agent/index.ts index 28e00c4d6f6..6d5a111ee26 100644 --- a/packages/core/src/agent/index.ts +++ b/packages/core/src/agent/index.ts @@ -309,15 +309,16 @@ export class Agent< response, threadId, resourceId, + now, }: { response: any; // why?? threadId: string; resourceId: string; + now: number; }) { if (!response.messages) return []; const messagesArray = Array.isArray(response.messages) ? response.messages : [response.messages]; - const now = Date.now(); return this.sanitizeResponseMessages(messagesArray).map((message: CoreMessage | CoreAssistantMessage, index) => { const messageId = randomUUID(); let toolCallIds: string[] | undefined; @@ -820,6 +821,7 @@ export class Agent< }; }, ); + const dateResponseMessagesFrom = (threadMessages.at(-1)?.createdAt?.getTime?.() || Date.now()) + 1; // renaming the thread doesn't need to block finishing the req void (async () => { @@ -843,7 +845,12 @@ export class Agent< await memory.saveMessages({ messages: [ ...threadMessages, - ...this.getResponseMessages({ threadId, resourceId, response: result.response }), + ...this.getResponseMessages({ + threadId, + resourceId, + response: result.response, + now: dateResponseMessagesFrom, + }), ], memoryConfig, });