Merge branch 'main' into pcarleton/auth-back-compat

Author: pcarleton

SERVER_REQUIREMENTS.md

@@ -98,7 +98,10 @@ program
           validated.scenario
         );
 
-        const { failed } = printServerResults(result.checks);
+        const { failed } = printServerResults(
+          result.checks,
+          result.scenarioDescription
+        );
         process.exit(failed > 0 ? 1 : 0);
       } else {
         // Run all active scenarios

src/index.ts

@@ -4,12 +4,26 @@ import { ConformanceCheck } from '../types';
 import { getClientScenario } from '../scenarios';
 import { ensureResultsDir, createResultDir } from './utils';
 
+/**
+ * Format markdown-style text for terminal output using ANSI codes
+ */
+function formatMarkdown(text: string): string {
+  return (
+    text
+      // Bold text: **text** -> bold
+      .replace(/\*\*([^*]+)\*\*/g, '\x1b[1m$1\x1b[0m')
+      // Inline code: `code` -> dim/gray
+      .replace(/`([^`]+)`/g, '\x1b[2m$1\x1b[0m')
+  );
+}
+
 export async function runServerConformanceTest(
   serverUrl: string,
   scenarioName: string
 ): Promise<{
   checks: ConformanceCheck[];
   resultDir: string;
+  scenarioDescription: string;
 }> {
   await ensureResultsDir();
   const resultDir = createResultDir(scenarioName, 'server');
@@ -33,11 +47,15 @@ export async function runServerConformanceTest(
 
   return {
     checks,
-    resultDir
+    resultDir,
+    scenarioDescription: scenario.description
   };
 }
 
-export function printServerResults(checks: ConformanceCheck[]): {
+export function printServerResults(
+  checks: ConformanceCheck[],
+  scenarioDescription: string
+): {
   passed: number;
   failed: number;
   denominator: number;
@@ -54,14 +72,15 @@ export function printServerResults(checks: ConformanceCheck[]): {
   console.log(`Passed: ${passed}/${denominator}, ${failed} failed`);
 
   if (failed > 0) {
-    console.log('\nFailed Checks:');
+    console.log('\n=== Failed Checks ===');
     checks
       .filter((c) => c.status === 'FAILURE')
       .forEach((c) => {
-        console.log(`  - ${c.name}: ${c.description}`);
+        console.log(`\n  - ${c.name}: ${c.description}`);
         if (c.errorMessage) {
           console.log(`    Error: ${c.errorMessage}`);
         }
+        console.log(`\n${formatMarkdown(scenarioDescription)}`);
       });
   }
 

src/runner/server.ts

@@ -8,8 +8,29 @@ import { ElicitRequestSchema } from '@modelcontextprotocol/sdk/types.js';
 
 export class ElicitationDefaultsScenario implements ClientScenario {
   name = 'elicitation-sep1034-defaults';
-  description =
-    'Test elicitation with default values for all primitive types (SEP-1034)';
+  description = `Test elicitation with default values for all primitive types (SEP-1034).
+
+**Server Implementation Requirements:**
+
+Implement a tool named \`test_elicitation_sep1034_defaults\` (no arguments) that requests \`elicitation/create\` from the client with a schema containing default values for all primitive types:
+- \`name\` (string): default "John Doe"
+- \`age\` (integer): default 30
+- \`score\` (number): default 95.5
+- \`status\` (string enum: ["active", "inactive", "pending"]): default "active"
+- \`verified\` (boolean): default true
+
+**Returns**: Text content with the elicitation result
+
+\`\`\`json
+{
+  "content": [
+    {
+      "type": "text",
+      "text": "Elicitation completed: action=<accept/decline/cancel>, content={...}"
+    }
+  ]
+}
+\`\`\``;
 
   async run(serverUrl: string): Promise<ConformanceCheck[]> {
     const checks: ConformanceCheck[] = [];

src/scenarios/server/elicitation-defaults.ts

@@ -8,7 +8,30 @@ import { ElicitRequestSchema } from '@modelcontextprotocol/sdk/types.js';
 
 export class ElicitationEnumsScenario implements ClientScenario {
   name = 'elicitation-sep1330-enums';
-  description = 'Test elicitation with enum schema improvements (SEP-1330)';
+  description = `Test elicitation with enum schema improvements (SEP-1330).
+
+**Server Implementation Requirements:**
+
+Implement a tool named \`test_elicitation_sep1330_enums\` (no arguments) that requests \`elicitation/create\` from the client with a schema containing all 5 enum variants:
+
+1. **Untitled single-select**: \`{ type: "string", enum: ["option1", "option2", "option3"] }\`
+2. **Titled single-select**: \`{ type: "string", oneOf: [{ const: "value1", title: "First Option" }, ...] }\`
+3. **Legacy titled (deprecated)**: \`{ type: "string", enum: ["opt1", "opt2", "opt3"], enumNames: ["Option One", "Option Two", "Option Three"] }\`
+4. **Untitled multi-select**: \`{ type: "array", items: { type: "string", enum: ["option1", "option2", "option3"] } }\`
+5. **Titled multi-select**: \`{ type: "array", items: { anyOf: [{ const: "value1", title: "First Choice" }, ...] } }\`
+
+**Returns**: Text content with the elicitation result
+
+\`\`\`json
+{
+  "content": [
+    {
+      "type": "text",
+      "text": "Elicitation completed: action=<accept/decline/cancel>, content={...}"
+    }
+  ]
+}
+\`\`\``;
 
   async run(serverUrl: string): Promise<ConformanceCheck[]> {
     const checks: ConformanceCheck[] = [];

src/scenarios/server/elicitation-enums.ts

@@ -7,7 +7,18 @@ import { connectToServer } from './client-helper.js';
 
 export class ServerInitializeScenario implements ClientScenario {
   name = 'server-initialize';
-  description = 'Test basic server initialization handshake';
+  description = `Test basic server initialization handshake.
+
+**Server Implementation Requirements:**
+
+**Endpoint**: \`initialize\`
+
+**Requirements**:
+- Accept \`initialize\` request with client info and capabilities
+- Return valid initialize response with server info, protocol version, and capabilities
+- Accept \`initialized\` notification from client after handshake
+
+This test verifies the server can complete the two-phase initialization handshake successfully.`;
 
   async run(serverUrl: string): Promise<ConformanceCheck[]> {
     const checks: ConformanceCheck[] = [];

src/scenarios/server/lifecycle.ts

@@ -7,7 +7,18 @@ import { connectToServer } from './client-helper.js';
 
 export class PromptsListScenario implements ClientScenario {
   name = 'prompts-list';
-  description = 'Test listing available prompts';
+  description = `Test listing available prompts.
+
+**Server Implementation Requirements:**
+
+**Endpoint**: \`prompts/list\`
+
+**Requirements**:
+- Return array of all available prompts
+- Each prompt MUST have:
+  - \`name\` (string)
+  - \`description\` (string)
+  - \`arguments\` (array, optional) - list of required arguments`;
 
   async run(serverUrl: string): Promise<ConformanceCheck[]> {
     const checks: ConformanceCheck[] = [];
@@ -76,7 +87,25 @@ export class PromptsListScenario implements ClientScenario {
 
 export class PromptsGetSimpleScenario implements ClientScenario {
   name = 'prompts-get-simple';
-  description = 'Test getting a simple prompt without arguments';
+  description = `Test getting a simple prompt without arguments.
+
+**Server Implementation Requirements:**
+
+Implement a prompt named \`test_simple_prompt\` with no arguments that returns:
+
+\`\`\`json
+{
+  "messages": [
+    {
+      "role": "user",
+      "content": {
+        "type": "text",
+        "text": "This is a simple prompt for testing."
+      }
+    }
+  ]
+}
+\`\`\``;
 
   async run(serverUrl: string): Promise<ConformanceCheck[]> {
     const checks: ConformanceCheck[] = [];
@@ -142,7 +171,29 @@ export class PromptsGetSimpleScenario implements ClientScenario {
 
 export class PromptsGetWithArgsScenario implements ClientScenario {
   name = 'prompts-get-with-args';
-  description = 'Test parameterized prompt';
+  description = `Test parameterized prompt.
+
+**Server Implementation Requirements:**
+
+Implement a prompt named \`test_prompt_with_arguments\` with arguments:
+- \`arg1\` (string, required) - First test argument
+- \`arg2\` (string, required) - Second test argument
+
+Returns (with args \`{arg1: "hello", arg2: "world"}\`):
+
+\`\`\`json
+{
+  "messages": [
+    {
+      "role": "user",
+      "content": {
+        "type": "text",
+        "text": "Prompt with arguments: arg1='hello', arg2='world'"
+      }
+    }
+  ]
+}
+\`\`\``;
 
   async run(serverUrl: string): Promise<ConformanceCheck[]> {
     const checks: ConformanceCheck[] = [];
@@ -215,7 +266,39 @@ export class PromptsGetWithArgsScenario implements ClientScenario {
 
 export class PromptsGetEmbeddedResourceScenario implements ClientScenario {
   name = 'prompts-get-embedded-resource';
-  description = 'Test prompt with embedded resource content';
+  description = `Test prompt with embedded resource content.
+
+**Server Implementation Requirements:**
+
+Implement a prompt named \`test_prompt_with_embedded_resource\` with argument:
+- \`resourceUri\` (string, required) - URI of the resource to embed
+
+Returns:
+
+\`\`\`json
+{
+  "messages": [
+    {
+      "role": "user",
+      "content": {
+        "type": "resource",
+        "resource": {
+          "uri": "<resourceUri from arguments>",
+          "mimeType": "text/plain",
+          "text": "Embedded resource content for testing."
+        }
+      }
+    },
+    {
+      "role": "user",
+      "content": {
+        "type": "text",
+        "text": "Please process the embedded resource above."
+      }
+    }
+  ]
+}
+\`\`\``;
 
   async run(serverUrl: string): Promise<ConformanceCheck[]> {
     const checks: ConformanceCheck[] = [];
@@ -288,7 +371,33 @@ export class PromptsGetEmbeddedResourceScenario implements ClientScenario {
 
 export class PromptsGetWithImageScenario implements ClientScenario {
   name = 'prompts-get-with-image';
-  description = 'Test prompt with image content';
+  description = `Test prompt with image content.
+
+**Server Implementation Requirements:**
+
+Implement a prompt named \`test_prompt_with_image\` with no arguments that returns:
+
+\`\`\`json
+{
+  "messages": [
+    {
+      "role": "user",
+      "content": {
+        "type": "image",
+        "data": "<base64-encoded-png>",
+        "mimeType": "image/png"
+      }
+    },
+    {
+      "role": "user",
+      "content": {
+        "type": "text",
+        "text": "Please analyze the image above."
+      }
+    }
+  ]
+}
+\`\`\``;
 
   async run(serverUrl: string): Promise<ConformanceCheck[]> {
     const checks: ConformanceCheck[] = [];