@mastra/core 0.4.3-alpha.3 → 0.4.3

package/dist/agent/index.cjs

@@ -396,7 +396,9 @@ var MastraLLM = class extends MastraLLMBase {
   }
   convertTools({
     tools,
-    runId
+    runId,
+    threadId,
+    resourceId
   } = {}) {
     this.logger.debug("Starting tool conversion for LLM");
     const converted = Object.entries(tools || {}).reduce((memo, value) => {
@@ -414,6 +416,8 @@ var MastraLLM = class extends MastraLLMBase {
               });
               return tool?.execute?.({
                 context: props,
+                threadId,
+                resourceId,
                 mastra: this.#mastra,
                 runId
               }, options) ?? void 0;
@@ -421,7 +425,10 @@ var MastraLLM = class extends MastraLLMBase {
               this.logger.error("Error executing tool", {
                 tool: k,
                 props,
-                error
+                error,
+                runId,
+                threadId,
+                resourceId
               });
               throw error;
             }
@@ -444,6 +451,8 @@ var MastraLLM = class extends MastraLLMBase {
     onStepFinish,
     experimental_output,
     telemetry,
+    threadId,
+    resourceId,
     ...rest
   }) {
     const model = this.#model;
@@ -451,11 +460,15 @@ var MastraLLM = class extends MastraLLMBase {
       runId,
       messages,
       maxSteps,
+      threadId,
+      resourceId,
       tools: Object.keys(tools || convertedTools || {})
     });
     const finalTools = convertedTools || this.convertTools({
       tools,
-      runId
+      runId,
+      threadId,
+      resourceId
     });
     const argsForExecute = {
       model,
@@ -521,6 +534,8 @@ var MastraLLM = class extends MastraLLMBase {
     temperature,
     toolChoice = "auto",
     telemetry,
+    threadId,
+    resourceId,
     ...rest
   }) {
     const model = this.#model;
@@ -529,7 +544,9 @@ var MastraLLM = class extends MastraLLMBase {
     });
     const finalTools = convertedTools || this.convertTools({
       tools,
-      runId
+      runId,
+      threadId,
+      resourceId
     });
     const argsForExecute = {
       model,
@@ -592,18 +609,24 @@ var MastraLLM = class extends MastraLLMBase {
     toolChoice = "auto",
     experimental_output,
     telemetry,
+    threadId,
+    resourceId,
     ...rest
   }) {
     const model = this.#model;
     this.logger.debug(`[LLM] - Streaming text`, {
       runId,
+      threadId,
+      resourceId,
       messages,
       maxSteps,
       tools: Object.keys(tools || convertedTools || {})
     });
     const finalTools = convertedTools || this.convertTools({
       tools,
-      runId
+      runId,
+      threadId,
+      resourceId
     });
     const argsForExecute = {
       model,
@@ -638,7 +661,9 @@ var MastraLLM = class extends MastraLLMBase {
           toolResults: props?.toolResults,
           finishReason: props?.finishReason,
           usage: props?.usage,
-          runId
+          runId,
+          threadId,
+          resourceId
         });
       },
       ...rest
@@ -681,6 +706,8 @@ var MastraLLM = class extends MastraLLMBase {
     temperature,
     toolChoice = "auto",
     telemetry,
+    threadId,
+    resourceId,
     ...rest
   }) {
     const model = this.#model;
@@ -692,7 +719,9 @@ var MastraLLM = class extends MastraLLMBase {
     });
     const finalTools = convertedTools || this.convertTools({
       tools,
-      runId
+      runId,
+      threadId,
+      resourceId
     });
     const argsForExecute = {
       model,
@@ -710,7 +739,9 @@ var MastraLLM = class extends MastraLLMBase {
           toolResults: props?.toolResults,
           finishReason: props?.finishReason,
           usage: props?.usage,
-          runId
+          runId,
+          threadId,
+          resourceId
         });
         if (props?.response?.headers?.["x-ratelimit-remaining-tokens"] && parseInt(props?.response?.headers?.["x-ratelimit-remaining-tokens"], 10) < 2e3) {
           this.logger.warn("Rate limit approaching, waiting 10 seconds", {
@@ -727,7 +758,9 @@ var MastraLLM = class extends MastraLLMBase {
           toolResults: props?.toolResults,
           finishReason: props?.finishReason,
           usage: props?.usage,
-          runId
+          runId,
+          threadId,
+          resourceId
         });
       },
       ...rest
@@ -1300,11 +1333,14 @@ exports.Agent = class Agent extends (_a = MastraBase) {
   }
   convertTools({
     toolsets,
-    // threadId,
+    threadId,
+    resourceId,
     runId
   }) {
     this.logger.debug(`[Agents:${this.name}] - Assigning tools`, {
-      runId
+      runId,
+      threadId,
+      resourceId
     });
     const converted = Object.entries(this.tools || {}).reduce((memo, value) => {
       const k = value[0];
@@ -1319,17 +1355,23 @@ exports.Agent = class Agent extends (_a = MastraBase) {
                 name: k,
                 description: tool.description,
                 args,
-                runId
+                runId,
+                threadId,
+                resourceId
               });
               return tool?.execute?.({
                 context: args,
                 mastra: this.#mastra,
-                runId
+                runId,
+                threadId,
+                resourceId
               }, options) ?? void 0;
             } catch (err) {
               this.logger.error(`[Agent:${this.name}] - Failed execution`, {
                 error: err,
-                runId
+                runId,
+                threadId,
+                resourceId
               });
               throw err;
             }
@@ -1358,18 +1400,24 @@ exports.Agent = class Agent extends (_a = MastraBase) {
                   name: toolName,
                   description: toolObj.description,
                   args,
-                  runId
+                  runId,
+                  threadId,
+                  resourceId
                 });
                 return toolObj?.execute?.({
                   context: args,
-                  runId
+                  runId,
+                  threadId,
+                  resourceId
                 }, options) ?? void 0;
-              } catch (err) {
+              } catch (error) {
                 this.logger.error(`[Agent:${this.name}] - Failed toolset execution`, {
-                  error: err,
-                  runId
+                  error,
+                  runId,
+                  threadId,
+                  resourceId
                 });
-                throw err;
+                throw error;
               }
             } : void 0
           };
@@ -1464,6 +1512,7 @@ exports.Agent = class Agent extends (_a = MastraBase) {
           convertedTools = this.convertTools({
             toolsets,
             threadId: threadIdToUse,
+            resourceId,
             runId
           });
         }
@@ -1600,6 +1649,8 @@ exports.Agent = class Agent extends (_a = MastraBase) {
         temperature,
         toolChoice: toolChoice || "auto",
         experimental_output,
+        threadId,
+        resourceId,
         ...rest
       });
       const outputText2 = result2.text;
@@ -1625,6 +1676,8 @@ exports.Agent = class Agent extends (_a = MastraBase) {
         temperature,
         toolChoice,
         telemetry,
+        threadId,
+        resourceId,
         ...rest
       });
       const outputText2 = result2.text;

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, n as AgentConfig, ao as AgentGenerateOptions, ap as AgentStreamOptions, an as ToolsInput, am as ToolsetsInput } from '../base-BhXOsdEx.cjs';
+export { A as Agent, n as AgentConfig, ao as AgentGenerateOptions, ap as AgentStreamOptions, an as ToolsInput, am as ToolsetsInput } from '../base-CbCmDLUb.cjs';
 import '../base-hs9NDAZ2.cjs';
 import '../types-m9RryK9a.cjs';
 import '../voice/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, n as AgentConfig, ao as AgentGenerateOptions, ap as AgentStreamOptions, an as ToolsInput, am as ToolsetsInput } from '../base-CZA3AlwW.js';
+export { A as Agent, n as AgentConfig, ao as AgentGenerateOptions, ap as AgentStreamOptions, an as ToolsInput, am as ToolsetsInput } from '../base-DqRXkxCw.js';
 import '../base-D90KQ4XI.js';
 import '../types-m9RryK9a.js';
 import '../voice/index.js';

package/dist/agent/index.js

@@ -1 +1 @@
-export { Agent } from '../chunk-VRY5N2EB.js';
+export { Agent } from '../chunk-E7K35ROR.js';

package/dist/{base-BhXOsdEx.d.cts → base-CbCmDLUb.d.cts}

@@ -436,6 +436,8 @@ interface IExecutionContext<TSchemaIn extends z.ZodSchema | undefined = undefine
     context: TSchemaIn extends z.ZodSchema ? z.infer<TSchemaIn> & TContext : TContext;
     runId?: string;
     mastra?: MastraPrimitives;
+    threadId?: string;
+    resourceId?: string;
     suspend: () => Promise<void>;
 }
 interface IAction<TId extends string, TSchemaIn extends z.ZodSchema | undefined, TSchemaOut extends z.ZodSchema | undefined, TContext extends IExecutionContext<TSchemaIn>, TOptions extends unknown = unknown> {
@@ -563,6 +565,8 @@ type MastraCustomLLMOptions<Z extends ZodSchema | JSONSchema7 | undefined = unde
     onStepFinish?: (step: string) => void;
     experimental_output?: Z;
     telemetry?: TelemetrySettings;
+    threadId?: string;
+    resourceId?: string;
 } & Run;
 type LLMTextOptions<Z extends ZodSchema | JSONSchema7 | undefined = undefined> = {
     messages: CoreMessage[];
@@ -647,9 +651,10 @@ declare class Agent<TTools extends Record<string, ToolAction<any, any, any, any>
         memoryConfig: MemoryConfig | undefined;
     }): Promise<void>;
     sanitizeResponseMessages(messages: Array<CoreMessage$1>): Array<CoreMessage$1>;
-    convertTools({ toolsets, runId, }: {
+    convertTools({ toolsets, threadId, resourceId, runId, }: {
         toolsets?: ToolsetsInput;
         threadId?: string;
+        resourceId?: string;
         runId?: string;
     }): Record<string, CoreTool>;
     preExecute({ resourceId, runId, threadId, memoryConfig, messages, }: {

package/dist/{base-CZA3AlwW.d.ts → base-DqRXkxCw.d.ts}

@@ -436,6 +436,8 @@ interface IExecutionContext<TSchemaIn extends z.ZodSchema | undefined = undefine
     context: TSchemaIn extends z.ZodSchema ? z.infer<TSchemaIn> & TContext : TContext;
     runId?: string;
     mastra?: MastraPrimitives;
+    threadId?: string;
+    resourceId?: string;
     suspend: () => Promise<void>;
 }
 interface IAction<TId extends string, TSchemaIn extends z.ZodSchema | undefined, TSchemaOut extends z.ZodSchema | undefined, TContext extends IExecutionContext<TSchemaIn>, TOptions extends unknown = unknown> {
@@ -563,6 +565,8 @@ type MastraCustomLLMOptions<Z extends ZodSchema | JSONSchema7 | undefined = unde
     onStepFinish?: (step: string) => void;
     experimental_output?: Z;
     telemetry?: TelemetrySettings;
+    threadId?: string;
+    resourceId?: string;
 } & Run;
 type LLMTextOptions<Z extends ZodSchema | JSONSchema7 | undefined = undefined> = {
     messages: CoreMessage[];
@@ -647,9 +651,10 @@ declare class Agent<TTools extends Record<string, ToolAction<any, any, any, any>
         memoryConfig: MemoryConfig | undefined;
     }): Promise<void>;
     sanitizeResponseMessages(messages: Array<CoreMessage$1>): Array<CoreMessage$1>;
-    convertTools({ toolsets, runId, }: {
+    convertTools({ toolsets, threadId, resourceId, runId, }: {
         toolsets?: ToolsetsInput;
         threadId?: string;
+        resourceId?: string;
         runId?: string;
     }): Record<string, CoreTool>;
     preExecute({ resourceId, runId, threadId, memoryConfig, messages, }: {

package/dist/{chunk-VRY5N2EB.js → chunk-E7K35ROR.js}

@@ -136,7 +136,9 @@ var MastraLLM = class extends MastraLLMBase {
   }
   convertTools({
     tools,
-    runId
+    runId,
+    threadId,
+    resourceId
   } = {}) {
     this.logger.debug("Starting tool conversion for LLM");
     const converted = Object.entries(tools || {}).reduce((memo, value) => {
@@ -154,6 +156,8 @@ var MastraLLM = class extends MastraLLMBase {
               });
               return tool?.execute?.({
                 context: props,
+                threadId,
+                resourceId,
                 mastra: this.#mastra,
                 runId
               }, options) ?? void 0;
@@ -161,7 +165,10 @@ var MastraLLM = class extends MastraLLMBase {
               this.logger.error("Error executing tool", {
                 tool: k,
                 props,
-                error
+                error,
+                runId,
+                threadId,
+                resourceId
               });
               throw error;
             }
@@ -184,6 +191,8 @@ var MastraLLM = class extends MastraLLMBase {
     onStepFinish,
     experimental_output,
     telemetry,
+    threadId,
+    resourceId,
     ...rest
   }) {
     const model = this.#model;
@@ -191,11 +200,15 @@ var MastraLLM = class extends MastraLLMBase {
       runId,
       messages,
       maxSteps,
+      threadId,
+      resourceId,
       tools: Object.keys(tools || convertedTools || {})
     });
     const finalTools = convertedTools || this.convertTools({
       tools,
-      runId
+      runId,
+      threadId,
+      resourceId
     });
     const argsForExecute = {
       model,
@@ -261,6 +274,8 @@ var MastraLLM = class extends MastraLLMBase {
     temperature,
     toolChoice = "auto",
     telemetry,
+    threadId,
+    resourceId,
     ...rest
   }) {
     const model = this.#model;
@@ -269,7 +284,9 @@ var MastraLLM = class extends MastraLLMBase {
     });
     const finalTools = convertedTools || this.convertTools({
       tools,
-      runId
+      runId,
+      threadId,
+      resourceId
     });
     const argsForExecute = {
       model,
@@ -332,18 +349,24 @@ var MastraLLM = class extends MastraLLMBase {
     toolChoice = "auto",
     experimental_output,
     telemetry,
+    threadId,
+    resourceId,
     ...rest
   }) {
     const model = this.#model;
     this.logger.debug(`[LLM] - Streaming text`, {
       runId,
+      threadId,
+      resourceId,
       messages,
       maxSteps,
       tools: Object.keys(tools || convertedTools || {})
     });
     const finalTools = convertedTools || this.convertTools({
       tools,
-      runId
+      runId,
+      threadId,
+      resourceId
     });
     const argsForExecute = {
       model,
@@ -378,7 +401,9 @@ var MastraLLM = class extends MastraLLMBase {
           toolResults: props?.toolResults,
           finishReason: props?.finishReason,
           usage: props?.usage,
-          runId
+          runId,
+          threadId,
+          resourceId
         });
       },
       ...rest
@@ -421,6 +446,8 @@ var MastraLLM = class extends MastraLLMBase {
     temperature,
     toolChoice = "auto",
     telemetry,
+    threadId,
+    resourceId,
     ...rest
   }) {
     const model = this.#model;
@@ -432,7 +459,9 @@ var MastraLLM = class extends MastraLLMBase {
     });
     const finalTools = convertedTools || this.convertTools({
       tools,
-      runId
+      runId,
+      threadId,
+      resourceId
     });
     const argsForExecute = {
       model,
@@ -450,7 +479,9 @@ var MastraLLM = class extends MastraLLMBase {
           toolResults: props?.toolResults,
           finishReason: props?.finishReason,
           usage: props?.usage,
-          runId
+          runId,
+          threadId,
+          resourceId
         });
         if (props?.response?.headers?.["x-ratelimit-remaining-tokens"] && parseInt(props?.response?.headers?.["x-ratelimit-remaining-tokens"], 10) < 2e3) {
           this.logger.warn("Rate limit approaching, waiting 10 seconds", {
@@ -467,7 +498,9 @@ var MastraLLM = class extends MastraLLMBase {
           toolResults: props?.toolResults,
           finishReason: props?.finishReason,
           usage: props?.usage,
-          runId
+          runId,
+          threadId,
+          resourceId
         });
       },
       ...rest
@@ -932,11 +965,14 @@ var Agent = class extends (_a = MastraBase) {
   }
   convertTools({
     toolsets,
-    // threadId,
+    threadId,
+    resourceId,
     runId
   }) {
     this.logger.debug(`[Agents:${this.name}] - Assigning tools`, {
-      runId
+      runId,
+      threadId,
+      resourceId
     });
     const converted = Object.entries(this.tools || {}).reduce((memo, value) => {
       const k = value[0];
@@ -951,17 +987,23 @@ var Agent = class extends (_a = MastraBase) {
                 name: k,
                 description: tool.description,
                 args,
-                runId
+                runId,
+                threadId,
+                resourceId
               });
               return tool?.execute?.({
                 context: args,
                 mastra: this.#mastra,
-                runId
+                runId,
+                threadId,
+                resourceId
               }, options) ?? void 0;
             } catch (err) {
               this.logger.error(`[Agent:${this.name}] - Failed execution`, {
                 error: err,
-                runId
+                runId,
+                threadId,
+                resourceId
               });
               throw err;
             }
@@ -990,18 +1032,24 @@ var Agent = class extends (_a = MastraBase) {
                   name: toolName,
                   description: toolObj.description,
                   args,
-                  runId
+                  runId,
+                  threadId,
+                  resourceId
                 });
                 return toolObj?.execute?.({
                   context: args,
-                  runId
+                  runId,
+                  threadId,
+                  resourceId
                 }, options) ?? void 0;
-              } catch (err) {
+              } catch (error) {
                 this.logger.error(`[Agent:${this.name}] - Failed toolset execution`, {
-                  error: err,
-                  runId
+                  error,
+                  runId,
+                  threadId,
+                  resourceId
                 });
-                throw err;
+                throw error;
               }
             } : void 0
           };
@@ -1096,6 +1144,7 @@ var Agent = class extends (_a = MastraBase) {
           convertedTools = this.convertTools({
             toolsets,
             threadId: threadIdToUse,
+            resourceId,
             runId
           });
         }
@@ -1232,6 +1281,8 @@ var Agent = class extends (_a = MastraBase) {
         temperature,
         toolChoice: toolChoice || "auto",
         experimental_output,
+        threadId,
+        resourceId,
         ...rest
       });
       const outputText2 = result2.text;
@@ -1257,6 +1308,8 @@ var Agent = class extends (_a = MastraBase) {
         temperature,
         toolChoice,
         telemetry,
+        threadId,
+        resourceId,
         ...rest
       });
       const outputText2 = result2.text;

package/dist/{chunk-N4UKSVX4.js → chunk-JXEH6PBQ.js}

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

package/dist/eval/index.d.cts

@@ -1,5 +1,5 @@
 import { a as Metric, T as TestInfo, M as MetricResult } from '../types-m9RryK9a.cjs';
-import { A as Agent } from '../base-BhXOsdEx.cjs';
+import { A as Agent } from '../base-CbCmDLUb.cjs';
 import 'ai';
 import '../base-hs9NDAZ2.cjs';
 import '@opentelemetry/api';

package/dist/eval/index.d.ts

@@ -1,5 +1,5 @@
 import { a as Metric, T as TestInfo, M as MetricResult } from '../types-m9RryK9a.js';
-import { A as Agent } from '../base-CZA3AlwW.js';
+import { A as Agent } from '../base-DqRXkxCw.js';
 import 'ai';
 import '../base-D90KQ4XI.js';
 import '@opentelemetry/api';