fix: update mcp.ts and protocol.ts after rebase - use getMethodLiteral, add createToolError

Author: dclark27

package-lock.json

@@ -45,7 +45,7 @@ import {
 } from '../types.js';
 
 import { UriTemplate, Variables } from '../shared/uriTemplate.js';
-import { RequestHandlerExtra } from '../shared/protocol.js';
+import { RequestHandlerExtra, getMethodLiteral } from '../shared/protocol.js';
 import { Transport } from '../shared/transport.js';
 
 import { toJsonSchemaCompat } from './zod-json-schema-compat.js';
@@ -96,8 +96,8 @@ export class McpServer {
             return;
         }
 
-        this.server.assertCanSetRequestHandler(ListToolsRequestSchema.shape.method.value);
-        this.server.assertCanSetRequestHandler(CallToolRequestSchema.shape.method.value);
+        this.server.assertCanSetRequestHandler(getMethodLiteral(ListToolsRequestSchema));
+        this.server.assertCanSetRequestHandler(getMethodLiteral(CallToolRequestSchema));
 
         this.server.registerCapabilities({
             tools: {
@@ -207,14 +207,32 @@ export class McpServer {
         this._toolHandlersInitialized = true;
     }
 
+    /**
+     * Creates a tool error result.
+     *
+     * @param errorMessage - The error message.
+     * @returns The tool error result.
+     */
+    private createToolError(errorMessage: string): CallToolResult {
+        return {
+            content: [
+                {
+                    type: 'text',
+                    text: errorMessage
+                }
+            ],
+            isError: true
+        };
+    }
+
     private _completionHandlerInitialized = false;
 
     private setCompletionRequestHandler() {
         if (this._completionHandlerInitialized) {
             return;
         }
 
-        this.server.assertCanSetRequestHandler(CompleteRequestSchema.shape.method.value);
+        this.server.assertCanSetRequestHandler(getMethodLiteral(CompleteRequestSchema));
 
         this.server.registerCapabilities({
             completions: {}
@@ -301,9 +319,9 @@ export class McpServer {
             return;
         }
 
-        this.server.assertCanSetRequestHandler(ListResourcesRequestSchema.shape.method.value);
-        this.server.assertCanSetRequestHandler(ListResourceTemplatesRequestSchema.shape.method.value);
-        this.server.assertCanSetRequestHandler(ReadResourceRequestSchema.shape.method.value);
+        this.server.assertCanSetRequestHandler(getMethodLiteral(ListResourcesRequestSchema));
+        this.server.assertCanSetRequestHandler(getMethodLiteral(ListResourceTemplatesRequestSchema));
+        this.server.assertCanSetRequestHandler(getMethodLiteral(ReadResourceRequestSchema));
 
         this.server.registerCapabilities({
             resources: {
@@ -384,8 +402,8 @@ export class McpServer {
             return;
         }
 
-        this.server.assertCanSetRequestHandler(ListPromptsRequestSchema.shape.method.value);
-        this.server.assertCanSetRequestHandler(GetPromptRequestSchema.shape.method.value);
+        this.server.assertCanSetRequestHandler(getMethodLiteral(ListPromptsRequestSchema));
+        this.server.assertCanSetRequestHandler(getMethodLiteral(GetPromptRequestSchema));
 
         this.server.registerCapabilities({
             prompts: {