@mastra/client-js 0.1.22 → 0.2.0-alpha.1

package/dist/index.js

@@ -3,6 +3,7 @@ import { Observable } from 'rxjs';
 import { processDataStream } from '@ai-sdk/ui-utils';
 import { ZodSchema } from 'zod';
 import originalZodToJsonSchema from 'zod-to-json-schema';
+import { RuntimeContext } from '@mastra/core/runtime-context';
 
 // src/adapters/agui.ts
 var AGUIAdapter = class extends AbstractAgent {
@@ -214,7 +215,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,
@@ -254,6 +255,15 @@ var BaseResource = class {
     throw lastError || new Error("Request failed");
   }
 };
+function parseClientRuntimeContext(runtimeContext) {
+  if (runtimeContext) {
+    if (runtimeContext instanceof RuntimeContext) {
+      return Object.fromEntries(runtimeContext.entries());
+    }
+    return runtimeContext;
+  }
+  return void 0;
+}
 
 // src/resources/agent.ts
 var AgentVoice = class extends BaseResource {
@@ -325,9 +335,9 @@ var Agent = class extends BaseResource {
   generate(params) {
     const processedParams = {
       ...params,
-      output: zodToJsonSchema(params.output),
-      experimental_output: zodToJsonSchema(params.experimental_output),
-      runtimeContext: params.runtimeContext ? Object.fromEntries(params.runtimeContext.entries()) : void 0
+      output: params.output ? zodToJsonSchema(params.output) : void 0,
+      experimental_output: params.experimental_output ? zodToJsonSchema(params.experimental_output) : void 0,
+      runtimeContext: parseClientRuntimeContext(params.runtimeContext)
     };
     return this.request(`/api/agents/${this.agentId}/generate`, {
       method: "POST",
@@ -342,9 +352,9 @@ var Agent = class extends BaseResource {
   async stream(params) {
     const processedParams = {
       ...params,
-      output: zodToJsonSchema(params.output),
-      experimental_output: zodToJsonSchema(params.experimental_output),
-      runtimeContext: params.runtimeContext ? Object.fromEntries(params.runtimeContext.entries()) : void 0
+      output: params.output ? zodToJsonSchema(params.output) : void 0,
+      experimental_output: params.experimental_output ? zodToJsonSchema(params.experimental_output) : void 0,
+      runtimeContext: parseClientRuntimeContext(params.runtimeContext)
     };
     const response = await this.request(`/api/agents/${this.agentId}/stream`, {
       method: "POST",
@@ -572,24 +582,24 @@ var Vector = class extends BaseResource {
   }
 };
 
-// src/resources/workflow.ts
+// src/resources/legacy-workflow.ts
 var RECORD_SEPARATOR = "";
-var Workflow = class extends BaseResource {
+var LegacyWorkflow = class extends BaseResource {
   constructor(options, workflowId) {
     super(options);
     this.workflowId = workflowId;
   }
   /**
-   * Retrieves details about the workflow
-   * @returns Promise containing workflow details including steps and graphs
+   * Retrieves details about the legacy workflow
+   * @returns Promise containing legacy workflow details including steps and graphs
    */
   details() {
-    return this.request(`/api/workflows/${this.workflowId}`);
+    return this.request(`/api/workflows/legacy/${this.workflowId}`);
   }
   /**
-   * Retrieves all runs for a workflow
+   * Retrieves all runs for a legacy workflow
    * @param params - Parameters for filtering runs
-   * @returns Promise containing workflow runs array
+   * @returns Promise containing legacy workflow runs array
    */
   runs(params) {
     const searchParams = new URLSearchParams();
@@ -609,25 +619,13 @@ var Workflow = class extends BaseResource {
       searchParams.set("resourceId", params.resourceId);
     }
     if (searchParams.size) {
-      return this.request(`/api/workflows/${this.workflowId}/runs?${searchParams}`);
+      return this.request(`/api/workflows/legacy/${this.workflowId}/runs?${searchParams}`);
     } else {
-      return this.request(`/api/workflows/${this.workflowId}/runs`);
+      return this.request(`/api/workflows/legacy/${this.workflowId}/runs`);
     }
   }
   /**
-   * @deprecated Use `startAsync` instead
-   * Executes the workflow with the provided parameters
-   * @param params - Parameters required for workflow execution
-   * @returns Promise containing the workflow execution results
-   */
-  execute(params) {
-    return this.request(`/api/workflows/${this.workflowId}/execute`, {
-      method: "POST",
-      body: params
-    });
-  }
-  /**
-   * Creates a new workflow run
+   * Creates a new legacy workflow run
    * @returns Promise containing the generated run ID
    */
   createRun(params) {
@@ -635,34 +633,34 @@ var Workflow = class extends BaseResource {
     if (!!params?.runId) {
       searchParams.set("runId", params.runId);
     }
-    return this.request(`/api/workflows/${this.workflowId}/createRun?${searchParams.toString()}`, {
+    return this.request(`/api/workflows/legacy/${this.workflowId}/create-run?${searchParams.toString()}`, {
       method: "POST"
     });
   }
   /**
-   * Starts a workflow run synchronously without waiting for the workflow to complete
+   * Starts a legacy workflow run synchronously without waiting for the workflow to complete
    * @param params - Object containing the runId and triggerData
    * @returns Promise containing success message
    */
   start(params) {
-    return this.request(`/api/workflows/${this.workflowId}/start?runId=${params.runId}`, {
+    return this.request(`/api/workflows/legacy/${this.workflowId}/start?runId=${params.runId}`, {
       method: "POST",
       body: params?.triggerData
     });
   }
   /**
-   * Resumes a suspended workflow step synchronously without waiting for the workflow to complete
+   * Resumes a suspended legacy workflow step synchronously without waiting for the workflow to complete
    * @param stepId - ID of the step to resume
-   * @param runId - ID of the workflow run
-   * @param context - Context to resume the workflow with
-   * @returns Promise containing the workflow resume results
+   * @param runId - ID of the legacy workflow run
+   * @param context - Context to resume the legacy workflow with
+   * @returns Promise containing the legacy workflow resume results
    */
   resume({
     stepId,
     runId,
     context
   }) {
-    return this.request(`/api/workflows/${this.workflowId}/resume?runId=${runId}`, {
+    return this.request(`/api/workflows/legacy/${this.workflowId}/resume?runId=${runId}`, {
       method: "POST",
       body: {
         stepId,
@@ -680,18 +678,18 @@ var Workflow = class extends BaseResource {
     if (!!params?.runId) {
       searchParams.set("runId", params.runId);
     }
-    return this.request(`/api/workflows/${this.workflowId}/start-async?${searchParams.toString()}`, {
+    return this.request(`/api/workflows/legacy/${this.workflowId}/start-async?${searchParams.toString()}`, {
       method: "POST",
       body: params?.triggerData
     });
   }
   /**
-   * Resumes a suspended workflow step asynchronously and returns a promise that resolves when the workflow is complete
+   * Resumes a suspended legacy workflow step asynchronously and returns a promise that resolves when the workflow is complete
    * @param params - Object containing the runId, stepId, and context
    * @returns Promise containing the workflow resume results
    */
   resumeAsync(params) {
-    return this.request(`/api/workflows/${this.workflowId}/resume-async?runId=${params.runId}`, {
+    return this.request(`/api/workflows/legacy/${this.workflowId}/resume-async?runId=${params.runId}`, {
       method: "POST",
       body: {
         stepId: params.stepId,
@@ -745,16 +743,16 @@ var Workflow = class extends BaseResource {
     }
   }
   /**
-   * Watches workflow transitions in real-time
+   * Watches legacy workflow transitions in real-time
    * @param runId - Optional run ID to filter the watch stream
-   * @returns AsyncGenerator that yields parsed records from the workflow watch stream
+   * @returns AsyncGenerator that yields parsed records from the legacy workflow watch stream
    */
   async watch({ runId }, onRecord) {
-    const response = await this.request(`/api/workflows/${this.workflowId}/watch?runId=${runId}`, {
+    const response = await this.request(`/api/workflows/legacy/${this.workflowId}/watch?runId=${runId}`, {
       stream: true
     });
     if (!response.ok) {
-      throw new Error(`Failed to watch workflow: ${response.statusText}`);
+      throw new Error(`Failed to watch legacy workflow: ${response.statusText}`);
     }
     if (!response.body) {
       throw new Error("Response body is null");
@@ -790,7 +788,7 @@ var Tool = class extends BaseResource {
     }
     const body = {
       data: params.data,
-      runtimeContext: params.runtimeContext ? Object.fromEntries(params.runtimeContext.entries()) : void 0
+      runtimeContext: parseClientRuntimeContext(params.runtimeContext)
     };
     return this.request(`/api/tools/${this.toolId}/execute?${url.toString()}`, {
       method: "POST",
@@ -798,14 +796,16 @@ var Tool = class extends BaseResource {
     });
   }
 };
+
+// src/resources/workflow.ts
 var RECORD_SEPARATOR2 = "";
-var VNextWorkflow = class extends BaseResource {
+var Workflow = class extends BaseResource {
   constructor(options, workflowId) {
     super(options);
     this.workflowId = workflowId;
   }
   /**
-   * Creates an async generator that processes a readable stream and yields vNext workflow records
+   * Creates an async generator that processes a readable stream and yields workflow records
    * separated by the Record Separator character (\x1E)
    *
    * @param stream - The readable stream to process
@@ -850,16 +850,16 @@ var VNextWorkflow = class extends BaseResource {
     }
   }
   /**
-   * Retrieves details about the vNext workflow
-   * @returns Promise containing vNext workflow details including steps and graphs
+   * Retrieves details about the workflow
+   * @returns Promise containing workflow details including steps and graphs
    */
   details() {
-    return this.request(`/api/workflows/v-next/${this.workflowId}`);
+    return this.request(`/api/workflows/${this.workflowId}`);
   }
   /**
-   * Retrieves all runs for a vNext workflow
+   * Retrieves all runs for a workflow
    * @param params - Parameters for filtering runs
-   * @returns Promise containing vNext workflow runs array
+   * @returns Promise containing workflow runs array
    */
   runs(params) {
     const searchParams = new URLSearchParams();
@@ -879,13 +879,13 @@ var VNextWorkflow = class extends BaseResource {
       searchParams.set("resourceId", params.resourceId);
     }
     if (searchParams.size) {
-      return this.request(`/api/workflows/v-next/${this.workflowId}/runs?${searchParams}`);
+      return this.request(`/api/workflows/${this.workflowId}/runs?${searchParams}`);
     } else {
-      return this.request(`/api/workflows/v-next/${this.workflowId}/runs`);
+      return this.request(`/api/workflows/${this.workflowId}/runs`);
     }
   }
   /**
-   * Creates a new vNext workflow run
+   * Creates a new workflow run
    * @param params - Optional object containing the optional runId
    * @returns Promise containing the runId of the created run
    */
@@ -894,24 +894,24 @@ var VNextWorkflow = class extends BaseResource {
     if (!!params?.runId) {
       searchParams.set("runId", params.runId);
     }
-    return this.request(`/api/workflows/v-next/${this.workflowId}/create-run?${searchParams.toString()}`, {
+    return this.request(`/api/workflows/${this.workflowId}/create-run?${searchParams.toString()}`, {
       method: "POST"
     });
   }
   /**
-   * Starts a vNext workflow run synchronously without waiting for the workflow to complete
+   * Starts a workflow run synchronously without waiting for the workflow to complete
    * @param params - Object containing the runId, inputData and runtimeContext
    * @returns Promise containing success message
    */
   start(params) {
-    const runtimeContext = params.runtimeContext ? Object.fromEntries(params.runtimeContext.entries()) : void 0;
-    return this.request(`/api/workflows/v-next/${this.workflowId}/start?runId=${params.runId}`, {
+    const runtimeContext = parseClientRuntimeContext(params.runtimeContext);
+    return this.request(`/api/workflows/${this.workflowId}/start?runId=${params.runId}`, {
       method: "POST",
       body: { inputData: params?.inputData, runtimeContext }
     });
   }
   /**
-   * Resumes a suspended vNext workflow step synchronously without waiting for the vNext workflow to complete
+   * Resumes a suspended workflow step synchronously without waiting for the workflow to complete
    * @param params - Object containing the runId, step, resumeData and runtimeContext
    * @returns Promise containing success message
    */
@@ -921,8 +921,8 @@ var VNextWorkflow = class extends BaseResource {
     resumeData,
     ...rest
   }) {
-    const runtimeContext = rest.runtimeContext ? Object.fromEntries(rest.runtimeContext.entries()) : void 0;
-    return this.request(`/api/workflows/v-next/${this.workflowId}/resume?runId=${runId}`, {
+    const runtimeContext = parseClientRuntimeContext(rest.runtimeContext);
+    return this.request(`/api/workflows/${this.workflowId}/resume?runId=${runId}`, {
       method: "POST",
       stream: true,
       body: {
@@ -933,29 +933,29 @@ var VNextWorkflow = class extends BaseResource {
     });
   }
   /**
-   * Starts a vNext workflow run asynchronously and returns a promise that resolves when the vNext workflow is complete
+   * Starts a workflow run asynchronously and returns a promise that resolves when the workflow is complete
    * @param params - Object containing the optional runId, inputData and runtimeContext
-   * @returns Promise containing the vNext workflow execution results
+   * @returns Promise containing the workflow execution results
    */
   startAsync(params) {
     const searchParams = new URLSearchParams();
     if (!!params?.runId) {
       searchParams.set("runId", params.runId);
     }
-    const runtimeContext = params.runtimeContext ? Object.fromEntries(params.runtimeContext.entries()) : void 0;
-    return this.request(`/api/workflows/v-next/${this.workflowId}/start-async?${searchParams.toString()}`, {
+    const runtimeContext = parseClientRuntimeContext(params.runtimeContext);
+    return this.request(`/api/workflows/${this.workflowId}/start-async?${searchParams.toString()}`, {
       method: "POST",
       body: { inputData: params.inputData, runtimeContext }
     });
   }
   /**
-   * Resumes a suspended vNext workflow step asynchronously and returns a promise that resolves when the vNext workflow is complete
+   * Resumes a suspended workflow step asynchronously and returns a promise that resolves when the workflow is complete
    * @param params - Object containing the runId, step, resumeData and runtimeContext
-   * @returns Promise containing the vNext workflow resume results
+   * @returns Promise containing the workflow resume results
    */
   resumeAsync(params) {
-    const runtimeContext = params.runtimeContext ? Object.fromEntries(params.runtimeContext.entries()) : void 0;
-    return this.request(`/api/workflows/v-next/${this.workflowId}/resume-async?runId=${params.runId}`, {
+    const runtimeContext = parseClientRuntimeContext(params.runtimeContext);
+    return this.request(`/api/workflows/${this.workflowId}/resume-async?runId=${params.runId}`, {
       method: "POST",
       body: {
         step: params.step,
@@ -965,16 +965,16 @@ var VNextWorkflow = class extends BaseResource {
     });
   }
   /**
-   * Watches vNext workflow transitions in real-time
+   * Watches workflow transitions in real-time
    * @param runId - Optional run ID to filter the watch stream
-   * @returns AsyncGenerator that yields parsed records from the vNext workflow watch stream
+   * @returns AsyncGenerator that yields parsed records from the workflow watch stream
    */
   async watch({ runId }, onRecord) {
-    const response = await this.request(`/api/workflows/v-next/${this.workflowId}/watch?runId=${runId}`, {
+    const response = await this.request(`/api/workflows/${this.workflowId}/watch?runId=${runId}`, {
       stream: true
     });
     if (!response.ok) {
-      throw new Error(`Failed to watch vNext workflow: ${response.statusText}`);
+      throw new Error(`Failed to watch workflow: ${response.statusText}`);
     }
     if (!response.body) {
       throw new Error("Response body is null");
@@ -1059,6 +1059,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) {
@@ -1151,6 +1185,21 @@ var MastraClient = class extends BaseResource {
   getTool(toolId) {
     return new Tool(this.options, toolId);
   }
+  /**
+   * Retrieves all available legacy workflows
+   * @returns Promise containing map of legacy workflow IDs to legacy workflow details
+   */
+  getLegacyWorkflows() {
+    return this.request("/api/workflows/legacy");
+  }
+  /**
+   * Gets a legacy workflow instance by ID
+   * @param workflowId - ID of the legacy workflow to retrieve
+   * @returns Legacy Workflow instance
+   */
+  getLegacyWorkflow(workflowId) {
+    return new LegacyWorkflow(this.options, workflowId);
+  }
   /**
    * Retrieves all available workflows
    * @returns Promise containing map of workflow IDs to workflow details
@@ -1166,21 +1215,6 @@ var MastraClient = class extends BaseResource {
   getWorkflow(workflowId) {
     return new Workflow(this.options, workflowId);
   }
-  /**
-   * Retrieves all available vNext workflows
-   * @returns Promise containing map of vNext workflow IDs to vNext workflow details
-   */
-  getVNextWorkflows() {
-    return this.request("/api/workflows/v-next");
-  }
-  /**
-   * Gets a vNext workflow instance by ID
-   * @param workflowId - ID of the vNext workflow to retrieve
-   * @returns vNext Workflow instance
-   */
-  getVNextWorkflow(workflowId) {
-    return new VNextWorkflow(this.options, workflowId);
-  }
   /**
    * Gets a vector instance by name
    * @param vectorName - Name of the vector to retrieve
@@ -1269,6 +1303,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",
+  "version": "0.2.0-alpha.1",
   "description": "The official TypeScript library for the Mastra Client API",
   "author": "",
   "type": "module",
@@ -27,11 +27,11 @@
     "json-schema": "^0.4.0",
     "rxjs": "7.8.1",
     "zod": "^3.24.3",
-    "zod-to-json-schema": "^3.24.5",
-    "@mastra/core": "^0.9.4"
+    "zod-to-json-schema": "^3.24.5"
   },
   "peerDependencies": {
-    "zod": "^3.0.0"
+    "zod": "^3.0.0",
+    "@mastra/core": "^0.9.4"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.26.9",
@@ -42,7 +42,8 @@
     "tsup": "^8.4.0",
     "typescript": "^5.8.2",
     "vitest": "^3.1.2",
-    "@internal/lint": "0.0.5"
+    "@internal/lint": "0.0.5",
+    "@mastra/core": "0.10.0-alpha.1"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts --clean --treeshake=smallest --splitting",

package/src/client.ts

@@ -1,6 +1,18 @@
 import type { AbstractAgent } from '@ag-ui/client';
+import type { ServerDetailInfo } from '@mastra/core/mcp';
 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,
+  A2A,
+  MCPTool,
+  LegacyWorkflow,
+} from './resources';
 import type {
   ClientOptions,
   CreateMemoryThreadParams,
@@ -15,10 +27,12 @@ import type {
   GetTelemetryParams,
   GetTelemetryResponse,
   GetToolResponse,
-  GetVNextWorkflowResponse,
   GetWorkflowResponse,
   SaveMessageToMemoryParams,
   SaveMessageToMemoryResponse,
+  McpServerListResponse,
+  McpServerToolListResponse,
+  GetLegacyWorkflowResponse,
 } from './types';
 
 export class MastraClient extends BaseResource {
@@ -126,6 +140,23 @@ export class MastraClient extends BaseResource {
     return new Tool(this.options, toolId);
   }
 
+  /**
+   * Retrieves all available legacy workflows
+   * @returns Promise containing map of legacy workflow IDs to legacy workflow details
+   */
+  public getLegacyWorkflows(): Promise<Record<string, GetLegacyWorkflowResponse>> {
+    return this.request('/api/workflows/legacy');
+  }
+
+  /**
+   * Gets a legacy workflow instance by ID
+   * @param workflowId - ID of the legacy workflow to retrieve
+   * @returns Legacy Workflow instance
+   */
+  public getLegacyWorkflow(workflowId: string) {
+    return new LegacyWorkflow(this.options, workflowId);
+  }
+
   /**
    * Retrieves all available workflows
    * @returns Promise containing map of workflow IDs to workflow details
@@ -143,23 +174,6 @@ export class MastraClient extends BaseResource {
     return new Workflow(this.options, workflowId);
   }
 
-  /**
-   * Retrieves all available vNext workflows
-   * @returns Promise containing map of vNext workflow IDs to vNext workflow details
-   */
-  public getVNextWorkflows(): Promise<Record<string, GetVNextWorkflowResponse>> {
-    return this.request('/api/workflows/v-next');
-  }
-
-  /**
-   * Gets a vNext workflow instance by ID
-   * @param workflowId - ID of the vNext workflow to retrieve
-   * @returns vNext Workflow instance
-   */
-  public getVNextWorkflow(workflowId: string) {
-    return new VNextWorkflow(this.options, workflowId);
-  }
-
   /**
    * Gets a vector instance by name
    * @param vectorName - Name of the vector to retrieve
@@ -257,6 +271,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