@mastra/core 0.5.0-alpha.7 → 0.5.0-alpha.9

package/dist/agent/index.cjs

@@ -454,12 +454,45 @@ function createExecute(tool, options, logType) {
     }
   };
 }
+function isZodType(value) {
+  return typeof value === "object" && value !== null && "_def" in value && "parse" in value && typeof value.parse === "function" && "safeParse" in value && typeof value.safeParse === "function";
+}
+function createDeterministicId(input) {
+  return crypto$1.createHash("sha256").update(input).digest("hex").slice(0, 8);
+}
+function setVercelToolProperties(tool) {
+  const inputSchema = convertVercelToolParameters(tool);
+  const toolId = !("id" in tool) ? tool.description ? `tool-${createDeterministicId(tool.description)}` : `tool-${Math.random().toString(36).substring(2, 9)}` : tool.id;
+  return {
+    ...tool,
+    id: toolId,
+    inputSchema
+  };
+}
+function ensureToolProperties(tools) {
+  const toolsWithProperties = Object.keys(tools).reduce((acc, key) => {
+    const tool = tools?.[key];
+    if (tool) {
+      if (isVercelTool(tool)) {
+        acc[key] = setVercelToolProperties(tool);
+      } else {
+        acc[key] = tool;
+      }
+    }
+    return acc;
+  }, {});
+  return toolsWithProperties;
+}
+function convertVercelToolParameters(tool) {
+  const schema = tool.parameters ?? zod.z.object({});
+  return isZodType(schema) ? schema : resolveSerializedZodOutput(jsonSchemaToZod__default.default(schema));
+}
 function makeCoreTool(tool, options, logType) {
   const getParameters = () => {
     if (isVercelTool(tool)) {
-      return tool.parameters instanceof zod.z.ZodType ? tool.parameters : resolveSerializedZodOutput(jsonSchemaToZod__default.default(tool.parameters));
+      return convertVercelToolParameters(tool);
     }
-    return tool.inputSchema;
+    return tool.inputSchema ?? zod.z.object({});
   };
   return {
     description: tool.description,
@@ -476,8 +509,14 @@ function createMastraProxy({
 }) {
   return new Proxy(mastra, {
     get(target, prop) {
-      if (Reflect.has(target, prop)) {
-        return Reflect.get(target, prop);
+      const hasProp = Reflect.has(target, prop);
+      if (hasProp) {
+        const value = Reflect.get(target, prop);
+        const isFunction = typeof value === "function";
+        if (isFunction) {
+          return value.bind(target);
+        }
+        return value;
       }
       if (prop === "logger") {
         logger.warn(`Please use 'getLogger' instead, logger is deprecated`);
@@ -1157,7 +1196,7 @@ exports.Agent = class Agent extends (_a = MastraBase) {
     this.metrics = {};
     this.evals = {};
     if (config.tools) {
-      this.tools = config.tools;
+      this.tools = ensureToolProperties(config.tools);
     }
     if (config.mastra) {
       this.__registerPrimitives({
@@ -1315,6 +1354,7 @@ exports.Agent = class Agent extends (_a = MastraBase) {
         });
         const memoryMessages = threadId && memory ? (await memory.rememberMessages({
           threadId,
+          resourceId,
           config: memoryConfig,
           vectorMessageSearch: messages.slice(-1).map(m => {
             if (typeof m === `string`) {

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, h as AgentConfig, au as AgentGenerateOptions, av as AgentStreamOptions, as as ToolsInput, at as ToolsetsInput } from '../base-CTdONy0_.cjs';
+export { A as Agent, i as AgentConfig, au as AgentGenerateOptions, av as AgentStreamOptions, a as ToolsInput, at as ToolsetsInput } from '../base-CMEKtEnE.cjs';
 import '../base-DboIg_Cd.cjs';
 import '../types-CwTG2XyQ.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, h as AgentConfig, au as AgentGenerateOptions, av as AgentStreamOptions, as as ToolsInput, at as ToolsetsInput } from '../base-DIn_km7X.js';
+export { A as Agent, i as AgentConfig, au as AgentGenerateOptions, av as AgentStreamOptions, a as ToolsInput, at as ToolsetsInput } from '../base-B78F6w8S.js';
 import '../base-BZViaFTt.js';
 import '../types-CwTG2XyQ.js';
 import '../voice/index.js';

package/dist/agent/index.js

@@ -1 +1 @@
-export { Agent } from '../chunk-SWDQYPJS.js';
+export { Agent } from '../chunk-TWAIC2XA.js';

package/dist/{base-DIn_km7X.d.ts → base-B78F6w8S.d.ts}

@@ -62,8 +62,9 @@ declare abstract class MastraMemory extends MastraBase {
         indexName: string;
     }>;
     getMergedThreadConfig(config?: MemoryConfig): MemoryConfig;
-    abstract rememberMessages({ threadId, vectorMessageSearch, config, }: {
+    abstract rememberMessages({ threadId, resourceId, vectorMessageSearch, config, }: {
         threadId: string;
+        resourceId?: string;
         vectorMessageSearch?: string;
         config?: MemoryConfig;
     }): Promise<{
@@ -108,7 +109,7 @@ declare abstract class MastraMemory extends MastraBase {
      * @param threadId - The unique identifier of the thread
      * @returns Promise resolving to array of messages and uiMessages
      */
-    abstract query({ threadId, selectBy, }: StorageGetMessagesArg): Promise<{
+    abstract query({ threadId, resourceId, selectBy, }: StorageGetMessagesArg): Promise<{
         messages: CoreMessage$1[];
         uiMessages: Message[];
     }>;
@@ -166,7 +167,7 @@ interface WorkflowOptions<TTriggerSchema extends z.ZodObject<any> = any> {
 }
 interface StepExecutionContext<TSchemaIn extends z.ZodSchema | undefined = undefined, TContext extends WorkflowContext = WorkflowContext> extends IExecutionContext<TSchemaIn> {
     context: TSchemaIn extends z.ZodSchema ? z.infer<TSchemaIn> & TContext : TContext;
-    suspend: () => Promise<void>;
+    suspend: (payload?: unknown) => Promise<void>;
     runId: string;
     mastra?: MastraUnion;
 }
@@ -572,13 +573,7 @@ interface Config<TAgents extends Record<string, Agent<any>> = Record<string, Age
     memory?: MastraMemory;
 }
 declare class Mastra<TAgents extends Record<string, Agent<any>> = Record<string, Agent<any>>, TWorkflows extends Record<string, Workflow> = Record<string, Workflow>, TVectors extends Record<string, MastraVector> = Record<string, MastraVector>, TTTS extends Record<string, MastraTTS> = Record<string, MastraTTS>, TLogger extends Logger = Logger> {
-    private vectors?;
-    private agents;
-    private logger;
-    private workflows;
-    private telemetry?;
-    private tts?;
-    private deployer?;
+    #private;
     storage?: MastraStorage;
     memory?: MastraMemory;
     constructor(config?: Config<TAgents, TWorkflows, TVectors, TTTS, TLogger>);
@@ -933,6 +928,7 @@ interface WorkflowRow {
 }
 type StorageGetMessagesArg = {
     threadId: string;
+    resourceId?: string;
     selectBy?: {
         vectorSearchString?: string;
         last?: number | false;
@@ -1120,4 +1116,4 @@ declare abstract class MastraStorage extends MastraBase {
     __getEvalsByAgentName(agentName: string, type?: 'test' | 'live'): Promise<EvalRow[]>;
 }
 
-export { type RetryConfig as $, Agent as A, type BaseStructuredOutputType as B, type CoreTool as C, type DefaultLLMTextOptions as D, type EvalRow as E, type LLMTextOptions as F, type GenerateReturn as G, type LLMTextObjectOptions as H, type LLMStreamOptions as I, type LLMInnerStreamOptions as J, type LLMStreamObjectOptions as K, type LanguageModel as L, Mastra as M, type Config as N, type OutputType as O, type MessageResponse as P, type MemoryConfig as Q, type SharedMemoryConfig as R, type StorageColumn as S, type ToolAction as T, type StepExecutionContext as U, type VercelTool as V, Workflow as W, type StepAction as X, type StepVariableType as Y, type StepNode as Z, type StepGraph as _, type MastraPrimitives as a, type VariableReference as a0, type BaseCondition as a1, type ActionContext as a2, WhenConditionReturnValue as a3, type StepDef as a4, type StepCondition as a5, type StepConfig as a6, type StepResult as a7, type WorkflowContext as a8, type WorkflowLogMessage as a9, TABLE_TRACES as aA, type WorkflowEvent as aa, type ResolverFunctionInput as ab, type ResolverFunctionOutput as ac, type SubscriberFunctionOutput as ad, type DependencyCheckOutput as ae, type WorkflowActors as af, type WorkflowActionParams as ag, type WorkflowActions as ah, type WorkflowState as ai, type StepId as aj, type ExtractSchemaFromStep as ak, type ExtractStepResult as al, type StepInputType as am, type ExtractSchemaType as an, type PathsToStringProps as ao, type WorkflowRunState as ap, type WorkflowResumeResult as aq, createStep as ar, type ToolsInput as as, type ToolsetsInput as at, type AgentGenerateOptions as au, type AgentStreamOptions as av, TABLE_WORKFLOW_SNAPSHOT as aw, TABLE_EVALS as ax, TABLE_MESSAGES as ay, TABLE_THREADS as az, MastraMemory as b, MastraStorage as c, type TABLE_NAMES as d, type StorageThreadType as e, type MessageType as f, type StorageGetMessagesArg as g, type AgentConfig as h, type ToolExecutionContext as i, Step as j, type WorkflowOptions as k, type WorkflowRow as l, type CoreMessage as m, type CoreSystemMessage as n, type CoreAssistantMessage as o, type CoreUserMessage as p, type CoreToolMessage as q, type EmbedResult as r, type EmbedManyResult as s, type StructuredOutputType as t, type StructuredOutputArrayItem as u, type StructuredOutput as v, type StreamReturn as w, type DefaultLLMTextObjectOptions as x, type DefaultLLMStreamOptions as y, type DefaultLLMStreamObjectOptions as z };
+export { type StepGraph as $, Agent as A, type BaseStructuredOutputType as B, type CoreTool as C, type DefaultLLMTextOptions as D, type EvalRow as E, type DefaultLLMStreamObjectOptions as F, type GenerateReturn as G, type LLMTextOptions as H, type LLMTextObjectOptions as I, type LLMStreamOptions as J, type LLMInnerStreamOptions as K, type LanguageModel as L, Mastra as M, type LLMStreamObjectOptions as N, type OutputType as O, type Config as P, type MessageResponse as Q, type MemoryConfig as R, type StorageColumn as S, type ToolAction as T, type SharedMemoryConfig as U, type VercelTool as V, Workflow as W, type StepExecutionContext as X, type StepAction as Y, type StepVariableType as Z, type StepNode as _, type ToolsInput as a, type RetryConfig as a0, type VariableReference as a1, type BaseCondition as a2, type ActionContext as a3, WhenConditionReturnValue as a4, type StepDef as a5, type StepCondition as a6, type StepConfig as a7, type StepResult as a8, type WorkflowContext as a9, TABLE_TRACES as aA, type WorkflowLogMessage as aa, type WorkflowEvent as ab, type ResolverFunctionInput as ac, type ResolverFunctionOutput as ad, type SubscriberFunctionOutput as ae, type DependencyCheckOutput as af, type WorkflowActors as ag, type WorkflowActionParams as ah, type WorkflowActions as ai, type WorkflowState as aj, type StepId as ak, type ExtractSchemaFromStep as al, type ExtractStepResult as am, type StepInputType as an, type ExtractSchemaType as ao, type PathsToStringProps as ap, type WorkflowRunState as aq, type WorkflowResumeResult as ar, createStep as as, type ToolsetsInput as at, type AgentGenerateOptions as au, type AgentStreamOptions as av, TABLE_WORKFLOW_SNAPSHOT as aw, TABLE_EVALS as ax, TABLE_MESSAGES as ay, TABLE_THREADS as az, type MastraPrimitives as b, MastraMemory as c, MastraStorage as d, type TABLE_NAMES as e, type StorageThreadType as f, type MessageType as g, type StorageGetMessagesArg as h, type AgentConfig as i, type ToolExecutionContext as j, Step as k, type WorkflowOptions as l, type WorkflowRow as m, type CoreMessage as n, type CoreSystemMessage as o, type CoreAssistantMessage as p, type CoreUserMessage as q, type CoreToolMessage as r, type EmbedResult as s, type EmbedManyResult as t, type StructuredOutputType as u, type StructuredOutputArrayItem as v, type StructuredOutput as w, type StreamReturn as x, type DefaultLLMTextObjectOptions as y, type DefaultLLMStreamOptions as z };

package/dist/{base-CTdONy0_.d.cts → base-CMEKtEnE.d.cts}

@@ -62,8 +62,9 @@ declare abstract class MastraMemory extends MastraBase {
         indexName: string;
     }>;
     getMergedThreadConfig(config?: MemoryConfig): MemoryConfig;
-    abstract rememberMessages({ threadId, vectorMessageSearch, config, }: {
+    abstract rememberMessages({ threadId, resourceId, vectorMessageSearch, config, }: {
         threadId: string;
+        resourceId?: string;
         vectorMessageSearch?: string;
         config?: MemoryConfig;
     }): Promise<{
@@ -108,7 +109,7 @@ declare abstract class MastraMemory extends MastraBase {
      * @param threadId - The unique identifier of the thread
      * @returns Promise resolving to array of messages and uiMessages
      */
-    abstract query({ threadId, selectBy, }: StorageGetMessagesArg): Promise<{
+    abstract query({ threadId, resourceId, selectBy, }: StorageGetMessagesArg): Promise<{
         messages: CoreMessage$1[];
         uiMessages: Message[];
     }>;
@@ -166,7 +167,7 @@ interface WorkflowOptions<TTriggerSchema extends z.ZodObject<any> = any> {
 }
 interface StepExecutionContext<TSchemaIn extends z.ZodSchema | undefined = undefined, TContext extends WorkflowContext = WorkflowContext> extends IExecutionContext<TSchemaIn> {
     context: TSchemaIn extends z.ZodSchema ? z.infer<TSchemaIn> & TContext : TContext;
-    suspend: () => Promise<void>;
+    suspend: (payload?: unknown) => Promise<void>;
     runId: string;
     mastra?: MastraUnion;
 }
@@ -572,13 +573,7 @@ interface Config<TAgents extends Record<string, Agent<any>> = Record<string, Age
     memory?: MastraMemory;
 }
 declare class Mastra<TAgents extends Record<string, Agent<any>> = Record<string, Agent<any>>, TWorkflows extends Record<string, Workflow> = Record<string, Workflow>, TVectors extends Record<string, MastraVector> = Record<string, MastraVector>, TTTS extends Record<string, MastraTTS> = Record<string, MastraTTS>, TLogger extends Logger = Logger> {
-    private vectors?;
-    private agents;
-    private logger;
-    private workflows;
-    private telemetry?;
-    private tts?;
-    private deployer?;
+    #private;
     storage?: MastraStorage;
     memory?: MastraMemory;
     constructor(config?: Config<TAgents, TWorkflows, TVectors, TTTS, TLogger>);
@@ -933,6 +928,7 @@ interface WorkflowRow {
 }
 type StorageGetMessagesArg = {
     threadId: string;
+    resourceId?: string;
     selectBy?: {
         vectorSearchString?: string;
         last?: number | false;
@@ -1120,4 +1116,4 @@ declare abstract class MastraStorage extends MastraBase {
     __getEvalsByAgentName(agentName: string, type?: 'test' | 'live'): Promise<EvalRow[]>;
 }
 
-export { type RetryConfig as $, Agent as A, type BaseStructuredOutputType as B, type CoreTool as C, type DefaultLLMTextOptions as D, type EvalRow as E, type LLMTextOptions as F, type GenerateReturn as G, type LLMTextObjectOptions as H, type LLMStreamOptions as I, type LLMInnerStreamOptions as J, type LLMStreamObjectOptions as K, type LanguageModel as L, Mastra as M, type Config as N, type OutputType as O, type MessageResponse as P, type MemoryConfig as Q, type SharedMemoryConfig as R, type StorageColumn as S, type ToolAction as T, type StepExecutionContext as U, type VercelTool as V, Workflow as W, type StepAction as X, type StepVariableType as Y, type StepNode as Z, type StepGraph as _, type MastraPrimitives as a, type VariableReference as a0, type BaseCondition as a1, type ActionContext as a2, WhenConditionReturnValue as a3, type StepDef as a4, type StepCondition as a5, type StepConfig as a6, type StepResult as a7, type WorkflowContext as a8, type WorkflowLogMessage as a9, TABLE_TRACES as aA, type WorkflowEvent as aa, type ResolverFunctionInput as ab, type ResolverFunctionOutput as ac, type SubscriberFunctionOutput as ad, type DependencyCheckOutput as ae, type WorkflowActors as af, type WorkflowActionParams as ag, type WorkflowActions as ah, type WorkflowState as ai, type StepId as aj, type ExtractSchemaFromStep as ak, type ExtractStepResult as al, type StepInputType as am, type ExtractSchemaType as an, type PathsToStringProps as ao, type WorkflowRunState as ap, type WorkflowResumeResult as aq, createStep as ar, type ToolsInput as as, type ToolsetsInput as at, type AgentGenerateOptions as au, type AgentStreamOptions as av, TABLE_WORKFLOW_SNAPSHOT as aw, TABLE_EVALS as ax, TABLE_MESSAGES as ay, TABLE_THREADS as az, MastraMemory as b, MastraStorage as c, type TABLE_NAMES as d, type StorageThreadType as e, type MessageType as f, type StorageGetMessagesArg as g, type AgentConfig as h, type ToolExecutionContext as i, Step as j, type WorkflowOptions as k, type WorkflowRow as l, type CoreMessage as m, type CoreSystemMessage as n, type CoreAssistantMessage as o, type CoreUserMessage as p, type CoreToolMessage as q, type EmbedResult as r, type EmbedManyResult as s, type StructuredOutputType as t, type StructuredOutputArrayItem as u, type StructuredOutput as v, type StreamReturn as w, type DefaultLLMTextObjectOptions as x, type DefaultLLMStreamOptions as y, type DefaultLLMStreamObjectOptions as z };
+export { type StepGraph as $, Agent as A, type BaseStructuredOutputType as B, type CoreTool as C, type DefaultLLMTextOptions as D, type EvalRow as E, type DefaultLLMStreamObjectOptions as F, type GenerateReturn as G, type LLMTextOptions as H, type LLMTextObjectOptions as I, type LLMStreamOptions as J, type LLMInnerStreamOptions as K, type LanguageModel as L, Mastra as M, type LLMStreamObjectOptions as N, type OutputType as O, type Config as P, type MessageResponse as Q, type MemoryConfig as R, type StorageColumn as S, type ToolAction as T, type SharedMemoryConfig as U, type VercelTool as V, Workflow as W, type StepExecutionContext as X, type StepAction as Y, type StepVariableType as Z, type StepNode as _, type ToolsInput as a, type RetryConfig as a0, type VariableReference as a1, type BaseCondition as a2, type ActionContext as a3, WhenConditionReturnValue as a4, type StepDef as a5, type StepCondition as a6, type StepConfig as a7, type StepResult as a8, type WorkflowContext as a9, TABLE_TRACES as aA, type WorkflowLogMessage as aa, type WorkflowEvent as ab, type ResolverFunctionInput as ac, type ResolverFunctionOutput as ad, type SubscriberFunctionOutput as ae, type DependencyCheckOutput as af, type WorkflowActors as ag, type WorkflowActionParams as ah, type WorkflowActions as ai, type WorkflowState as aj, type StepId as ak, type ExtractSchemaFromStep as al, type ExtractStepResult as am, type StepInputType as an, type ExtractSchemaType as ao, type PathsToStringProps as ap, type WorkflowRunState as aq, type WorkflowResumeResult as ar, createStep as as, type ToolsetsInput as at, type AgentGenerateOptions as au, type AgentStreamOptions as av, TABLE_WORKFLOW_SNAPSHOT as aw, TABLE_EVALS as ax, TABLE_MESSAGES as ay, TABLE_THREADS as az, type MastraPrimitives as b, MastraMemory as c, MastraStorage as d, type TABLE_NAMES as e, type StorageThreadType as f, type MessageType as g, type StorageGetMessagesArg as h, type AgentConfig as i, type ToolExecutionContext as j, Step as k, type WorkflowOptions as l, type WorkflowRow as m, type CoreMessage as n, type CoreSystemMessage as o, type CoreAssistantMessage as p, type CoreUserMessage as q, type CoreToolMessage as r, type EmbedResult as s, type EmbedManyResult as t, type StructuredOutputType as u, type StructuredOutputArrayItem as v, type StructuredOutput as w, type StreamReturn as x, type DefaultLLMTextObjectOptions as y, type DefaultLLMStreamOptions as z };

package/dist/{chunk-QABMKXI3.js → chunk-4AQBRUR2.js}

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

package/dist/{chunk-KBSR2LLT.js → chunk-6V737PR2.js}

@@ -1,4 +1,4 @@
-import { createMastraProxy } from './chunk-HBHPTMAC.js';
+import { createMastraProxy } from './chunk-IM7CM3DU.js';
 import { MastraBase } from './chunk-4VHCCQ7P.js';
 import { setTimeout } from 'node:timers/promises';
 import { context, trace } from '@opentelemetry/api';
@@ -1207,6 +1207,7 @@ var Workflow = class extends MastraBase {
         telemetry: mastra.getTelemetry(),
         logger: mastra.getLogger()
       });
+      this.#mastra = mastra;
     }
   }
   step(step, config) {
@@ -1508,10 +1509,14 @@ var Workflow = class extends MastraBase {
         return await context.with(
           trace.setSpan(context.active(), this.getExecutionSpan(attributes?.runId ?? data?.runId)),
           async () => {
-            return this.#mastra.telemetry.traceMethod(handler2, {
-              spanName,
-              attributes
-            })(data);
+            if (this?.telemetry) {
+              return this.telemetry.traceMethod(handler2, {
+                spanName,
+                attributes
+              })(data);
+            } else {
+              return handler2(data);
+            }
           }
         );
       };
@@ -1525,7 +1530,7 @@ var Workflow = class extends MastraBase {
         ...payload,
         ...context
       };
-      const finalAction = this.#mastra?.getTelemetry() ? executeStep(execute, `workflow.${this.name}.action.${stepId}`, {
+      const finalAction = this.telemetry ? executeStep(execute, `workflow.${this.name}.action.${stepId}`, {
         componentName: this.name,
         runId: rest.runId
       }) : execute;