diff --git a/server/src/services/__tests__/mcp-connection-failure.test.ts b/server/src/services/__tests__/mcp-connection-failure.test.ts index 6a422a1af31..f6ff037a09b 100644 --- a/server/src/services/__tests__/mcp-connection-failure.test.ts +++ b/server/src/services/__tests__/mcp-connection-failure.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from "vitest"; import { HttpError } from "../../errors.js"; -import { isExpectedMcpConnectionFailure, retainMcpConnectionFailure, withMcpConnectionFailure } from "../mcp-connection-failure.js"; +import { isExpectedMcpConnectionFailure, mcpConnectionFailureReason, mcpDiscoveryHttpFailure, retainMcpConnectionFailure, withMcpConnectionFailure } from "../mcp-connection-failure.js"; import { assertPublicRemoteHttpEndpoint } from "../remote-http-endpoint-guard.js"; import { classifyRemoteConnectionError, markRemoteConnectionFailure, readRemoteConnectionFailure, recordRemoteConnectionAttempts } from "../remote-connection-failure.js"; @@ -49,6 +49,22 @@ describe("MCP outbound failure provenance", () => { .toBe(false); }); + it.each([ + [401, "authentication_failed"], [403, "authentication_failed"], [404, "endpoint_not_found"], + [405, "endpoint_not_found"], [429, "rate_limited"], [503, "remote_unavailable"], + ])("classifies a remote HTTP %i response as %s across health-check wrapping", (status, reason) => { + const original = mcpDiscoveryHttpFailure(new Response(null, { status }), `Remote app returned HTTP ${status}`); + expect(mcpConnectionFailureReason(original)).toBe(reason); + const wrapped = retainMcpConnectionFailure(original, new HttpError(502, original.message)); + expect(isExpectedMcpConnectionFailure(wrapped)).toBe(true); + }); + + it.each([400, 406, 409, 415, 422])("keeps an unexplained remote HTTP %i response reportable", (status) => { + const original = mcpDiscoveryHttpFailure(new Response(null, { status }), `Remote app returned HTTP ${status}`); + expect(mcpConnectionFailureReason(original)).toBeNull(); + expect(isExpectedMcpConnectionFailure(retainMcpConnectionFailure(original, new HttpError(502, original.message)))).toBe(false); + }); + it("does not carry provenance onto a subsequent independent error", async () => { const transport = Object.assign(new Error("connection reset"), { code: "ECONNRESET" }); await expect(withMcpConnectionFailure(async () => { throw transport; })).rejects.toBe(transport); diff --git a/server/src/services/mcp-connection-failure.ts b/server/src/services/mcp-connection-failure.ts index 16e6413544a..b76265be31d 100644 --- a/server/src/services/mcp-connection-failure.ts +++ b/server/src/services/mcp-connection-failure.ts @@ -35,8 +35,10 @@ export function mcpDiscoveryHttpFailure(response: Response, message: string): Ht /** Only an actual MCP response can attach this evidence to a protocol wrapper. */ export function markMcpHttpResponseFailure(response: Response, error: T): T { const status = response.status; + // MCP Streamable HTTP always accepts POST, so a 405 means the saved URL is + // not an MCP endpoint (for example a web page or a legacy SSE-only path). const reason: Reason | null = status === 401 || status === 403 ? "authentication_failed" - : status === 404 ? "endpoint_not_found" + : status === 404 || status === 405 ? "endpoint_not_found" : status === 429 ? "rate_limited" : status >= 500 && status <= 599 ? "remote_unavailable" : null; if (reason) remember(error, reason);