tmcp 1.6.2 → 1.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tmcp",
-  "version": "1.6.2",
+  "version": "1.7.1",
   "description": "The main tmcp library",
   "main": "src/index.js",
   "type": "module",
@@ -36,10 +36,11 @@
     "@standard-schema/spec": "^1.0.0",
     "@types/json-schema": "^7.0.15",
     "@types/node": "^24.0.13",
-    "publint": "^0.3.12"
+    "publint": "^0.3.12",
+    "vitest": "^3.2.4"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "vitest",
     "typecheck": "tsc --noEmit",
     "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

@@ -41,17 +41,18 @@ export class McpServer<StandardSchema extends StandardSchemaV1> {
      * @param {McpEvents[TEvent]} callback
      * @param {AddEventListenerOptions} [options]
      */
-    on<TEvent extends keyof McpEvents>(event: TEvent, callback: McpEvents[TEvent], options?: AddEventListenerOptions): void;
+    on<TEvent extends keyof McpEvents>(event: TEvent, callback: McpEvents[TEvent], options?: AddEventListenerOptions): () => void;
     /**
      * @template {StandardSchema | undefined} [TSchema=undefined]
-     * @param {{ name: string; description: string; title?: string; schema?: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema> extends Record<string, unknown> ? TSchema : never }} options
+     * @param {{ name: string; description: string; title?: string; schema?: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema> extends Record<string, unknown> ? TSchema : never; annotations?: ToolAnnotations }} options
      * @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, title, schema }: {
+    tool<TSchema extends StandardSchema | undefined = undefined>({ name, description, title, schema, annotations }: {
         name: string;
         description: string;
         title?: string;
         schema?: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema> extends Record<string, unknown> ? TSchema : never;
+        annotations?: ToolAnnotations;
     }, execute: TSchema extends undefined ? (() => Promise<CallToolResult> | CallToolResult) : ((input: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema>) => Promise<CallToolResult> | CallToolResult)): void;
     /**
      * @template {StandardSchema | undefined} [TSchema=undefined]
@@ -129,6 +130,7 @@ export class McpServer<StandardSchema extends StandardSchemaV1> {
 export type ClientCapabilities = ClientCapabilitiesType;
 import type { StandardSchemaV1 } from "@standard-schema/spec";
 import type { McpEvents } from "./internal/internal.js";
+import type { ToolAnnotations } from "./validation/index.js";
 import type { CallToolResult } from "./validation/index.js";
 import type { Completion } from "./internal/internal.js";
 import type { GetPromptResult } from "./validation/index.js";

package/src/index.js

@@ -3,7 +3,7 @@
  * @import SqidsType from "sqids";
  * @import { JSONRPCRequest, JSONRPCParams } from "json-rpc-2.0";
  * @import { ExtractURITemplateVariables } from "./internal/uri-template.js";
- * @import { CallToolResult, ReadResourceResult, GetPromptResult, ClientCapabilities as ClientCapabilitiesType, JSONRPCRequest as JSONRPCRequestType, JSONRPCResponse, CreateMessageRequestParams, CreateMessageResult, Resource, LoggingLevel } from "./validation/index.js";
+ * @import { CallToolResult, ReadResourceResult, GetPromptResult, ClientCapabilities as ClientCapabilitiesType, JSONRPCRequest as JSONRPCRequestType, JSONRPCResponse, CreateMessageRequestParams, CreateMessageResult, Resource, LoggingLevel, ToolAnnotations } from "./validation/index.js";
  * @import { Tool, Completion, Prompt, StoredResource, ServerOptions, ServerInfo, SubscriptionsKeys, McpEvents } from "./internal/internal.js";
  */
 import { JSONRPCClient, JSONRPCServer } from 'json-rpc-2.0';
@@ -270,13 +270,18 @@ export class McpServer {
 			this.#lazyily_create_client();
 		}
 
-		this.#event_target.addEventListener(
-			event,
-			(e) => {
-				callback(/** @type {CustomEvent} */ (e).detail);
-			},
-			options,
-		);
+		/**
+		 * @param {Event} e
+		 */
+		const listener = (e) => {
+			callback(/** @type {CustomEvent} */ (e).detail);
+		};
+
+		this.#event_target.addEventListener(event, listener, options);
+
+		return () => {
+			this.#event_target.removeEventListener(event, listener, options);
+		};
 	}
 
 	/**
@@ -300,6 +305,7 @@ export class McpServer {
 						name,
 						title: tool.title || tool.description,
 						description: tool.description,
+						annotations: tool.annotations,
 						inputSchema: tool.schema
 							? await this.#options.adapter.toJsonSchema(
 									tool.schema,
@@ -519,7 +525,10 @@ export class McpServer {
 			}
 			if (resource.template) {
 				if (!params)
-					throw new McpError(-32602, 'Missing parameters for template resource');
+					throw new McpError(
+						-32602,
+						'Missing parameters for template resource',
+					);
 				return v.parse(
 					ReadResourceResultSchema,
 					await resource.execute(uri, params),
@@ -595,10 +604,10 @@ export class McpServer {
 	}
 	/**
 	 * @template {StandardSchema | undefined} [TSchema=undefined]
-	 * @param {{ name: string; description: string; title?: string; schema?: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema> extends Record<string, unknown> ? TSchema : never }} options
+	 * @param {{ name: string; description: string; title?: string; schema?: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema> extends Record<string, unknown> ? TSchema : never; annotations?: ToolAnnotations }} options
 	 * @param {TSchema extends undefined ? (()=>Promise<CallToolResult> | CallToolResult) : ((input: StandardSchemaV1.InferInput<TSchema extends undefined ? never : TSchema>) => Promise<CallToolResult> | CallToolResult)} execute
 	 */
-	tool({ name, description, title, schema }, execute) {
+	tool({ name, description, title, schema, annotations }, execute) {
 		if (this.#options.capabilities?.tools?.listChanged) {
 			this.#notify('notifications/tools/list_changed', {});
 		}
@@ -607,6 +616,7 @@ export class McpServer {
 			title,
 			schema,
 			execute,
+			annotations,
 		});
 	}
 	/**

package/src/internal/internal.d.ts

@@ -9,13 +9,15 @@ import {
 	InitializeRequestParams,
 	Resource,
 	ServerCapabilities,
-	LoggingLevel
+	LoggingLevel,
+	ToolAnnotations
 } from '../validation/index.js';
 
 export type Tool<TSchema extends StandardSchemaV1 = StandardSchemaV1<any>> = {
 	description: string;
 	schema: TSchema;
 	title?: string;
+	annotations?: ToolAnnotations;
 	execute: (
 		input?: StandardSchemaV1.InferInput<TSchema>,
 	) => Promise<CallToolResult> | CallToolResult;

package/src/validation/index.d.ts

@@ -4315,4 +4315,5 @@ export type Resource = v.InferInput<typeof ResourceSchema>;
 export type JSONRPCRequest = v.InferInput<typeof JSONRPCRequestSchema>;
 export type JSONRPCResponse = v.InferInput<typeof JSONRPCResponseSchema>;
 export type LoggingLevel = v.InferInput<typeof LoggingLevelSchema>;
+export type ToolAnnotations = v.InferInput<typeof ToolAnnotationsSchema>;
 import * as v from 'valibot';

package/src/validation/index.js

@@ -1530,3 +1530,6 @@ export const ServerResultSchema = v.union([
 /**
  * @typedef {v.InferInput<typeof LoggingLevelSchema>} LoggingLevel
  */
+/**
+ * @typedef {v.InferInput<typeof ToolAnnotationsSchema>} ToolAnnotations
+ */