some clean up

Author: pcarleton

src/checks/server.ts

@@ -1,36 +1 @@
-import { ConformanceCheck, CheckStatus } from '../types.js';
-
-export function createServerInitializationCheck(initializeResponse: any, expectedSpecVersion: string = '2025-06-18'): ConformanceCheck {
-    const result = initializeResponse?.result;
-    const protocolVersion = result?.protocolVersion;
-    const serverInfo = result?.serverInfo;
-    const capabilities = result?.capabilities;
-    
-    const errors: string[] = [];
-    if (!initializeResponse?.jsonrpc) errors.push('Missing jsonrpc field');
-    if (!initializeResponse?.id) errors.push('Missing id field');
-    if (!result) errors.push('Missing result field');
-    if (!protocolVersion) errors.push('Missing protocolVersion in result');
-    if (protocolVersion !== expectedSpecVersion) errors.push(`Protocol version mismatch: expected ${expectedSpecVersion}, got ${protocolVersion}`);
-    if (!serverInfo) errors.push('Missing serverInfo in result');
-    if (!serverInfo?.name) errors.push('Missing server name in serverInfo');
-    if (!serverInfo?.version) errors.push('Missing server version in serverInfo');
-    if (capabilities === undefined) errors.push('Missing capabilities in result');
-
-    const status: CheckStatus = errors.length === 0 ? 'SUCCESS' : 'FAILURE';
-
-    return {
-        id: 'mcp-server-initialization',
-        name: 'MCPServerInitialization',
-        description: 'Validates that MCP server properly responds to initialize request',
-        status,
-        timestamp: new Date().toISOString(),
-        specReferences: [{ id: 'MCP-Lifecycle', url: 'https://modelcontextprotocol.io/specification/2025-06-18/basic/lifecycle' }],
-        details: {
-            expectedSpecVersion,
-            response: initializeResponse
-        },
-        errorMessage: errors.length > 0 ? errors.join('; ') : undefined,
-        logs: errors.length > 0 ? errors : undefined
-    };
-}
+import { ConformanceCheck, CheckStatus } from '../types.js';

src/scenarios/client/tools_call.ts

@@ -2,7 +2,7 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js';
 import type { Scenario, ConformanceCheck } from '../../types.js';
-import express from 'express';
+import express, { Request, Response, NextFunction } from 'express';
 import { ScenarioUrls } from '../../types.js';
 
 function createServer(checks: ConformanceCheck[]): express.Application {
@@ -83,7 +83,7 @@ function createServer(checks: ConformanceCheck[]): express.Application {
     const app = express();
     app.use(express.json());
 
-    app.use((req, res, next) => {
+    app.use((req: Request, res: Response, next: NextFunction) => {
         // Log incoming requests for debugging
         // console.log(`Incoming request: ${req.method} ${req.url}`);
         checks.push({
@@ -111,7 +111,7 @@ function createServer(checks: ConformanceCheck[]): express.Application {
         });
     });
 
-    app.post('/mcp', async (req, res) => {
+    app.post('/mcp', async (req: Request, res: Response) => {
         const transport = new StreamableHTTPServerTransport({
             sessionIdGenerator: undefined
         });

src/scenarios/index.ts

@@ -1,12 +1,10 @@
 import { Scenario, ClientScenario } from '../types.js';
 import { InitializeScenario } from './client/initialize.js';
 import { ToolsCallScenario } from './client/tools_call.js';
-import { ServerInitializeClientScenario } from './server/server_initialize.js';
 
 // Import all new server test scenarios
 import {
-    ServerInitializeScenario,
-    ServerInitializeCapabilitiesScenario
+    ServerInitializeScenario
 } from './server/lifecycle.js';
 
 import {
@@ -51,12 +49,8 @@ export const scenarios = new Map<string, Scenario>([
 ]);
 
 export const clientScenarios = new Map<string, ClientScenario>([
-    // Legacy
-    ['initialize', new ServerInitializeClientScenario()],
-
     // Lifecycle scenarios
     ['server-initialize', new ServerInitializeScenario()],
-    ['server-initialize-capabilities', new ServerInitializeCapabilitiesScenario()],
 
     // Utilities scenarios
     ['logging-set-level', new LoggingSetLevelScenario()],

src/scenarios/server/lifecycle.ts

@@ -52,51 +52,3 @@ export class ServerInitializeScenario implements ClientScenario {
         return checks;
     }
 }
-
-export class ServerInitializeCapabilitiesScenario implements ClientScenario {
-    name = 'server-initialize-capabilities';
-    description = 'Test server advertising all its capabilities';
-
-    async run(serverUrl: string): Promise<ConformanceCheck[]> {
-        const checks: ConformanceCheck[] = [];
-
-        try {
-            const connection = await connectToServer(serverUrl);
-
-            // Get server capabilities from the connection
-            // Note: The SDK should expose this, for now we'll just verify connection works
-            checks.push({
-                id: 'server-initialize-capabilities',
-                name: 'ServerInitializeCapabilities',
-                description: 'Server declares its capabilities correctly',
-                status: 'SUCCESS',
-                timestamp: new Date().toISOString(),
-                specReferences: [{
-                    id: 'MCP-Capabilities',
-                    url: 'https://modelcontextprotocol.io/specification/2025-06-18/architecture/index#capability-negotiation'
-                }],
-                details: {
-                    serverUrl,
-                    note: 'Capabilities verified through successful connection'
-                }
-            });
-
-            await connection.close();
-        } catch (error) {
-            checks.push({
-                id: 'server-initialize-capabilities',
-                name: 'ServerInitializeCapabilities',
-                description: 'Server declares its capabilities correctly',
-                status: 'FAILURE',
-                timestamp: new Date().toISOString(),
-                errorMessage: `Failed: ${error instanceof Error ? error.message : String(error)}`,
-                specReferences: [{
-                    id: 'MCP-Capabilities',
-                    url: 'https://modelcontextprotocol.io/specification/2025-06-18/architecture/index#capability-negotiation'
-                }]
-            });
-        }
-
-        return checks;
-    }
-}