tmcp 1.6.1 → 1.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tmcp",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "description": "The main tmcp library",
   "main": "src/index.js",
   "type": "module",

package/src/index.d.ts

@@ -44,14 +44,15 @@ export class McpServer<StandardSchema extends StandardSchemaV1> {
     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';
@@ -300,6 +300,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,
@@ -317,7 +318,7 @@ export class McpServer {
 			async ({ name, arguments: args }) => {
 				const tool = this.#tools.get(name);
 				if (!tool) {
-					throw new Error(`Tool ${name} not found`);
+					throw new McpError(-32601, `Tool ${name} not found`);
 				}
 				if (!tool.schema) {
 					return v.parse(CallToolResultSchema, await tool.execute());
@@ -326,7 +327,8 @@ export class McpServer {
 				if (validated_args instanceof Promise)
 					validated_args = await validated_args;
 				if (validated_args.issues) {
-					throw new Error(
+					throw new McpError(
+						-32602,
 						`Invalid arguments for tool ${name}: ${JSON.stringify(validated_args.issues)}`,
 					);
 				}
@@ -403,7 +405,7 @@ export class McpServer {
 			async ({ name, arguments: args }) => {
 				const prompt = this.#prompts.get(name);
 				if (!prompt) {
-					throw new Error(`Tool ${name} not found`);
+					throw new McpError(-32601, `Prompt ${name} not found`);
 				}
 				if (!prompt.schema) {
 					return v.parse(
@@ -415,8 +417,9 @@ export class McpServer {
 				if (validated_args instanceof Promise)
 					validated_args = await validated_args;
 				if (validated_args.issues) {
-					throw new Error(
-						`Invalid arguments for tool ${name}: ${JSON.stringify(validated_args.issues)}`,
+					throw new McpError(
+						-32602,
+						`Invalid arguments for prompt ${name}: ${JSON.stringify(validated_args.issues)}`,
 					);
 				}
 				return v.parse(
@@ -512,12 +515,15 @@ export class McpServer {
 					params = match.params;
 				}
 				if (!resource) {
-					throw new Error(`Resource ${uri} not found`);
+					throw new McpError(-32601, `Resource ${uri} not found`);
 				}
 			}
 			if (resource.template) {
 				if (!params)
-					throw new Error('Missing parameters for template resource');
+					throw new McpError(
+						-32602,
+						'Missing parameters for template resource',
+					);
 				return v.parse(
 					ReadResourceResultSchema,
 					await resource.execute(uri, params),
@@ -593,10 +599,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', {});
 		}
@@ -605,6 +611,7 @@ export class McpServer {
 			title,
 			schema,
 			execute,
+			annotations,
 		});
 	}
 	/**
@@ -753,7 +760,7 @@ export class McpServer {
 	 */
 	async elicitation(schema) {
 		if (!this.#client_capabilities?.elicitation)
-			throw new Error("Client doesn't support elicitation");
+			throw new McpError(-32601, "Client doesn't support elicitation");
 
 		this.#lazyily_create_client();
 		let validated_result = schema['~standard'].validate(
@@ -770,7 +777,8 @@ export class McpServer {
 		if (validated_result instanceof Promise)
 			validated_result = await validated_result;
 		if (validated_result.issues) {
-			throw new Error(
+			throw new McpError(
+				-32603,
 				`Invalid elicitation result: ${JSON.stringify(validated_result.issues)}`,
 			);
 		}
@@ -784,7 +792,7 @@ export class McpServer {
 	 */
 	async message(request) {
 		if (!this.#client_capabilities?.sampling)
-			throw new Error("Client doesn't support sampling");
+			throw new McpError(-32601, "Client doesn't support sampling");
 
 		this.#lazyily_create_client();
 
@@ -815,7 +823,8 @@ export class McpServer {
 	 */
 	log(level, data, logger) {
 		if (!this.#options.capabilities?.logging) {
-			throw new Error(
+			throw new McpError(
+				-32601,
 				"The server doesn't support logging, please enable it in capabilities",
 			);
 		}

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
+ */