@mastra/mcp 0.10.5-alpha.0 → 0.10.5-alpha.2

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @mastra/mcp@0.10.5-alpha.0 build /home/runner/work/mastra/mastra/packages/mcp
+> @mastra/mcp@0.10.5-alpha.2 build /home/runner/work/mastra/mastra/packages/mcp
 > tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting
 
 CLI Building entry: src/index.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v8.5.0
 TSC Build start
-TSC ⚡️ Build success in 19065ms
+TSC ⚡️ Build success in 25816ms
 DTS Build start
 CLI Target: es2022
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/packages/mcp/dist/_tsup-dts-rollup.d.ts
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/packages/mcp/dist/_tsup-dts-rollup.d.cts
-DTS ⚡️ Build success in 19786ms
+DTS ⚡️ Build success in 28816ms
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-ESM dist/index.js 80.87 KB
-ESM ⚡️ Build success in 1770ms
-CJS dist/index.cjs 81.49 KB
-CJS ⚡️ Build success in 1773ms
+CJS dist/index.cjs 89.35 KB
+CJS ⚡️ Build success in 2381ms
+ESM dist/index.js 88.67 KB
+ESM ⚡️ Build success in 2381ms

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @mastra/mcp
 
+## 0.10.5-alpha.2
+
+### Patch Changes
+
+- dc93062: Add elicitation support to MCPServer and MCPClient. Also fixes connectivity issues between multiple MCPClient instances and an MCPServer.
+- Updated dependencies [a8b194f]
+  - @mastra/core@0.10.7-alpha.4
+
+## 0.10.5-alpha.1
+
+### Patch Changes
+
+- ee93d96: dependencies updates:
+  - Updated dependency [`@modelcontextprotocol/sdk@^1.12.3` ↗︎](https://www.npmjs.com/package/@modelcontextprotocol/sdk/v/1.12.3) (from `^1.12.1`, in `dependencies`)
+- c00039d: dependencies updates:
+  - Updated dependency [`@modelcontextprotocol/sdk@^1.13.0` ↗︎](https://www.npmjs.com/package/@modelcontextprotocol/sdk/v/1.13.0) (from `^1.12.3`, in `dependencies`)
+- 07d6d88: Bump MCP SDK version and add tool output schema support to MCPServer and MCPClient
+- Updated dependencies [15e9d26]
+- Updated dependencies [07d6d88]
+- Updated dependencies [5d74aab]
+- Updated dependencies [144eb0b]
+  - @mastra/core@0.10.7-alpha.2
+
 ## 0.10.5-alpha.0
 
 ### Patch Changes

package/dist/_tsup-dts-rollup.d.cts

@@ -1,9 +1,12 @@
 import type { Agent } from '@mastra/core/agent';
 import type { ClientCapabilities } from '@modelcontextprotocol/sdk/types.js';
 import type { ConvertedTool } from '@mastra/core/mcp';
+import type { ElicitRequest } from '@modelcontextprotocol/sdk/types.js';
+import type { ElicitResult } from '@modelcontextprotocol/sdk/types.js';
 import type { GetPromptResult } from '@modelcontextprotocol/sdk/types.js';
 import type * as http from 'node:http';
 import type { IMastraLogger } from '@mastra/core/logger';
+import type { InternalCoreTool } from '@mastra/core';
 import type { ListPromptsResult } from '@modelcontextprotocol/sdk/types.js';
 import { LoggingLevel } from '@modelcontextprotocol/sdk/types.js';
 import { MastraBase } from '@mastra/core/base';
@@ -52,6 +55,34 @@ declare type BaseServerOptions = {
     enableServerLogs?: boolean;
 };
 
+declare type ElicitationActions = {
+    sendRequest: (request: ElicitRequest['params']) => Promise<ElicitResult>;
+};
+export { ElicitationActions }
+export { ElicitationActions as ElicitationActions_alias_1 }
+export { ElicitationActions as ElicitationActions_alias_2 }
+
+export declare class ElicitationClientActions {
+    private readonly client;
+    private readonly logger;
+    constructor({ client, logger }: ElicitationClientActionsConfig);
+    /**
+     * Set a handler for elicitation requests.
+     * @param handler The callback function to handle the elicitation request.
+     */
+    onRequest(handler: (request: ElicitRequest['params']) => Promise<ElicitResult>): void;
+}
+
+declare interface ElicitationClientActionsConfig {
+    client: InternalMastraMCPClient;
+    logger: IMastraLogger;
+}
+
+declare type ElicitationHandler = (request: ElicitRequest['params']) => Promise<ElicitResult>;
+export { ElicitationHandler }
+export { ElicitationHandler as ElicitationHandler_alias_1 }
+export { ElicitationHandler as ElicitationHandler_alias_2 }
+
 declare type HttpServerDefinition = BaseServerOptions & {
     url: URL;
     command?: never;
@@ -74,6 +105,7 @@ export declare class InternalMastraMCPClient extends MastraBase {
     private currentOperationContext;
     readonly resources: ResourceClientActions;
     readonly prompts: PromptClientActions;
+    readonly elicitation: ElicitationClientActions;
     constructor({ name, version, server, capabilities, timeout, }: InternalMastraMCPClientOptions);
     /**
      * Log a message at the specified level
@@ -98,22 +130,31 @@ export declare class InternalMastraMCPClient extends MastraBase {
     } & {
         nextCursor: z.ZodOptional<z.ZodString>;
     } & {
-        resources: z.ZodArray<z.ZodObject<{
-            uri: z.ZodString;
+        resources: z.ZodArray<z.ZodObject<z.objectUtil.extendShape<{
             name: z.ZodString;
+            title: z.ZodOptional<z.ZodString>;
+        }, {
+            uri: z.ZodString;
             description: z.ZodOptional<z.ZodString>;
             mimeType: z.ZodOptional<z.ZodString>;
-        }, "passthrough", z.ZodTypeAny, z.objectOutputType<{
-            uri: z.ZodString;
+            _meta: z.ZodOptional<z.ZodObject<{}, "passthrough", z.ZodTypeAny, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">, z.objectInputType<{}, z.ZodTypeAny, "passthrough">>>;
+        }>, "passthrough", z.ZodTypeAny, z.objectOutputType<z.objectUtil.extendShape<{
             name: z.ZodString;
+            title: z.ZodOptional<z.ZodString>;
+        }, {
+            uri: z.ZodString;
             description: z.ZodOptional<z.ZodString>;
             mimeType: z.ZodOptional<z.ZodString>;
-        }, z.ZodTypeAny, "passthrough">, z.objectInputType<{
-            uri: z.ZodString;
+            _meta: z.ZodOptional<z.ZodObject<{}, "passthrough", z.ZodTypeAny, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">, z.objectInputType<{}, z.ZodTypeAny, "passthrough">>>;
+        }>, z.ZodTypeAny, "passthrough">, z.objectInputType<z.objectUtil.extendShape<{
             name: z.ZodString;
+            title: z.ZodOptional<z.ZodString>;
+        }, {
+            uri: z.ZodString;
             description: z.ZodOptional<z.ZodString>;
             mimeType: z.ZodOptional<z.ZodString>;
-        }, z.ZodTypeAny, "passthrough">>, "many">;
+            _meta: z.ZodOptional<z.ZodObject<{}, "passthrough", z.ZodTypeAny, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">, z.objectInputType<{}, z.ZodTypeAny, "passthrough">>>;
+        }>, z.ZodTypeAny, "passthrough">>, "many">;
     }, z.ZodTypeAny, "passthrough">>;
     readResource(uri: string): Promise<z.objectOutputType<{
         _meta: z.ZodOptional<z.ZodObject<{}, "passthrough", z.ZodTypeAny, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">, z.objectInputType<{}, z.ZodTypeAny, "passthrough">>>;
@@ -121,31 +162,37 @@ export declare class InternalMastraMCPClient extends MastraBase {
         contents: z.ZodArray<z.ZodUnion<[z.ZodObject<z.objectUtil.extendShape<{
             uri: z.ZodString;
             mimeType: z.ZodOptional<z.ZodString>;
+            _meta: z.ZodOptional<z.ZodObject<{}, "passthrough", z.ZodTypeAny, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">, z.objectInputType<{}, z.ZodTypeAny, "passthrough">>>;
         }, {
             text: z.ZodString;
         }>, "passthrough", z.ZodTypeAny, z.objectOutputType<z.objectUtil.extendShape<{
             uri: z.ZodString;
             mimeType: z.ZodOptional<z.ZodString>;
+            _meta: z.ZodOptional<z.ZodObject<{}, "passthrough", z.ZodTypeAny, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">, z.objectInputType<{}, z.ZodTypeAny, "passthrough">>>;
         }, {
             text: z.ZodString;
         }>, z.ZodTypeAny, "passthrough">, z.objectInputType<z.objectUtil.extendShape<{
             uri: z.ZodString;
             mimeType: z.ZodOptional<z.ZodString>;
+            _meta: z.ZodOptional<z.ZodObject<{}, "passthrough", z.ZodTypeAny, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">, z.objectInputType<{}, z.ZodTypeAny, "passthrough">>>;
         }, {
             text: z.ZodString;
         }>, z.ZodTypeAny, "passthrough">>, z.ZodObject<z.objectUtil.extendShape<{
             uri: z.ZodString;
             mimeType: z.ZodOptional<z.ZodString>;
+            _meta: z.ZodOptional<z.ZodObject<{}, "passthrough", z.ZodTypeAny, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">, z.objectInputType<{}, z.ZodTypeAny, "passthrough">>>;
         }, {
             blob: z.ZodString;
         }>, "passthrough", z.ZodTypeAny, z.objectOutputType<z.objectUtil.extendShape<{
             uri: z.ZodString;
             mimeType: z.ZodOptional<z.ZodString>;
+            _meta: z.ZodOptional<z.ZodObject<{}, "passthrough", z.ZodTypeAny, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">, z.objectInputType<{}, z.ZodTypeAny, "passthrough">>>;
         }, {
             blob: z.ZodString;
         }>, z.ZodTypeAny, "passthrough">, z.objectInputType<z.objectUtil.extendShape<{
             uri: z.ZodString;
             mimeType: z.ZodOptional<z.ZodString>;
+            _meta: z.ZodOptional<z.ZodObject<{}, "passthrough", z.ZodTypeAny, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">, z.objectInputType<{}, z.ZodTypeAny, "passthrough">>>;
         }, {
             blob: z.ZodString;
         }>, z.ZodTypeAny, "passthrough">>]>, "many">;
@@ -157,22 +204,31 @@ export declare class InternalMastraMCPClient extends MastraBase {
     } & {
         nextCursor: z.ZodOptional<z.ZodString>;
     } & {
-        resourceTemplates: z.ZodArray<z.ZodObject<{
-            uriTemplate: z.ZodString;
+        resourceTemplates: z.ZodArray<z.ZodObject<z.objectUtil.extendShape<{
             name: z.ZodString;
+            title: z.ZodOptional<z.ZodString>;
+        }, {
+            uriTemplate: z.ZodString;
             description: z.ZodOptional<z.ZodString>;
             mimeType: z.ZodOptional<z.ZodString>;
-        }, "passthrough", z.ZodTypeAny, z.objectOutputType<{
-            uriTemplate: z.ZodString;
+            _meta: z.ZodOptional<z.ZodObject<{}, "passthrough", z.ZodTypeAny, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">, z.objectInputType<{}, z.ZodTypeAny, "passthrough">>>;
+        }>, "passthrough", z.ZodTypeAny, z.objectOutputType<z.objectUtil.extendShape<{
             name: z.ZodString;
+            title: z.ZodOptional<z.ZodString>;
+        }, {
+            uriTemplate: z.ZodString;
             description: z.ZodOptional<z.ZodString>;
             mimeType: z.ZodOptional<z.ZodString>;
-        }, z.ZodTypeAny, "passthrough">, z.objectInputType<{
-            uriTemplate: z.ZodString;
+            _meta: z.ZodOptional<z.ZodObject<{}, "passthrough", z.ZodTypeAny, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">, z.objectInputType<{}, z.ZodTypeAny, "passthrough">>>;
+        }>, z.ZodTypeAny, "passthrough">, z.objectInputType<z.objectUtil.extendShape<{
             name: z.ZodString;
+            title: z.ZodOptional<z.ZodString>;
+        }, {
+            uriTemplate: z.ZodString;
             description: z.ZodOptional<z.ZodString>;
             mimeType: z.ZodOptional<z.ZodString>;
-        }, z.ZodTypeAny, "passthrough">>, "many">;
+            _meta: z.ZodOptional<z.ZodObject<{}, "passthrough", z.ZodTypeAny, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">, z.objectInputType<{}, z.ZodTypeAny, "passthrough">>>;
+        }>, z.ZodTypeAny, "passthrough">>, "many">;
     }, z.ZodTypeAny, "passthrough">>;
     /**
      * Fetch the list of available prompts from the MCP server.
@@ -196,7 +252,9 @@ export declare class InternalMastraMCPClient extends MastraBase {
     setPromptListChangedNotificationHandler(handler: () => void): void;
     setResourceUpdatedNotificationHandler(handler: (params: z.infer<typeof ResourceUpdatedNotificationSchema>['params']) => void): void;
     setResourceListChangedNotificationHandler(handler: () => void): void;
+    setElicitationRequestHandler(handler: ElicitationHandler): void;
     private convertInputSchema;
+    private convertOutputSchema;
     tools(): Promise<Record<string, any>>;
 }
 
@@ -251,6 +309,9 @@ declare class MCPClient extends MastraBase {
     private mcpClientsById;
     private disconnectPromise;
     constructor(args: MCPClientOptions);
+    get elicitation(): {
+        onRequest: (serverName: string, handler: (request: ElicitRequest["params"]) => Promise<ElicitResult>) => Promise<void>;
+    };
     get resources(): {
         list: () => Promise<Record<string, Resource[]>>;
         templates: () => Promise<Record<string, ResourceTemplate[]>>;
@@ -260,31 +321,37 @@ declare class MCPClient extends MastraBase {
         contents: ZodArray<ZodUnion<[ZodObject<objectUtil.extendShape<    {
         uri: ZodString;
         mimeType: ZodOptional<ZodString>;
+        _meta: ZodOptional<ZodObject<    {}, "passthrough", ZodTypeAny, objectOutputType<    {}, ZodTypeAny, "passthrough">, objectInputType<    {}, ZodTypeAny, "passthrough">>>;
         }, {
         text: ZodString;
         }>, "passthrough", ZodTypeAny, objectOutputType<objectUtil.extendShape<    {
         uri: ZodString;
         mimeType: ZodOptional<ZodString>;
+        _meta: ZodOptional<ZodObject<    {}, "passthrough", ZodTypeAny, objectOutputType<    {}, ZodTypeAny, "passthrough">, objectInputType<    {}, ZodTypeAny, "passthrough">>>;
         }, {
         text: ZodString;
         }>, ZodTypeAny, "passthrough">, objectInputType<objectUtil.extendShape<    {
         uri: ZodString;
         mimeType: ZodOptional<ZodString>;
+        _meta: ZodOptional<ZodObject<    {}, "passthrough", ZodTypeAny, objectOutputType<    {}, ZodTypeAny, "passthrough">, objectInputType<    {}, ZodTypeAny, "passthrough">>>;
         }, {
         text: ZodString;
         }>, ZodTypeAny, "passthrough">>, ZodObject<objectUtil.extendShape<    {
         uri: ZodString;
         mimeType: ZodOptional<ZodString>;
+        _meta: ZodOptional<ZodObject<    {}, "passthrough", ZodTypeAny, objectOutputType<    {}, ZodTypeAny, "passthrough">, objectInputType<    {}, ZodTypeAny, "passthrough">>>;
         }, {
         blob: ZodString;
         }>, "passthrough", ZodTypeAny, objectOutputType<objectUtil.extendShape<    {
         uri: ZodString;
         mimeType: ZodOptional<ZodString>;
+        _meta: ZodOptional<ZodObject<    {}, "passthrough", ZodTypeAny, objectOutputType<    {}, ZodTypeAny, "passthrough">, objectInputType<    {}, ZodTypeAny, "passthrough">>>;
         }, {
         blob: ZodString;
         }>, ZodTypeAny, "passthrough">, objectInputType<objectUtil.extendShape<    {
         uri: ZodString;
         mimeType: ZodOptional<ZodString>;
+        _meta: ZodOptional<ZodObject<    {}, "passthrough", ZodTypeAny, objectOutputType<    {}, ZodTypeAny, "passthrough">, objectInputType<    {}, ZodTypeAny, "passthrough">>>;
         }, {
         blob: ZodString;
         }>, ZodTypeAny, "passthrough">>]>, "many">;
@@ -307,21 +374,40 @@ declare class MCPClient extends MastraBase {
             [x: string]: unknown;
             messages: {
                 [x: string]: unknown;
-                role: "user" | "assistant";
                 content: {
                     [x: string]: unknown;
                     type: "text";
                     text: string;
+                    _meta?: {
+                        [x: string]: unknown;
+                    } | undefined;
                 } | {
                     [x: string]: unknown;
                     type: "image";
                     data: string;
                     mimeType: string;
+                    _meta?: {
+                        [x: string]: unknown;
+                    } | undefined;
                 } | {
                     [x: string]: unknown;
                     type: "audio";
                     data: string;
                     mimeType: string;
+                    _meta?: {
+                        [x: string]: unknown;
+                    } | undefined;
+                } | {
+                    [x: string]: unknown;
+                    type: "resource_link";
+                    name: string;
+                    uri: string;
+                    _meta?: {
+                        [x: string]: unknown;
+                    } | undefined;
+                    title?: string | undefined;
+                    description?: string | undefined;
+                    mimeType?: string | undefined;
                 } | {
                     [x: string]: unknown;
                     type: "resource";
@@ -329,19 +415,29 @@ declare class MCPClient extends MastraBase {
                         [x: string]: unknown;
                         text: string;
                         uri: string;
+                        _meta?: {
+                            [x: string]: unknown;
+                        } | undefined;
                         mimeType?: string | undefined;
                     } | {
                         [x: string]: unknown;
                         uri: string;
                         blob: string;
+                        _meta?: {
+                            [x: string]: unknown;
+                        } | undefined;
                         mimeType?: string | undefined;
                     };
+                    _meta?: {
+                        [x: string]: unknown;
+                    } | undefined;
                 };
+                role: "user" | "assistant";
             }[];
-            description?: string | undefined;
             _meta?: {
                 [x: string]: unknown;
             } | undefined;
+            description?: string | undefined;
         }>;
         onListChanged: (serverName: string, handler: () => void) => Promise<void>;
     };
@@ -357,6 +453,10 @@ declare class MCPClient extends MastraBase {
         [x: string]: unknown;
         name: string;
         uri: string;
+        _meta?: {
+            [x: string]: unknown;
+        } | undefined;
+        title?: string | undefined;
         description?: string | undefined;
         mimeType?: string | undefined;
     }[]>>;
@@ -410,15 +510,7 @@ declare class MCPServer extends MCPServerBase {
     private sseTransport?;
     private sseHonoTransports;
     private streamableHTTPTransports;
-    private listToolsHandlerIsRegistered;
-    private callToolHandlerIsRegistered;
-    private listResourcesHandlerIsRegistered;
-    private readResourceHandlerIsRegistered;
-    private listResourceTemplatesHandlerIsRegistered;
-    private subscribeResourceHandlerIsRegistered;
-    private unsubscribeResourceHandlerIsRegistered;
-    private listPromptsHandlerIsRegistered;
-    private getPromptHandlerIsRegistered;
+    private httpServerInstances;
     private definedResources?;
     private definedResourceTemplates?;
     private resourceOptions?;
@@ -427,6 +519,7 @@ declare class MCPServer extends MCPServerBase {
     private subscriptions;
     readonly resources: ServerResourceActions;
     readonly prompts: ServerPromptActions;
+    readonly elicitation: ElicitationActions;
     /**
      * Get the current stdio transport.
      */
@@ -451,53 +544,44 @@ declare class MCPServer extends MCPServerBase {
         resources?: MCPServerResources;
         prompts?: MCPServerPrompts;
     });
-    private convertAgentsToTools;
-    private convertWorkflowsToTools;
     /**
-     * Convert and validate all provided tools, logging registration status.
-     * Also converts agents and workflows into tools.
-     * @param tools Tool definitions
-     * @param agentsConfig Agent definitions to be converted to tools, expected from MCPServerConfig
-     * @param workflowsConfig Workflow definitions to be converted to tools, expected from MCPServerConfig
-     * @returns Converted tools registry
-     */
-    convertTools(tools: ToolsInput, agentsConfig?: Record<string, Agent>, workflowsConfig?: Record<string, Workflow>): Record<string, ConvertedTool>;
-    /**
-     * Register the ListTools handler for listing all available tools.
-     */
-    private registerListToolsHandler;
-    /**
-     * Register the CallTool handler for executing a tool by name.
-     */
-    private registerCallToolHandler;
-    /**
-     * Register the ListResources handler for listing all available resources.
-     */
-    private registerListResourcesHandler;
-    /**
-     * Register the ReadResource handler for reading a resource by URI.
+     * Handle an elicitation request by sending it to the connected client.
+     * This method sends an elicitation/create request to the client and waits for the response.
+     *
+     * @param request - The elicitation request containing message and schema
+     * @param serverInstance - Optional server instance to use; defaults to main server for backward compatibility
+     * @returns Promise that resolves to the client's response
      */
-    private registerReadResourceHandler;
+    private handleElicitationRequest;
     /**
-     * Register the ListResourceTemplates handler.
+     * Creates a new Server instance configured with all handlers for HTTP sessions.
+     * Each HTTP client connection gets its own Server instance to avoid routing conflicts.
      */
-    private registerListResourceTemplatesHandler;
+    private createServerInstance;
     /**
-     * Register the SubscribeResource handler.
+     * Registers all MCP handlers on a given server instance.
+     * This allows us to create multiple server instances with identical functionality.
      */
-    private registerSubscribeResourceHandler;
+    private registerHandlersOnServer;
     /**
-     * Register the UnsubscribeResource handler.
+     * Registers resource-related handlers on a server instance.
      */
-    private registerUnsubscribeResourceHandler;
+    private registerResourceHandlersOnServer;
     /**
-     * Register the ListPrompts handler.
+     * Registers prompt-related handlers on a server instance.
      */
-    private registerListPromptsHandler;
+    private registerPromptHandlersOnServer;
+    private convertAgentsToTools;
+    private convertWorkflowsToTools;
     /**
-     * Register the GetPrompt handler.
+     * Convert and validate all provided tools, logging registration status.
+     * Also converts agents and workflows into tools.
+     * @param tools Tool definitions
+     * @param agentsConfig Agent definitions to be converted to tools, expected from MCPServerConfig
+     * @param workflowsConfig Workflow definitions to be converted to tools, expected from MCPServerConfig
+     * @returns Converted tools registry
      */
-    private registerGetPromptHandler;
+    convertTools(tools: ToolsInput, agentsConfig?: Record<string, Agent>, workflowsConfig?: Record<string, Workflow>): Record<string, ConvertedTool>;
     /**
      * Start the MCP server using stdio transport (for Windsurf integration).
      */
@@ -572,6 +656,7 @@ declare class MCPServer extends MCPServerBase {
             name: string;
             description?: string;
             inputSchema: any;
+            outputSchema?: any;
             toolType?: MCPToolType;
         }>;
     };
@@ -584,6 +669,7 @@ declare class MCPServer extends MCPServerBase {
         name: string;
         description?: string;
         inputSchema: any;
+        outputSchema?: any;
         toolType?: MCPToolType;
     } | undefined;
     /**
@@ -647,6 +733,19 @@ export { MCPServerResources }
 export { MCPServerResources as MCPServerResources_alias_1 }
 export { MCPServerResources as MCPServerResources_alias_2 }
 
+declare type MCPTool = {
+    id?: InternalCoreTool['id'];
+    description?: InternalCoreTool['description'];
+    parameters: InternalCoreTool['parameters'];
+    outputSchema?: InternalCoreTool['outputSchema'];
+    execute: (params: any, options: Parameters<NonNullable<InternalCoreTool['execute']>>[1] & {
+        elicitation: ElicitationActions;
+    }) => Promise<any>;
+};
+export { MCPTool }
+export { MCPTool as MCPTool_alias_1 }
+export { MCPTool as MCPTool_alias_2 }
+
 /**
  * Client-side prompt actions for listing, getting, and subscribing to prompt changes.
  */
@@ -712,31 +811,37 @@ export declare class ResourceClientActions {
     contents: ZodArray<ZodUnion<[ZodObject<objectUtil.extendShape<    {
     uri: ZodString;
     mimeType: ZodOptional<ZodString>;
+    _meta: ZodOptional<ZodObject<    {}, "passthrough", ZodTypeAny, objectOutputType<    {}, ZodTypeAny, "passthrough">, objectInputType<    {}, ZodTypeAny, "passthrough">>>;
     }, {
     text: ZodString;
     }>, "passthrough", ZodTypeAny, objectOutputType<objectUtil.extendShape<    {
     uri: ZodString;
     mimeType: ZodOptional<ZodString>;
+    _meta: ZodOptional<ZodObject<    {}, "passthrough", ZodTypeAny, objectOutputType<    {}, ZodTypeAny, "passthrough">, objectInputType<    {}, ZodTypeAny, "passthrough">>>;
     }, {
     text: ZodString;
     }>, ZodTypeAny, "passthrough">, objectInputType<objectUtil.extendShape<    {
     uri: ZodString;
     mimeType: ZodOptional<ZodString>;
+    _meta: ZodOptional<ZodObject<    {}, "passthrough", ZodTypeAny, objectOutputType<    {}, ZodTypeAny, "passthrough">, objectInputType<    {}, ZodTypeAny, "passthrough">>>;
     }, {
     text: ZodString;
     }>, ZodTypeAny, "passthrough">>, ZodObject<objectUtil.extendShape<    {
     uri: ZodString;
     mimeType: ZodOptional<ZodString>;
+    _meta: ZodOptional<ZodObject<    {}, "passthrough", ZodTypeAny, objectOutputType<    {}, ZodTypeAny, "passthrough">, objectInputType<    {}, ZodTypeAny, "passthrough">>>;
     }, {
     blob: ZodString;
     }>, "passthrough", ZodTypeAny, objectOutputType<objectUtil.extendShape<    {
     uri: ZodString;
     mimeType: ZodOptional<ZodString>;
+    _meta: ZodOptional<ZodObject<    {}, "passthrough", ZodTypeAny, objectOutputType<    {}, ZodTypeAny, "passthrough">, objectInputType<    {}, ZodTypeAny, "passthrough">>>;
     }, {
     blob: ZodString;
     }>, ZodTypeAny, "passthrough">, objectInputType<objectUtil.extendShape<    {
     uri: ZodString;
     mimeType: ZodOptional<ZodString>;
+    _meta: ZodOptional<ZodObject<    {}, "passthrough", ZodTypeAny, objectOutputType<    {}, ZodTypeAny, "passthrough">, objectInputType<    {}, ZodTypeAny, "passthrough">>>;
     }, {
     blob: ZodString;
     }>, ZodTypeAny, "passthrough">>]>, "many">;
@@ -864,76 +969,12 @@ location: z.ZodString;
 location: string;
 }, {
 location: string;
-}>, z.ZodObject<{
-temperature: z.ZodNumber;
-feelsLike: z.ZodNumber;
-humidity: z.ZodNumber;
-windSpeed: z.ZodNumber;
-windGust: z.ZodNumber;
-conditions: z.ZodString;
-location: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-temperature: number;
-location: string;
-feelsLike: number;
-humidity: number;
-windSpeed: number;
-windGust: number;
-conditions: string;
-}, {
-temperature: number;
-location: string;
-feelsLike: number;
-humidity: number;
-windSpeed: number;
-windGust: number;
-conditions: string;
-}>, ToolExecutionContext<z.ZodObject<{
+}>, undefined, ToolExecutionContext<z.ZodObject<{
 location: z.ZodString;
 }, "strip", z.ZodTypeAny, {
 location: string;
 }, {
 location: string;
-}>>> & {
-    inputSchema: z.ZodObject<{
-        location: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        location: string;
-    }, {
-        location: string;
-    }>;
-    outputSchema: z.ZodObject<{
-        temperature: z.ZodNumber;
-        feelsLike: z.ZodNumber;
-        humidity: z.ZodNumber;
-        windSpeed: z.ZodNumber;
-        windGust: z.ZodNumber;
-        conditions: z.ZodString;
-        location: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        temperature: number;
-        location: string;
-        feelsLike: number;
-        humidity: number;
-        windSpeed: number;
-        windGust: number;
-        conditions: string;
-    }, {
-        temperature: number;
-        location: string;
-        feelsLike: number;
-        humidity: number;
-        windSpeed: number;
-        windGust: number;
-        conditions: string;
-    }>;
-    execute: (context: ToolExecutionContext<z.ZodObject<{
-    location: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-    location: string;
-    }, {
-    location: string;
-    }>>) => Promise<any>;
-};
+}>>>;
 
 export { }