diff --git a/scripts/lint/rules/typed-resource-refusal-baseline.json b/scripts/lint/rules/typed-resource-refusal-baseline.json index 3c1cc24e4d..06dd0426e7 100644 --- a/scripts/lint/rules/typed-resource-refusal-baseline.json +++ b/scripts/lint/rules/typed-resource-refusal-baseline.json @@ -7,6 +7,5 @@ "src/model/ModelArtifactProvider.ts": 1, "src/native/NativeMacOSProvider.ts": 1, "src/native/NativePlistSource.ts": 1, - "src/server/http/NodeHttpRequestOwner.ts": 1, "src/sqlite/SqliteDatabaseWorkerExecution.ts": 1 } diff --git a/src/server/http/NodeHttpRequestOwner.ts b/src/server/http/NodeHttpRequestOwner.ts index 315e395cb8..151ed453c4 100644 --- a/src/server/http/NodeHttpRequestOwner.ts +++ b/src/server/http/NodeHttpRequestOwner.ts @@ -1,7 +1,9 @@ import type { IncomingMessage, ServerResponse } from "node:http"; import { writeWebResponse } from "./nodeHttpBridge.js"; -import { AnalysisResourceConstraintError } from "../../domain/analysisErrorCore.js"; +import { ProviderCleanupError } from "../../domain/providerCleanupError.js"; + +const HTTP_RESPONSE_SOURCE = "MCP HTTP response source"; export type HttpAdmissionLifetime = "dispatch" | "response"; @@ -162,17 +164,21 @@ export class NodeHttpRequestOwner { while (this.#bodyCleanups.size > 0) await Promise.allSettled(this.#bodyCleanups); if (this.#cleanupFailures.length > 0) - throw new AnalysisResourceConstraintError( - "mcp_http_response_cleanup", - "transport", - "HTTP response cleanup could not be confirmed; provider shutdown remains blocked", - { failed_cleanup_count: this.#cleanupFailures.length }, + // Unconfirmed cleanup is retained work, not a budget the caller can raise. + throw new ProviderCleanupError( + "rea", + [HTTP_RESPONSE_SOURCE], { + reason: + "HTTP response cleanup could not be confirmed; provider shutdown remains blocked", + failed_cleanup_count: this.#cleanupFailures.length, + }, + { + operation: "mcp_http_response_cleanup", cause: new AggregateError( this.#cleanupFailures, "Response cleanup failed", ), - retryable: false, }, ); } diff --git a/src/server/http/serveStreamableHttp.test.ts b/src/server/http/serveStreamableHttp.test.ts index c605f7950b..2cb16c3bb8 100644 --- a/src/server/http/serveStreamableHttp.test.ts +++ b/src/server/http/serveStreamableHttp.test.ts @@ -26,6 +26,7 @@ import { mcpAllowedHostsTextSchema } from "../../config/mcpHttpEndpoint.js"; import { parseMcpHttpArguments } from "../../main/mcpHttpArguments.js"; import { RequestTrackingMcpServer } from "../RequestTrackingMcpServer.js"; import { waitFor } from "../../../tests/support/testWait.js"; +import { ProviderCleanupError } from "../../domain/providerCleanupError.js"; const servers: StreamableHttpServer[] = []; @@ -1408,13 +1409,13 @@ it("retains failed response cleanup and blocks provider teardown and further adm expect((await fetch(new URL("/health", served.url))).status).toBe(503); }); await expect(served.prepareShutdown()).rejects.toMatchObject({ - _tag: "AnalysisResourceConstraintError", - reportedLimits: { failed_cleanup_count: 1 }, + _tag: "ProviderAdapterError", + cleanupIncomplete: true, + cleanupResources: ["MCP HTTP response source"], + diagnostics: { failed_cleanup_count: 1 }, cause: expect.any(AggregateError), }); - await expect(served.close()).rejects.toMatchObject({ - reportedLimits: { failed_cleanup_count: 1 }, - }); + await expect(served.close()).rejects.toBeInstanceOf(ProviderCleanupError); expect(shutdownHooks()).toBe(0); await expect(rawHttpRequest(new URL(served.url))).rejects.toMatchObject({ code: "ECONNREFUSED",