Refactored MCP test server (servers, fixtures,etc) out of core and into top level test package - in preparation for composable test server work.

Author: BobDickinson

.gitignore

@@ -9,6 +9,7 @@ web/tsconfig.jest.tsbuildinfo
 core/build
 cli/build
 tui/build
+test/build
 test-output
 tool-test-output
 metadata-test-output
@@ -18,7 +19,7 @@ web/playwright-report/
 web/results.json
 web/test-results/
 web/e2e/test-results/
-# Only ignore mcp.json at repo root (test configs in test/ are committed)
+# Only ignore mcp.json at repo root (configs in configs/ are committed)
 /mcp.json
 .claude/settings.local.json
 

.prettierignore

@@ -3,6 +3,7 @@ core/build
 web/dist
 cli/build
 tui/build
+test/build
 CODE_OF_CONDUCT.md
 SECURITY.md
 mcp.json

AGENTS.md

@@ -33,3 +33,4 @@ The project is organized as a monorepo with workspaces:
 - `core/`: Core shared code used by web, CLI, and TUI
 - `cli/`: Command-line interface for testing and invoking MCP server methods directly
 - `tui/`: Terminal user interface
+- `test/`: Composable MCP test servers, fixtures, and harness

cli/__tests__/cli.test.ts

@@ -12,12 +12,12 @@ import {
   createInvalidConfig,
   deleteConfigFile,
 } from "./helpers/fixtures.js";
-import { getTestMcpServerCommand } from "../../core/test/test-server-stdio.js";
-import { createTestServerHttp } from "../../core/test/test-server-http.js";
 import {
+  getTestMcpServerCommand,
+  createTestServerHttp,
   createEchoTool,
   createTestServerInfo,
-} from "../../core/test/test-server-fixtures.js";
+} from "@modelcontextprotocol/inspector-test-server";
 
 describe("CLI Tests", () => {
   describe("Basic CLI Mode", () => {

cli/__tests__/headers.test.ts

@@ -5,11 +5,11 @@ import {
   expectOutputContains,
   expectCliSuccess,
 } from "./helpers/assertions.js";
-import { createTestServerHttp } from "../../core/test/test-server-http.js";
 import {
+  createTestServerHttp,
   createEchoTool,
   createTestServerInfo,
-} from "../../core/test/test-server-fixtures.js";
+} from "@modelcontextprotocol/inspector-test-server";
 
 describe("Header Parsing and Validation", () => {
   describe("Valid Headers", () => {

cli/__tests__/helpers/fixtures.ts

@@ -2,7 +2,7 @@ import * as fs from "fs";
 import * as path from "path";
 import * as os from "os";
 import * as crypto from "crypto";
-import { getTestMcpServerCommand } from "../../../core/test/test-server-stdio.js";
+import { getTestMcpServerCommand } from "@modelcontextprotocol/inspector-test-server";
 
 /**
  * Sentinel value for tests that don't need a real server

cli/__tests__/metadata.test.ts

@@ -5,12 +5,12 @@ import {
   expectCliFailure,
   expectValidJson,
 } from "./helpers/assertions.js";
-import { createTestServerHttp } from "../../core/test/test-server-http.js";
 import {
+  createTestServerHttp,
   createEchoTool,
   createAddTool,
   createTestServerInfo,
-} from "../../core/test/test-server-fixtures.js";
+} from "@modelcontextprotocol/inspector-test-server";
 import { NO_SERVER_SENTINEL } from "./helpers/fixtures.js";
 
 describe("Metadata Tests", () => {

cli/__tests__/tools.test.ts

@@ -6,7 +6,7 @@ import {
   expectValidJson,
   expectJsonError,
 } from "./helpers/assertions.js";
-import { getTestMcpServerCommand } from "../../core/test/test-server-stdio.js";
+import { getTestMcpServerCommand } from "@modelcontextprotocol/inspector-test-server";
 
 describe("Tool Tests", () => {
   describe("Tool Discovery", () => {

cli/package.json

@@ -27,7 +27,8 @@
   "devDependencies": {
     "@types/express": "^5.0.0",
     "tsx": "^4.7.0",
-    "vitest": "^4.0.17"
+    "vitest": "^4.0.17",
+    "@modelcontextprotocol/inspector-test-server": "*"
   },
   "dependencies": {
     "@modelcontextprotocol/inspector-core": "*",