tmcp 1.15.3 → 1.15.5

package/package.json

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

package/src/index.js

@@ -205,11 +205,6 @@ export class McpServer {
 	 */
 	#client_info_map = new Map();
 
-	/**
-	 * @type {Map<string|undefined, string>}
-	 */
-	#negotiated_protocol_versions = new Map();
-
 	/**
 	 * @type {Map<string|undefined, LoggingLevel>}
 	 */
@@ -250,12 +245,6 @@ export class McpServer {
 					validated_initialize.protocolVersion,
 				);
 
-				// Store negotiated protocol version
-				this.#negotiated_protocol_versions.set(
-					session_id,
-					negotiated_version,
-				);
-
 				// Store client capabilities
 				this.#client_capabilities_map.set(
 					session_id,
@@ -467,7 +456,15 @@ export class McpServer {
 			async ({ name, arguments: args }) => {
 				const tool = this.#tools.get(name);
 				if (!tool) {
-					throw new McpError(-32601, `Tool ${name} not found`);
+					return /** @type {CallToolResult<any>} */ ({
+						isError: true,
+						content: [
+							{
+								type: 'text',
+								text: `Tool ${name} not found`,
+							},
+						],
+					});
 				}
 
 				// Validate input arguments if schema is provided
@@ -478,10 +475,15 @@ export class McpServer {
 					if (validation_result instanceof Promise)
 						validation_result = await validation_result;
 					if (validation_result.issues) {
-						throw new McpError(
-							-32602,
-							`Invalid arguments for tool ${name}: ${JSON.stringify(validation_result.issues)}`,
-						);
+						return /** @type {CallToolResult<any>} */ ({
+							isError: true,
+							content: [
+								{
+									type: 'text',
+									text: `Invalid arguments for tool ${name}: ${JSON.stringify(validation_result.issues)}`,
+								},
+							],
+						});
 					}
 					validated_args = validation_result.value;
 				}
@@ -508,10 +510,15 @@ export class McpServer {
 					if (output_validation instanceof Promise)
 						output_validation = await output_validation;
 					if (output_validation.issues) {
-						throw new McpError(
-							-32603,
-							`Tool ${name} returned invalid structured content: ${JSON.stringify(output_validation.issues)}`,
-						);
+						return /** @type {CallToolResult<any>} */ ({
+							isError: true,
+							content: [
+								{
+									type: 'text',
+									text: `Tool ${name} returned invalid structured content: ${JSON.stringify(output_validation.issues)}`,
+								},
+							],
+						});
 					}
 					// Update with validated structured content
 					parsed_result.structuredContent = output_validation.value;
@@ -1174,11 +1181,15 @@ export class McpServer {
 
 		const sessions = [];
 
-		for (let [session_id, session_log_level] of this.#session_log_levels) {
-			// Check if the current log level should be sent based on severity
-			if (this.#should_log(level, session_log_level)) {
-				sessions.push(session_id);
-			}
+		const current_session_level = this.#session_log_levels.get(
+			this.#session_id,
+		);
+
+		if (
+			current_session_level &&
+			this.#should_log(level, current_session_level)
+		) {
+			sessions.push(this.#session_id);
 		}
 
 		if (sessions.length === 0) return;