add suites and shift pending to reflect current pending

Author: pcarleton

package-lock.json

@@ -45,7 +45,7 @@
     "vitest": "^4.0.5"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.22.0",
+    "@modelcontextprotocol/sdk": "^1.23.0-beta.0",
     "commander": "^14.0.2",
     "express": "^5.1.0",
     "zod": "^3.25.76"

package.json

@@ -14,6 +14,7 @@ import {
   listScenarios,
   listClientScenarios,
   listActiveClientScenarios,
+  listPendingClientScenarios,
   listAuthScenarios,
   listMetadataScenarios
 } from './scenarios';
@@ -53,7 +54,9 @@ program
 
         const suites: Record<string, () => string[]> = {
           auth: listAuthScenarios,
-          metadata: listMetadataScenarios
+          metadata: listMetadataScenarios,
+          'sep-835': () =>
+            listAuthScenarios().filter((name) => name.startsWith('auth/scope-'))
         };
 
         const suiteName = options.suite.toLowerCase();
@@ -123,8 +126,9 @@ program
           totalWarnings += warnings;
 
           const status = failed === 0 ? '✓' : '✗';
+          const warningStr = warnings > 0 ? `, ${warnings} warnings` : '';
           console.log(
-            `${status} ${result.scenario}: ${passed} passed, ${failed} failed`
+            `${status} ${result.scenario}: ${passed} passed, ${failed} failed${warningStr}`
           );
 
           if (verbose && failed > 0) {
@@ -149,7 +153,7 @@ program
         console.error('Either --scenario or --suite is required');
         console.error('\nAvailable client scenarios:');
         listScenarios().forEach((s) => console.error(`  - ${s}`));
-        console.error('\nAvailable suites: auth, metadata');
+        console.error('\nAvailable suites: auth, metadata, sep-835');
         process.exit(1);
       }
 
@@ -193,7 +197,12 @@ program
   .requiredOption('--url <url>', 'URL of the server to test')
   .option(
     '--scenario <scenario>',
-    'Scenario to test (defaults to all scenarios if not specified)'
+    'Scenario to test (defaults to active suite if not specified)'
+  )
+  .option(
+    '--suite <suite>',
+    'Suite to run: "active" (default, excludes pending), "all", or "pending"',
+    'active'
   )
   .action(async (options) => {
     try {
@@ -213,10 +222,24 @@ program
         );
         process.exit(failed > 0 ? 1 : 0);
       } else {
-        // Run all active scenarios
-        const scenarios = listActiveClientScenarios();
+        // Run scenarios based on suite
+        const suite = options.suite?.toLowerCase() || 'active';
+        let scenarios: string[];
+
+        if (suite === 'all') {
+          scenarios = listClientScenarios();
+        } else if (suite === 'active') {
+          scenarios = listActiveClientScenarios();
+        } else if (suite === 'pending') {
+          scenarios = listPendingClientScenarios();
+        } else {
+          console.error(`Unknown suite: ${suite}`);
+          console.error('Available suites: active, all, pending');
+          process.exit(1);
+        }
+
         console.log(
-          `Running ${scenarios.length} scenarios against ${validated.url}\n`
+          `Running ${suite} suite (${scenarios.length} scenarios) against ${validated.url}\n`
         );
 
         const allResults: { scenario: string; checks: ConformanceCheck[] }[] =

src/index.ts

@@ -17,17 +17,6 @@ beforeAll(() => {
 });
 
 const skipScenarios = new Set<string>([
-  // Waiting on typescript-sdk support in bearerAuth middleware to include
-  // scope in WWW-Authenticate header
-  // https://github.com/modelcontextprotocol/typescript-sdk/pull/1133
-  'auth/scope-from-www-authenticate',
-  // Waiting on typescript-sdk support for using scopes_supported from PRM
-  // to request scopes.
-  // https://github.com/modelcontextprotocol/typescript-sdk/pull/1133
-  'auth/scope-from-scopes-supported',
-  // Waiting on typescript-sdk support for CIMD
-  // https://github.com/modelcontextprotocol/typescript-sdk/pull/1127
-  'auth/basic-cimd'
 ]);
 
 const allowClientErrorScenarios = new Set<string>([

src/scenarios/client/auth/index.test.ts

@@ -58,7 +58,12 @@ const pendingClientScenariosList: ClientScenario[] = [
   // JSON Schema 2020-12 (SEP-1613)
   // This test is pending until the SDK includes PR #1135 which preserves
   // $schema, $defs, and additionalProperties fields in tool schemas.
-  new JsonSchema2020_12Scenario()
+  new JsonSchema2020_12Scenario(),
+
+  // On hold until elicitation schema types are fixed
+  // https://github.com/modelcontextprotocol/modelcontextprotocol/pull/1863
+  new ToolsCallElicitationScenario(),
+  new ElicitationDefaultsScenario(),
 ];
 
 // All client scenarios
@@ -90,7 +95,7 @@ const allClientScenariosList: ClientScenario[] = [
   new ElicitationDefaultsScenario(),
 
   // Elicitation scenarios (SEP-1330) - pending
-  ...pendingClientScenariosList,
+  new ElicitationEnumsScenario(),
 
   // Resources scenarios
   new ResourcesListScenario(),
@@ -159,6 +164,10 @@ export function listActiveClientScenarios(): string[] {
   return activeClientScenariosList.map((scenario) => scenario.name);
 }
 
+export function listPendingClientScenarios(): string[] {
+  return pendingClientScenariosList.map((scenario) => scenario.name);
+}
+
 export function listAuthScenarios(): string[] {
   return authScenariosList.map((scenario) => scenario.name);
 }