@mastra/core 0.2.0-alpha.108 → 0.2.0-alpha.110

package/dist/agent/index.d.ts

@@ -1,8 +1,8 @@
 import 'ai';
 import 'json-schema';
 import 'zod';
-export { A as Agent } from '../base--m8Grk5r.js';
-import '../base-DAc1ytq3.js';
+export { A as Agent } from '../base-Bpb7Dmwe.js';
+import '../base-BbtPAA6f.js';
 import '../types-m9RryK9a.js';
 import 'sift';
 import '../vector/index.js';
@@ -10,6 +10,5 @@ import '@opentelemetry/api';
 import '../index-B2JCcAQt.js';
 import 'pino';
 import 'stream';
-import '@opentelemetry/sdk-node';
 import '@opentelemetry/sdk-trace-base';
 import '../tts/index.js';

package/dist/agent/index.js

@@ -1,15 +1,15 @@
-export { Agent } from '../chunk-VHGB3TPS.js';
-import '../chunk-N7KCML45.js';
+export { Agent } from '../chunk-NQSNACFJ.js';
+import '../chunk-FGZVE4CM.js';
 import '../chunk-2SAHBQEF.js';
-import '../chunk-264HTEWA.js';
-import '../chunk-MVMR4OSN.js';
+import '../chunk-65VPTVVP.js';
+import '../chunk-U6J2FOU4.js';
 import '../chunk-RG66XEJT.js';
-import '../chunk-WB5OEAWD.js';
-import '../chunk-6MKKSWBC.js';
+import '../chunk-OJ26F3J4.js';
+import '../chunk-ZJOXJFJI.js';
 import '../chunk-55GTEVHJ.js';
 import '../chunk-VB7CO5ND.js';
 import '../chunk-MLWGYRJR.js';
-import '../chunk-D6RHRYQ7.js';
+import '../chunk-AWEACB2T.js';
 import '../chunk-O2VP5JBC.js';
 import '../chunk-SIFBBGY6.js';
 import '../chunk-C6A6W6XS.js';

package/dist/{base-DAc1ytq3.d.ts → base-BbtPAA6f.d.ts}

@@ -1,7 +1,6 @@
 import * as _opentelemetry_api from '@opentelemetry/api';
-import { Tracer } from '@opentelemetry/api';
+import { Tracer, Span } from '@opentelemetry/api';
 import { R as RegisteredLogger, L as Logger, a as LogLevel } from './index-B2JCcAQt.js';
-import { NodeSDK } from '@opentelemetry/sdk-node';
 import { SpanExporter } from '@opentelemetry/sdk-trace-base';
 
 /** Sampling strategy configuration for OpenTelemetry */
@@ -54,16 +53,15 @@ type OtelConfig = {
 };
 
 declare global {
-    var __OTEL_SDK__: NodeSDK | undefined;
     var __TELEMETRY__: Telemetry | undefined;
 }
 declare class Telemetry {
-    private sdk;
     tracer: Tracer;
     name: string;
-    private static isInitialized;
-    private getSampler;
     private constructor();
+    /**
+     * @deprecated This method does not do anything
+     */
     shutdown(): Promise<void>;
     /**
      * Initialize telemetry with the given configuration
@@ -103,6 +101,7 @@ declare class Telemetry {
         spanName: string;
         attributes?: Record<string, string>;
         skipIfNoTelemetry?: boolean;
+        parentSpan?: Span;
     }): TMethod;
     getBaggageTracer(): Tracer;
 }

package/dist/{base--m8Grk5r.d.ts → base-Bpb7Dmwe.d.ts}

@@ -1,5 +1,6 @@
+import * as ai from 'ai';
 import { EmbeddingModel, CoreMessage as CoreMessage$1, Message, UserContent, AssistantContent, LanguageModelV1, CoreSystemMessage as CoreSystemMessage$1, CoreAssistantMessage as CoreAssistantMessage$1, CoreUserMessage as CoreUserMessage$1, CoreToolMessage as CoreToolMessage$1, EmbedResult as EmbedResult$1, EmbedManyResult as EmbedManyResult$1, GenerateTextResult, GenerateObjectResult, StreamTextResult, StreamObjectResult, LanguageModel as LanguageModel$1, DeepPartial, ToolContent } from 'ai';
-import { M as MastraBase, T as Telemetry } from './base-DAc1ytq3.js';
+import { M as MastraBase, T as Telemetry } from './base-BbtPAA6f.js';
 import { a as Metric, M as MetricResult, T as TestInfo } from './types-m9RryK9a.js';
 import { Query } from 'sift';
 import { z, ZodSchema } from 'zod';
@@ -21,6 +22,9 @@ declare abstract class MastraMemory extends MastraBase {
     constructor(config: {
         name: string;
     } & SharedMemoryConfig);
+    setStorage(storage: MastraStorage): void;
+    setVector(vector: MastraVector): void;
+    setEmbedder(embedder: EmbeddingModel<string>): void;
     /**
      * Get a system message to inject into the conversation.
      * This will be called before each conversation turn.
@@ -452,7 +456,9 @@ interface AgentConfig<TTools extends Record<string, ToolAction<any, any, any, an
     model: LanguageModelV1;
     tools?: TTools;
     mastra?: MastraPrimitives;
+    /** @deprecated This property is deprecated. Use evals instead to add evaluation metrics. */
     metrics?: TMetrics;
+    evals?: TMetrics;
     memory?: MastraMemory;
 }
 interface AgentGenerateOptions<Z extends ZodSchema | JSONSchema7 | undefined = undefined> {
@@ -557,6 +563,7 @@ declare class MastraLLMBase extends MastraBase {
     });
     getProvider(): string;
     getModelId(): string;
+    getModel(): ai.LanguageModelV1;
     convertToMessages(messages: string | string[] | CoreMessage$1[]): CoreMessage$1[];
     __registerPrimitives(p: MastraPrimitives): void;
     __text(input: LLMTextOptions): Promise<GenerateTextResult<any, any>>;
@@ -574,7 +581,9 @@ declare class Agent<TTools extends Record<string, ToolAction<any, any, any, any>
     instructions: string;
     readonly model?: LanguageModelV1;
     tools: TTools;
+    /** @deprecated This property is deprecated. Use evals instead. */
     metrics: TMetrics;
+    evals: TMetrics;
     constructor(config: AgentConfig<TTools, TMetrics>);
     hasOwnMemory(): boolean;
     getMemory(): MastraMemory | undefined;
@@ -609,7 +618,7 @@ declare class Agent<TTools extends Record<string, ToolAction<any, any, any, any>
         threadId: string;
         memoryConfig: MemoryConfig | undefined;
     }): Promise<void>;
-    sanitizeResponseMessages(messages: Array<CoreToolMessage$1 | CoreAssistantMessage$1>): Array<CoreToolMessage$1 | CoreAssistantMessage$1>;
+    sanitizeResponseMessages(messages: Array<CoreMessage$1>): Array<CoreMessage$1>;
     convertTools({ toolsets, runId, }: {
         toolsets?: ToolsetsInput;
         threadId?: string;

package/dist/base.d.ts

@@ -1,7 +1,6 @@
 import '@opentelemetry/api';
 import './index-B2JCcAQt.js';
-export { M as MastraBase } from './base-DAc1ytq3.js';
+export { M as MastraBase } from './base-BbtPAA6f.js';
 import 'pino';
 import 'stream';
-import '@opentelemetry/sdk-node';
 import '@opentelemetry/sdk-trace-base';

package/dist/base.js

@@ -1,3 +1,3 @@
-export { MastraBase } from './chunk-D6RHRYQ7.js';
+export { MastraBase } from './chunk-AWEACB2T.js';
 import './chunk-O2VP5JBC.js';
 import './chunk-C6A6W6XS.js';

package/dist/bundler/index.d.ts

@@ -1,9 +1,8 @@
-import { M as MastraBase } from '../base-DAc1ytq3.js';
+import { M as MastraBase } from '../base-BbtPAA6f.js';
 import '@opentelemetry/api';
 import '../index-B2JCcAQt.js';
 import 'pino';
 import 'stream';
-import '@opentelemetry/sdk-node';
 import '@opentelemetry/sdk-trace-base';
 
 interface IBundler {
@@ -21,6 +20,7 @@ declare abstract class MastraBundler extends MastraBase implements IBundler {
     loadEnvVars(): Promise<Map<string, string>>;
     abstract prepare(outputDirectory: string): Promise<void>;
     abstract writePackageJson(outputDirectory: string, dependencies: Map<string, string>): Promise<void>;
+    abstract writeInstrumentationFile(outputDirectory: string): Promise<void>;
     abstract getEnvFiles(): Promise<string[]>;
     abstract bundle(entryFile: string, outputDirectory: string): Promise<void>;
 }

package/dist/bundler/index.js

@@ -1,4 +1,4 @@
-export { MastraBundler } from '../chunk-VCVLH453.js';
-import '../chunk-D6RHRYQ7.js';
+export { MastraBundler } from '../chunk-22LC46YN.js';
+import '../chunk-AWEACB2T.js';
 import '../chunk-O2VP5JBC.js';
 import '../chunk-C6A6W6XS.js';

package/dist/{chunk-VCVLH453.js → chunk-22LC46YN.js}

@@ -1,4 +1,4 @@
-import { MastraBase } from './chunk-D6RHRYQ7.js';
+import { MastraBase } from './chunk-AWEACB2T.js';
 import { parse } from 'dotenv';
 import { readFile } from 'fs/promises';
 

package/dist/{chunk-W5VWYN5Z.js → chunk-2KPUTKGW.js}

@@ -1,4 +1,4 @@
-import { Agent } from './chunk-VHGB3TPS.js';
+import { Agent } from './chunk-NQSNACFJ.js';
 import { CohereClient } from 'cohere-ai';
 import 'ai';
 

package/dist/{chunk-264HTEWA.js → chunk-65VPTVVP.js}

@@ -1,8 +1,8 @@
-import { DefaultStorage } from './chunk-MVMR4OSN.js';
-import { DefaultVectorDB } from './chunk-WB5OEAWD.js';
-import { defaultEmbedder } from './chunk-6MKKSWBC.js';
+import { DefaultStorage } from './chunk-U6J2FOU4.js';
+import { DefaultVectorDB } from './chunk-OJ26F3J4.js';
+import { defaultEmbedder } from './chunk-ZJOXJFJI.js';
 import { deepMerge } from './chunk-55GTEVHJ.js';
-import { MastraBase } from './chunk-D6RHRYQ7.js';
+import { MastraBase } from './chunk-AWEACB2T.js';
 
 // src/memory/memory.ts
 var MastraMemory = class extends MastraBase {
@@ -38,6 +38,15 @@ var MastraMemory = class extends MastraBase {
       this.threadConfig = this.getMergedThreadConfig(config.options);
     }
   }
+  setStorage(storage) {
+    this.storage = storage;
+  }
+  setVector(vector) {
+    this.vector = vector;
+  }
+  setEmbedder(embedder) {
+    this.embedder = embedder;
+  }
   /**
    * Get a system message to inject into the conversation.
    * This will be called before each conversation turn.

package/dist/{chunk-D6RHRYQ7.js → chunk-AWEACB2T.js}

@@ -17,7 +17,7 @@ var MastraBase = class {
    */
   __setLogger(logger) {
     this.logger = logger;
-    this.logger.debug(`Logger updated for ${this.component}:${this.name}`);
+    this.logger.debug(`Logger updated [component=${this.component}] [name=${this.name}]`);
   }
   /**
    * Internal logging helper that formats and sends logs to the configured logger
@@ -42,7 +42,7 @@ var MastraBase = class {
    */
   __setTelemetry(telemetry) {
     this.telemetry = telemetry;
-    this.logger.debug(`Telemetry updated for ${this.component} ${this.telemetry.tracer}`);
+    this.logger.debug(`Telemetry updated [component=${this.component}] [tracer=${this.telemetry.tracer}]`);
   }
   /**
    * Get the telemetry on the vector

package/dist/{chunk-N7KCML45.js → chunk-FGZVE4CM.js}

@@ -2,12 +2,7 @@ import { TABLE_TRACES } from './chunk-RG66XEJT.js';
 import { trace, context, propagation, SpanStatusCode, SpanKind } from '@opentelemetry/api';
 import { ExportResultCode } from '@opentelemetry/core';
 import { JsonTraceSerializer } from '@opentelemetry/otlp-transformer';
-import { AlwaysOnSampler, AlwaysOffSampler, TraceIdRatioBasedSampler, ParentBasedSampler, ConsoleSpanExporter } from '@opentelemetry/sdk-trace-base';
-import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node';
-import { OTLPTraceExporter as OTLPTraceExporter$1 } from '@opentelemetry/exporter-trace-otlp-http';
-import { Resource } from '@opentelemetry/resources';
-import { NodeSDK } from '@opentelemetry/sdk-node';
-import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
+import '@opentelemetry/sdk-trace-base';
 
 function hasActiveTelemetry(tracerName = "default-tracer") {
   try {
@@ -50,9 +45,11 @@ function withSpan(options) {
       const currentBaggage = propagation.getBaggage(ctx);
       if (currentBaggage?.componentName) {
         span.setAttribute("componentName", currentBaggage?.componentName);
+        span.setAttribute("runId", currentBaggage?.runId);
       } else if (this && this.name) {
         span.setAttribute("componentName", this.name);
-        ctx = propagation.setBaggage(ctx, { componentName: this.name });
+        span.setAttribute("runId", this.runId);
+        ctx = propagation.setBaggage(ctx, { componentName: this.name, runId: this.runId });
       }
       let result;
       try {
@@ -129,7 +126,7 @@ var OTLPTraceExporter = class {
     const serializedRequest = this.serializer.serializeRequest(internalRepresentation);
     const payload = JSON.parse(Buffer.from(serializedRequest.buffer, "utf8"));
     const items = payload?.resourceSpans?.[0]?.scopeSpans;
-    this.logger.debug("items to be sent: " + items.length);
+    this.logger.debug(`Exporting telemetry: ${items.length} scope spans to be processed [trace batch]`);
     this.queue.push({ data: items, resultCallback });
     if (!this.activeFlush) {
       this.activeFlush = this.flush();
@@ -218,75 +215,17 @@ var OTLPTraceExporter = class {
     this.logger = logger;
   }
 };
-var sdkInstance = null;
 var Telemetry = class _Telemetry {
-  sdk = null;
   tracer = trace.getTracer("default");
   name = "default-service";
-  static isInitialized = false;
-  getSampler(config) {
-    if (!config.sampling) {
-      return new AlwaysOnSampler();
-    }
-    if (!config.enabled) {
-      return new AlwaysOffSampler();
-    }
-    switch (config.sampling.type) {
-      case "ratio":
-        return new TraceIdRatioBasedSampler(config.sampling.probability);
-      case "always_on":
-        return new AlwaysOnSampler();
-      case "always_off":
-        return new AlwaysOffSampler();
-      case "parent_based":
-        const rootSampler = new TraceIdRatioBasedSampler(config.sampling.root?.probability || 1);
-        return new ParentBasedSampler({ root: rootSampler });
-      default:
-        return new AlwaysOnSampler();
-    }
-  }
   constructor(config) {
     this.name = config.serviceName ?? "default-service";
-    if (typeof window === "undefined") {
-      if (process.env.NODE_ENV === "development" || !sdkInstance) {
-        if (sdkInstance) {
-          this.shutdown();
-        }
-        const exporter = config.export?.type === "otlp" ? new OTLPTraceExporter$1({
-          url: config.export.endpoint,
-          headers: config.export.headers
-        }) : config.export?.type === "custom" ? config.export.exporter : new ConsoleSpanExporter();
-        const sampler = this.getSampler(config);
-        sdkInstance = new NodeSDK({
-          resource: new Resource({
-            [ATTR_SERVICE_NAME]: this.name
-          }),
-          traceExporter: exporter,
-          sampler,
-          instrumentations: [getNodeAutoInstrumentations()]
-        });
-        try {
-          sdkInstance.start();
-          this.sdk = sdkInstance;
-          _Telemetry.isInitialized = true;
-        } catch (error) {
-          console.warn("Failed to initialize OpenTelemetry:", error);
-        }
-      }
-    }
     this.tracer = trace.getTracer(this.name);
   }
+  /**
+   * @deprecated This method does not do anything
+   */
   async shutdown() {
-    if (this.sdk && _Telemetry.isInitialized) {
-      try {
-        await this.sdk.shutdown();
-        _Telemetry.isInitialized = false;
-        global.__OTEL_SDK__ = void 0;
-        global.__TELEMETRY__ = void 0;
-      } catch (error) {
-        console.warn("Error shutting down OpenTelemetry:", error);
-      }
-    }
   }
   /**
    * Initialize telemetry with the given configuration
@@ -351,6 +290,7 @@ var Telemetry = class _Telemetry {
    * @returns Wrapped method with tracing
    */
   traceMethod(method, context3) {
+    let ctx = context.active();
     const { skipIfNoTelemetry = true } = context3;
     if (skipIfNoTelemetry && !hasActiveTelemetry()) {
       return method;
@@ -380,16 +320,21 @@ var Telemetry = class _Telemetry {
         if (context3.attributes) {
           span.setAttributes(context3.attributes);
         }
-        let ctx = context.active();
         if (context3.attributes?.componentName) {
-          ctx = propagation.setBaggage(ctx, { componentName: this.name });
+          ctx = propagation.setBaggage(ctx, {
+            // @ts-ignore
+            componentName: context3.attributes.componentName,
+            runId: context3.attributes.runId
+          });
         } else {
           const currentBaggage = propagation.getBaggage(ctx);
           if (currentBaggage?.componentName) {
             span.setAttribute("componentName", currentBaggage?.componentName);
+            span.setAttribute("runId", currentBaggage?.runId);
           } else if (this && this.name) {
             span.setAttribute("componentName", this.name);
-            ctx = propagation.setBaggage(ctx, { componentName: this.name });
+            span.setAttribute("runId", this.runId);
+            ctx = propagation.setBaggage(ctx, { componentName: this.name, runId: this.runId });
           }
         }
         args.forEach((arg, index) => {
@@ -399,7 +344,10 @@ var Telemetry = class _Telemetry {
             span.setAttribute(`${context3.spanName}.argument.${index}`, "[Not Serializable]");
           }
         });
-        const result = method(...args);
+        let result;
+        context.with(trace.setSpan(ctx, span), () => {
+          result = method(...args);
+        });
         if (result instanceof Promise) {
           return result.then(recordResult2).catch(handleError);
         } else {
@@ -424,6 +372,7 @@ var BaggageTracer = class {
     const span = this._tracer.startSpan(name, options, ctx);
     const currentBaggage = propagation.getBaggage(ctx);
     span.setAttribute("componentName", currentBaggage?.componentName);
+    span.setAttribute("runId", currentBaggage?.runId);
     return span;
   }
   startActiveSpan(name, optionsOrFn, ctxOrFn, fn) {

package/dist/{chunk-JVJYHOKI.js → chunk-J3W3IHDO.js}

@@ -1,5 +1,5 @@
-import { InstrumentClass, OTLPTraceExporter, Telemetry } from './chunk-N7KCML45.js';
-import { DefaultStorage } from './chunk-MVMR4OSN.js';
+import { InstrumentClass, OTLPTraceExporter, Telemetry } from './chunk-FGZVE4CM.js';
+import { DefaultStorage } from './chunk-U6J2FOU4.js';
 import { LogLevel, createLogger, noopLogger } from './chunk-O2VP5JBC.js';
 import { __decoratorStart, __decorateElement, __runInitializers } from './chunk-C6A6W6XS.js';
 
@@ -36,7 +36,7 @@ var Mastra = class {
     if (!storage) {
       storage = new DefaultStorage({
         config: {
-          url: ":memory:"
+          url: process.env.MASTRA_DEFAULT_STORAGE_URL || `:memory:`
         }
       });
     }

package/dist/{chunk-MPEWMN7X.js → chunk-K36NSQWH.js}

@@ -1,4 +1,4 @@
-import { MastraBundler } from './chunk-VCVLH453.js';
+import { MastraBundler } from './chunk-22LC46YN.js';
 
 // src/deployer/index.ts
 var MastraDeployer = class extends MastraBundler {

package/dist/{chunk-VHGB3TPS.js → chunk-NQSNACFJ.js}

@@ -1,7 +1,7 @@
-import { InstrumentClass } from './chunk-N7KCML45.js';
+import { InstrumentClass } from './chunk-FGZVE4CM.js';
 import { delay } from './chunk-55GTEVHJ.js';
 import { executeHook } from './chunk-MLWGYRJR.js';
-import { MastraBase } from './chunk-D6RHRYQ7.js';
+import { MastraBase } from './chunk-AWEACB2T.js';
 import { RegisteredLogger, LogLevel } from './chunk-O2VP5JBC.js';
 import { __decoratorStart, __decorateElement, __runInitializers } from './chunk-C6A6W6XS.js';
 import { generateText, jsonSchema, generateObject, streamText, streamObject } from 'ai';
@@ -26,6 +26,9 @@ var MastraLLMBase = class extends MastraBase {
   getModelId() {
     return this.#model.modelId;
   }
+  getModel() {
+    return this.#model;
+  }
   convertToMessages(messages) {
     if (Array.isArray(messages)) {
       return messages.map((m) => {
@@ -107,7 +110,10 @@ var MastraLLM = class extends MastraLLMBase {
   getModelId() {
     return this.#model.modelId;
   }
-  convertTools(tools) {
+  getModel() {
+    return this.#model;
+  }
+  convertTools({ tools, runId } = {}) {
     this.logger.debug("Starting tool conversion for LLM");
     const converted = Object.entries(tools || {}).reduce(
       (memo, value) => {
@@ -125,7 +131,8 @@ var MastraLLM = class extends MastraLLMBase {
                 });
                 return tool.execute({
                   context: props,
-                  mastra: this.#mastra
+                  mastra: this.#mastra,
+                  runId
                 });
               } catch (error) {
                 this.logger.error("Error executing tool", {
@@ -162,7 +169,7 @@ var MastraLLM = class extends MastraLLMBase {
       maxSteps,
       tools: Object.keys(tools || convertedTools || {})
     });
-    const finalTools = convertedTools || this.convertTools(tools);
+    const finalTools = convertedTools || this.convertTools({ tools, runId });
     const argsForExecute = {
       model,
       temperature,
@@ -206,7 +213,7 @@ var MastraLLM = class extends MastraLLMBase {
   }) {
     const model = this.#model;
     this.logger.debug(`[LLM] - Generating a text object`, { runId });
-    const finalTools = convertedTools || this.convertTools(tools);
+    const finalTools = convertedTools || this.convertTools({ tools, runId });
     const argsForExecute = {
       model,
       temperature,
@@ -268,7 +275,7 @@ var MastraLLM = class extends MastraLLMBase {
       maxSteps,
       tools: Object.keys(tools || convertedTools || {})
     });
-    const finalTools = convertedTools || this.convertTools(tools);
+    const finalTools = convertedTools || this.convertTools({ tools, runId });
     const argsForExecute = {
       model,
       temperature,
@@ -329,7 +336,7 @@ var MastraLLM = class extends MastraLLMBase {
       maxSteps,
       tools: Object.keys(tools || convertedTools || {})
     });
-    const finalTools = convertedTools || this.convertTools(tools);
+    const finalTools = convertedTools || this.convertTools({ tools, runId });
     const argsForExecute = {
       model,
       temperature,
@@ -466,7 +473,9 @@ var Agent = class extends (_a = MastraBase) {
   #mastra;
   #memory;
   tools;
+  /** @deprecated This property is deprecated. Use evals instead. */
   metrics;
+  evals;
   constructor(config) {
     super({ component: RegisteredLogger.AGENT });
     this.name = config.name;
@@ -477,6 +486,7 @@ var Agent = class extends (_a = MastraBase) {
     this.llm = new MastraLLM({ model: config.model });
     this.tools = {};
     this.metrics = {};
+    this.evals = {};
     if (config.tools) {
       this.tools = config.tools;
     }
@@ -484,7 +494,12 @@ var Agent = class extends (_a = MastraBase) {
       this.#mastra = config.mastra;
     }
     if (config.metrics) {
+      this.logger.warn("The metrics property is deprecated. Please use evals instead to add evaluation metrics.");
       this.metrics = config.metrics;
+      this.evals = config.metrics;
+    }
+    if (config.evals) {
+      this.evals = config.evals;
     }
     if (config.memory) {
       this.#memory = config.memory;
@@ -645,7 +660,7 @@ var Agent = class extends (_a = MastraBase) {
 
 ${memorySystemMessage}` : ""}`
             },
-            ...memoryMessages,
+            ...this.sanitizeResponseMessages(memoryMessages),
             ...newMessages
           ]
         };
@@ -733,6 +748,7 @@ ${memorySystemMessage}` : ""}`
   }
   sanitizeResponseMessages(messages) {
     let toolResultIds = [];
+    let toolCallIds = [];
     for (const message of messages) {
       if (message.role === "tool") {
         for (const content of message.content) {
@@ -741,19 +757,50 @@ ${memorySystemMessage}` : ""}`
           }
         }
       }
+      if (message.role === "assistant" || message.role === "user") {
+        for (const content of message.content) {
+          if (typeof content !== `string`) {
+            if (content.type === `tool-call`) {
+              toolCallIds.push(content.toolCallId);
+            }
+          }
+        }
+      }
     }
     const messagesBySanitizedContent = messages.map((message) => {
-      if (message.role !== "assistant") return message;
+      if (message.role !== "assistant" && message.role !== `tool` && message.role !== `user`) return message;
       if (typeof message.content === "string") return message;
-      const sanitizedContent = message.content.filter(
-        (content) => content.type === "tool-call" ? toolResultIds.includes(content.toolCallId) : content.type === "text" ? content.text.length > 0 : true
-      );
+      const sanitizedContent = message.content.filter((content) => {
+        if (content.type === `tool-call`) {
+          return toolResultIds.includes(content.toolCallId);
+        }
+        if (content.type === `text`) {
+          return content.text.trim() !== ``;
+        }
+        if (content.type === `tool-result`) {
+          return toolCallIds.includes(content.toolCallId);
+        }
+        return true;
+      });
       return {
         ...message,
         content: sanitizedContent
       };
     });
-    return messagesBySanitizedContent.filter((message) => message.content.length > 0);
+    return messagesBySanitizedContent.filter((message) => {
+      if (typeof message.content === `string`) {
+        return message.content !== "";
+      }
+      if (Array.isArray(message.content)) {
+        return message.content.length && message.content.every((c) => {
+          if (c.type === `text`) {
+            return c.text && c.text !== "";
+          }
+          return true;
+        });
+      }
+      return true;
+    });
   }
   convertTools({
     toolsets,
@@ -778,7 +825,8 @@ ${memorySystemMessage}` : ""}`
                 });
                 return tool.execute({
                   context: args,
-                  mastra: this.#mastra
+                  mastra: this.#mastra,
+                  runId
                 });
               } catch (err) {
                 this.logger.error(`[Agent:${this.name}] - Failed execution`, {
@@ -816,7 +864,8 @@ ${memorySystemMessage}` : ""}`
                   args
                 });
                 return toolObj.execute({
-                  context: args
+                  context: args,
+                  runId
                 });
               } catch (err) {
                 this.logger.error(`[Agent:${this.name}] - Failed toolset execution`, {
@@ -841,7 +890,7 @@ ${memorySystemMessage}` : ""}`
   }) {
     let coreMessages = [];
     let threadIdToUse = threadId;
-    this.log(LogLevel.INFO, `Saving user messages in memory for agent ${this.name}`, { runId });
+    this.log(LogLevel.DEBUG, `Saving user messages in memory for agent ${this.name}`, { runId });
     const saveMessageResponse = await this.saveMemory({
       threadId,
       resourceId,
@@ -963,10 +1012,10 @@ ${memorySystemMessage}` : ""}`
             });
           }
         }
-        if (Object.keys(this.metrics || {}).length > 0) {
+        if (Object.keys(this.evals || {}).length > 0) {
           const input = messages.map((message) => message.content).join("\n");
           const runIdToUse = runId2 || crypto.randomUUID();
-          for (const metric of Object.values(this.metrics || {})) {
+          for (const metric of Object.values(this.evals || {})) {
             executeHook("onGeneration" /* ON_GENERATION */, {
               input,
               output: outputText,
@@ -1121,7 +1170,7 @@ ${memorySystemMessage}` : ""}`
           onFinish?.(result);
         },
         maxSteps,
-        runId,
+        runId: runIdToUse,
         toolChoice
       });
     }
@@ -1149,7 +1198,7 @@ ${memorySystemMessage}` : ""}`
         onFinish?.(result);
       },
       maxSteps,
-      runId,
+      runId: runIdToUse,
       toolChoice
     });
   }

package/dist/{chunk-WB5OEAWD.js → chunk-OJ26F3J4.js}

@@ -1,4 +1,4 @@
-import { MastraVector } from './chunk-6MKKSWBC.js';
+import { MastraVector } from './chunk-ZJOXJFJI.js';
 import { BaseFilterTranslator } from './chunk-SIFBBGY6.js';
 import { createClient } from '@libsql/client';
 import { join } from 'path';