fixes

Author: KKonstantinov

src/server/context.ts

@@ -146,7 +146,7 @@ export class Context<RequestT extends Request = Request, NotificationT extends N
      * This is used by certain transports to correctly associate related messages.
      */
     public sendNotification = (notification: NotificationT | ServerNotification): Promise<void> => {
-        return this.server.notification(notification);
+        return this.requestCtx.sendNotification(notification);
     };
 
     /**
@@ -159,7 +159,7 @@ export class Context<RequestT extends Request = Request, NotificationT extends N
         resultSchema: U,
         options?: RequestOptions
     ): Promise<SchemaOutput<U>> => {
-        return this.server.request(request, resultSchema, { ...options, relatedRequestId: this.requestId });
+        return this.requestCtx.sendRequest(request, resultSchema, { ...options, relatedRequestId: this.requestId });
     };
 
     /**

src/server/mcp.ts

@@ -1136,7 +1136,7 @@ export class McpServer {
     /**
      * Registers a prompt with a config object and callback.
      */
-    registerPrompt<Args extends PromptArgsRawShape>(
+    registerPrompt<Args extends undefined | PromptArgsRawShape = undefined>(
         name: string,
         config: {
             title?: string;

test/server/context.test.ts

@@ -13,7 +13,6 @@ import {
 } from '../../src/types.js';
 import { InMemoryTransport } from '../../src/inMemory.js';
 import { RequestHandlerExtra } from '../../src/shared/protocol.js';
-import { ShapeOutput, ZodRawShapeCompat } from '../../src/server/zod-compat.js';
 
 describe('Context', () => {
     /***
@@ -243,15 +242,11 @@ describe('Context', () => {
                 'prompt',
                 (mcpServer, seen) => {
                     // The test is to ensure that the extra is compatible with the RequestHandlerExtra type
-                    mcpServer.registerPrompt(
-                        'ctx-prompt',
-                        {},
-                        async (args: ShapeOutput<ZodRawShapeCompat>, extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => {
-                            seen.isContext = extra instanceof Context;
-                            seen.hasRequestId = !!extra.requestId;
-                            return { messages: [] };
-                        }
-                    );
+                    mcpServer.registerPrompt('ctx-prompt', {}, async (extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => {
+                        seen.isContext = extra instanceof Context;
+                        seen.hasRequestId = !!extra.requestId;
+                        return { messages: [] };
+                    });
                 },
                 client => client.request({ method: 'prompts/get', params: { name: 'ctx-prompt', arguments: {} } }, GetPromptResultSchema)
             ]