@mastra/client-js 0.1.22-alpha.4 → 0.1.23-alpha.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @mastra/client-js@0.1.22-alpha.4 build /home/runner/work/mastra/mastra/client-sdks/client-js
+> @mastra/client-js@0.1.23-alpha.0 build /home/runner/work/mastra/mastra/client-sdks/client-js
 > tsup src/index.ts --format esm,cjs --dts --clean --treeshake=smallest --splitting
 
 CLI Building entry: src/index.ts
@@ -9,11 +9,11 @@
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-CJS dist/index.cjs 38.52 KB
-CJS ⚡️ Build success in 1179ms
-ESM dist/index.js 38.25 KB
-ESM ⚡️ Build success in 1199ms
+CJS dist/index.cjs 41.58 KB
+CJS ⚡️ Build success in 1056ms
+ESM dist/index.js 41.31 KB
+ESM ⚡️ Build success in 1067ms
 DTS Build start
-DTS ⚡️ Build success in 13527ms
-DTS dist/index.d.ts  27.63 KB
-DTS dist/index.d.cts 27.63 KB
+DTS ⚡️ Build success in 13556ms
+DTS dist/index.d.ts  30.71 KB
+DTS dist/index.d.cts 30.71 KB

package/CHANGELOG.md

@@ -1,5 +1,52 @@
 # @mastra/client-js
 
+## 0.1.23-alpha.0
+
+### Patch Changes
+
+- f53a6ac: Add VNextWorkflowRuns type
+- ccdabdc: Remove trailing / from mastraClient baseUrl
+- a6e3881: Remove non serializable options from agent stream,generate
+- fddae56: Add telemetry to cliend SDK streamParams
+- 23f258c: Add new list and get routes for mcp servers. Changed route make-up for more consistency with existing API routes. Lastly, added in a lot of extra detail that can be optionally passed to the mcp server per the mcp spec.
+- 2672a05: Add MCP servers and tool call execution to playground
+- Updated dependencies [f53a6ac]
+- Updated dependencies [eabdcd9]
+- Updated dependencies [90be034]
+- Updated dependencies [99f050a]
+- Updated dependencies [d0ee3c6]
+- Updated dependencies [23f258c]
+- Updated dependencies [2672a05]
+  - @mastra/core@0.9.5-alpha.0
+
+## 0.1.22
+
+### Patch Changes
+
+- c2f9e60: Resolves type issue and listen response string wrapped in text object twice
+- 5c70b8a: [MASTRA-3234] added limit for client-js getMessages
+- b4c6c87: fix: Specify $refStrategy: 'none' when calling zodToJsonSchema.
+- 0c3d117: Add workflows to agent server handlers
+- a5810ce: Add support for experimental_generateMessageId and remove it from client-js types since it's not serializable
+- c2b980b: Fix multiple too-calls in AGUI
+- cb1f698: Set runtimeContext from playground for agents, tools, workflows
+- 0b8b868: Added A2A support + streaming
+- Updated dependencies [396be50]
+- Updated dependencies [ab80e7e]
+- Updated dependencies [c3bd795]
+- Updated dependencies [da082f8]
+- Updated dependencies [a5810ce]
+- Updated dependencies [3e9c131]
+- Updated dependencies [3171b5b]
+- Updated dependencies [973e5ac]
+- Updated dependencies [daf942f]
+- Updated dependencies [0b8b868]
+- Updated dependencies [9e1eff5]
+- Updated dependencies [6fa1ad1]
+- Updated dependencies [c28d7a0]
+- Updated dependencies [edf1e88]
+  - @mastra/core@0.9.4
+
 ## 0.1.22-alpha.4
 
 ### Patch Changes

package/dist/index.cjs

@@ -220,7 +220,7 @@ var BaseResource = class {
     let delay = backoffMs;
     for (let attempt = 0; attempt <= retries; attempt++) {
       try {
-        const response = await fetch(`${baseUrl}${path}`, {
+        const response = await fetch(`${baseUrl.replace(/\/$/, "")}${path}`, {
           ...options,
           headers: {
             ...headers,
@@ -331,8 +331,8 @@ var Agent = class extends BaseResource {
   generate(params) {
     const processedParams = {
       ...params,
-      output: zodToJsonSchema(params.output),
-      experimental_output: zodToJsonSchema(params.experimental_output),
+      output: params.output ? zodToJsonSchema(params.output) : void 0,
+      experimental_output: params.experimental_output ? zodToJsonSchema(params.experimental_output) : void 0,
       runtimeContext: params.runtimeContext ? Object.fromEntries(params.runtimeContext.entries()) : void 0
     };
     return this.request(`/api/agents/${this.agentId}/generate`, {
@@ -348,8 +348,8 @@ var Agent = class extends BaseResource {
   async stream(params) {
     const processedParams = {
       ...params,
-      output: zodToJsonSchema(params.output),
-      experimental_output: zodToJsonSchema(params.experimental_output),
+      output: params.output ? zodToJsonSchema(params.output) : void 0,
+      experimental_output: params.experimental_output ? zodToJsonSchema(params.experimental_output) : void 0,
       runtimeContext: params.runtimeContext ? Object.fromEntries(params.runtimeContext.entries()) : void 0
     };
     const response = await this.request(`/api/agents/${this.agentId}/stream`, {
@@ -804,6 +804,8 @@ var Tool = class extends BaseResource {
     });
   }
 };
+
+// src/resources/vnext-workflow.ts
 var RECORD_SEPARATOR2 = "";
 var VNextWorkflow = class extends BaseResource {
   constructor(options, workflowId) {
@@ -1065,6 +1067,40 @@ var A2A = class extends BaseResource {
   }
 };
 
+// src/resources/mcp-tool.ts
+var MCPTool = class extends BaseResource {
+  serverId;
+  toolId;
+  constructor(options, serverId, toolId) {
+    super(options);
+    this.serverId = serverId;
+    this.toolId = toolId;
+  }
+  /**
+   * Retrieves details about this specific tool from the MCP server.
+   * @returns Promise containing the tool's information (name, description, schema).
+   */
+  details() {
+    return this.request(`/api/mcp/${this.serverId}/tools/${this.toolId}`);
+  }
+  /**
+   * Executes this specific tool on the MCP server.
+   * @param params - Parameters for tool execution, including data/args and optional runtimeContext.
+   * @returns Promise containing the result of the tool execution.
+   */
+  execute(params) {
+    const body = {};
+    if (params.data !== void 0) body.data = params.data;
+    if (params.runtimeContext !== void 0) {
+      body.runtimeContext = params.runtimeContext;
+    }
+    return this.request(`/api/mcp/${this.serverId}/tools/${this.toolId}/execute`, {
+      method: "POST",
+      body: Object.keys(body).length > 0 ? body : void 0
+    });
+  }
+};
+
 // src/client.ts
 var MastraClient = class extends BaseResource {
   constructor(options) {
@@ -1275,6 +1311,54 @@ var MastraClient = class extends BaseResource {
   getNetwork(networkId) {
     return new Network(this.options, networkId);
   }
+  /**
+   * Retrieves a list of available MCP servers.
+   * @param params - Optional parameters for pagination (limit, offset).
+   * @returns Promise containing the list of MCP servers and pagination info.
+   */
+  getMcpServers(params) {
+    const searchParams = new URLSearchParams();
+    if (params?.limit !== void 0) {
+      searchParams.set("limit", String(params.limit));
+    }
+    if (params?.offset !== void 0) {
+      searchParams.set("offset", String(params.offset));
+    }
+    const queryString = searchParams.toString();
+    return this.request(`/api/mcp/v0/servers${queryString ? `?${queryString}` : ""}`);
+  }
+  /**
+   * Retrieves detailed information for a specific MCP server.
+   * @param serverId - The ID of the MCP server to retrieve.
+   * @param params - Optional parameters, e.g., specific version.
+   * @returns Promise containing the detailed MCP server information.
+   */
+  getMcpServerDetails(serverId, params) {
+    const searchParams = new URLSearchParams();
+    if (params?.version) {
+      searchParams.set("version", params.version);
+    }
+    const queryString = searchParams.toString();
+    return this.request(`/api/mcp/v0/servers/${serverId}${queryString ? `?${queryString}` : ""}`);
+  }
+  /**
+   * Retrieves a list of tools for a specific MCP server.
+   * @param serverId - The ID of the MCP server.
+   * @returns Promise containing the list of tools.
+   */
+  getMcpServerTools(serverId) {
+    return this.request(`/api/mcp/${serverId}/tools`);
+  }
+  /**
+   * Gets an MCPTool resource instance for a specific tool on an MCP server.
+   * This instance can then be used to fetch details or execute the tool.
+   * @param serverId - The ID of the MCP server.
+   * @param toolId - The ID of the tool.
+   * @returns MCPTool instance.
+   */
+  getMcpServerTool(serverId, toolId) {
+    return new MCPTool(this.options, serverId, toolId);
+  }
   /**
    * Gets an A2A client for interacting with an agent via the A2A protocol
    * @param agentId - ID of the agent to interact with

package/dist/index.d.cts

@@ -1,12 +1,13 @@
 import { AbstractAgent } from '@ag-ui/client';
 import { processDataStream } from '@ai-sdk/ui-utils';
-import { StepAction, StepGraph, CoreMessage, AiMessageType, StorageThreadType, MessageType, WorkflowRuns, WorkflowRunResult as WorkflowRunResult$1, QueryResult, BaseLogMessage, GenerateReturn } from '@mastra/core';
+import { StepAction, StepGraph, CoreMessage, AiMessageType, StorageThreadType, MessageType, WorkflowRuns, WorkflowRunResult as WorkflowRunResult$1, VNextWorkflowRuns, QueryResult, BaseLogMessage, GenerateReturn } from '@mastra/core';
 import { JSONSchema7 } from 'json-schema';
 import { ZodSchema } from 'zod';
 import { AgentGenerateOptions, AgentStreamOptions } from '@mastra/core/agent';
+import { RuntimeContext } from '@mastra/core/runtime-context';
+import { ServerInfo, ServerDetailInfo } from '@mastra/core/mcp';
 import { NewWorkflow, WorkflowResult, WatchEvent } from '@mastra/core/workflows/vNext';
-import { RuntimeContext } from '@mastra/core/di';
-import { RuntimeContext as RuntimeContext$1 } from '@mastra/core/runtime-context';
+import { RuntimeContext as RuntimeContext$1 } from '@mastra/core/di';
 import { AgentCard, TaskSendParams, Task, TaskQueryParams, TaskIdParams } from '@mastra/core/a2a';
 
 interface ClientOptions {
@@ -28,6 +29,11 @@ interface RequestOptions {
     stream?: boolean;
     signal?: AbortSignal;
 }
+type WithoutMethods<T> = {
+    [K in keyof T as T[K] extends (...args: any[]) => any ? never : T[K] extends {
+        (): any;
+    } ? never : T[K] extends undefined | ((...args: any[]) => any) ? never : K]: T[K];
+};
 interface GetAgentResponse {
     name: string;
     instructions: string;
@@ -38,10 +44,16 @@ interface GetAgentResponse {
 }
 type GenerateParams<T extends JSONSchema7 | ZodSchema | undefined = undefined> = {
     messages: string | string[] | CoreMessage[] | AiMessageType[];
-} & Partial<Omit<AgentGenerateOptions<T>, 'experimental_generateMessageId'>>;
+    output?: T;
+    experimental_output?: T;
+    runtimeContext?: RuntimeContext;
+} & WithoutMethods<Omit<AgentGenerateOptions<T>, 'output' | 'experimental_output' | 'runtimeContext'>>;
 type StreamParams<T extends JSONSchema7 | ZodSchema | undefined = undefined> = {
     messages: string | string[] | CoreMessage[] | AiMessageType[];
-} & Omit<AgentStreamOptions<T>, 'onFinish' | 'onStepFinish' | 'telemetry' | 'experimental_generateMessageId'>;
+    output?: T;
+    experimental_output?: T;
+    runtimeContext?: RuntimeContext;
+} & WithoutMethods<Omit<AgentStreamOptions<T>, 'output' | 'experimental_output' | 'runtimeContext'>>;
 interface GetEvalsByAgentIdResponse extends GetAgentResponse {
     evals: any[];
     instructions: string;
@@ -70,6 +82,7 @@ interface GetWorkflowRunsParams {
     resourceId?: string;
 }
 type GetWorkflowRunsResponse = WorkflowRuns;
+type GetVNextWorkflowRunsResponse = VNextWorkflowRuns;
 type WorkflowRunResult = {
     activePaths: Record<string, {
         status: string;
@@ -231,6 +244,20 @@ interface GetNetworkResponse {
     };
     state?: Record<string, any>;
 }
+interface McpServerListResponse {
+    servers: ServerInfo[];
+    next: string | null;
+    total_count: number;
+}
+interface McpToolInfo {
+    id: string;
+    name: string;
+    description?: string;
+    inputSchema: string;
+}
+interface McpServerToolListResponse {
+    tools: McpToolInfo[];
+}
 
 declare class BaseResource {
     readonly options: ClientOptions;
@@ -312,7 +339,7 @@ declare class Agent extends BaseResource {
      */
     executeTool(toolId: string, params: {
         data: any;
-        runtimeContext?: RuntimeContext;
+        runtimeContext?: RuntimeContext$1;
     }): Promise<any>;
     /**
      * Retrieves evaluation results for the agent
@@ -534,7 +561,7 @@ declare class Tool extends BaseResource {
     execute(params: {
         data: any;
         runId?: string;
-        runtimeContext?: RuntimeContext;
+        runtimeContext?: RuntimeContext$1;
     }): Promise<any>;
 }
 
@@ -559,7 +586,7 @@ declare class VNextWorkflow extends BaseResource {
      * @param params - Parameters for filtering runs
      * @returns Promise containing vNext workflow runs array
      */
-    runs(params?: GetWorkflowRunsParams): Promise<GetWorkflowRunsResponse>;
+    runs(params?: GetWorkflowRunsParams): Promise<GetVNextWorkflowRunsResponse>;
     /**
      * Creates a new vNext workflow run
      * @param params - Optional object containing the optional runId
@@ -578,7 +605,7 @@ declare class VNextWorkflow extends BaseResource {
     start(params: {
         runId: string;
         inputData: Record<string, any>;
-        runtimeContext?: RuntimeContext$1;
+        runtimeContext?: RuntimeContext;
     }): Promise<{
         message: string;
     }>;
@@ -591,7 +618,7 @@ declare class VNextWorkflow extends BaseResource {
         step: string | string[];
         runId: string;
         resumeData?: Record<string, any>;
-        runtimeContext?: RuntimeContext$1;
+        runtimeContext?: RuntimeContext;
     }): Promise<{
         message: string;
     }>;
@@ -603,7 +630,7 @@ declare class VNextWorkflow extends BaseResource {
     startAsync(params: {
         runId?: string;
         inputData: Record<string, any>;
-        runtimeContext?: RuntimeContext$1;
+        runtimeContext?: RuntimeContext;
     }): Promise<VNextWorkflowRunResult>;
     /**
      * Resumes a suspended vNext workflow step asynchronously and returns a promise that resolves when the vNext workflow is complete
@@ -614,7 +641,7 @@ declare class VNextWorkflow extends BaseResource {
         runId: string;
         step: string | string[];
         resumeData?: Record<string, any>;
-        runtimeContext?: RuntimeContext$1;
+        runtimeContext?: RuntimeContext;
     }): Promise<VNextWorkflowRunResult>;
     /**
      * Watches vNext workflow transitions in real-time
@@ -667,6 +694,30 @@ declare class A2A extends BaseResource {
     sendAndSubscribe(params: TaskSendParams): Promise<Response>;
 }
 
+/**
+ * Represents a specific tool available on a specific MCP server.
+ * Provides methods to get details and execute the tool.
+ */
+declare class MCPTool extends BaseResource {
+    private serverId;
+    private toolId;
+    constructor(options: ClientOptions, serverId: string, toolId: string);
+    /**
+     * Retrieves details about this specific tool from the MCP server.
+     * @returns Promise containing the tool's information (name, description, schema).
+     */
+    details(): Promise<McpToolInfo>;
+    /**
+     * Executes this specific tool on the MCP server.
+     * @param params - Parameters for tool execution, including data/args and optional runtimeContext.
+     * @returns Promise containing the result of the tool execution.
+     */
+    execute(params: {
+        data?: any;
+        runtimeContext?: RuntimeContext;
+    }): Promise<any>;
+}
+
 declare class MastraClient extends BaseResource {
     constructor(options: ClientOptions);
     /**
@@ -789,6 +840,38 @@ declare class MastraClient extends BaseResource {
      * @returns Network instance
      */
     getNetwork(networkId: string): Network;
+    /**
+     * Retrieves a list of available MCP servers.
+     * @param params - Optional parameters for pagination (limit, offset).
+     * @returns Promise containing the list of MCP servers and pagination info.
+     */
+    getMcpServers(params?: {
+        limit?: number;
+        offset?: number;
+    }): Promise<McpServerListResponse>;
+    /**
+     * Retrieves detailed information for a specific MCP server.
+     * @param serverId - The ID of the MCP server to retrieve.
+     * @param params - Optional parameters, e.g., specific version.
+     * @returns Promise containing the detailed MCP server information.
+     */
+    getMcpServerDetails(serverId: string, params?: {
+        version?: string;
+    }): Promise<ServerDetailInfo>;
+    /**
+     * Retrieves a list of tools for a specific MCP server.
+     * @param serverId - The ID of the MCP server.
+     * @returns Promise containing the list of tools.
+     */
+    getMcpServerTools(serverId: string): Promise<McpServerToolListResponse>;
+    /**
+     * Gets an MCPTool resource instance for a specific tool on an MCP server.
+     * This instance can then be used to fetch details or execute the tool.
+     * @param serverId - The ID of the MCP server.
+     * @param toolId - The ID of the tool.
+     * @returns MCPTool instance.
+     */
+    getMcpServerTool(serverId: string, toolId: string): MCPTool;
     /**
      * Gets an A2A client for interacting with an agent via the A2A protocol
      * @param agentId - ID of the agent to interact with
@@ -797,4 +880,4 @@ declare class MastraClient extends BaseResource {
     getA2A(agentId: string): A2A;
 }
 
-export { type ClientOptions, type CreateIndexParams, type CreateMemoryThreadParams, type CreateMemoryThreadResponse, type GenerateParams, type GetAgentResponse, type GetEvalsByAgentIdResponse, type GetLogParams, type GetLogsParams, type GetLogsResponse, type GetMemoryThreadMessagesParams, type GetMemoryThreadMessagesResponse, type GetMemoryThreadParams, type GetMemoryThreadResponse, type GetNetworkResponse, type GetTelemetryParams, type GetTelemetryResponse, type GetToolResponse, type GetVNextWorkflowResponse, type GetVectorIndexResponse, type GetWorkflowResponse, type GetWorkflowRunsParams, type GetWorkflowRunsResponse, MastraClient, type QueryVectorParams, type QueryVectorResponse, type RequestFunction, type RequestOptions, type SaveMessageToMemoryParams, type SaveMessageToMemoryResponse, type StreamParams, type UpdateMemoryThreadParams, type UpsertVectorParams, type VNextWorkflowRunResult, type VNextWorkflowWatchResult, type WorkflowRunResult };
+export { type ClientOptions, type CreateIndexParams, type CreateMemoryThreadParams, type CreateMemoryThreadResponse, type GenerateParams, type GetAgentResponse, type GetEvalsByAgentIdResponse, type GetLogParams, type GetLogsParams, type GetLogsResponse, type GetMemoryThreadMessagesParams, type GetMemoryThreadMessagesResponse, type GetMemoryThreadParams, type GetMemoryThreadResponse, type GetNetworkResponse, type GetTelemetryParams, type GetTelemetryResponse, type GetToolResponse, type GetVNextWorkflowResponse, type GetVNextWorkflowRunsResponse, type GetVectorIndexResponse, type GetWorkflowResponse, type GetWorkflowRunsParams, type GetWorkflowRunsResponse, MastraClient, type McpServerListResponse, type McpServerToolListResponse, type McpToolInfo, type QueryVectorParams, type QueryVectorResponse, type RequestFunction, type RequestOptions, type SaveMessageToMemoryParams, type SaveMessageToMemoryResponse, type StreamParams, type UpdateMemoryThreadParams, type UpsertVectorParams, type VNextWorkflowRunResult, type VNextWorkflowWatchResult, type WorkflowRunResult };

package/dist/index.d.ts

@@ -1,12 +1,13 @@
 import { AbstractAgent } from '@ag-ui/client';
 import { processDataStream } from '@ai-sdk/ui-utils';
-import { StepAction, StepGraph, CoreMessage, AiMessageType, StorageThreadType, MessageType, WorkflowRuns, WorkflowRunResult as WorkflowRunResult$1, QueryResult, BaseLogMessage, GenerateReturn } from '@mastra/core';
+import { StepAction, StepGraph, CoreMessage, AiMessageType, StorageThreadType, MessageType, WorkflowRuns, WorkflowRunResult as WorkflowRunResult$1, VNextWorkflowRuns, QueryResult, BaseLogMessage, GenerateReturn } from '@mastra/core';
 import { JSONSchema7 } from 'json-schema';
 import { ZodSchema } from 'zod';
 import { AgentGenerateOptions, AgentStreamOptions } from '@mastra/core/agent';
+import { RuntimeContext } from '@mastra/core/runtime-context';
+import { ServerInfo, ServerDetailInfo } from '@mastra/core/mcp';
 import { NewWorkflow, WorkflowResult, WatchEvent } from '@mastra/core/workflows/vNext';
-import { RuntimeContext } from '@mastra/core/di';
-import { RuntimeContext as RuntimeContext$1 } from '@mastra/core/runtime-context';
+import { RuntimeContext as RuntimeContext$1 } from '@mastra/core/di';
 import { AgentCard, TaskSendParams, Task, TaskQueryParams, TaskIdParams } from '@mastra/core/a2a';
 
 interface ClientOptions {
@@ -28,6 +29,11 @@ interface RequestOptions {
     stream?: boolean;
     signal?: AbortSignal;
 }
+type WithoutMethods<T> = {
+    [K in keyof T as T[K] extends (...args: any[]) => any ? never : T[K] extends {
+        (): any;
+    } ? never : T[K] extends undefined | ((...args: any[]) => any) ? never : K]: T[K];
+};
 interface GetAgentResponse {
     name: string;
     instructions: string;
@@ -38,10 +44,16 @@ interface GetAgentResponse {
 }
 type GenerateParams<T extends JSONSchema7 | ZodSchema | undefined = undefined> = {
     messages: string | string[] | CoreMessage[] | AiMessageType[];
-} & Partial<Omit<AgentGenerateOptions<T>, 'experimental_generateMessageId'>>;
+    output?: T;
+    experimental_output?: T;
+    runtimeContext?: RuntimeContext;
+} & WithoutMethods<Omit<AgentGenerateOptions<T>, 'output' | 'experimental_output' | 'runtimeContext'>>;
 type StreamParams<T extends JSONSchema7 | ZodSchema | undefined = undefined> = {
     messages: string | string[] | CoreMessage[] | AiMessageType[];
-} & Omit<AgentStreamOptions<T>, 'onFinish' | 'onStepFinish' | 'telemetry' | 'experimental_generateMessageId'>;
+    output?: T;
+    experimental_output?: T;
+    runtimeContext?: RuntimeContext;
+} & WithoutMethods<Omit<AgentStreamOptions<T>, 'output' | 'experimental_output' | 'runtimeContext'>>;
 interface GetEvalsByAgentIdResponse extends GetAgentResponse {
     evals: any[];
     instructions: string;
@@ -70,6 +82,7 @@ interface GetWorkflowRunsParams {
     resourceId?: string;
 }
 type GetWorkflowRunsResponse = WorkflowRuns;
+type GetVNextWorkflowRunsResponse = VNextWorkflowRuns;
 type WorkflowRunResult = {
     activePaths: Record<string, {
         status: string;
@@ -231,6 +244,20 @@ interface GetNetworkResponse {
     };
     state?: Record<string, any>;
 }
+interface McpServerListResponse {
+    servers: ServerInfo[];
+    next: string | null;
+    total_count: number;
+}
+interface McpToolInfo {
+    id: string;
+    name: string;
+    description?: string;
+    inputSchema: string;
+}
+interface McpServerToolListResponse {
+    tools: McpToolInfo[];
+}
 
 declare class BaseResource {
     readonly options: ClientOptions;
@@ -312,7 +339,7 @@ declare class Agent extends BaseResource {
      */
     executeTool(toolId: string, params: {
         data: any;
-        runtimeContext?: RuntimeContext;
+        runtimeContext?: RuntimeContext$1;
     }): Promise<any>;
     /**
      * Retrieves evaluation results for the agent
@@ -534,7 +561,7 @@ declare class Tool extends BaseResource {
     execute(params: {
         data: any;
         runId?: string;
-        runtimeContext?: RuntimeContext;
+        runtimeContext?: RuntimeContext$1;
     }): Promise<any>;
 }
 
@@ -559,7 +586,7 @@ declare class VNextWorkflow extends BaseResource {
      * @param params - Parameters for filtering runs
      * @returns Promise containing vNext workflow runs array
      */
-    runs(params?: GetWorkflowRunsParams): Promise<GetWorkflowRunsResponse>;
+    runs(params?: GetWorkflowRunsParams): Promise<GetVNextWorkflowRunsResponse>;
     /**
      * Creates a new vNext workflow run
      * @param params - Optional object containing the optional runId
@@ -578,7 +605,7 @@ declare class VNextWorkflow extends BaseResource {
     start(params: {
         runId: string;
         inputData: Record<string, any>;
-        runtimeContext?: RuntimeContext$1;
+        runtimeContext?: RuntimeContext;
     }): Promise<{
         message: string;
     }>;
@@ -591,7 +618,7 @@ declare class VNextWorkflow extends BaseResource {
         step: string | string[];
         runId: string;
         resumeData?: Record<string, any>;
-        runtimeContext?: RuntimeContext$1;
+        runtimeContext?: RuntimeContext;
     }): Promise<{
         message: string;
     }>;
@@ -603,7 +630,7 @@ declare class VNextWorkflow extends BaseResource {
     startAsync(params: {
         runId?: string;
         inputData: Record<string, any>;
-        runtimeContext?: RuntimeContext$1;
+        runtimeContext?: RuntimeContext;
     }): Promise<VNextWorkflowRunResult>;
     /**
      * Resumes a suspended vNext workflow step asynchronously and returns a promise that resolves when the vNext workflow is complete
@@ -614,7 +641,7 @@ declare class VNextWorkflow extends BaseResource {
         runId: string;
         step: string | string[];
         resumeData?: Record<string, any>;
-        runtimeContext?: RuntimeContext$1;
+        runtimeContext?: RuntimeContext;
     }): Promise<VNextWorkflowRunResult>;
     /**
      * Watches vNext workflow transitions in real-time
@@ -667,6 +694,30 @@ declare class A2A extends BaseResource {
     sendAndSubscribe(params: TaskSendParams): Promise<Response>;
 }
 
+/**
+ * Represents a specific tool available on a specific MCP server.
+ * Provides methods to get details and execute the tool.
+ */
+declare class MCPTool extends BaseResource {
+    private serverId;
+    private toolId;
+    constructor(options: ClientOptions, serverId: string, toolId: string);
+    /**
+     * Retrieves details about this specific tool from the MCP server.
+     * @returns Promise containing the tool's information (name, description, schema).
+     */
+    details(): Promise<McpToolInfo>;
+    /**
+     * Executes this specific tool on the MCP server.
+     * @param params - Parameters for tool execution, including data/args and optional runtimeContext.
+     * @returns Promise containing the result of the tool execution.
+     */
+    execute(params: {
+        data?: any;
+        runtimeContext?: RuntimeContext;
+    }): Promise<any>;
+}
+
 declare class MastraClient extends BaseResource {
     constructor(options: ClientOptions);
     /**
@@ -789,6 +840,38 @@ declare class MastraClient extends BaseResource {
      * @returns Network instance
      */
     getNetwork(networkId: string): Network;
+    /**
+     * Retrieves a list of available MCP servers.
+     * @param params - Optional parameters for pagination (limit, offset).
+     * @returns Promise containing the list of MCP servers and pagination info.
+     */
+    getMcpServers(params?: {
+        limit?: number;
+        offset?: number;
+    }): Promise<McpServerListResponse>;
+    /**
+     * Retrieves detailed information for a specific MCP server.
+     * @param serverId - The ID of the MCP server to retrieve.
+     * @param params - Optional parameters, e.g., specific version.
+     * @returns Promise containing the detailed MCP server information.
+     */
+    getMcpServerDetails(serverId: string, params?: {
+        version?: string;
+    }): Promise<ServerDetailInfo>;
+    /**
+     * Retrieves a list of tools for a specific MCP server.
+     * @param serverId - The ID of the MCP server.
+     * @returns Promise containing the list of tools.
+     */
+    getMcpServerTools(serverId: string): Promise<McpServerToolListResponse>;
+    /**
+     * Gets an MCPTool resource instance for a specific tool on an MCP server.
+     * This instance can then be used to fetch details or execute the tool.
+     * @param serverId - The ID of the MCP server.
+     * @param toolId - The ID of the tool.
+     * @returns MCPTool instance.
+     */
+    getMcpServerTool(serverId: string, toolId: string): MCPTool;
     /**
      * Gets an A2A client for interacting with an agent via the A2A protocol
      * @param agentId - ID of the agent to interact with
@@ -797,4 +880,4 @@ declare class MastraClient extends BaseResource {
     getA2A(agentId: string): A2A;
 }
 
-export { type ClientOptions, type CreateIndexParams, type CreateMemoryThreadParams, type CreateMemoryThreadResponse, type GenerateParams, type GetAgentResponse, type GetEvalsByAgentIdResponse, type GetLogParams, type GetLogsParams, type GetLogsResponse, type GetMemoryThreadMessagesParams, type GetMemoryThreadMessagesResponse, type GetMemoryThreadParams, type GetMemoryThreadResponse, type GetNetworkResponse, type GetTelemetryParams, type GetTelemetryResponse, type GetToolResponse, type GetVNextWorkflowResponse, type GetVectorIndexResponse, type GetWorkflowResponse, type GetWorkflowRunsParams, type GetWorkflowRunsResponse, MastraClient, type QueryVectorParams, type QueryVectorResponse, type RequestFunction, type RequestOptions, type SaveMessageToMemoryParams, type SaveMessageToMemoryResponse, type StreamParams, type UpdateMemoryThreadParams, type UpsertVectorParams, type VNextWorkflowRunResult, type VNextWorkflowWatchResult, type WorkflowRunResult };
+export { type ClientOptions, type CreateIndexParams, type CreateMemoryThreadParams, type CreateMemoryThreadResponse, type GenerateParams, type GetAgentResponse, type GetEvalsByAgentIdResponse, type GetLogParams, type GetLogsParams, type GetLogsResponse, type GetMemoryThreadMessagesParams, type GetMemoryThreadMessagesResponse, type GetMemoryThreadParams, type GetMemoryThreadResponse, type GetNetworkResponse, type GetTelemetryParams, type GetTelemetryResponse, type GetToolResponse, type GetVNextWorkflowResponse, type GetVNextWorkflowRunsResponse, type GetVectorIndexResponse, type GetWorkflowResponse, type GetWorkflowRunsParams, type GetWorkflowRunsResponse, MastraClient, type McpServerListResponse, type McpServerToolListResponse, type McpToolInfo, type QueryVectorParams, type QueryVectorResponse, type RequestFunction, type RequestOptions, type SaveMessageToMemoryParams, type SaveMessageToMemoryResponse, type StreamParams, type UpdateMemoryThreadParams, type UpsertVectorParams, type VNextWorkflowRunResult, type VNextWorkflowWatchResult, type WorkflowRunResult };

package/dist/index.js

@@ -214,7 +214,7 @@ var BaseResource = class {
     let delay = backoffMs;
     for (let attempt = 0; attempt <= retries; attempt++) {
       try {
-        const response = await fetch(`${baseUrl}${path}`, {
+        const response = await fetch(`${baseUrl.replace(/\/$/, "")}${path}`, {
           ...options,
           headers: {
             ...headers,
@@ -325,8 +325,8 @@ var Agent = class extends BaseResource {
   generate(params) {
     const processedParams = {
       ...params,
-      output: zodToJsonSchema(params.output),
-      experimental_output: zodToJsonSchema(params.experimental_output),
+      output: params.output ? zodToJsonSchema(params.output) : void 0,
+      experimental_output: params.experimental_output ? zodToJsonSchema(params.experimental_output) : void 0,
       runtimeContext: params.runtimeContext ? Object.fromEntries(params.runtimeContext.entries()) : void 0
     };
     return this.request(`/api/agents/${this.agentId}/generate`, {
@@ -342,8 +342,8 @@ var Agent = class extends BaseResource {
   async stream(params) {
     const processedParams = {
       ...params,
-      output: zodToJsonSchema(params.output),
-      experimental_output: zodToJsonSchema(params.experimental_output),
+      output: params.output ? zodToJsonSchema(params.output) : void 0,
+      experimental_output: params.experimental_output ? zodToJsonSchema(params.experimental_output) : void 0,
       runtimeContext: params.runtimeContext ? Object.fromEntries(params.runtimeContext.entries()) : void 0
     };
     const response = await this.request(`/api/agents/${this.agentId}/stream`, {
@@ -798,6 +798,8 @@ var Tool = class extends BaseResource {
     });
   }
 };
+
+// src/resources/vnext-workflow.ts
 var RECORD_SEPARATOR2 = "";
 var VNextWorkflow = class extends BaseResource {
   constructor(options, workflowId) {
@@ -1059,6 +1061,40 @@ var A2A = class extends BaseResource {
   }
 };
 
+// src/resources/mcp-tool.ts
+var MCPTool = class extends BaseResource {
+  serverId;
+  toolId;
+  constructor(options, serverId, toolId) {
+    super(options);
+    this.serverId = serverId;
+    this.toolId = toolId;
+  }
+  /**
+   * Retrieves details about this specific tool from the MCP server.
+   * @returns Promise containing the tool's information (name, description, schema).
+   */
+  details() {
+    return this.request(`/api/mcp/${this.serverId}/tools/${this.toolId}`);
+  }
+  /**
+   * Executes this specific tool on the MCP server.
+   * @param params - Parameters for tool execution, including data/args and optional runtimeContext.
+   * @returns Promise containing the result of the tool execution.
+   */
+  execute(params) {
+    const body = {};
+    if (params.data !== void 0) body.data = params.data;
+    if (params.runtimeContext !== void 0) {
+      body.runtimeContext = params.runtimeContext;
+    }
+    return this.request(`/api/mcp/${this.serverId}/tools/${this.toolId}/execute`, {
+      method: "POST",
+      body: Object.keys(body).length > 0 ? body : void 0
+    });
+  }
+};
+
 // src/client.ts
 var MastraClient = class extends BaseResource {
   constructor(options) {
@@ -1269,6 +1305,54 @@ var MastraClient = class extends BaseResource {
   getNetwork(networkId) {
     return new Network(this.options, networkId);
   }
+  /**
+   * Retrieves a list of available MCP servers.
+   * @param params - Optional parameters for pagination (limit, offset).
+   * @returns Promise containing the list of MCP servers and pagination info.
+   */
+  getMcpServers(params) {
+    const searchParams = new URLSearchParams();
+    if (params?.limit !== void 0) {
+      searchParams.set("limit", String(params.limit));
+    }
+    if (params?.offset !== void 0) {
+      searchParams.set("offset", String(params.offset));
+    }
+    const queryString = searchParams.toString();
+    return this.request(`/api/mcp/v0/servers${queryString ? `?${queryString}` : ""}`);
+  }
+  /**
+   * Retrieves detailed information for a specific MCP server.
+   * @param serverId - The ID of the MCP server to retrieve.
+   * @param params - Optional parameters, e.g., specific version.
+   * @returns Promise containing the detailed MCP server information.
+   */
+  getMcpServerDetails(serverId, params) {
+    const searchParams = new URLSearchParams();
+    if (params?.version) {
+      searchParams.set("version", params.version);
+    }
+    const queryString = searchParams.toString();
+    return this.request(`/api/mcp/v0/servers/${serverId}${queryString ? `?${queryString}` : ""}`);
+  }
+  /**
+   * Retrieves a list of tools for a specific MCP server.
+   * @param serverId - The ID of the MCP server.
+   * @returns Promise containing the list of tools.
+   */
+  getMcpServerTools(serverId) {
+    return this.request(`/api/mcp/${serverId}/tools`);
+  }
+  /**
+   * Gets an MCPTool resource instance for a specific tool on an MCP server.
+   * This instance can then be used to fetch details or execute the tool.
+   * @param serverId - The ID of the MCP server.
+   * @param toolId - The ID of the tool.
+   * @returns MCPTool instance.
+   */
+  getMcpServerTool(serverId, toolId) {
+    return new MCPTool(this.options, serverId, toolId);
+  }
   /**
    * Gets an A2A client for interacting with an agent via the A2A protocol
    * @param agentId - ID of the agent to interact with

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/client-js",
-  "version": "0.1.22-alpha.4",
+  "version": "0.1.23-alpha.0",
   "description": "The official TypeScript library for the Mastra Client API",
   "author": "",
   "type": "module",
@@ -28,7 +28,7 @@
     "rxjs": "7.8.1",
     "zod": "^3.24.3",
     "zod-to-json-schema": "^3.24.5",
-    "@mastra/core": "^0.9.4-alpha.4"
+    "@mastra/core": "^0.9.5-alpha.0"
   },
   "peerDependencies": {
     "zod": "^3.0.0"
@@ -42,7 +42,7 @@
     "tsup": "^8.4.0",
     "typescript": "^5.8.2",
     "vitest": "^3.1.2",
-    "@internal/lint": "0.0.4"
+    "@internal/lint": "0.0.5"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts --clean --treeshake=smallest --splitting",

package/src/client.ts

@@ -1,6 +1,17 @@
 import type { AbstractAgent } from '@ag-ui/client';
 import { AGUIAdapter } from './adapters/agui';
-import { Agent, MemoryThread, Tool, Workflow, Vector, BaseResource, Network, VNextWorkflow, A2A } from './resources';
+import {
+  Agent,
+  MemoryThread,
+  Tool,
+  Workflow,
+  Vector,
+  BaseResource,
+  Network,
+  VNextWorkflow,
+  A2A,
+  MCPTool,
+} from './resources';
 import type {
   ClientOptions,
   CreateMemoryThreadParams,
@@ -19,7 +30,11 @@ import type {
   GetWorkflowResponse,
   SaveMessageToMemoryParams,
   SaveMessageToMemoryResponse,
+  McpServerListResponse,
+  McpServerToolListResponse,
+  McpToolInfo,
 } from './types';
+import type { ServerDetailInfo } from '@mastra/core/mcp';
 
 export class MastraClient extends BaseResource {
   constructor(options: ClientOptions) {
@@ -257,6 +272,58 @@ export class MastraClient extends BaseResource {
     return new Network(this.options, networkId);
   }
 
+  /**
+   * Retrieves a list of available MCP servers.
+   * @param params - Optional parameters for pagination (limit, offset).
+   * @returns Promise containing the list of MCP servers and pagination info.
+   */
+  public getMcpServers(params?: { limit?: number; offset?: number }): Promise<McpServerListResponse> {
+    const searchParams = new URLSearchParams();
+    if (params?.limit !== undefined) {
+      searchParams.set('limit', String(params.limit));
+    }
+    if (params?.offset !== undefined) {
+      searchParams.set('offset', String(params.offset));
+    }
+    const queryString = searchParams.toString();
+    return this.request(`/api/mcp/v0/servers${queryString ? `?${queryString}` : ''}`);
+  }
+
+  /**
+   * Retrieves detailed information for a specific MCP server.
+   * @param serverId - The ID of the MCP server to retrieve.
+   * @param params - Optional parameters, e.g., specific version.
+   * @returns Promise containing the detailed MCP server information.
+   */
+  public getMcpServerDetails(serverId: string, params?: { version?: string }): Promise<ServerDetailInfo> {
+    const searchParams = new URLSearchParams();
+    if (params?.version) {
+      searchParams.set('version', params.version);
+    }
+    const queryString = searchParams.toString();
+    return this.request(`/api/mcp/v0/servers/${serverId}${queryString ? `?${queryString}` : ''}`);
+  }
+
+  /**
+   * Retrieves a list of tools for a specific MCP server.
+   * @param serverId - The ID of the MCP server.
+   * @returns Promise containing the list of tools.
+   */
+  public getMcpServerTools(serverId: string): Promise<McpServerToolListResponse> {
+    return this.request(`/api/mcp/${serverId}/tools`);
+  }
+
+  /**
+   * Gets an MCPTool resource instance for a specific tool on an MCP server.
+   * This instance can then be used to fetch details or execute the tool.
+   * @param serverId - The ID of the MCP server.
+   * @param toolId - The ID of the tool.
+   * @returns MCPTool instance.
+   */
+  public getMcpServerTool(serverId: string, toolId: string): MCPTool {
+    return new MCPTool(this.options, serverId, toolId);
+  }
+
   /**
    * Gets an A2A client for interacting with an agent via the A2A protocol
    * @param agentId - ID of the agent to interact with

package/src/example.ts

@@ -1,40 +1,39 @@
-// import { MastraClient } from './client';
+import { MastraClient } from './client';
 // import type { WorkflowRunResult } from './types';
 
 // Agent
 
-// (async () => {
-//   const client = new MastraClient({
-//     baseUrl: 'http://localhost:4111',
-//   });
+(async () => {
+  const client = new MastraClient({
+    baseUrl: 'http://localhost:4111',
+  });
 
-//   console.log('Starting agent...');
+  console.log('Starting agent...');
 
-//   try {
-//     const agent = client.getAgent('weatherAgent');
-//     const response = await agent.stream({
-//       messages: 'what is the weather in new york?',
-//     })
+  try {
+    const agent = client.getAgent('weatherAgent');
+    const response = await agent.stream({
+      messages: 'what is the weather in new york?',
+    });
 
-//     response.processDataStream({
-//       onTextPart: (text) => {
-//         process.stdout.write(text);
-//       },
-//       onFilePart: (file) => {
-//         console.log(file);
-//       },
-//       onDataPart: (data) => {
-//         console.log(data);
-//       },
-//       onErrorPart: (error) => {
-//         console.error(error);
-//       },
-//     });
-
-//   } catch (error) {
-//     console.error(error);
-//   }
-// })();
+    response.processDataStream({
+      onTextPart: text => {
+        process.stdout.write(text);
+      },
+      onFilePart: file => {
+        console.log(file);
+      },
+      onDataPart: data => {
+        console.log(data);
+      },
+      onErrorPart: error => {
+        console.error(error);
+      },
+    });
+  } catch (error) {
+    console.error(error);
+  }
+})();
 
 // Workflow
 // (async () => {

package/src/index.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, beforeEach, it, vi } from 'vitest';
-
 import { MastraClient } from './client';
+import type { McpServerListResponse, ServerDetailInfo } from './types';
 
 // Mock fetch globally
 global.fetch = vi.fn();
@@ -737,4 +737,94 @@ describe('MastraClient Resources', () => {
       );
     });
   });
+
+  describe('MCP Server Registry Client Methods', () => {
+    const mockServerInfo1 = {
+      id: 'mcp-server-1',
+      name: 'Test MCP Server 1',
+      version_detail: { version: '1.0.0', release_date: '2023-01-01T00:00:00Z', is_latest: true },
+    };
+    const mockServerInfo2 = {
+      id: 'mcp-server-2',
+      name: 'Test MCP Server 2',
+      version_detail: { version: '1.1.0', release_date: '2023-02-01T00:00:00Z', is_latest: true },
+    };
+
+    const mockServerDetail1: ServerDetailInfo = {
+      ...mockServerInfo1,
+      description: 'Detailed description for server 1',
+      package_canonical: 'npm',
+      packages: [{ registry_name: 'npm', name: '@example/server1', version: '1.0.0' }],
+      remotes: [{ transport_type: 'sse', url: 'http://localhost/sse1' }],
+    };
+
+    describe('getMcpServers()', () => {
+      it('should fetch a list of MCP servers', async () => {
+        const mockResponse: McpServerListResponse = {
+          servers: [mockServerInfo1, mockServerInfo2],
+          total_count: 2,
+          next: null,
+        };
+        mockFetchResponse(mockResponse);
+
+        const result = await client.getMcpServers();
+        expect(result).toEqual(mockResponse);
+        expect(global.fetch).toHaveBeenCalledWith(
+          `${clientOptions.baseUrl}/api/mcp/v0/servers`,
+          expect.objectContaining({
+            headers: expect.objectContaining(clientOptions.headers),
+          }),
+        );
+      });
+
+      it('should fetch MCP servers with limit and offset parameters', async () => {
+        const mockResponse: McpServerListResponse = {
+          servers: [mockServerInfo1],
+          total_count: 2,
+          next: '/api/mcp/v0/servers?limit=1&offset=1',
+        };
+        mockFetchResponse(mockResponse);
+
+        const result = await client.getMcpServers({ limit: 1, offset: 0 });
+        expect(result).toEqual(mockResponse);
+        expect(global.fetch).toHaveBeenCalledWith(
+          `${clientOptions.baseUrl}/api/mcp/v0/servers?limit=1&offset=0`,
+          expect.objectContaining({
+            headers: expect.objectContaining(clientOptions.headers),
+          }),
+        );
+      });
+    });
+
+    describe('getMcpServerDetails()', () => {
+      const serverId = 'mcp-server-1';
+
+      it('should fetch details for a specific MCP server', async () => {
+        mockFetchResponse(mockServerDetail1);
+
+        const result = await client.getMcpServerDetails(serverId);
+        expect(result).toEqual(mockServerDetail1);
+        expect(global.fetch).toHaveBeenCalledWith(
+          `${clientOptions.baseUrl}/api/mcp/v0/servers/${serverId}`,
+          expect.objectContaining({
+            headers: expect.objectContaining(clientOptions.headers),
+          }),
+        );
+      });
+
+      it('should fetch MCP server details with a version parameter', async () => {
+        mockFetchResponse(mockServerDetail1);
+        const version = '1.0.0';
+
+        const result = await client.getMcpServerDetails(serverId, { version });
+        expect(result).toEqual(mockServerDetail1);
+        expect(global.fetch).toHaveBeenCalledWith(
+          `${clientOptions.baseUrl}/api/mcp/v0/servers/${serverId}?version=${version}`,
+          expect.objectContaining({
+            headers: expect.objectContaining(clientOptions.headers),
+          }),
+        );
+      });
+    });
+  });
 });

package/src/resources/agent.ts

@@ -100,8 +100,8 @@ export class Agent extends BaseResource {
   ): Promise<GenerateReturn<T>> {
     const processedParams = {
       ...params,
-      output: zodToJsonSchema(params.output),
-      experimental_output: zodToJsonSchema(params.experimental_output),
+      output: params.output ? zodToJsonSchema(params.output) : undefined,
+      experimental_output: params.experimental_output ? zodToJsonSchema(params.experimental_output) : undefined,
       runtimeContext: params.runtimeContext ? Object.fromEntries(params.runtimeContext.entries()) : undefined,
     };
 
@@ -125,8 +125,8 @@ export class Agent extends BaseResource {
   > {
     const processedParams = {
       ...params,
-      output: zodToJsonSchema(params.output),
-      experimental_output: zodToJsonSchema(params.experimental_output),
+      output: params.output ? zodToJsonSchema(params.output) : undefined,
+      experimental_output: params.experimental_output ? zodToJsonSchema(params.experimental_output) : undefined,
       runtimeContext: params.runtimeContext ? Object.fromEntries(params.runtimeContext.entries()) : undefined,
     };
 

package/src/resources/base.ts

@@ -21,7 +21,7 @@ export class BaseResource {
 
     for (let attempt = 0; attempt <= retries; attempt++) {
       try {
-        const response = await fetch(`${baseUrl}${path}`, {
+        const response = await fetch(`${baseUrl.replace(/\/$/, '')}${path}`, {
           ...options,
           headers: {
             ...headers,

package/src/resources/index.ts

@@ -7,3 +7,4 @@ export * from './tool';
 export * from './base';
 export * from './vnext-workflow';
 export * from './a2a';
+export * from './mcp-tool';

package/src/resources/mcp-tool.ts

@@ -0,0 +1,48 @@
+import type { RuntimeContext } from '@mastra/core/runtime-context';
+import type { ClientOptions, McpToolInfo } from '../types';
+import { BaseResource } from './base';
+
+/**
+ * Represents a specific tool available on a specific MCP server.
+ * Provides methods to get details and execute the tool.
+ */
+export class MCPTool extends BaseResource {
+  private serverId: string;
+  private toolId: string;
+
+  constructor(options: ClientOptions, serverId: string, toolId: string) {
+    super(options);
+    this.serverId = serverId;
+    this.toolId = toolId;
+  }
+
+  /**
+   * Retrieves details about this specific tool from the MCP server.
+   * @returns Promise containing the tool's information (name, description, schema).
+   */
+  details(): Promise<McpToolInfo> {
+    return this.request(`/api/mcp/${this.serverId}/tools/${this.toolId}`);
+  }
+
+  /**
+   * Executes this specific tool on the MCP server.
+   * @param params - Parameters for tool execution, including data/args and optional runtimeContext.
+   * @returns Promise containing the result of the tool execution.
+   */
+  execute(params: { data?: any; runtimeContext?: RuntimeContext }): Promise<any> {
+    const body: any = {};
+    if (params.data !== undefined) body.data = params.data;
+    // If none of data, args the body might be empty or just contain runtimeContext.
+    // The handler will look for these, so an empty args object might be appropriate if that's the intent.
+    // else body.data = {}; // Or let it be empty if no specific input fields are used
+
+    if (params.runtimeContext !== undefined) {
+      body.runtimeContext = params.runtimeContext;
+    }
+
+    return this.request(`/api/mcp/${this.serverId}/tools/${this.toolId}/execute`, {
+      method: 'POST',
+      body: Object.keys(body).length > 0 ? body : undefined,
+    });
+  }
+}

package/src/resources/vnext-workflow.ts

@@ -1,9 +1,9 @@
-import { RuntimeContext } from '@mastra/core/runtime-context';
+import type { RuntimeContext } from '@mastra/core/runtime-context';
 import type {
   ClientOptions,
   GetVNextWorkflowResponse,
+  GetVNextWorkflowRunsResponse,
   GetWorkflowRunsParams,
-  GetWorkflowRunsResponse,
   VNextWorkflowRunResult,
   VNextWorkflowWatchResult,
 } from '../types';
@@ -104,7 +104,7 @@ export class VNextWorkflow extends BaseResource {
    * @param params - Parameters for filtering runs
    * @returns Promise containing vNext workflow runs array
    */
-  runs(params?: GetWorkflowRunsParams): Promise<GetWorkflowRunsResponse> {
+  runs(params?: GetWorkflowRunsParams): Promise<GetVNextWorkflowRunsResponse> {
     const searchParams = new URLSearchParams();
     if (params?.fromDate) {
       searchParams.set('fromDate', params.fromDate.toISOString());

package/src/types.ts

@@ -8,10 +8,13 @@ import type {
   StorageThreadType,
   BaseLogMessage,
   WorkflowRunResult as CoreWorkflowRunResult,
+  VNextWorkflowRuns,
   WorkflowRuns,
 } from '@mastra/core';
 
 import type { AgentGenerateOptions, AgentStreamOptions } from '@mastra/core/agent';
+import type { RuntimeContext } from '@mastra/core/runtime-context';
+import type { ServerInfo } from '@mastra/core/mcp';
 import type { NewWorkflow, WatchEvent, WorkflowResult as VNextWorkflowResult } from '@mastra/core/workflows/vNext';
 import type { JSONSchema7 } from 'json-schema';
 import type { ZodSchema } from 'zod';
@@ -38,6 +41,16 @@ export interface RequestOptions {
   signal?: AbortSignal;
 }
 
+type WithoutMethods<T> = {
+  [K in keyof T as T[K] extends (...args: any[]) => any
+    ? never
+    : T[K] extends { (): any }
+      ? never
+      : T[K] extends undefined | ((...args: any[]) => any)
+        ? never
+        : K]: T[K];
+};
+
 export interface GetAgentResponse {
   name: string;
   instructions: string;
@@ -49,11 +62,17 @@ export interface GetAgentResponse {
 
 export type GenerateParams<T extends JSONSchema7 | ZodSchema | undefined = undefined> = {
   messages: string | string[] | CoreMessage[] | AiMessageType[];
-} & Partial<Omit<AgentGenerateOptions<T>, 'experimental_generateMessageId'>>;
+  output?: T;
+  experimental_output?: T;
+  runtimeContext?: RuntimeContext;
+} & WithoutMethods<Omit<AgentGenerateOptions<T>, 'output' | 'experimental_output' | 'runtimeContext'>>;
 
 export type StreamParams<T extends JSONSchema7 | ZodSchema | undefined = undefined> = {
   messages: string | string[] | CoreMessage[] | AiMessageType[];
-} & Omit<AgentStreamOptions<T>, 'onFinish' | 'onStepFinish' | 'telemetry' | 'experimental_generateMessageId'>;
+  output?: T;
+  experimental_output?: T;
+  runtimeContext?: RuntimeContext;
+} & WithoutMethods<Omit<AgentStreamOptions<T>, 'output' | 'experimental_output' | 'runtimeContext'>>;
 
 export interface GetEvalsByAgentIdResponse extends GetAgentResponse {
   evals: any[];
@@ -88,6 +107,8 @@ export interface GetWorkflowRunsParams {
 
 export type GetWorkflowRunsResponse = WorkflowRuns;
 
+export type GetVNextWorkflowRunsResponse = VNextWorkflowRuns;
+
 export type WorkflowRunResult = {
   activePaths: Record<string, { status: string; suspendPayload?: any; stepPath: string[] }>;
   results: CoreWorkflowRunResult<any, any, any>['results'];
@@ -268,3 +289,20 @@ export interface GetNetworkResponse {
   };
   state?: Record<string, any>;
 }
+
+export interface McpServerListResponse {
+  servers: ServerInfo[];
+  next: string | null;
+  total_count: number;
+}
+
+export interface McpToolInfo {
+  id: string;
+  name: string;
+  description?: string;
+  inputSchema: string;
+}
+
+export interface McpServerToolListResponse {
+  tools: McpToolInfo[];
+}