The agent harness performance optimization system. Skills, instincts, memory, security, and research-first development for Claude Code, Codex, Opencode, Cursor and beyond.
fix: treat MCP HTTP 406 probes as reachable
Affaan Mustafa386326df8eaf
diff --git a/scripts/hooks/mcp-health-check.js b/scripts/hooks/mcp-health-check.jsindex 3e763d05f..b880d7d97 100644--- a/scripts/hooks/mcp-health-check.js+++ b/scripts/hooks/mcp-health-check.js@@ -26,8 +26,10 @@ const DEFAULT_BACKOFF_MS = 30 * 1000;const MAX_BACKOFF_MS = 10 * 60 * 1000;// The preflight HTTP probe only checks reachability; it does not have access to// Claude Code's stored OAuth bearer token. Treat auth-gated responses as-// reachable so the real MCP client can attempt the authenticated call.-const HEALTHY_HTTP_CODES = new Set([200, 201, 202, 204, 301, 302, 303, 304, 307, 308, 400, 401, 403, 405]);+// reachable so the real MCP client can attempt the authenticated call. A+// Streamable HTTP MCP server can also return 406 to a bare GET that omits+// Accept: text/event-stream; that still proves the endpoint is alive.+const HEALTHY_HTTP_CODES = new Set([200, 201, 202, 204, 301, 302, 303, 304, 307, 308, 400, 401, 403, 405, 406]);const RECONNECT_STATUS_CODES = new Set([401, 403, 429, 503]);const FAILURE_PATTERNS = [{ code: 401, pattern: /\b401\b|unauthori[sz]ed|auth(?:entication)?\s+(?:failed|expired|invalid)/i },diff --git a/tests/hooks/mcp-health-check.test.js b/tests/hooks/mcp-health-check.test.jsindex 9f01f12ec..1fb56cfce 100644--- a/tests/hooks/mcp-health-check.test.js+++ b/tests/hooks/mcp-health-check.test.js@@ -955,6 +955,75 @@ async function runTests() {}})) passed++; else failed++;+ if (await asyncTest('treats HTTP 406 probe responses as healthy reachable Streamable HTTP MCP servers', async () => {+ const tempDir = createTempDir();+ const configPath = path.join(tempDir, 'claude.json');+ const statePath = path.join(tempDir, 'mcp-health.json');+ const serverScript = path.join(tempDir, 'http-406-server.js');+ const portFile = path.join(tempDir, 'server-port.txt');++ fs.writeFileSync(+ serverScript,+ [+ "const fs = require('fs');",+ "const http = require('http');",+ "const portFile = process.argv[2];",+ "const server = http.createServer((req, res) => {",+ " if (String(req.headers.accept || '').includes('text/event-stream')) {",+ " res.writeHead(200, { 'Content-Type': 'text/event-stream' });",+ " res.end();",+ " return;",+ " }",+ " res.writeHead(406, { 'Content-Type': 'application/json' });",+ " res.end(JSON.stringify({ error: 'missing Accept: text/event-stream' }));",+ "});",+ "server.listen(0, '127.0.0.1', () => {",+ " fs.writeFileSync(portFile, String(server.address().port));",+ "});",+ "setInterval(() => {}, 1000);"+ ].join('\n')+ );++ const serverProcess = spawn(process.execPath, [serverScript, portFile], {+ stdio: 'ignore'+ });++ try {+ const port = waitForFile(portFile).trim();+ await waitForHttpReady(`http://127.0.0.1:${port}/mcp`);++ writeConfig(configPath, {+ mcpServers: {+ streamable: {+ type: 'http',+ url: `http://127.0.0.1:${port}/mcp`+ }+ }+ });++ const input = { tool_name: 'mcp__streamable__initialize', tool_input: {} };+ const result = runHook(input, {+ CLAUDE_HOOK_EVENT_NAME: 'PreToolUse',+ ECC_MCP_CONFIG_PATH: configPath,+ ECC_MCP_HEALTH_STATE_PATH: statePath,+ ECC_MCP_HEALTH_TIMEOUT_MS: '2000'+ });++ assert.strictEqual(+ result.code,+ 0,+ `Expected HTTP 406 probe to be treated as healthy: ${hookFailureDetails(result, statePath)}`+ );+ assert.strictEqual(result.stdout.trim(), JSON.stringify(input), 'Expected original JSON on stdout');++ const state = readState(statePath);+ assert.strictEqual(state.servers.streamable.status, 'healthy', 'Expected Streamable HTTP MCP server to be marked healthy');+ } finally {+ serverProcess.kill('SIGTERM');+ cleanupTempDir(tempDir);+ }+ })) passed++; else failed++;+// Windows-only: child_process.spawn cannot resolve .cmd/.bat shims for// bare PATH commands without an extension, and Node 18.20+/20.12+ refuse// to spawn .cmd targets without `shell: true` (CVE-2024-27980). The probe