Fix SEP-1036 URL elicitation conformance tests

- Use elicitInput() instead of raw request() for proper capability checking
- Add completion notification test (notifications/elicitation/complete)
- Add test_elicitation_sep1036_complete tool to everything-server

Author: felixweinberger

examples/servers/typescript/everything-server.ts

@@ -13,7 +13,11 @@ import {
   ResourceTemplate
 } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
-import { ElicitResultSchema, McpError, ErrorCode } from '@modelcontextprotocol/sdk/types.js';
+import {
+  ElicitResultSchema,
+  McpError,
+  ErrorCode
+} from '@modelcontextprotocol/sdk/types.js';
 import { z } from 'zod';
 import express from 'express';
 import cors from 'cors';
@@ -579,27 +583,18 @@ function createMcpServer() {
     async () => {
       try {
         const elicitationId = `sep1036-test-${randomUUID()}`;
-        const result = await mcpServer.server.request(
-          {
-            method: 'elicitation/create',
-            params: {
-              mode: 'url',
-              message: 'Please complete authorization to continue',
-              url: 'https://mcp.example.com/authorize',
-              elicitationId
-            }
-          },
-          z
-            .object({ method: z.literal('elicitation/create') })
-            .passthrough() as any
-        );
+        const result = await mcpServer.server.elicitInput({
+          mode: 'url',
+          message: 'Please complete authorization to continue',
+          url: 'https://mcp.example.com/authorize',
+          elicitationId
+        });
 
-        const elicitResult = result as any;
         return {
           content: [
             {
               type: 'text',
-              text: `URL elicitation completed: action=${elicitResult.action}`
+              text: `URL elicitation completed: action=${result.action}`
             }
           ]
         };
@@ -643,6 +638,42 @@ function createMcpServer() {
     }
   );
 
+  // SEP-1036: URL mode elicitation with completion notification
+  mcpServer.registerTool(
+    'test_elicitation_sep1036_complete',
+    {
+      description:
+        'Tests URL mode elicitation with completion notification per SEP-1036',
+      inputSchema: {}
+    },
+    async () => {
+      const elicitationId = `sep1036-complete-${randomUUID()}`;
+      const result = await mcpServer.server.elicitInput({
+        mode: 'url',
+        message: 'Please complete the authorization flow',
+        url: 'https://mcp.example.com/authorize-with-completion',
+        elicitationId
+      });
+
+      // Send completion notification after client accepts
+      if (result.action === 'accept') {
+        // Create a notifier for this elicitationId and send the notification
+        const notifier =
+          mcpServer.server.createElicitationCompletionNotifier(elicitationId);
+        await notifier();
+      }
+
+      return {
+        content: [
+          {
+            type: 'text',
+            text: `URL elicitation with completion: action=${result.action}, notification sent`
+          }
+        ]
+      };
+    }
+  );
+
   // Dynamic tool (registered later via timer)
 
   // ===== RESOURCES =====

src/scenarios/server/elicitation-url.ts

@@ -6,6 +6,7 @@ import { ClientScenario, ConformanceCheck } from '../../types.js';
 import { connectToServerWithUrlElicitation } from './client-helper.js';
 import {
   ElicitRequestSchema,
+  ElicitationCompleteNotificationSchema,
   ErrorCode,
   McpError
 } from '@modelcontextprotocol/sdk/types.js';
@@ -16,7 +17,7 @@ export class ElicitationUrlModeScenario implements ClientScenario {
 
 **Server Implementation Requirements:**
 
-Implement two tools:
+Implement three tools:
 
 1. \`test_elicitation_sep1036_url\` (no arguments) - Requests URL mode elicitation from client with:
    - \`mode\`: "url"
@@ -30,6 +31,11 @@ Implement two tools:
    - Error code: -32042
    - Error data contains \`elicitations\` array with URL mode elicitation objects
 
+3. \`test_elicitation_sep1036_complete\` (no arguments) - Tests completion notification flow:
+   - Requests URL mode elicitation
+   - When client accepts, sends \`notifications/elicitation/complete\` notification
+   - The notification must include the matching \`elicitationId\`
+
 **Example elicitation request:**
 \`\`\`json
 {
@@ -399,6 +405,126 @@ Implement two tools:
         });
       }
 
+      // Part 3: Test completion notification flow
+      let completionNotificationReceived = false;
+      let receivedElicitationId: string | null = null;
+      let capturedElicitationIdFromRequest: string | null = null;
+
+      // Set up notification handler for completion
+      connection.client.setNotificationHandler(
+        ElicitationCompleteNotificationSchema,
+        (notification) => {
+          completionNotificationReceived = true;
+          receivedElicitationId = notification.params.elicitationId;
+        }
+      );
+
+      // Update the request handler to capture the elicitationId
+      connection.client.setRequestHandler(
+        ElicitRequestSchema,
+        async (request) => {
+          capturedElicitationIdFromRequest = request.params.elicitationId;
+          return { action: 'accept' };
+        }
+      );
+
+      try {
+        await connection.client.callTool({
+          name: 'test_elicitation_sep1036_complete',
+          arguments: {}
+        });
+
+        // Small delay to allow notification to be received
+        await new Promise((resolve) => setTimeout(resolve, 100));
+
+        // Check 10: Verify completion notification was received
+        const notificationErrors: string[] = [];
+        if (!completionNotificationReceived) {
+          notificationErrors.push(
+            'Server did not send notifications/elicitation/complete notification'
+          );
+        }
+
+        checks.push({
+          id: 'sep1036-url-completion-notification',
+          name: 'URLCompletionNotification',
+          description:
+            'Server sends notifications/elicitation/complete after out-of-band completion',
+          status: notificationErrors.length === 0 ? 'SUCCESS' : 'FAILURE',
+          timestamp: new Date().toISOString(),
+          errorMessage:
+            notificationErrors.length > 0
+              ? notificationErrors.join('; ')
+              : undefined,
+          specReferences: [
+            {
+              id: 'SEP-1036',
+              url: 'https://github.com/modelcontextprotocol/modelcontextprotocol/pull/887'
+            }
+          ],
+          details: {
+            notificationReceived: completionNotificationReceived
+          }
+        });
+
+        // Check 11: Verify elicitationId matches
+        const idMatchErrors: string[] = [];
+        if (completionNotificationReceived) {
+          if (!receivedElicitationId) {
+            idMatchErrors.push('Completion notification missing elicitationId');
+          } else if (
+            capturedElicitationIdFromRequest &&
+            receivedElicitationId !== capturedElicitationIdFromRequest
+          ) {
+            idMatchErrors.push(
+              `elicitationId mismatch: request had "${capturedElicitationIdFromRequest}", notification had "${receivedElicitationId}"`
+            );
+          }
+        }
+
+        checks.push({
+          id: 'sep1036-url-completion-id-match',
+          name: 'URLCompletionIdMatch',
+          description:
+            'Completion notification elicitationId matches the original request',
+          status:
+            completionNotificationReceived && idMatchErrors.length === 0
+              ? 'SUCCESS'
+              : completionNotificationReceived
+                ? 'FAILURE'
+                : 'SKIPPED',
+          timestamp: new Date().toISOString(),
+          errorMessage:
+            idMatchErrors.length > 0 ? idMatchErrors.join('; ') : undefined,
+          specReferences: [
+            {
+              id: 'SEP-1036',
+              url: 'https://github.com/modelcontextprotocol/modelcontextprotocol/pull/887'
+            }
+          ],
+          details: {
+            requestElicitationId: capturedElicitationIdFromRequest,
+            notificationElicitationId: receivedElicitationId
+          }
+        });
+      } catch (error) {
+        checks.push({
+          id: 'sep1036-url-completion-notification',
+          name: 'URLCompletionNotification',
+          description:
+            'Server sends notifications/elicitation/complete after out-of-band completion',
+          status: 'FAILURE',
+          timestamp: new Date().toISOString(),
+          errorMessage: `Tool call failed: ${error instanceof Error ? error.message : String(error)}`,
+          specReferences: [
+            {
+              id: 'SEP-1036',
+              url: 'https://github.com/modelcontextprotocol/modelcontextprotocol/pull/887'
+            }
+          ]
+        });
+      }
+
       await connection.close();
     } catch (error) {
       checks.push({