tmcp 1.2.0 → 1.4.0

package/README.md

@@ -1,3 +1,6 @@
+> [!WARNING]
+> Unfortunately i published the 1.0 by mistake...this package is currently under heavy development so there will be breaking changes in minors...threat this `1.x` as the `0.x` of any other package. Sorry for the disservice, every breaking will be properly labeled in the PR name.
+
 # tmcp
 
 A lightweight, schema-agnostic Model Context Protocol (MCP) server implementation with unified API design.

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "tmcp",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "description": "The main tmcp library",
   "main": "src/index.js",
   "type": "module",
   "keywords": [],
   "repository": {
     "type": "git",
-    "url": "https://github.com/paoloricciuti/tmcp.git",
+    "url": "git+https://github.com/paoloricciuti/tmcp.git",
     "directory": "packages/tmcp"
   },
   "author": "Paolo Ricciuti",
@@ -34,12 +34,13 @@
   "devDependencies": {
     "@standard-schema/spec": "^1.0.0",
     "@types/json-schema": "^7.0.15",
+    "@types/node": "^24.0.13",
     "publint": "^0.3.12"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "typecheck": "tsc --noEmit",
-    "generate:types": "rm -f ./src/*.d.ts && tsc ./src/*.js --declaration --emitDeclarationOnly --target esnext --allowJs --moduleresolution nodenext --module nodenext && publint",
+    "generate:types": "find ./src -name \"*.d.ts\" -not -path \"./src/internal/*\" -delete && tsc ./src/*.js --declaration --emitDeclarationOnly --target esnext --allowJs --moduleresolution nodenext --module nodenext && publint",
     "prepublish": "pnpm generate:types"
   }
 }

package/src/index.d.ts

@@ -1,3 +1,6 @@
+/**
+ * @typedef {ClientCapabilitiesType} ClientCapabilities
+ */
 /**
  * @template {StandardSchemaV1} StandardSchema
  */
@@ -7,6 +10,21 @@ export class McpServer<StandardSchema extends StandardSchemaV1> {
      * @param {ServerOptions<StandardSchema>} options
      */
     constructor(server_info: ServerInfo, options: ServerOptions<StandardSchema>);
+    currentClientCapabilities(): {
+        roots?: {
+            listChanged?: boolean;
+        } & {
+            [key: string]: unknown;
+        };
+        sampling?: {} & {
+            [key: string]: unknown;
+        };
+        elicitation?: {} & {
+            [key: string]: unknown;
+        };
+    } & {
+        [key: string]: unknown;
+    };
     /**
      * @template {keyof McpEvents} TEvent
      * @param {TEvent} event
@@ -17,64 +35,76 @@ export class McpServer<StandardSchema extends StandardSchemaV1> {
     /**
      * @template {StandardSchema | undefined} [TSchema=undefined]
      * @param {{ name: string; description: string; schema?: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema> extends Record<string, unknown> ? TSchema : never }} options
-     * @param {TSchema extends undefined ? (()=>Promise<unknown> | unknown) : ((input: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema>) => Promise<unknown> | unknown)} execute
+     * @param {TSchema extends undefined ? (()=>Promise<CallToolResult> | CallToolResult) : ((input: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema>) => Promise<CallToolResult> | CallToolResult)} execute
      */
     tool<TSchema extends StandardSchema | undefined = undefined>({ name, description, schema }: {
         name: string;
         description: string;
         schema?: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema> extends Record<string, unknown> ? TSchema : never;
-    }, execute: TSchema extends undefined ? (() => Promise<unknown> | unknown) : ((input: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema>) => Promise<unknown> | unknown)): void;
+    }, execute: TSchema extends undefined ? (() => Promise<CallToolResult> | CallToolResult) : ((input: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema>) => Promise<CallToolResult> | CallToolResult)): void;
     /**
      * @template {StandardSchema | undefined} [TSchema=undefined]
-     * @param {{ name: string; description: string; schema?: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema> extends Record<string, unknown> ? TSchema : never; complete?: TSchema extends undefined ? never : Partial<Record<keyof (StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema>), Completion>> }} options
-     * @param {TSchema extends undefined ? (()=>Promise<unknown> | unknown) : (input: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema>) => Promise<unknown> | unknown} execute
+     * @param {{ name: string; description: string; schema?: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema> extends Record<string, unknown> ? TSchema : never; complete?: NoInfer<TSchema extends undefined ? never : Partial<Record<keyof (StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema>), Completion>>> }} options
+     * @param {TSchema extends undefined ? (()=>Promise<GetPromptResult> | GetPromptResult) : (input: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema>) => Promise<GetPromptResult> | GetPromptResult} execute
      */
     prompt<TSchema extends StandardSchema | undefined = undefined>({ name, description, schema, complete }: {
         name: string;
         description: string;
         schema?: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema> extends Record<string, unknown> ? TSchema : never;
-        complete?: TSchema extends undefined ? never : Partial<Record<keyof StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema>, Completion>>;
-    }, execute: TSchema extends undefined ? (() => Promise<unknown> | unknown) : (input: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema>) => Promise<unknown> | unknown): void;
+        complete?: NoInfer<TSchema extends undefined ? never : Partial<Record<keyof StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema>, Completion>>>;
+    }, execute: TSchema extends undefined ? (() => Promise<GetPromptResult> | GetPromptResult) : (input: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema>) => Promise<GetPromptResult> | GetPromptResult): void;
     /**
      * @param {{ name: string; description: string; uri: string }} options
-     * @param {(uri: string) => Promise<unknown> | unknown} execute
+     * @param {(uri: string) => Promise<ReadResourceResult> | ReadResourceResult} execute
      */
     resource({ name, description, uri }: {
         name: string;
         description: string;
         uri: string;
-    }, execute: (uri: string) => Promise<unknown> | unknown): void;
+    }, execute: (uri: string) => Promise<ReadResourceResult> | ReadResourceResult): void;
     /**
      * @template {string} TUri
      * @template {ExtractURITemplateVariables<TUri>} TVariables
-     * @param {{ name: string; description: string; uri: TUri; complete?: TVariables extends never ? never : Partial<Record<TVariables, Completion>> }} options
-     * @param {(uri: string, params: Record<TVariables, string | string[]>) => Promise<unknown> | unknown} execute
+     * @param {{ name: string; description: string; uri: TUri; complete?: NoInfer<TVariables extends never ? never : Partial<Record<TVariables, Completion>>> }} options
+     * @param {(uri: string, params: Record<TVariables, string | string[]>) => Promise<ReadResourceResult> | ReadResourceResult} execute
      */
     template<TUri extends string, TVariables extends ExtractURITemplateVariables<TUri>>({ name, description, uri, complete }: {
         name: string;
         description: string;
         uri: TUri;
-        complete?: TVariables extends never ? never : Partial<Record<TVariables, Completion>>;
-    }, execute: (uri: string, params: Record<TVariables, string | string[]>) => Promise<unknown> | unknown): void;
+        complete?: NoInfer<TVariables extends never ? never : Partial<Record<TVariables, Completion>>>;
+    }, execute: (uri: string, params: Record<TVariables, string | string[]>) => Promise<ReadResourceResult> | ReadResourceResult): void;
     /**
      * @param {JSONRPCRequest} request
+     * @param {string} [session_id]
      * @returns {ReturnType<JSONRPCServer['receive']>}
      */
-    receive(request: JSONRPCRequest): ReturnType<JSONRPCServer["receive"]>;
+    receive(request: JSONRPCRequest, session_id?: string): ReturnType<JSONRPCServer["receive"]>;
     /**
      * Send a notification for subscriptions
      * @param {SubscriptionsKeys} what
      * @param {string} id
      */
     changed(what: SubscriptionsKeys, id: string): void;
+    /**
+     * @template {StandardSchema} TSchema
+     * @param {TSchema} schema
+     * @returns {Promise<StandardSchemaV1.InferOutput<TSchema>>}
+     */
+    elicitation<TSchema extends StandardSchema>(schema: TSchema): Promise<StandardSchemaV1.InferOutput<TSchema>>;
     #private;
 }
+export type ClientCapabilities = ClientCapabilitiesType;
 import type { StandardSchemaV1 } from "@standard-schema/spec";
 import type { McpEvents } from "./internal/internal.js";
+import type { CallToolResult } from "./validation/index.js";
 import type { Completion } from "./internal/internal.js";
+import type { GetPromptResult } from "./validation/index.js";
+import type { ReadResourceResult } from "./validation/index.js";
 import type { ExtractURITemplateVariables } from "./internal/uri-template.js";
 import type { JSONRPCRequest } from "json-rpc-2.0";
 import { JSONRPCServer } from 'json-rpc-2.0';
 import type { SubscriptionsKeys } from "./internal/internal.js";
 import type { ServerInfo } from "./internal/internal.js";
 import type { ServerOptions } from "./internal/internal.js";
+import type { ClientCapabilities as ClientCapabilitiesType } from "./validation/index.js";

package/src/index.js

@@ -2,10 +2,24 @@
  * @import { StandardSchemaV1 } from "@standard-schema/spec";
  * @import { JSONRPCRequest, JSONRPCParams } from "json-rpc-2.0";
  * @import { ExtractURITemplateVariables } from "./internal/uri-template.js";
+ * @import { CallToolResult, ReadResourceResult, GetPromptResult, ClientCapabilities as ClientCapabilitiesType } from "./validation/index.js";
  * @import { Tool, Completion, Prompt, Resource, ServerOptions, ServerInfo, SubscriptionsKeys, McpEvents } from "./internal/internal.js";
  */
 import { JSONRPCServer, JSONRPCClient } from 'json-rpc-2.0';
 import { UriTemplateMatcher } from 'uri-template-matcher';
+import {
+	CallToolResultSchema,
+	ReadResourceResultSchema,
+	GetPromptResultSchema,
+	CompleteResultSchema,
+	InitializeRequestSchema,
+} from './validation/index.js';
+import { AsyncLocalStorage } from 'node:async_hooks';
+import * as v from 'valibot';
+
+/**
+ * @typedef {ClientCapabilitiesType} ClientCapabilities
+ */
 
 /**
  * @template {StandardSchemaV1} StandardSchema
@@ -13,7 +27,7 @@ import { UriTemplateMatcher } from 'uri-template-matcher';
 export class McpServer {
 	#server = new JSONRPCServer();
 	/**
-	 * @type {JSONRPCClient | undefined}
+	 * @type {JSONRPCClient<Record<string, any> | undefined> | undefined}
 	 */
 	#client;
 	#options;
@@ -41,24 +55,47 @@ export class McpServer {
 	#event_target = new EventTarget();
 
 	/**
-	 * @type {Record<SubscriptionsKeys, Set<string>>}
+	 * @type {Record<SubscriptionsKeys, Map<string, Set<string | undefined>>>}
 	 */
 	#subscriptions = {
 		/**
-		 * @type {Set<string>}
+		 * @type {Map<string, Set<string>>}
 		 */
-		resource: new Set(),
+		resource: new Map(),
 	};
 
+	/**
+	 * @type {AsyncLocalStorage<string | undefined>}
+	 */
+	#session_storage = new AsyncLocalStorage();
+
+	/**
+	 * @type {Map<string|undefined, ClientCapabilities>}
+	 */
+	#client_capabilities_map = new Map();
+
 	/**
 	 * @param {ServerInfo} server_info
 	 * @param {ServerOptions<StandardSchema>} options
 	 */
 	constructor(server_info, options) {
 		this.#options = options;
-		this.#server.addMethod('initialize', ({ protocolVersion }) => {
+		this.#server.addMethod('initialize', (initialize_request) => {
+			const validated_initialize = v.parse(
+				InitializeRequestSchema,
+				initialize_request,
+			);
+			this.#client_capabilities_map.set(
+				this.#session_id,
+				validated_initialize.capabilities,
+			);
+			this.#event_target.dispatchEvent(
+				new CustomEvent('initialize', {
+					detail: validated_initialize,
+				}),
+			);
 			return {
-				protocolVersion,
+				protocolVersion: validated_initialize.protocolVersion,
 				...options,
 				serverInfo: server_info,
 			};
@@ -75,6 +112,30 @@ export class McpServer {
 		this.#init_completion();
 	}
 
+	get #session_id() {
+		return this.#session_storage.getStore();
+	}
+
+	get #client_capabilities() {
+		return this.#client_capabilities_map.get(this.#session_id);
+	}
+
+	currentClientCapabilities() {
+		return this.#client_capabilities;
+	}
+
+	#lazyily_create_client() {
+		if (!this.#client) {
+			this.#client = new JSONRPCClient((payload, context = {}) => {
+				this.#event_target.dispatchEvent(
+					new CustomEvent('send', {
+						detail: { request: payload, context },
+					}),
+				);
+			});
+		}
+	}
+
 	/**
 	 * @template {keyof McpEvents} TEvent
 	 * @param {TEvent} event
@@ -82,12 +143,8 @@ export class McpServer {
 	 * @param {AddEventListenerOptions} [options]
 	 */
 	on(event, callback, options) {
-		if (event === 'send' && !this.#client) {
-			this.#client = new JSONRPCClient((payload) => {
-				this.#event_target.dispatchEvent(
-					new CustomEvent('send', { detail: payload }),
-				);
-			});
+		if (event === 'send') {
+			this.#lazyily_create_client();
 		}
 
 		this.#event_target.addEventListener(
@@ -102,9 +159,10 @@ export class McpServer {
 	/**
 	 * @param {string} method
 	 * @param {JSONRPCParams} [params]
+	 * @param {Record<string, any>} [extra]
 	 */
-	#notify(method, params) {
-		this.#client?.notify(method, params);
+	#notify(method, params, extra) {
+		this.#client?.notify(method, params, extra);
 	}
 
 	/**
@@ -139,7 +197,7 @@ export class McpServer {
 					throw new Error(`Tool ${name} not found`);
 				}
 				if (!tool.schema) {
-					return tool.execute();
+					return v.parse(CallToolResultSchema, await tool.execute());
 				}
 				let validated_args = tool.schema['~standard'].validate(args);
 				if (validated_args instanceof Promise)
@@ -149,7 +207,10 @@ export class McpServer {
 						`Invalid arguments for tool ${name}: ${JSON.stringify(validated_args.issues)}`,
 					);
 				}
-				return tool.execute(validated_args.value);
+				return v.parse(
+					CallToolResultSchema,
+					await tool.execute(validated_args.value),
+				);
 			},
 		);
 	}
@@ -204,7 +265,10 @@ export class McpServer {
 					throw new Error(`Tool ${name} not found`);
 				}
 				if (!prompt.schema) {
-					return prompt.execute();
+					return v.parse(
+						GetPromptResultSchema,
+						await prompt.execute(),
+					);
 				}
 				let validated_args = prompt.schema['~standard'].validate(args);
 				if (validated_args instanceof Promise)
@@ -214,7 +278,10 @@ export class McpServer {
 						`Invalid arguments for tool ${name}: ${JSON.stringify(validated_args.issues)}`,
 					);
 				}
-				return prompt.execute(validated_args.value);
+				return v.parse(
+					GetPromptResultSchema,
+					await prompt.execute(validated_args.value),
+				);
 			},
 		);
 	}
@@ -226,7 +293,12 @@ export class McpServer {
 
 		if (this.#options.capabilities?.resources?.subscribe) {
 			this.#server.addMethod('resources/subscribe', async ({ uri }) => {
-				this.#subscriptions.resource.add(uri);
+				let subscriptions = this.#subscriptions.resource.get(uri);
+				if (!subscriptions) {
+					subscriptions = new Set();
+					this.#subscriptions.resource.set(uri, subscriptions);
+				}
+				subscriptions.add(this.#session_id);
 				return {};
 			});
 		}
@@ -281,9 +353,15 @@ export class McpServer {
 			if (resource.template) {
 				if (!params)
 					throw new Error('Missing parameters for template resource');
-				return resource.execute(uri, params);
+				return v.parse(
+					ReadResourceResultSchema,
+					await resource.execute(uri, params),
+				);
 			}
-			return resource.execute(uri);
+			return v.parse(
+				ReadResourceResultSchema,
+				await resource.execute(uri),
+			);
 		});
 	}
 	/**
@@ -299,19 +377,17 @@ export class McpServer {
 				if (!complete) return null;
 				const actual_complete = complete[argument.name];
 				if (!actual_complete) return null;
-				return {
-					completion: {
-						values: actual_complete(argument.value, context),
-						hasMore: false,
-					},
-				};
+				return v.parse(
+					CompleteResultSchema,
+					actual_complete(argument.value, context),
+				);
 			},
 		);
 	}
 	/**
 	 * @template {StandardSchema | undefined} [TSchema=undefined]
 	 * @param {{ name: string; description: string; schema?: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema> extends Record<string, unknown> ? TSchema : never }} options
-	 * @param {TSchema extends undefined ? (()=>Promise<unknown> | unknown) : ((input: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema>) => Promise<unknown> | unknown)} execute
+	 * @param {TSchema extends undefined ? (()=>Promise<CallToolResult> | CallToolResult) : ((input: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema>) => Promise<CallToolResult> | CallToolResult)} execute
 	 */
 	tool({ name, description, schema }, execute) {
 		if (this.#options.capabilities?.tools?.listChanged) {
@@ -325,8 +401,8 @@ export class McpServer {
 	}
 	/**
 	 * @template {StandardSchema | undefined} [TSchema=undefined]
-	 * @param {{ name: string; description: string; schema?: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema> extends Record<string, unknown> ? TSchema : never; complete?: TSchema extends undefined ? never : Partial<Record<keyof (StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema>), Completion>> }} options
-	 * @param {TSchema extends undefined ? (()=>Promise<unknown> | unknown) : (input: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema>) => Promise<unknown> | unknown} execute
+	 * @param {{ name: string; description: string; schema?: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema> extends Record<string, unknown> ? TSchema : never; complete?: NoInfer<TSchema extends undefined ? never : Partial<Record<keyof (StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema>), Completion>>> }} options
+	 * @param {TSchema extends undefined ? (()=>Promise<GetPromptResult> | GetPromptResult) : (input: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema>) => Promise<GetPromptResult> | GetPromptResult} execute
 	 */
 	prompt({ name, description, schema, complete }, execute) {
 		if (complete) {
@@ -358,7 +434,7 @@ export class McpServer {
 	}
 	/**
 	 * @param {{ name: string; description: string; uri: string }} options
-	 * @param {(uri: string) => Promise<unknown> | unknown} execute
+	 * @param {(uri: string) => Promise<ReadResourceResult> | ReadResourceResult} execute
 	 */
 	resource({ name, description, uri }, execute) {
 		this.#resource({
@@ -372,8 +448,8 @@ export class McpServer {
 	/**
 	 * @template {string} TUri
 	 * @template {ExtractURITemplateVariables<TUri>} TVariables
-	 * @param {{ name: string; description: string; uri: TUri; complete?: TVariables extends never ? never : Partial<Record<TVariables, Completion>> }} options
-	 * @param {(uri: string, params: Record<TVariables, string | string[]>) => Promise<unknown> | unknown} execute
+	 * @param {{ name: string; description: string; uri: TUri; complete?: NoInfer<TVariables extends never ? never : Partial<Record<TVariables, Completion>>> }} options
+	 * @param {(uri: string, params: Record<TVariables, string | string[]>) => Promise<ReadResourceResult> | ReadResourceResult} execute
 	 */
 	template({ name, description, uri, complete }, execute) {
 		this.#resource({
@@ -387,10 +463,14 @@ export class McpServer {
 	}
 	/**
 	 * @param {JSONRPCRequest} request
+	 * @param {string} [session_id]
 	 * @returns {ReturnType<JSONRPCServer['receive']>}
 	 */
-	receive(request) {
-		return this.#server.receive(request);
+	receive(request, session_id) {
+		return this.#session_storage.run(
+			session_id,
+			async () => await this.#server.receive(request),
+		);
 	}
 
 	/**
@@ -402,10 +482,48 @@ export class McpServer {
 		if (this.#subscriptions[what].has(id)) {
 			const resource = this.#resources.get(id);
 			if (!resource) return;
-			this.#notify(`notifications/resources/updated`, {
-				uri: id,
-				title: resource.name,
-			});
+			const sessions = this.#subscriptions[what].get(id);
+			this.#notify(
+				`notifications/resources/updated`,
+				{
+					uri: id,
+					title: resource.name,
+				},
+				{
+					sessions: sessions ? [...sessions] : undefined,
+				},
+			);
+		}
+	}
+
+	/**
+	 * @template {StandardSchema} TSchema
+	 * @param {TSchema} schema
+	 * @returns {Promise<StandardSchemaV1.InferOutput<TSchema>>}
+	 */
+	async elicitation(schema) {
+		if (!this.#client_capabilities?.elicitation)
+			throw new Error("Client doesn't support elicitation");
+
+		this.#lazyily_create_client();
+		let validated_result = schema['~standard'].validate(
+			await this.#client?.request(
+				'elicitation/create',
+				{
+					params: await this.#options.adapter.toJsonSchema(schema),
+				},
+				{
+					sessions: [this.#session_id],
+				},
+			),
+		);
+		if (validated_result instanceof Promise)
+			validated_result = await validated_result;
+		if (validated_result.issues) {
+			throw new Error(
+				`Invalid elicitation result: ${JSON.stringify(validated_result.issues)}`,
+			);
 		}
+		return validated_result.value;
 	}
 }

package/src/internal/internal.d.ts

@@ -1,26 +1,33 @@
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import { JSONRPCRequest } from 'json-rpc-2.0';
 import { JsonSchemaAdapter } from '../adapter.js';
+import {
+	GetPromptResult,
+	CallToolResult,
+	ReadResourceResult,
+	CompleteResult,
+	InitializeRequest,
+} from '../validation/index.js';
 
 export type Tool<TSchema extends StandardSchemaV1 = StandardSchemaV1<any>> = {
 	description: string;
 	schema: TSchema;
 	execute: (
 		input?: StandardSchemaV1.InferInput<TSchema>,
-	) => Promise<unknown> | unknown;
+	) => Promise<CallToolResult> | CallToolResult;
 };
 
 export type Completion = (
 	query: string,
 	context: { arguments: Record<string, string> },
-) => string[];
+) => CompleteResult;
 
 export type Prompt<TSchema extends StandardSchemaV1 = StandardSchemaV1<any>> = {
 	description: string;
 	schema: TSchema;
 	execute: (
 		input?: StandardSchemaV1.InferInput<TSchema>,
-	) => Promise<unknown> | unknown;
+	) => Promise<GetPromptResult> | GetPromptResult;
 };
 
 export type Resource =
@@ -31,13 +38,15 @@ export type Resource =
 			execute: (
 				uri: string,
 				params: Record<string, string | string[]>,
-			) => Promise<unknown> | unknown;
+			) => Promise<ReadResourceResult> | ReadResourceResult;
 	  }
 	| {
 			description: string;
 			name: string;
 			template: false;
-			execute: (uri: string) => Promise<unknown> | unknown;
+			execute: (
+				uri: string,
+			) => Promise<ReadResourceResult> | ReadResourceResult;
 	  };
 
 export type ServerOptions<TSchema extends StandardSchemaV1> = {
@@ -59,5 +68,11 @@ export type ServerInfo = {
 export type SubscriptionsKeys = 'resource';
 
 export type McpEvents = {
-	send: (message: JSONRPCRequest) => void;
+	send: (message: {
+		request: JSONRPCRequest;
+		context: {
+			sessions?: string[] | undefined;
+		};
+	}) => void;
+	initialize: (initialize_request: InitializeRequest) => void;
 };