@mastra/core 0.10.11 → 0.10.12-alpha.1

package/dist/agent/index.cjs

@@ -1,13 +1,13 @@
 'use strict';
 
-var chunkWTC6DJHD_cjs = require('../chunk-WTC6DJHD.cjs');
+var chunkFBKJ3652_cjs = require('../chunk-FBKJ3652.cjs');
 var chunkQUSEDVYI_cjs = require('../chunk-QUSEDVYI.cjs');
 
 
 
 Object.defineProperty(exports, "Agent", {
   enumerable: true,
-  get: function () { return chunkWTC6DJHD_cjs.Agent; }
+  get: function () { return chunkFBKJ3652_cjs.Agent; }
 });
 Object.defineProperty(exports, "MessageList", {
   enumerable: true,

package/dist/agent/index.d.cts

@@ -1,7 +1,7 @@
 export { Message as AiMessageType } from 'ai';
 import 'json-schema';
 import 'zod';
-export { A as Agent, av as AgentConfig, c6 as AgentGenerateOptions, c5 as AgentMemoryOption, c7 as AgentStreamOptions, aZ as DynamicArgument, aY as MastraLanguageModel, c8 as MastraMessageContentV2, t as MastraMessageV2, c3 as MessageList, T as ToolsInput, c4 as ToolsetsInput } from '../base-DpaaEQWN.cjs';
+export { A as Agent, av as AgentConfig, c6 as AgentGenerateOptions, c5 as AgentMemoryOption, c7 as AgentStreamOptions, aZ as DynamicArgument, aY as MastraLanguageModel, c8 as MastraMessageContentV2, t as MastraMessageV2, c3 as MessageList, T as ToolsInput, c4 as ToolsetsInput } from '../base-CS5eSXbL.cjs';
 import '../base-B_y9sMg0.cjs';
 import '../types-Bo1uigWx.cjs';
 import '../runtime-context/index.cjs';

package/dist/agent/index.d.ts

@@ -1,7 +1,7 @@
 export { Message as AiMessageType } from 'ai';
 import 'json-schema';
 import 'zod';
-export { A as Agent, av as AgentConfig, c6 as AgentGenerateOptions, c5 as AgentMemoryOption, c7 as AgentStreamOptions, aZ as DynamicArgument, aY as MastraLanguageModel, c8 as MastraMessageContentV2, t as MastraMessageV2, c3 as MessageList, T as ToolsInput, c4 as ToolsetsInput } from '../base-BBkhRGjp.js';
+export { A as Agent, av as AgentConfig, c6 as AgentGenerateOptions, c5 as AgentMemoryOption, c7 as AgentStreamOptions, aZ as DynamicArgument, aY as MastraLanguageModel, c8 as MastraMessageContentV2, t as MastraMessageV2, c3 as MessageList, T as ToolsInput, c4 as ToolsetsInput } from '../base-DBhKcre4.js';
 import '../base-ClrXcCRx.js';
 import '../types-Bo1uigWx.js';
 import '../runtime-context/index.js';

package/dist/agent/index.js

@@ -1,2 +1,2 @@
-export { Agent } from '../chunk-XR7OX4ZC.js';
+export { Agent } from '../chunk-EWCOOO3H.js';
 export { MessageList } from '../chunk-4UBOJFSL.js';

package/dist/{base-DpaaEQWN.d.cts → base-CS5eSXbL.d.cts}

@@ -1,5 +1,4 @@
-import * as ai from 'ai';
-import { Tool as Tool$2, Schema, ToolExecutionOptions, LanguageModelV1, CoreMessage as CoreMessage$1, GenerateTextResult, GenerateObjectResult, StreamTextResult, StreamObjectResult, TextStreamPart, UserContent, AssistantContent, ToolContent, EmbeddingModel, UIMessage, Message, IDGenerator as IDGenerator$1, CoreSystemMessage as CoreSystemMessage$1, LanguageModel as LanguageModel$1, DeepPartial, generateText, generateObject, streamText, streamObject, TelemetrySettings, CoreAssistantMessage as CoreAssistantMessage$1, CoreUserMessage as CoreUserMessage$1, CoreToolMessage as CoreToolMessage$1, EmbedResult as EmbedResult$1, EmbedManyResult as EmbedManyResult$1, GenerateTextOnStepFinishCallback, StreamTextOnFinishCallback, StreamObjectOnFinishCallback, StreamTextOnStepFinishCallback } from 'ai';
+import { Tool as Tool$2, Schema, ToolExecutionOptions, LanguageModelV1, CoreMessage as CoreMessage$1, GenerateTextResult, GenerateObjectResult, StreamTextResult, StreamObjectResult, TextStreamPart, UserContent, AssistantContent, ToolContent, EmbeddingModel, UIMessage, Message, IDGenerator as IDGenerator$1, CoreSystemMessage as CoreSystemMessage$1, DeepPartial, generateText, generateObject, streamText, streamObject, TelemetrySettings, CoreAssistantMessage as CoreAssistantMessage$1, CoreUserMessage as CoreUserMessage$1, CoreToolMessage as CoreToolMessage$1, EmbedResult as EmbedResult$1, EmbedManyResult as EmbedManyResult$1, GenerateTextOnStepFinishCallback, StreamTextOnFinishCallback, StreamObjectOnFinishCallback, StreamTextOnStepFinishCallback } from 'ai';
 import { M as MastraBase, a as Telemetry, O as OtelConfig, T as Trace } from './base-B_y9sMg0.cjs';
 import { z, ZodSchema, ZodObject } from 'zod';
 import { B as BaseLogMessage, R as RegisteredLogger, I as IMastraLogger, a as LogLevel } from './logger-B8XXh6ya.cjs';
@@ -2265,24 +2264,21 @@ declare abstract class MastraMemory extends MastraBase {
     abstract getWorkingMemoryTemplate(): Promise<WorkingMemoryTemplate | null>;
 }
 
-declare class MastraLLMBase extends MastraBase {
-    #private;
-    constructor({ name, model }: {
+declare abstract class MastraLLMBase extends MastraBase {
+    constructor({ name }: {
         name: string;
-        model: LanguageModel$1;
     });
-    getProvider(): string;
-    getModelId(): string;
-    getModel(): ai.LanguageModelV1;
+    abstract getProvider(): string;
+    abstract getModelId(): string;
+    abstract __registerMastra(p: Mastra): void;
+    abstract __text<Z extends ZodSchema | JSONSchema7 | undefined>(input: LLMTextOptions<Z>): Promise<GenerateTextResult<any, any>>;
+    abstract __textObject<T extends ZodSchema | JSONSchema7 | undefined>(input: LLMTextObjectOptions<T>): Promise<GenerateObjectResult<T>>;
+    abstract generate<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], options: LLMStreamOptions<Z>): Promise<GenerateReturn<Z>>;
+    abstract __stream<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(input: LLMInnerStreamOptions<Z>): StreamTextResult<any, any>;
+    abstract __streamObject<T extends ZodSchema | JSONSchema7 | undefined>(input: LLMStreamObjectOptions<T>): StreamObjectResult<DeepPartial<T>, T, never>;
+    abstract stream<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], options: LLMStreamOptions<Z>): StreamReturn<Z>;
     convertToMessages(messages: string | string[] | CoreMessage$1[]): CoreMessage$1[];
     __registerPrimitives(p: MastraPrimitives): void;
-    __registerMastra(p: Mastra): void;
-    __text<Z extends ZodSchema | JSONSchema7 | undefined>(input: LLMTextOptions<Z>): Promise<GenerateTextResult<any, any>>;
-    __textObject<T extends ZodSchema | JSONSchema7 | undefined>(input: LLMTextObjectOptions<T>): Promise<GenerateObjectResult<T>>;
-    generate<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], options: LLMStreamOptions<Z>): Promise<GenerateReturn<Z>>;
-    __stream<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(input: LLMInnerStreamOptions<Z>): Promise<StreamTextResult<any, any>>;
-    __streamObject<T extends ZodSchema | JSONSchema7 | undefined>(input: LLMStreamObjectOptions<T>): Promise<StreamObjectResult<DeepPartial<T>, T, never>>;
-    stream<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], options: LLMStreamOptions<Z>): Promise<StreamReturn<Z>>;
 }
 
 declare function createMockModel({ objectGenerationMode, mockText, spyGenerate, spyStream, }: {
@@ -3824,6 +3820,7 @@ declare class Agent<TAgentId extends string = string, TTools extends ToolsInput
         messages: CoreMessage$1[];
     }>;
     private getMemoryTools;
+    private getMemoryMessages;
     private getAssignedTools;
     private getToolsets;
     private getClientTools;

package/dist/{base-BBkhRGjp.d.ts → base-DBhKcre4.d.ts}

@@ -1,5 +1,4 @@
-import * as ai from 'ai';
-import { Tool as Tool$2, Schema, ToolExecutionOptions, LanguageModelV1, CoreMessage as CoreMessage$1, GenerateTextResult, GenerateObjectResult, StreamTextResult, StreamObjectResult, TextStreamPart, UserContent, AssistantContent, ToolContent, EmbeddingModel, UIMessage, Message, IDGenerator as IDGenerator$1, CoreSystemMessage as CoreSystemMessage$1, LanguageModel as LanguageModel$1, DeepPartial, generateText, generateObject, streamText, streamObject, TelemetrySettings, CoreAssistantMessage as CoreAssistantMessage$1, CoreUserMessage as CoreUserMessage$1, CoreToolMessage as CoreToolMessage$1, EmbedResult as EmbedResult$1, EmbedManyResult as EmbedManyResult$1, GenerateTextOnStepFinishCallback, StreamTextOnFinishCallback, StreamObjectOnFinishCallback, StreamTextOnStepFinishCallback } from 'ai';
+import { Tool as Tool$2, Schema, ToolExecutionOptions, LanguageModelV1, CoreMessage as CoreMessage$1, GenerateTextResult, GenerateObjectResult, StreamTextResult, StreamObjectResult, TextStreamPart, UserContent, AssistantContent, ToolContent, EmbeddingModel, UIMessage, Message, IDGenerator as IDGenerator$1, CoreSystemMessage as CoreSystemMessage$1, DeepPartial, generateText, generateObject, streamText, streamObject, TelemetrySettings, CoreAssistantMessage as CoreAssistantMessage$1, CoreUserMessage as CoreUserMessage$1, CoreToolMessage as CoreToolMessage$1, EmbedResult as EmbedResult$1, EmbedManyResult as EmbedManyResult$1, GenerateTextOnStepFinishCallback, StreamTextOnFinishCallback, StreamObjectOnFinishCallback, StreamTextOnStepFinishCallback } from 'ai';
 import { M as MastraBase, a as Telemetry, O as OtelConfig, T as Trace } from './base-ClrXcCRx.js';
 import { z, ZodSchema, ZodObject } from 'zod';
 import { B as BaseLogMessage, R as RegisteredLogger, I as IMastraLogger, a as LogLevel } from './logger-Bpa2oLL4.js';
@@ -2265,24 +2264,21 @@ declare abstract class MastraMemory extends MastraBase {
     abstract getWorkingMemoryTemplate(): Promise<WorkingMemoryTemplate | null>;
 }
 
-declare class MastraLLMBase extends MastraBase {
-    #private;
-    constructor({ name, model }: {
+declare abstract class MastraLLMBase extends MastraBase {
+    constructor({ name }: {
         name: string;
-        model: LanguageModel$1;
     });
-    getProvider(): string;
-    getModelId(): string;
-    getModel(): ai.LanguageModelV1;
+    abstract getProvider(): string;
+    abstract getModelId(): string;
+    abstract __registerMastra(p: Mastra): void;
+    abstract __text<Z extends ZodSchema | JSONSchema7 | undefined>(input: LLMTextOptions<Z>): Promise<GenerateTextResult<any, any>>;
+    abstract __textObject<T extends ZodSchema | JSONSchema7 | undefined>(input: LLMTextObjectOptions<T>): Promise<GenerateObjectResult<T>>;
+    abstract generate<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], options: LLMStreamOptions<Z>): Promise<GenerateReturn<Z>>;
+    abstract __stream<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(input: LLMInnerStreamOptions<Z>): StreamTextResult<any, any>;
+    abstract __streamObject<T extends ZodSchema | JSONSchema7 | undefined>(input: LLMStreamObjectOptions<T>): StreamObjectResult<DeepPartial<T>, T, never>;
+    abstract stream<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], options: LLMStreamOptions<Z>): StreamReturn<Z>;
     convertToMessages(messages: string | string[] | CoreMessage$1[]): CoreMessage$1[];
     __registerPrimitives(p: MastraPrimitives): void;
-    __registerMastra(p: Mastra): void;
-    __text<Z extends ZodSchema | JSONSchema7 | undefined>(input: LLMTextOptions<Z>): Promise<GenerateTextResult<any, any>>;
-    __textObject<T extends ZodSchema | JSONSchema7 | undefined>(input: LLMTextObjectOptions<T>): Promise<GenerateObjectResult<T>>;
-    generate<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], options: LLMStreamOptions<Z>): Promise<GenerateReturn<Z>>;
-    __stream<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(input: LLMInnerStreamOptions<Z>): Promise<StreamTextResult<any, any>>;
-    __streamObject<T extends ZodSchema | JSONSchema7 | undefined>(input: LLMStreamObjectOptions<T>): Promise<StreamObjectResult<DeepPartial<T>, T, never>>;
-    stream<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], options: LLMStreamOptions<Z>): Promise<StreamReturn<Z>>;
 }
 
 declare function createMockModel({ objectGenerationMode, mockText, spyGenerate, spyStream, }: {
@@ -3824,6 +3820,7 @@ declare class Agent<TAgentId extends string = string, TTools extends ToolsInput
         messages: CoreMessage$1[];
     }>;
     private getMemoryTools;
+    private getMemoryMessages;
     private getAssignedTools;
     private getToolsets;
     private getClientTools;

package/dist/{chunk-VNEHTPHO.js → chunk-2HDFKWFU.js}

@@ -1,5 +1,5 @@
 import { EMITTER_SYMBOL } from './chunk-Y7D2JLKS.js';
-import { Agent } from './chunk-XR7OX4ZC.js';
+import { Agent } from './chunk-EWCOOO3H.js';
 import { Tool } from './chunk-C4LMN2IR.js';
 import { MastraError } from './chunk-6UNGH46J.js';
 import { MastraBase } from './chunk-5IEKR756.js';

package/dist/{chunk-FL4BYLDK.cjs → chunk-7MZNOW6W.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var chunkBB6DPGIV_cjs = require('./chunk-BB6DPGIV.cjs');
-var chunkWTC6DJHD_cjs = require('./chunk-WTC6DJHD.cjs');
+var chunkFBKJ3652_cjs = require('./chunk-FBKJ3652.cjs');
 var chunk4Z3OU5RY_cjs = require('./chunk-4Z3OU5RY.cjs');
 var chunkB6TOBUS6_cjs = require('./chunk-B6TOBUS6.cjs');
 var chunkP3Q73CAW_cjs = require('./chunk-P3Q73CAW.cjs');
@@ -1301,7 +1301,7 @@ function mapVariable(config) {
   return config;
 }
 function createStep(params) {
-  if (params instanceof chunkWTC6DJHD_cjs.Agent) {
+  if (params instanceof chunkFBKJ3652_cjs.Agent) {
     return {
       id: params.name,
       // @ts-ignore

package/dist/{chunk-VUEY4BUU.cjs → chunk-E7AX3U6M.cjs}

@@ -10,24 +10,11 @@ var zod = require('zod');
 
 // src/llm/model/base.ts
 var MastraLLMBase = class extends chunkP3Q73CAW_cjs.MastraBase {
-  // @ts-ignore
-  #mastra;
-  #model;
-  constructor({ name, model }) {
+  constructor({ name }) {
     super({
       component: chunkZIZ3CVHN_cjs.RegisteredLogger.LLM,
       name
     });
-    this.#model = model;
-  }
-  getProvider() {
-    return this.#model.provider;
-  }
-  getModelId() {
-    return this.#model.modelId;
-  }
-  getModel() {
-    return this.#model;
   }
   convertToMessages(messages) {
     if (Array.isArray(messages)) {
@@ -56,33 +43,6 @@ var MastraLLMBase = class extends chunkP3Q73CAW_cjs.MastraBase {
       this.__setLogger(p.logger);
     }
   }
-  __registerMastra(p) {
-    this.#mastra = p;
-  }
-  async __text(input) {
-    this.logger.debug(`[LLMs:${this.name}] Generating text.`, { input });
-    throw new Error("Method not implemented.");
-  }
-  async __textObject(input) {
-    this.logger.debug(`[LLMs:${this.name}] Generating object.`, { input });
-    throw new Error("Method not implemented.");
-  }
-  async generate(messages, options) {
-    this.logger.debug(`[LLMs:${this.name}] Generating text.`, { messages, options });
-    throw new Error("Method not implemented.");
-  }
-  async __stream(input) {
-    this.logger.debug(`[LLMs:${this.name}] Streaming text.`, { input });
-    throw new Error("Method not implemented.");
-  }
-  async __streamObject(input) {
-    this.logger.debug(`[LLMs:${this.name}] Streaming object.`, { input });
-    throw new Error("Method not implemented.");
-  }
-  async stream(messages, options) {
-    this.logger.debug(`[LLMs:${this.name}] Streaming text.`, { messages, options });
-    throw new Error("Method not implemented.");
-  }
 };
 
 // src/llm/model/model.ts
@@ -90,7 +50,7 @@ var MastraLLM = class extends MastraLLMBase {
   #model;
   #mastra;
   constructor({ model, mastra }) {
-    super({ name: "aisdk", model });
+    super({ name: "aisdk" });
     this.#model = model;
     if (mastra) {
       this.#mastra = mastra;
@@ -194,7 +154,6 @@ var MastraLLM = class extends MastraLLMBase {
             },
             e
           );
-          this.logger.trackException(mastraError);
           throw mastraError;
         }
         this.logger.debug("[LLM] - Step Change:", {
@@ -254,7 +213,6 @@ var MastraLLM = class extends MastraLLMBase {
         },
         e
       );
-      this.logger.trackException(mastraError);
       throw mastraError;
     }
   }
@@ -305,7 +263,6 @@ var MastraLLM = class extends MastraLLMBase {
             },
             e
           );
-          this.logger.trackException(mastraError);
           throw mastraError;
         }
         this.logger.debug("[LLM] - Step Change:", {
@@ -356,11 +313,10 @@ var MastraLLM = class extends MastraLLMBase {
         },
         e
       );
-      this.logger.trackException(mastraError);
       throw mastraError;
     }
   }
-  async __stream({
+  __stream({
     messages,
     onStepFinish,
     onFinish,
@@ -487,7 +443,7 @@ var MastraLLM = class extends MastraLLMBase {
       }
     }
     try {
-      return await ai.streamText({
+      return ai.streamText({
         messages,
         ...argsForExecute,
         experimental_telemetry: {
@@ -514,11 +470,10 @@ var MastraLLM = class extends MastraLLMBase {
         },
         e
       );
-      this.logger.trackException(mastraError);
       throw mastraError;
     }
   }
-  async __streamObject({
+  __streamObject({
     messages,
     runId,
     tools = {},
@@ -664,7 +619,6 @@ var MastraLLM = class extends MastraLLMBase {
         },
         e
       );
-      this.logger.trackException(mastraError);
       throw mastraError;
     }
   }
@@ -684,16 +638,16 @@ var MastraLLM = class extends MastraLLMBase {
       ...rest
     });
   }
-  async stream(messages, { maxSteps = 5, output, ...rest }) {
+  stream(messages, { maxSteps = 5, output, ...rest }) {
     const msgs = this.convertToMessages(messages);
     if (!output) {
-      return await this.__stream({
+      return this.__stream({
         messages: msgs,
         maxSteps,
         ...rest
       });
     }
-    return await this.__streamObject({
+    return this.__streamObject({
       messages: msgs,
       structuredOutput: output,
       maxSteps,

package/dist/{chunk-XR7OX4ZC.js → chunk-EWCOOO3H.js}

@@ -1,7 +1,7 @@
 import { DefaultVoice } from './chunk-5HTMDAXP.js';
 import { MessageList } from './chunk-4UBOJFSL.js';
 import { executeHook } from './chunk-BB4KXGBU.js';
-import { MastraLLM } from './chunk-EJI2SQJP.js';
+import { MastraLLM } from './chunk-YJEHXYK5.js';
 import { InstrumentClass } from './chunk-TC2SCOTE.js';
 import { ensureToolProperties, makeCoreTool, createMastraProxy } from './chunk-DFFVEKIG.js';
 import { MastraError } from './chunk-6UNGH46J.js';
@@ -853,6 +853,24 @@ var Agent = class extends (_a = MastraBase) {
     }
     return convertedMemoryTools;
   }
+  async getMemoryMessages({
+    resourceId,
+    threadId,
+    vectorMessageSearch,
+    memoryConfig
+  }) {
+    const memory = this.getMemory();
+    if (!memory) {
+      return [];
+    }
+    return memory.rememberMessages({
+      threadId,
+      resourceId,
+      config: memoryConfig,
+      // The new user messages aren't in the list yet cause we add memory messages first to try to make sure ordering is correct (memory comes before new user messages)
+      vectorMessageSearch
+    }).then(r => r.messagesV2);
+  }
   async getAssignedTools({
     runtimeContext,
     runId,
@@ -1232,17 +1250,16 @@ var Agent = class extends (_a = MastraBase) {
             resourceId
           });
         }
-        let [memoryMessages, memorySystemMessage] = thread.id && memory ? await Promise.all([memory.rememberMessages({
-          threadId: threadObject.id,
+        let [memoryMessages, memorySystemMessage] = thread.id && memory ? await Promise.all([this.getMemoryMessages({
           resourceId,
-          config: memoryConfig,
-          // The new user messages aren't in the list yet cause we add memory messages first to try to make sure ordering is correct (memory comes before new user messages)
-          vectorMessageSearch: new MessageList().add(messages, `user`).getLatestUserContent() || ""
-        }).then(r => r.messagesV2), memory.getSystemMessage({
+          threadId: threadObject.id,
+          vectorMessageSearch: new MessageList().add(messages, `user`).getLatestUserContent() || "",
+          memoryConfig
+        }), memory.getSystemMessage({
           threadId: threadObject.id,
           resourceId,
           memoryConfig
-        })]) : [[], null, null];
+        })]) : [[], null];
         this.logger.debug("Fetched messages from memory", {
           threadId: threadObject.id,
           runId,
@@ -1672,7 +1689,7 @@ ${JSON.stringify(
       this.logger.debug(`Starting agent ${this.name} llm stream call`, {
         runId
       });
-      const streamResult = await llm.__stream({
+      const streamResult = llm.__stream({
         messages: messageObjects,
         temperature,
         tools: convertedTools,

package/dist/{chunk-WTC6DJHD.cjs → chunk-FBKJ3652.cjs}

@@ -3,7 +3,7 @@
 var chunkZPOUMTTH_cjs = require('./chunk-ZPOUMTTH.cjs');
 var chunkQUSEDVYI_cjs = require('./chunk-QUSEDVYI.cjs');
 var chunkST5RMVLG_cjs = require('./chunk-ST5RMVLG.cjs');
-var chunkVUEY4BUU_cjs = require('./chunk-VUEY4BUU.cjs');
+var chunkE7AX3U6M_cjs = require('./chunk-E7AX3U6M.cjs');
 var chunkQQ5K5TZE_cjs = require('./chunk-QQ5K5TZE.cjs');
 var chunk7F6BQXE2_cjs = require('./chunk-7F6BQXE2.cjs');
 var chunkB6TOBUS6_cjs = require('./chunk-B6TOBUS6.cjs');
@@ -565,7 +565,7 @@ exports.Agent = class Agent extends (_a = chunkP3Q73CAW_cjs.MastraBase) {
       runtimeContext
     });
     return resolveMaybePromise(modelToUse, resolvedModel => {
-      const llm = new chunkVUEY4BUU_cjs.MastraLLM({
+      const llm = new chunkE7AX3U6M_cjs.MastraLLM({
         model: resolvedModel,
         mastra: this.#mastra
       });
@@ -860,6 +860,24 @@ exports.Agent = class Agent extends (_a = chunkP3Q73CAW_cjs.MastraBase) {
     }
     return convertedMemoryTools;
   }
+  async getMemoryMessages({
+    resourceId,
+    threadId,
+    vectorMessageSearch,
+    memoryConfig
+  }) {
+    const memory = this.getMemory();
+    if (!memory) {
+      return [];
+    }
+    return memory.rememberMessages({
+      threadId,
+      resourceId,
+      config: memoryConfig,
+      // The new user messages aren't in the list yet cause we add memory messages first to try to make sure ordering is correct (memory comes before new user messages)
+      vectorMessageSearch
+    }).then(r => r.messagesV2);
+  }
   async getAssignedTools({
     runtimeContext,
     runId,
@@ -1239,17 +1257,16 @@ exports.Agent = class Agent extends (_a = chunkP3Q73CAW_cjs.MastraBase) {
             resourceId
           });
         }
-        let [memoryMessages, memorySystemMessage] = thread.id && memory ? await Promise.all([memory.rememberMessages({
-          threadId: threadObject.id,
+        let [memoryMessages, memorySystemMessage] = thread.id && memory ? await Promise.all([this.getMemoryMessages({
           resourceId,
-          config: memoryConfig,
-          // The new user messages aren't in the list yet cause we add memory messages first to try to make sure ordering is correct (memory comes before new user messages)
-          vectorMessageSearch: new chunkQUSEDVYI_cjs.MessageList().add(messages, `user`).getLatestUserContent() || ""
-        }).then(r => r.messagesV2), memory.getSystemMessage({
+          threadId: threadObject.id,
+          vectorMessageSearch: new chunkQUSEDVYI_cjs.MessageList().add(messages, `user`).getLatestUserContent() || "",
+          memoryConfig
+        }), memory.getSystemMessage({
           threadId: threadObject.id,
           resourceId,
           memoryConfig
-        })]) : [[], null, null];
+        })]) : [[], null];
         this.logger.debug("Fetched messages from memory", {
           threadId: threadObject.id,
           runId,
@@ -1679,7 +1696,7 @@ ${JSON.stringify(
       this.logger.debug(`Starting agent ${this.name} llm stream call`, {
         runId
       });
-      const streamResult = await llm.__stream({
+      const streamResult = llm.__stream({
         messages: messageObjects,
         temperature,
         tools: convertedTools,

package/dist/{chunk-QO6F3HHE.js → chunk-PA2YIVIT.js}

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

package/dist/{chunk-ZJSVUBYU.cjs → chunk-UX3B6S2I.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkWTC6DJHD_cjs = require('./chunk-WTC6DJHD.cjs');
+var chunkFBKJ3652_cjs = require('./chunk-FBKJ3652.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 chunkWTC6DJHD_cjs.Agent({
+    this.agent = new chunkFBKJ3652_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-EJI2SQJP.js → chunk-YJEHXYK5.js}

@@ -8,24 +8,11 @@ import { z } from 'zod';
 
 // src/llm/model/base.ts
 var MastraLLMBase = class extends MastraBase {
-  // @ts-ignore
-  #mastra;
-  #model;
-  constructor({ name, model }) {
+  constructor({ name }) {
     super({
       component: RegisteredLogger.LLM,
       name
     });
-    this.#model = model;
-  }
-  getProvider() {
-    return this.#model.provider;
-  }
-  getModelId() {
-    return this.#model.modelId;
-  }
-  getModel() {
-    return this.#model;
   }
   convertToMessages(messages) {
     if (Array.isArray(messages)) {
@@ -54,33 +41,6 @@ var MastraLLMBase = class extends MastraBase {
       this.__setLogger(p.logger);
     }
   }
-  __registerMastra(p) {
-    this.#mastra = p;
-  }
-  async __text(input) {
-    this.logger.debug(`[LLMs:${this.name}] Generating text.`, { input });
-    throw new Error("Method not implemented.");
-  }
-  async __textObject(input) {
-    this.logger.debug(`[LLMs:${this.name}] Generating object.`, { input });
-    throw new Error("Method not implemented.");
-  }
-  async generate(messages, options) {
-    this.logger.debug(`[LLMs:${this.name}] Generating text.`, { messages, options });
-    throw new Error("Method not implemented.");
-  }
-  async __stream(input) {
-    this.logger.debug(`[LLMs:${this.name}] Streaming text.`, { input });
-    throw new Error("Method not implemented.");
-  }
-  async __streamObject(input) {
-    this.logger.debug(`[LLMs:${this.name}] Streaming object.`, { input });
-    throw new Error("Method not implemented.");
-  }
-  async stream(messages, options) {
-    this.logger.debug(`[LLMs:${this.name}] Streaming text.`, { messages, options });
-    throw new Error("Method not implemented.");
-  }
 };
 
 // src/llm/model/model.ts
@@ -88,7 +48,7 @@ var MastraLLM = class extends MastraLLMBase {
   #model;
   #mastra;
   constructor({ model, mastra }) {
-    super({ name: "aisdk", model });
+    super({ name: "aisdk" });
     this.#model = model;
     if (mastra) {
       this.#mastra = mastra;
@@ -192,7 +152,6 @@ var MastraLLM = class extends MastraLLMBase {
             },
             e
           );
-          this.logger.trackException(mastraError);
           throw mastraError;
         }
         this.logger.debug("[LLM] - Step Change:", {
@@ -252,7 +211,6 @@ var MastraLLM = class extends MastraLLMBase {
         },
         e
       );
-      this.logger.trackException(mastraError);
       throw mastraError;
     }
   }
@@ -303,7 +261,6 @@ var MastraLLM = class extends MastraLLMBase {
             },
             e
           );
-          this.logger.trackException(mastraError);
           throw mastraError;
         }
         this.logger.debug("[LLM] - Step Change:", {
@@ -354,11 +311,10 @@ var MastraLLM = class extends MastraLLMBase {
         },
         e
       );
-      this.logger.trackException(mastraError);
       throw mastraError;
     }
   }
-  async __stream({
+  __stream({
     messages,
     onStepFinish,
     onFinish,
@@ -485,7 +441,7 @@ var MastraLLM = class extends MastraLLMBase {
       }
     }
     try {
-      return await streamText({
+      return streamText({
         messages,
         ...argsForExecute,
         experimental_telemetry: {
@@ -512,11 +468,10 @@ var MastraLLM = class extends MastraLLMBase {
         },
         e
       );
-      this.logger.trackException(mastraError);
       throw mastraError;
     }
   }
-  async __streamObject({
+  __streamObject({
     messages,
     runId,
     tools = {},
@@ -662,7 +617,6 @@ var MastraLLM = class extends MastraLLMBase {
         },
         e
       );
-      this.logger.trackException(mastraError);
       throw mastraError;
     }
   }
@@ -682,16 +636,16 @@ var MastraLLM = class extends MastraLLMBase {
       ...rest
     });
   }
-  async stream(messages, { maxSteps = 5, output, ...rest }) {
+  stream(messages, { maxSteps = 5, output, ...rest }) {
     const msgs = this.convertToMessages(messages);
     if (!output) {
-      return await this.__stream({
+      return this.__stream({
         messages: msgs,
         maxSteps,
         ...rest
       });
     }
-    return await this.__streamObject({
+    return this.__streamObject({
       messages: msgs,
       structuredOutput: output,
       maxSteps,

package/dist/eval/index.d.cts

@@ -1,6 +1,6 @@
 import { M as Metric, T as TestInfo, E as EvaluationResult } from '../types-Bo1uigWx.cjs';
 export { a as MetricResult } from '../types-Bo1uigWx.cjs';
-import { A as Agent } from '../base-DpaaEQWN.cjs';
+import { A as Agent } from '../base-CS5eSXbL.cjs';
 import 'ai';
 import '../base-B_y9sMg0.cjs';
 import '@opentelemetry/api';

package/dist/eval/index.d.ts

@@ -1,6 +1,6 @@
 import { M as Metric, T as TestInfo, E as EvaluationResult } from '../types-Bo1uigWx.js';
 export { a as MetricResult } from '../types-Bo1uigWx.js';
-import { A as Agent } from '../base-BBkhRGjp.js';
+import { A as Agent } from '../base-DBhKcre4.js';
 import 'ai';
 import '../base-ClrXcCRx.js';
 import '@opentelemetry/api';