@mastra/core 0.8.0-alpha.4 → 0.8.0-alpha.5

package/dist/agent/index.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
-var chunkADBGSSBH_cjs = require('../chunk-ADBGSSBH.cjs');
+var chunkLK5H7SEM_cjs = require('../chunk-LK5H7SEM.cjs');
 
 
 
 Object.defineProperty(exports, "Agent", {
   enumerable: true,
-  get: function () { return chunkADBGSSBH_cjs.Agent; }
+  get: function () { return chunkLK5H7SEM_cjs.Agent; }
 });

package/dist/agent/index.d.cts

@@ -1,7 +1,7 @@
 export { Message as AiMessageType } from 'ai';
 import 'json-schema';
 import 'zod';
-export { j as Agent, k as AgentConfig, aM as AgentGenerateOptions, aN as AgentStreamOptions, aG as MastraLanguageModel, aH as ToolsInput, aL as ToolsetsInput } from '../base-CsysLRiE.cjs';
+export { j as Agent, k as AgentConfig, aM as AgentGenerateOptions, aN as AgentStreamOptions, aG as MastraLanguageModel, aH as ToolsInput, aL as ToolsetsInput } from '../base-DUSE03ps.cjs';
 import '../base-CvQbEqGB.cjs';
 import '../types-BtMyV38I.cjs';
 import 'sift';

package/dist/agent/index.d.ts

@@ -1,7 +1,7 @@
 export { Message as AiMessageType } from 'ai';
 import 'json-schema';
 import 'zod';
-export { j as Agent, k as AgentConfig, aM as AgentGenerateOptions, aN as AgentStreamOptions, aG as MastraLanguageModel, aH as ToolsInput, aL as ToolsetsInput } from '../base-DKCrhg-t.js';
+export { j as Agent, k as AgentConfig, aM as AgentGenerateOptions, aN as AgentStreamOptions, aG as MastraLanguageModel, aH as ToolsInput, aL as ToolsetsInput } from '../base-C1_qIrbQ.js';
 import '../base-BA_in99t.js';
 import '../types-BtMyV38I.js';
 import 'sift';

package/dist/agent/index.js

@@ -1 +1 @@
-export { Agent } from '../chunk-5LOK7ABN.js';
+export { Agent } from '../chunk-TFDALD5V.js';

package/dist/{base-DKCrhg-t.d.ts → base-C1_qIrbQ.d.ts}

@@ -1148,7 +1148,7 @@ declare abstract class MastraMemory extends MastraBase {
      * Implementations can override this to provide additional tools.
      */
     getTools(_config?: MemoryConfig): Record<string, CoreTool>;
-    protected createEmbeddingIndex(): Promise<{
+    protected createEmbeddingIndex(dimensions?: number): Promise<{
         indexName: string;
     }>;
     getMergedThreadConfig(config?: MemoryConfig): MemoryConfig;
@@ -1785,9 +1785,10 @@ declare class Agent<TAgentId extends string = string, TTools extends ToolsInput
     }): Promise<string>;
     getMostRecentUserMessage(messages: Array<CoreMessage$1>): CoreUserMessage$1 | undefined;
     genTitle(userMessage: CoreUserMessage$1 | undefined): Promise<string>;
-    fetchMemory({ threadId, memoryConfig, resourceId, userMessages, systemMessage, runId, }: {
+    fetchMemory({ threadId, thread: passedThread, memoryConfig, resourceId, userMessages, systemMessage, runId, }: {
         resourceId: string;
         threadId: string;
+        thread?: StorageThreadType;
         memoryConfig?: MemoryConfig;
         userMessages: CoreMessage$1[];
         systemMessage: CoreMessage$1;
@@ -1798,13 +1799,7 @@ declare class Agent<TAgentId extends string = string, TTools extends ToolsInput
         threadId: string;
         messages: CoreMessage$1[];
     }>;
-    saveResponse({ result, threadId, resourceId, runId, memoryConfig, }: {
-        runId: string;
-        resourceId: string;
-        result: Record<string, any>;
-        threadId: string;
-        memoryConfig: MemoryConfig | undefined;
-    }): Promise<void>;
+    private getResponseMessages;
     sanitizeResponseMessages(messages: Array<CoreMessage$1>): Array<CoreMessage$1>;
     convertTools({ toolsets, threadId, resourceId, runId, }: {
         toolsets?: ToolsetsInput;
@@ -1812,9 +1807,10 @@ declare class Agent<TAgentId extends string = string, TTools extends ToolsInput
         resourceId?: string;
         runId?: string;
     }): Record<string, CoreTool>;
-    preExecute({ resourceId, runId, threadId, memoryConfig, messages, systemMessage, }: {
+    preExecute({ resourceId, runId, threadId, thread, memoryConfig, messages, systemMessage, }: {
         runId?: string;
         threadId: string;
+        thread?: StorageThreadType;
         memoryConfig?: MemoryConfig;
         messages: CoreMessage$1[];
         resourceId: string;

package/dist/{base-CsysLRiE.d.cts → base-DUSE03ps.d.cts}

@@ -1148,7 +1148,7 @@ declare abstract class MastraMemory extends MastraBase {
      * Implementations can override this to provide additional tools.
      */
     getTools(_config?: MemoryConfig): Record<string, CoreTool>;
-    protected createEmbeddingIndex(): Promise<{
+    protected createEmbeddingIndex(dimensions?: number): Promise<{
         indexName: string;
     }>;
     getMergedThreadConfig(config?: MemoryConfig): MemoryConfig;
@@ -1785,9 +1785,10 @@ declare class Agent<TAgentId extends string = string, TTools extends ToolsInput
     }): Promise<string>;
     getMostRecentUserMessage(messages: Array<CoreMessage$1>): CoreUserMessage$1 | undefined;
     genTitle(userMessage: CoreUserMessage$1 | undefined): Promise<string>;
-    fetchMemory({ threadId, memoryConfig, resourceId, userMessages, systemMessage, runId, }: {
+    fetchMemory({ threadId, thread: passedThread, memoryConfig, resourceId, userMessages, systemMessage, runId, }: {
         resourceId: string;
         threadId: string;
+        thread?: StorageThreadType;
         memoryConfig?: MemoryConfig;
         userMessages: CoreMessage$1[];
         systemMessage: CoreMessage$1;
@@ -1798,13 +1799,7 @@ declare class Agent<TAgentId extends string = string, TTools extends ToolsInput
         threadId: string;
         messages: CoreMessage$1[];
     }>;
-    saveResponse({ result, threadId, resourceId, runId, memoryConfig, }: {
-        runId: string;
-        resourceId: string;
-        result: Record<string, any>;
-        threadId: string;
-        memoryConfig: MemoryConfig | undefined;
-    }): Promise<void>;
+    private getResponseMessages;
     sanitizeResponseMessages(messages: Array<CoreMessage$1>): Array<CoreMessage$1>;
     convertTools({ toolsets, threadId, resourceId, runId, }: {
         toolsets?: ToolsetsInput;
@@ -1812,9 +1807,10 @@ declare class Agent<TAgentId extends string = string, TTools extends ToolsInput
         resourceId?: string;
         runId?: string;
     }): Record<string, CoreTool>;
-    preExecute({ resourceId, runId, threadId, memoryConfig, messages, systemMessage, }: {
+    preExecute({ resourceId, runId, threadId, thread, memoryConfig, messages, systemMessage, }: {
         runId?: string;
         threadId: string;
+        thread?: StorageThreadType;
         memoryConfig?: MemoryConfig;
         messages: CoreMessage$1[];
         resourceId: string;

package/dist/{chunk-YZDUZFVZ.cjs → chunk-AAMFAGE5.cjs}

@@ -431,6 +431,12 @@ var LibSQLVector = class extends chunk7JBINHJX_cjs.MastraVector {
       authToken,
       syncInterval
     });
+    if (connectionUrl.includes(`file:`) || connectionUrl.includes(`:memory:`)) {
+      void this.turso.execute({
+        sql: "PRAGMA journal_mode=WAL;",
+        args: {}
+      });
+    }
   }
   // If we're in the .mastra/output directory, use the dir outside .mastra dir
   // reason we need to do this is libsql relative file paths are based on cwd, not current file path

package/dist/{chunk-3ZXH2ILQ.cjs → chunk-E7N5CDWQ.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkYZDUZFVZ_cjs = require('./chunk-YZDUZFVZ.cjs');
+var chunkAAMFAGE5_cjs = require('./chunk-AAMFAGE5.cjs');
 var chunk3HRHS5S2_cjs = require('./chunk-3HRHS5S2.cjs');
 var chunk64VPB7ZD_cjs = require('./chunk-64VPB7ZD.cjs');
 var chunkD63P5O4Q_cjs = require('./chunk-D63P5O4Q.cjs');
@@ -155,7 +155,7 @@ var MastraMemory = class extends chunkD63P5O4Q_cjs.MastraBase {
           `Found deprecated Memory vector db file ${oldDb} this db is now merged with the default ${newDb} file. Delete the old one to use the new one. You will need to migrate any data if that's important to you. For now the deprecated path will be used but in a future breaking change we will only use the new db file path.`
         );
       }
-      this.vector = new chunkYZDUZFVZ_cjs.LibSQLVector({
+      this.vector = new chunkAAMFAGE5_cjs.LibSQLVector({
         connectionUrl: hasOldDb ? `file:${oldDb}` : `file:${newDb}`
       });
     }
@@ -196,17 +196,15 @@ var MastraMemory = class extends chunkD63P5O4Q_cjs.MastraBase {
   getTools(_config) {
     return {};
   }
-  async createEmbeddingIndex() {
+  async createEmbeddingIndex(dimensions) {
     const defaultDimensions = 1536;
-    const dimensionsByModelId = {
-      "bge-small-en-v1.5": 384,
-      "bge-base-en-v1.5": 768,
-      "voyage-3-lite": 512
-    };
-    const dimensions = dimensionsByModelId[this.embedder.modelId] || defaultDimensions;
     const isDefault = dimensions === defaultDimensions;
-    const indexName = isDefault ? "memory_messages" : `memory_messages_${dimensions}`;
-    await this.vector.createIndex({ indexName, dimension: dimensions });
+    const usedDimensions = dimensions ?? defaultDimensions;
+    const indexName = isDefault ? "memory_messages" : `memory_messages_${usedDimensions}`;
+    await this.vector.createIndex({
+      indexName,
+      dimension: usedDimensions
+    });
     return { indexName };
   }
   getMergedThreadConfig(config) {

package/dist/{chunk-C76A6MVU.js → chunk-KHMCAV4W.js}

@@ -1,4 +1,4 @@
-import { Agent } from './chunk-5LOK7ABN.js';
+import { Agent } from './chunk-TFDALD5V.js';
 import { CohereClient } from 'cohere-ai';
 
 var CohereRelevanceScorer = class {

package/dist/{chunk-ADBGSSBH.cjs → chunk-LK5H7SEM.cjs}

@@ -891,6 +891,7 @@ exports.Agent = class Agent extends (_a = chunkD63P5O4Q_cjs.MastraBase) {
   }
   async fetchMemory({
     threadId,
+    thread: passedThread,
     memoryConfig,
     resourceId,
     userMessages,
@@ -899,9 +900,9 @@ exports.Agent = class Agent extends (_a = chunkD63P5O4Q_cjs.MastraBase) {
   }) {
     const memory = this.getMemory();
     if (memory) {
-      const thread = await memory.getThreadById({
+      const thread = passedThread ?? (await memory.getThreadById({
         threadId
-      });
+      }));
       if (!thread) {
         return {
           threadId: threadId || "",
@@ -959,80 +960,54 @@ exports.Agent = class Agent extends (_a = chunkD63P5O4Q_cjs.MastraBase) {
       messages: userMessages
     };
   }
-  async saveResponse({
-    result,
+  getResponseMessages({
+    response,
     threadId,
-    resourceId,
-    runId,
-    memoryConfig
+    resourceId
   }) {
-    const {
-      response
-    } = result;
-    try {
-      if (response.messages) {
-        const ms = Array.isArray(response.messages) ? response.messages : [response.messages];
-        const responseMessagesWithoutIncompleteToolCalls = this.sanitizeResponseMessages(ms);
-        const memory = this.getMemory();
-        if (memory) {
-          this.logger.debug(`[Agent:${this.name}] - Memory persistence: store=${this.getMemory()?.constructor.name} threadId=${threadId}`, {
-            runId,
-            resourceId,
-            threadId,
-            memoryStore: this.getMemory()?.constructor.name
-          });
-          await memory.saveMessages({
-            memoryConfig,
-            messages: responseMessagesWithoutIncompleteToolCalls.map((message, index) => {
-              const messageId = crypto$1.randomUUID();
-              let toolCallIds;
-              let toolCallArgs;
-              let toolNames;
-              let type = "text";
-              if (message.role === "tool") {
-                toolCallIds = message.content.map(content => content.toolCallId);
-                type = "tool-result";
-              }
-              if (message.role === "assistant") {
-                const assistantContent = message.content;
-                const assistantToolCalls = assistantContent.map(content => {
-                  if (content.type === "tool-call") {
-                    return {
-                      toolCallId: content.toolCallId,
-                      toolArgs: content.args,
-                      toolName: content.toolName
-                    };
-                  }
-                  return void 0;
-                })?.filter(Boolean);
-                toolCallIds = assistantToolCalls?.map(toolCall => toolCall.toolCallId);
-                toolCallArgs = assistantToolCalls?.map(toolCall => toolCall.toolArgs);
-                toolNames = assistantToolCalls?.map(toolCall => toolCall.toolName);
-                type = assistantContent?.[0]?.type;
-              }
-              return {
-                id: messageId,
-                threadId,
-                resourceId,
-                role: message.role,
-                content: message.content,
-                createdAt: new Date(Date.now() + index),
-                // use Date.now() + index to make sure every message is atleast one millisecond apart
-                toolCallIds: toolCallIds?.length ? toolCallIds : void 0,
-                toolCallArgs: toolCallArgs?.length ? toolCallArgs : void 0,
-                toolNames: toolNames?.length ? toolNames : void 0,
-                type
-              };
-            })
-          });
-        }
+    if (!response.messages) return [];
+    const messagesArray = Array.isArray(response.messages) ? response.messages : [response.messages];
+    return this.sanitizeResponseMessages(messagesArray).map((message, index) => {
+      const messageId = crypto$1.randomUUID();
+      let toolCallIds;
+      let toolCallArgs;
+      let toolNames;
+      let type = "text";
+      if (message.role === "tool") {
+        toolCallIds = message.content.map(content => content.toolCallId);
+        type = "tool-result";
       }
-    } catch (err) {
-      this.logger.error(`[Agent:${this.name}] - Failed to save assistant response`, {
-        error: err,
-        runId
-      });
-    }
+      if (message.role === "assistant") {
+        const assistantContent = message.content;
+        const assistantToolCalls = assistantContent.map(content => {
+          if (content.type === "tool-call") {
+            return {
+              toolCallId: content.toolCallId,
+              toolArgs: content.args,
+              toolName: content.toolName
+            };
+          }
+          return void 0;
+        })?.filter(Boolean);
+        toolCallIds = assistantToolCalls?.map(toolCall => toolCall.toolCallId);
+        toolCallArgs = assistantToolCalls?.map(toolCall => toolCall.toolArgs);
+        toolNames = assistantToolCalls?.map(toolCall => toolCall.toolName);
+        type = assistantContent?.[0]?.type;
+      }
+      return {
+        id: messageId,
+        threadId,
+        resourceId,
+        role: message.role,
+        content: message.content,
+        createdAt: new Date(Date.now() + index),
+        // use Date.now() + index to make sure every message is atleast one millisecond apart
+        toolCallIds: toolCallIds?.length ? toolCallIds : void 0,
+        toolCallArgs: toolCallArgs?.length ? toolCallArgs : void 0,
+        toolNames: toolNames?.length ? toolNames : void 0,
+        type
+      };
+    });
   }
   sanitizeResponseMessages(messages) {
     let toolResultIds = [];
@@ -1196,6 +1171,7 @@ exports.Agent = class Agent extends (_a = chunkD63P5O4Q_cjs.MastraBase) {
     resourceId,
     runId,
     threadId,
+    thread,
     memoryConfig,
     messages,
     systemMessage
@@ -1207,6 +1183,7 @@ exports.Agent = class Agent extends (_a = chunkD63P5O4Q_cjs.MastraBase) {
     });
     const saveMessageResponse = await this.fetchMemory({
       threadId,
+      thread,
       resourceId,
       userMessages: messages,
       memoryConfig,
@@ -1269,6 +1246,7 @@ exports.Agent = class Agent extends (_a = chunkD63P5O4Q_cjs.MastraBase) {
             resourceId,
             runId,
             threadId: threadIdToUse,
+            thread,
             memoryConfig,
             messages,
             systemMessage
@@ -1344,7 +1322,7 @@ exports.Agent = class Agent extends (_a = chunkD63P5O4Q_cjs.MastraBase) {
           try {
             const userMessage = this.getMostRecentUserMessage(messages);
             const newMessages = userMessage ? [userMessage] : messages;
-            const threadMessages = newMessages.map(u => {
+            const threadMessages = this.sanitizeResponseMessages(chunk64VPB7ZD_cjs.ensureAllMessagesAreCoreMessages(newMessages)).map(u => {
               return {
                 id: this.getMemory()?.generateId(),
                 createdAt: /* @__PURE__ */new Date(),
@@ -1356,19 +1334,7 @@ exports.Agent = class Agent extends (_a = chunkD63P5O4Q_cjs.MastraBase) {
                 type: "text"
               };
             });
-            await Promise.all([(async () => {
-              await memory.saveMessages({
-                messages: threadMessages,
-                memoryConfig: memoryConfig2
-              });
-              await this.saveResponse({
-                result,
-                threadId: threadId2,
-                resourceId,
-                memoryConfig: memoryConfig2,
-                runId: runId2
-              });
-            })(), (async () => {
+            void (async () => {
               if (!thread.title?.startsWith("New Thread")) {
                 return;
               }
@@ -1383,7 +1349,15 @@ exports.Agent = class Agent extends (_a = chunkD63P5O4Q_cjs.MastraBase) {
                 memoryConfig: memoryConfig2,
                 title
               });
-            })()]);
+            })();
+            await memory.saveMessages({
+              messages: [...threadMessages, ...this.getResponseMessages({
+                threadId: threadId2,
+                resourceId,
+                response: result.response
+              })],
+              memoryConfig: memoryConfig2
+            });
           } catch (e) {
             this.logger.error("Error saving response", {
               error: e,

package/dist/{chunk-R6ERLKCY.cjs → chunk-S3VEAYDK.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkADBGSSBH_cjs = require('./chunk-ADBGSSBH.cjs');
+var chunkLK5H7SEM_cjs = require('./chunk-LK5H7SEM.cjs');
 var cohereAi = require('cohere-ai');
 
 var CohereRelevanceScorer = class {
@@ -38,7 +38,7 @@ Relevance score (0-1):`;
 var MastraAgentRelevanceScorer = class {
   agent;
   constructor(name, model) {
-    this.agent = new chunkADBGSSBH_cjs.Agent({
+    this.agent = new chunkLK5H7SEM_cjs.Agent({
       name: `Relevance Scorer ${name}`,
       instructions: `You are a specialized agent for evaluating the relevance of text to queries.
 Your task is to rate how well a text passage answers a given query.

package/dist/{chunk-5LOK7ABN.js → chunk-TFDALD5V.js}

@@ -884,6 +884,7 @@ var Agent = class extends (_a = MastraBase) {
   }
   async fetchMemory({
     threadId,
+    thread: passedThread,
     memoryConfig,
     resourceId,
     userMessages,
@@ -892,9 +893,9 @@ var Agent = class extends (_a = MastraBase) {
   }) {
     const memory = this.getMemory();
     if (memory) {
-      const thread = await memory.getThreadById({
+      const thread = passedThread ?? (await memory.getThreadById({
         threadId
-      });
+      }));
       if (!thread) {
         return {
           threadId: threadId || "",
@@ -952,80 +953,54 @@ var Agent = class extends (_a = MastraBase) {
       messages: userMessages
     };
   }
-  async saveResponse({
-    result,
+  getResponseMessages({
+    response,
     threadId,
-    resourceId,
-    runId,
-    memoryConfig
+    resourceId
   }) {
-    const {
-      response
-    } = result;
-    try {
-      if (response.messages) {
-        const ms = Array.isArray(response.messages) ? response.messages : [response.messages];
-        const responseMessagesWithoutIncompleteToolCalls = this.sanitizeResponseMessages(ms);
-        const memory = this.getMemory();
-        if (memory) {
-          this.logger.debug(`[Agent:${this.name}] - Memory persistence: store=${this.getMemory()?.constructor.name} threadId=${threadId}`, {
-            runId,
-            resourceId,
-            threadId,
-            memoryStore: this.getMemory()?.constructor.name
-          });
-          await memory.saveMessages({
-            memoryConfig,
-            messages: responseMessagesWithoutIncompleteToolCalls.map((message, index) => {
-              const messageId = randomUUID();
-              let toolCallIds;
-              let toolCallArgs;
-              let toolNames;
-              let type = "text";
-              if (message.role === "tool") {
-                toolCallIds = message.content.map(content => content.toolCallId);
-                type = "tool-result";
-              }
-              if (message.role === "assistant") {
-                const assistantContent = message.content;
-                const assistantToolCalls = assistantContent.map(content => {
-                  if (content.type === "tool-call") {
-                    return {
-                      toolCallId: content.toolCallId,
-                      toolArgs: content.args,
-                      toolName: content.toolName
-                    };
-                  }
-                  return void 0;
-                })?.filter(Boolean);
-                toolCallIds = assistantToolCalls?.map(toolCall => toolCall.toolCallId);
-                toolCallArgs = assistantToolCalls?.map(toolCall => toolCall.toolArgs);
-                toolNames = assistantToolCalls?.map(toolCall => toolCall.toolName);
-                type = assistantContent?.[0]?.type;
-              }
-              return {
-                id: messageId,
-                threadId,
-                resourceId,
-                role: message.role,
-                content: message.content,
-                createdAt: new Date(Date.now() + index),
-                // use Date.now() + index to make sure every message is atleast one millisecond apart
-                toolCallIds: toolCallIds?.length ? toolCallIds : void 0,
-                toolCallArgs: toolCallArgs?.length ? toolCallArgs : void 0,
-                toolNames: toolNames?.length ? toolNames : void 0,
-                type
-              };
-            })
-          });
-        }
+    if (!response.messages) return [];
+    const messagesArray = Array.isArray(response.messages) ? response.messages : [response.messages];
+    return this.sanitizeResponseMessages(messagesArray).map((message, index) => {
+      const messageId = randomUUID();
+      let toolCallIds;
+      let toolCallArgs;
+      let toolNames;
+      let type = "text";
+      if (message.role === "tool") {
+        toolCallIds = message.content.map(content => content.toolCallId);
+        type = "tool-result";
       }
-    } catch (err) {
-      this.logger.error(`[Agent:${this.name}] - Failed to save assistant response`, {
-        error: err,
-        runId
-      });
-    }
+      if (message.role === "assistant") {
+        const assistantContent = message.content;
+        const assistantToolCalls = assistantContent.map(content => {
+          if (content.type === "tool-call") {
+            return {
+              toolCallId: content.toolCallId,
+              toolArgs: content.args,
+              toolName: content.toolName
+            };
+          }
+          return void 0;
+        })?.filter(Boolean);
+        toolCallIds = assistantToolCalls?.map(toolCall => toolCall.toolCallId);
+        toolCallArgs = assistantToolCalls?.map(toolCall => toolCall.toolArgs);
+        toolNames = assistantToolCalls?.map(toolCall => toolCall.toolName);
+        type = assistantContent?.[0]?.type;
+      }
+      return {
+        id: messageId,
+        threadId,
+        resourceId,
+        role: message.role,
+        content: message.content,
+        createdAt: new Date(Date.now() + index),
+        // use Date.now() + index to make sure every message is atleast one millisecond apart
+        toolCallIds: toolCallIds?.length ? toolCallIds : void 0,
+        toolCallArgs: toolCallArgs?.length ? toolCallArgs : void 0,
+        toolNames: toolNames?.length ? toolNames : void 0,
+        type
+      };
+    });
   }
   sanitizeResponseMessages(messages) {
     let toolResultIds = [];
@@ -1189,6 +1164,7 @@ var Agent = class extends (_a = MastraBase) {
     resourceId,
     runId,
     threadId,
+    thread,
     memoryConfig,
     messages,
     systemMessage
@@ -1200,6 +1176,7 @@ var Agent = class extends (_a = MastraBase) {
     });
     const saveMessageResponse = await this.fetchMemory({
       threadId,
+      thread,
       resourceId,
       userMessages: messages,
       memoryConfig,
@@ -1262,6 +1239,7 @@ var Agent = class extends (_a = MastraBase) {
             resourceId,
             runId,
             threadId: threadIdToUse,
+            thread,
             memoryConfig,
             messages,
             systemMessage
@@ -1337,7 +1315,7 @@ var Agent = class extends (_a = MastraBase) {
           try {
             const userMessage = this.getMostRecentUserMessage(messages);
             const newMessages = userMessage ? [userMessage] : messages;
-            const threadMessages = newMessages.map(u => {
+            const threadMessages = this.sanitizeResponseMessages(ensureAllMessagesAreCoreMessages(newMessages)).map(u => {
               return {
                 id: this.getMemory()?.generateId(),
                 createdAt: /* @__PURE__ */new Date(),
@@ -1349,19 +1327,7 @@ var Agent = class extends (_a = MastraBase) {
                 type: "text"
               };
             });
-            await Promise.all([(async () => {
-              await memory.saveMessages({
-                messages: threadMessages,
-                memoryConfig: memoryConfig2
-              });
-              await this.saveResponse({
-                result,
-                threadId: threadId2,
-                resourceId,
-                memoryConfig: memoryConfig2,
-                runId: runId2
-              });
-            })(), (async () => {
+            void (async () => {
               if (!thread.title?.startsWith("New Thread")) {
                 return;
               }
@@ -1376,7 +1342,15 @@ var Agent = class extends (_a = MastraBase) {
                 memoryConfig: memoryConfig2,
                 title
               });
-            })()]);
+            })();
+            await memory.saveMessages({
+              messages: [...threadMessages, ...this.getResponseMessages({
+                threadId: threadId2,
+                resourceId,
+                response: result.response
+              })],
+              memoryConfig: memoryConfig2
+            });
           } catch (e) {
             this.logger.error("Error saving response", {
               error: e,