Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 62 additions & 0 deletions packages/provider-acp/src/server/mcpOverAcpBridge.test.ts
Original file line number Diff line number Diff line change
@@ -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";

Expand Down Expand Up @@ -165,6 +168,65 @@ describe("AcpMcpOverAcpBridge", () => {
}),
);

it.effect("closes all MCP sessions within one disconnect timeout during runtime cleanup", () =>
Effect.gen(function* () {
const deleteStarted = Promise.withResolvers<void>();
const deleteResponse = Promise.withResolvers<Response>();
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({
Expand Down
13 changes: 12 additions & 1 deletion packages/provider-acp/src/server/mcpOverAcpBridge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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))),
);
Expand Down Expand Up @@ -272,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 },
),
),
};
Expand Down
Loading