Made both stdio and http test servers fully composable, cleaned up types, terminology, and usage.

Author: BobDickinson

cli/__tests__/cli.test.ts

@@ -11,12 +11,13 @@ import {
   createTestConfig,
   createInvalidConfig,
   deleteConfigFile,
-  getTestMcpServerCommand,
 } from "./helpers/fixtures.js";
+import { getTestMcpServerCommand } from "./helpers/test-server-stdio.js";
+import { createTestServerHttp } from "./helpers/test-server-http.js";
 import {
-  createInstrumentedServer,
   createEchoTool,
-} from "./helpers/instrumented-server.js";
+  createTestServerInfo,
+} from "./helpers/test-fixtures.js";
 
 describe("CLI Tests", () => {
   describe("Basic CLI Mode", () => {
@@ -363,7 +364,10 @@ describe("CLI Tests", () => {
 
   describe("Logging Options", () => {
     it("should set log level", async () => {
-      const server = createInstrumentedServer({});
+      const server = createTestServerHttp({
+        serverInfo: createTestServerInfo(),
+        logging: true,
+      });
 
       try {
         const port = await server.start("http");
@@ -731,7 +735,8 @@ describe("CLI Tests", () => {
 
   describe("HTTP Transport", () => {
     it("should infer HTTP transport from URL ending with /mcp", async () => {
-      const server = createInstrumentedServer({
+      const server = createTestServerHttp({
+        serverInfo: createTestServerInfo(),
         tools: [createEchoTool()],
       });
 
@@ -757,7 +762,8 @@ describe("CLI Tests", () => {
     });
 
     it("should work with explicit --transport http flag", async () => {
-      const server = createInstrumentedServer({
+      const server = createTestServerHttp({
+        serverInfo: createTestServerInfo(),
         tools: [createEchoTool()],
       });
 
@@ -785,7 +791,8 @@ describe("CLI Tests", () => {
     });
 
     it("should work with explicit transport flag and URL suffix", async () => {
-      const server = createInstrumentedServer({
+      const server = createTestServerHttp({
+        serverInfo: createTestServerInfo(),
         tools: [createEchoTool()],
       });
 
@@ -813,7 +820,8 @@ describe("CLI Tests", () => {
     });
 
     it("should fail when SSE transport is given to HTTP server", async () => {
-      const server = createInstrumentedServer({
+      const server = createTestServerHttp({
+        serverInfo: createTestServerInfo(),
         tools: [createEchoTool()],
       });
 

cli/__tests__/headers.test.ts

@@ -5,15 +5,17 @@ import {
   expectOutputContains,
   expectCliSuccess,
 } from "./helpers/assertions.js";
+import { createTestServerHttp } from "./helpers/test-server-http.js";
 import {
-  createInstrumentedServer,
   createEchoTool,
-} from "./helpers/instrumented-server.js";
+  createTestServerInfo,
+} from "./helpers/test-fixtures.js";
 
 describe("Header Parsing and Validation", () => {
   describe("Valid Headers", () => {
     it("should parse valid single header and send it to server", async () => {
-      const server = createInstrumentedServer({
+      const server = createTestServerHttp({
+        serverInfo: createTestServerInfo(),
         tools: [createEchoTool()],
       });
 
@@ -52,7 +54,8 @@ describe("Header Parsing and Validation", () => {
     });
 
     it("should parse multiple headers", async () => {
-      const server = createInstrumentedServer({
+      const server = createTestServerHttp({
+        serverInfo: createTestServerInfo(),
         tools: [createEchoTool()],
       });
 
@@ -86,7 +89,8 @@ describe("Header Parsing and Validation", () => {
     });
 
     it("should handle header with colons in value", async () => {
-      const server = createInstrumentedServer({
+      const server = createTestServerHttp({
+        serverInfo: createTestServerInfo(),
         tools: [createEchoTool()],
       });
 
@@ -119,7 +123,8 @@ describe("Header Parsing and Validation", () => {
     });
 
     it("should handle whitespace in headers", async () => {
-      const server = createInstrumentedServer({
+      const server = createTestServerHttp({
+        serverInfo: createTestServerInfo(),
         tools: [createEchoTool()],
       });
 

cli/__tests__/helpers/fixtures.ts

@@ -2,10 +2,7 @@ import fs from "fs";
 import path from "path";
 import os from "os";
 import crypto from "crypto";
-import { fileURLToPath } from "url";
-import { dirname } from "path";
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
+import { getTestMcpServerCommand } from "./test-server-stdio.js";
 
 /**
  * Sentinel value for tests that don't need a real server
@@ -90,20 +87,3 @@ export function createInvalidConfig(): string {
 export function deleteConfigFile(configPath: string): void {
   cleanupTempDir(path.dirname(configPath));
 }
-
-/**
- * Get the path to the test MCP server script
- */
-export function getTestMcpServerPath(): string {
-  return path.resolve(__dirname, "test-mcp-server.ts");
-}
-
-/**
- * Get the command and args to run the test MCP server
- */
-export function getTestMcpServerCommand(): { command: string; args: string[] } {
-  return {
-    command: "tsx",
-    args: [getTestMcpServerPath()],
-  };
-}