Merge branch 'main' into oleina/logging

Author: olaservo

.github/workflows/cli_tests.yml

@@ -0,0 +1,41 @@
+name: CLI Tests
+
+on:
+  push:
+    paths:
+      - "cli/**"
+  pull_request:
+    paths:
+      - "cli/**"
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./cli
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: package.json
+          cache: npm
+
+      - name: Install dependencies
+        run: |
+          cd ..
+          npm ci --ignore-scripts
+
+      - name: Build CLI
+        run: npm run build
+
+      - name: Explicitly pre-install test dependencies
+        run: npx -y @modelcontextprotocol/server-everything --help || true
+
+      - name: Run tests
+        run: npm test
+        env:
+          NPM_CONFIG_YES: true
+          CI: true

README.md

@@ -166,6 +166,12 @@ If you need to disable authentication (NOT RECOMMENDED), you can set the `DANGER
 DANGEROUSLY_OMIT_AUTH=true npm start
 ```
 
+You can also set the token via the `MCP_PROXY_AUTH_TOKEN` environment variable when starting the server:
+
+```bash
+MCP_PROXY_AUTH_TOKEN=$(openssl rand -hex 32) npm start
+```
+
 #### Local-only Binding
 
 By default, both the MCP Inspector proxy server and client bind only to `localhost` to prevent network access. This ensures they are not accessible from other devices on the network. If you need to bind to all interfaces for development purposes, you can override this with the `HOST` environment variable:
@@ -309,7 +315,7 @@ npx @modelcontextprotocol/inspector --cli node build/index.js --method prompts/l
 npx @modelcontextprotocol/inspector --cli https://my-mcp-server.example.com
 
 # Connect to a remote MCP server (with Streamable HTTP transport)
-npx @modelcontextprotocol/inspector --cli https://my-mcp-server.example.com --transport http
+npx @modelcontextprotocol/inspector --cli https://my-mcp-server.example.com --transport http --method tools/list
 
 # Call a tool on a remote server
 npx @modelcontextprotocol/inspector --cli https://my-mcp-server.example.com --method tools/call --tool-name remotetool --tool-arg param=value

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/inspector-cli",
-  "version": "0.16.1",
+  "version": "0.16.2",
   "description": "CLI for the Model Context Protocol inspector",
   "license": "MIT",
   "author": "Anthropic, PBC (https://anthropic.com)",
@@ -21,7 +21,7 @@
   },
   "devDependencies": {},
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.13.1",
+    "@modelcontextprotocol/sdk": "^1.17.0",
     "commander": "^13.1.0",
     "spawn-rx": "^5.1.2"
   }

cli/scripts/cli-tests.js

@@ -12,7 +12,7 @@ const colors = {
 
 import fs from "fs";
 import path from "path";
-import { execSync, spawn } from "child_process";
+import { spawn } from "child_process";
 import os from "os";
 import { fileURLToPath } from "url";
 
@@ -680,7 +680,7 @@ async function runTests() {
   // Test 26: HTTP transport with explicit --transport http flag
   await runBasicTest(
     "http_transport_with_explicit_flag",
-    "http://127.0.0.1:3001",
+    "http://127.0.0.1:3001/mcp",
     "--transport",
     "http",
     "--cli",
@@ -710,6 +710,26 @@ async function runTests() {
     "tools/list",
   );
 
+  // Test 29: HTTP transport without URL (should fail)
+  await runErrorTest(
+    "http_transport_without_url",
+    "--transport",
+    "http",
+    "--cli",
+    "--method",
+    "tools/list",
+  );
+
+  // Test 30: SSE transport without URL (should fail)
+  await runErrorTest(
+    "sse_transport_without_url",
+    "--transport",
+    "sse",
+    "--cli",
+    "--method",
+    "tools/list",
+  );
+
   // Kill HTTP server
   try {
     process.kill(-httpServer.pid);

cli/src/cli.ts

@@ -66,8 +66,21 @@ async function runWebClient(args: Args): Promise<void> {
     abort.abort();
   });
 
+  // Build arguments to pass to start.js
+  const startArgs: string[] = [];
+
+  // Pass environment variables
+  for (const [key, value] of Object.entries(args.envArgs)) {
+    startArgs.push("-e", `${key}=${value}`);
+  }
+
+  // Pass command and args (using -- to separate them)
+  if (args.command) {
+    startArgs.push("--", args.command, ...args.args);
+  }
+
   try {
-    await spawnPromise("node", [inspectorClientPath], {
+    await spawnPromise("node", [inspectorClientPath, ...startArgs], {
       signal: abort.signal,
       echoOutput: true,
     });
@@ -233,7 +246,7 @@ async function main(): Promise<void> {
     const args = parseArgs();
 
     if (args.cli) {
-      runCli(args);
+      await runCli(args);
     } else {
       await runWebClient(args);
     }

cli/src/index.ts

@@ -287,6 +287,8 @@ async function main(): Promise<void> {
   try {
     const args = parseArgs();
     await callMethod(args);
+    // Explicitly exit to ensure process terminates in CI
+    process.exit(0);
   } catch (error) {
     handleError(error);
   }

cli/src/transport.ts

@@ -14,24 +14,6 @@ export type TransportOptions = {
   url?: string;
 };
 
-function createSSETransport(options: TransportOptions): Transport {
-  const baseUrl = new URL(options.url ?? "");
-  const sseUrl = baseUrl.pathname.endsWith("/sse")
-    ? baseUrl
-    : new URL("/sse", baseUrl);
-
-  return new SSEClientTransport(sseUrl);
-}
-
-function createHTTPTransport(options: TransportOptions): Transport {
-  const baseUrl = new URL(options.url ?? "");
-  const mcpUrl = baseUrl.pathname.endsWith("/mcp")
-    ? baseUrl
-    : new URL("/mcp", baseUrl);
-
-  return new StreamableHTTPClientTransport(mcpUrl);
-}
-
 function createStdioTransport(options: TransportOptions): Transport {
   let args: string[] = [];
 
@@ -75,12 +57,18 @@ export function createTransport(options: TransportOptions): Transport {
       return createStdioTransport(options);
     }
 
+    // If not STDIO, then it must be either SSE or HTTP.
+    if (!options.url) {
+      throw new Error("URL must be provided for SSE or HTTP transport types.");
+    }
+    const url = new URL(options.url);
+
     if (transportType === "sse") {
-      return createSSETransport(options);
+      return new SSEClientTransport(url);
     }
 
     if (transportType === "http") {
-      return createHTTPTransport(options);
+      return new StreamableHTTPClientTransport(url);
     }
 
     throw new Error(`Unsupported transport type: ${transportType}`);

client/bin/start.js

@@ -40,7 +40,7 @@ async function startDevServer(serverOptions) {
       ...process.env,
       SERVER_PORT,
       CLIENT_PORT,
-      MCP_PROXY_TOKEN: sessionToken,
+      MCP_PROXY_AUTH_TOKEN: sessionToken,
       MCP_ENV_VARS: JSON.stringify(envVars),
     },
     signal: abort.signal,
@@ -91,15 +91,17 @@ async function startProdServer(serverOptions) {
     "node",
     [
       inspectorServerPath,
-      ...(command ? [`--env`, command] : []),
-      ...(mcpServerArgs ? [`--args=${mcpServerArgs.join(" ")}`] : []),
+      ...(command ? [`--command`, command] : []),
+      ...(mcpServerArgs && mcpServerArgs.length > 0
+        ? [`--args`, mcpServerArgs.join(" ")]
+        : []),
     ],
     {
       env: {
         ...process.env,
         SERVER_PORT,
         CLIENT_PORT,
-        MCP_PROXY_TOKEN: sessionToken,
+        MCP_PROXY_AUTH_TOKEN: sessionToken,
         MCP_ENV_VARS: JSON.stringify(envVars),
       },
       signal: abort.signal,
@@ -247,8 +249,9 @@ async function main() {
       : "Starting MCP inspector...",
   );
 
-  // Generate session token for authentication
-  const sessionToken = randomBytes(32).toString("hex");
+  // Use provided token from environment or generate a new one
+  const sessionToken =
+    process.env.MCP_PROXY_AUTH_TOKEN || randomBytes(32).toString("hex");
   const authDisabled = !!process.env.DANGEROUSLY_OMIT_AUTH;
 
   const abort = new AbortController();

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/inspector-client",
-  "version": "0.16.1",
+  "version": "0.16.2",
   "description": "Client-side application for the Model Context Protocol inspector",
   "license": "MIT",
   "author": "Anthropic, PBC (https://anthropic.com)",
@@ -25,9 +25,8 @@
     "cleanup:e2e": "node e2e/global-teardown.js"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.13.1",
+    "@modelcontextprotocol/sdk": "^1.17.0",
     "@radix-ui/react-checkbox": "^1.1.4",
-    "ajv": "^6.12.6",
     "@radix-ui/react-dialog": "^1.1.3",
     "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/react-label": "^2.1.0",
@@ -37,6 +36,7 @@
     "@radix-ui/react-tabs": "^1.1.1",
     "@radix-ui/react-toast": "^1.2.6",
     "@radix-ui/react-tooltip": "^1.1.8",
+    "ajv": "^6.12.6",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "cmdk": "^1.0.4",