From dc8a9ffbd2a2b14668f710afcb723ab26858bc57 Mon Sep 17 00:00:00 2001 From: Wout Stiens <71498452+StiensWout@users.noreply.github.com> Date: Tue, 17 Nov 2026 17:51:12 +0100 Subject: [PATCH 1/5] test(acp): MCP bridge dispose must finish when DELETE never answers Co-authored-by: Claude Opus 5.5 --- .../src/server/mcpOverAcpBridge.test.ts | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/packages/provider-acp/src/server/mcpOverAcpBridge.test.ts b/packages/provider-acp/src/server/mcpOverAcpBridge.test.ts index d60da55bb91df..32198218a033e 100644 --- a/packages/provider-acp/src/server/mcpOverAcpBridge.test.ts +++ b/packages/provider-acp/src/server/mcpOverAcpBridge.test.ts @@ -1,6 +1,9 @@ import { describe, expect, it } from "@effect/vitest"; import * as Effect from "effect/Effect"; import * as Fiber from "effect/Fiber"; +import * as Exit from "effect/Exit"; +import * as Scope from "effect/Scope"; +import * as TestClock from "effect/testing/TestClock"; import { makeAcpMcpOverAcpBridge } from "./mcpOverAcpBridge.ts"; @@ -165,6 +168,57 @@ describe("AcpMcpOverAcpBridge", () => { }), ); + it.effect("finishes runtime cleanup when the MCP endpoint never answers DELETE", () => + Effect.gen(function* () { + const deleteStarted = Promise.withResolvers(); + const deleteResponse = Promise.withResolvers(); + const bridge = yield* makeAcpMcpOverAcpBridge({ + endpoint: "http://127.0.0.1:1/mcp", + authorization: "Bearer bridge-test", + allocateConnectionId: Effect.succeed("connection-1"), + fetchImplementation: (_url, init) => { + if (init?.method === "DELETE") { + deleteStarted.resolve(); + return deleteResponse.promise; + } + const request = JSON.parse(String(init?.body)) as { readonly id: number }; + return Promise.resolve( + new Response( + JSON.stringify({ + jsonrpc: "2.0", + id: request.id, + result: { protocolVersion: "2025-06-18" }, + }), + { + headers: { "content-type": "application/json", "mcp-session-id": "session-42" }, + }, + ), + ); + }, + }); + const { connectionId } = yield* bridge.connect({ serverId: "t3-code" }); + yield* bridge.message({ connectionId, method: "initialize" }); + const scope = yield* Scope.make(); + yield* Scope.addFinalizer(scope, bridge.dispose); + const closing = yield* Scope.close(scope, Exit.void).pipe(Effect.forkChild); + yield* Effect.gen(function* () { + yield* Effect.promise(() => deleteStarted.promise); + yield* TestClock.adjust("1 minute"); + expect( + closing.pollUnsafe(), + "Runtime scope must close despite an unanswered MCP DELETE", + ).toBeDefined(); + }).pipe( + Effect.ensuring( + Effect.gen(function* () { + deleteResponse.resolve(new Response(null, { status: 204 })); + yield* Fiber.join(closing); + }), + ), + ); + }), + ); + it.effect("rejects unknown servers, connections, and oversized messages", () => Effect.gen(function* () { const bridge = yield* makeAcpMcpOverAcpBridge({ From 7a113044315ebc15fbebb9175c1acbd11e948951 Mon Sep 17 00:00:00 2001 From: Wout Stiens <71498452+StiensWout@users.noreply.github.com> Date: Tue, 17 Nov 2026 17:51:52 +0100 Subject: [PATCH 2/5] fix(acp): MCP bridge disconnect gives up on an endpoint that never answers Co-authored-by: Claude Opus 5.5 --- packages/provider-acp/src/server/mcpOverAcpBridge.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packages/provider-acp/src/server/mcpOverAcpBridge.ts b/packages/provider-acp/src/server/mcpOverAcpBridge.ts index 3ec47074f1445..04280e4ad1288 100644 --- a/packages/provider-acp/src/server/mcpOverAcpBridge.ts +++ b/packages/provider-acp/src/server/mcpOverAcpBridge.ts @@ -10,6 +10,8 @@ import { responsePayloads } from "@t3tools/shared/mcpResponsePayloads"; const MAX_CONNECTIONS = 16; const MAX_MESSAGE_BYTES = 8 * 1024 * 1024; +// Runtime teardown waits on disconnect, so an endpoint that never answers must not hold it. +const DISCONNECT_TIMEOUT = "5 seconds"; interface JsonRpcEnvelope { readonly id?: unknown; @@ -207,6 +209,15 @@ export const makeAcpMcpOverAcpBridge = Effect.fn("AcpMcpOverAcpBridge.make")(fun () => response.body?.cancel().catch(() => undefined) ?? Promise.resolve(), ); }).pipe( + Effect.timeoutOrElse({ + duration: DISCONNECT_TIMEOUT, + orElse: () => + Effect.fail( + new AcpMcpOverAcpError({ + message: "T3 Code MCP endpoint did not answer disconnect.", + }), + ), + }), // Restore a session that failed to close, so a retry or dispose can close it. Effect.onError(() => Effect.sync(() => connections.set(request.connectionId, connection))), ); From 7e9c08914a4509f6c4bada495c80df18d4c3efe2 Mon Sep 17 00:00:00 2001 From: Wout Stiens <71498452+StiensWout@users.noreply.github.com> Date: Tue, 17 Nov 2026 18:00:10 +0100 Subject: [PATCH 3/5] fix(acp): close MCP sessions concurrently during teardown Co-authored-by: GPT 6.1 Sol --- .../src/server/mcpOverAcpBridge.test.ts | 59 +++++++++++++++++++ .../src/server/mcpOverAcpBridge.ts | 2 +- 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/packages/provider-acp/src/server/mcpOverAcpBridge.test.ts b/packages/provider-acp/src/server/mcpOverAcpBridge.test.ts index 32198218a033e..c2b1d872a2d74 100644 --- a/packages/provider-acp/src/server/mcpOverAcpBridge.test.ts +++ b/packages/provider-acp/src/server/mcpOverAcpBridge.test.ts @@ -219,6 +219,65 @@ describe("AcpMcpOverAcpBridge", () => { }), ); + it.effect("closes all MCP sessions within one disconnect timeout during runtime cleanup", () => + Effect.gen(function* () { + const deleteStarted = Promise.withResolvers(); + const deleteResponse = Promise.withResolvers(); + const deleteSignals: AbortSignal[] = []; + let nextConnectionId = 0; + const bridge = yield* makeAcpMcpOverAcpBridge({ + endpoint: "http://127.0.0.1:1/mcp", + authorization: "Bearer bridge-test", + allocateConnectionId: Effect.sync(() => `connection-${++nextConnectionId}`), + fetchImplementation: (_url, init) => { + if (init?.method === "DELETE") { + if (!init.signal) throw new Error("Missing cancellation signal"); + deleteSignals.push(init.signal); + deleteStarted.resolve(); + return deleteResponse.promise; + } + const request = JSON.parse(String(init?.body)) as { readonly id: number }; + return Promise.resolve( + new Response( + JSON.stringify({ + jsonrpc: "2.0", + id: request.id, + result: { protocolVersion: "2025-06-18" }, + }), + { + headers: { + "content-type": "application/json", + "mcp-session-id": `session-${nextConnectionId}`, + }, + }, + ), + ); + }, + }); + for (let index = 0; index < 16; index++) { + const { connectionId } = yield* bridge.connect({ serverId: "t3-code" }); + yield* bridge.message({ connectionId, method: "initialize" }); + } + const scope = yield* Scope.make(); + yield* Scope.addFinalizer(scope, bridge.dispose); + const closing = yield* Scope.close(scope, Exit.void).pipe(Effect.forkChild); + yield* Effect.gen(function* () { + yield* Effect.promise(() => deleteStarted.promise); + yield* TestClock.adjust("5 seconds"); + expect(closing.pollUnsafe(), "All sessions must close within one timeout").toBeDefined(); + expect(deleteSignals).toHaveLength(16); + expect(deleteSignals.every((signal) => signal.aborted)).toBe(true); + }).pipe( + Effect.ensuring( + Effect.gen(function* () { + deleteResponse.resolve(new Response(null, { status: 204 })); + yield* Fiber.join(closing); + }), + ), + ); + }), + ); + it.effect("rejects unknown servers, connections, and oversized messages", () => Effect.gen(function* () { const bridge = yield* makeAcpMcpOverAcpBridge({ diff --git a/packages/provider-acp/src/server/mcpOverAcpBridge.ts b/packages/provider-acp/src/server/mcpOverAcpBridge.ts index 04280e4ad1288..779076a622b5b 100644 --- a/packages/provider-acp/src/server/mcpOverAcpBridge.ts +++ b/packages/provider-acp/src/server/mcpOverAcpBridge.ts @@ -283,7 +283,7 @@ export const makeAcpMcpOverAcpBridge = Effect.fn("AcpMcpOverAcpBridge.make")(fun Effect.forEach( [...connections.keys()], (connectionId) => disconnect({ connectionId }).pipe(Effect.ignore), - { discard: true }, + { concurrency: "unbounded", discard: true }, ), ), }; From d391770b6e4b8f02084b92972129713dad8eb684 Mon Sep 17 00:00:00 2001 From: Wout Stiens <71498452+StiensWout@users.noreply.github.com> Date: Tue, 17 Nov 2026 18:00:46 +0100 Subject: [PATCH 4/5] chore: credit the models that worked on this change Co-authored-by: Grok 4.7 From cf0b3ddfad334b0c8bddd84c515ba66c2a678305 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Tue, 17 Nov 2026 17:09:26 +0000 Subject: [PATCH 5/5] test(acp): keep one MCP bridge teardown test covering timeout and concurrency Co-Authored-By: Claude Opus 5.5 --- .../src/server/mcpOverAcpBridge.test.ts | 51 ------------------- 1 file changed, 51 deletions(-) diff --git a/packages/provider-acp/src/server/mcpOverAcpBridge.test.ts b/packages/provider-acp/src/server/mcpOverAcpBridge.test.ts index c2b1d872a2d74..04d9fe4b55632 100644 --- a/packages/provider-acp/src/server/mcpOverAcpBridge.test.ts +++ b/packages/provider-acp/src/server/mcpOverAcpBridge.test.ts @@ -168,57 +168,6 @@ describe("AcpMcpOverAcpBridge", () => { }), ); - it.effect("finishes runtime cleanup when the MCP endpoint never answers DELETE", () => - Effect.gen(function* () { - const deleteStarted = Promise.withResolvers(); - const deleteResponse = Promise.withResolvers(); - const bridge = yield* makeAcpMcpOverAcpBridge({ - endpoint: "http://127.0.0.1:1/mcp", - authorization: "Bearer bridge-test", - allocateConnectionId: Effect.succeed("connection-1"), - fetchImplementation: (_url, init) => { - if (init?.method === "DELETE") { - deleteStarted.resolve(); - return deleteResponse.promise; - } - const request = JSON.parse(String(init?.body)) as { readonly id: number }; - return Promise.resolve( - new Response( - JSON.stringify({ - jsonrpc: "2.0", - id: request.id, - result: { protocolVersion: "2025-06-18" }, - }), - { - headers: { "content-type": "application/json", "mcp-session-id": "session-42" }, - }, - ), - ); - }, - }); - const { connectionId } = yield* bridge.connect({ serverId: "t3-code" }); - yield* bridge.message({ connectionId, method: "initialize" }); - const scope = yield* Scope.make(); - yield* Scope.addFinalizer(scope, bridge.dispose); - const closing = yield* Scope.close(scope, Exit.void).pipe(Effect.forkChild); - yield* Effect.gen(function* () { - yield* Effect.promise(() => deleteStarted.promise); - yield* TestClock.adjust("1 minute"); - expect( - closing.pollUnsafe(), - "Runtime scope must close despite an unanswered MCP DELETE", - ).toBeDefined(); - }).pipe( - Effect.ensuring( - Effect.gen(function* () { - deleteResponse.resolve(new Response(null, { status: 204 })); - yield* Fiber.join(closing); - }), - ), - ); - }), - ); - it.effect("closes all MCP sessions within one disconnect timeout during runtime cleanup", () => Effect.gen(function* () { const deleteStarted = Promise.withResolvers();