@@ -54,7 +54,7 @@ import type * as EffectAcpProtocol from "effect-acp/protocol";
5454import type * as EffectAcpSchema from "effect-acp/compat";
5555
5656import { layerTestProviderHost } from "@t3tools/provider-testing/host";
57- import * as McpProviderSession from "@t3tools/provider-core/server/mcpSession ";
57+ import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions ";
5858import * as AcpSessionRuntime from "@t3tools/provider-acp/server/AcpSessionRuntime";
5959import {
6060 extractXAiAcpSubagentEndNotice,
@@ -96,7 +96,12 @@ const DEFAULT_GROK_SETTINGS = Schema.decodeSync(GrokSettings)({});
9696
9797const layerHost = layerTestProviderHost().pipe(Layer.provide(NodeServices.layer));
9898
99- const layerTest = Layer.mergeAll(NodeServices.layer, IdAllocator.layer, layerHost);
99+ const layerTest = Layer.mergeAll(
100+ NodeServices.layer,
101+ IdAllocator.layer,
102+ McpProviderSessions.layer,
103+ layerHost,
104+ );
100105const ACP_TEST_DRIVER = ProviderDriverKind.make("acp-test");
101106const decodeUnknownJson = Schema.decodeUnknownOption(Schema.fromJsonString(Schema.Unknown));
102107
@@ -708,7 +713,7 @@ describe("AcpAdapterV2", () => {
708713
709714 const instanceId = ProviderInstanceId.make("acp-test-self-contained-mcp-bridge");
710715 const threadId = ThreadId.make("thread-acp-self-contained-mcp-bridge");
711- McpProviderSession.setMcpProviderSession ({
716+ yield* (yield* McpProviderSessions.McpProviderSessions).set ({
712717 environmentId: EnvironmentId.make("environment-acp-self-contained-mcp-bridge"),
713718 threadId,
714719 providerSessionId: "mcp-session-acp-self-contained-mcp-bridge",
@@ -717,11 +722,6 @@ describe("AcpAdapterV2", () => {
717722 authorizationHeader: "Bearer self-contained-mcp-bridge-token",
718723 browserToolsAvailable: false,
719724 });
720- yield* Effect.addFinalizer(() =>
721- Effect.sync(() => {
722- McpProviderSession.clearMcpProviderSession(threadId);
723- }),
724- );
725725
726726 let runtimeInput: AcpAdapterV2RuntimeInput | undefined;
727727 const makeRuntime = makeMockRuntime({ childProcessSpawner, mockAgentPath });
@@ -772,7 +772,7 @@ describe("AcpAdapterV2", () => {
772772 const protocolEvents = yield* Queue.unbounded<EffectAcpProtocol.AcpProtocolLogEvent>();
773773 const instanceId = ProviderInstanceId.make("acp-test-instruction-transitions");
774774 const threadId = ThreadId.make("thread-acp-instruction-transitions");
775- McpProviderSession.setMcpProviderSession ({
775+ yield* (yield* McpProviderSessions.McpProviderSessions).set ({
776776 environmentId: EnvironmentId.make("environment-acp-instruction-transitions"),
777777 threadId,
778778 providerSessionId: "mcp-session-acp-instruction-transitions",
@@ -781,9 +781,6 @@ describe("AcpAdapterV2", () => {
781781 authorizationHeader: "Bearer instruction-transition-token",
782782 browserToolsAvailable: false,
783783 });
784- yield* Effect.addFinalizer(() =>
785- Effect.sync(() => McpProviderSession.clearMcpProviderSession(threadId)),
786- );
787784 const adapter = yield* makeAcpAdapterV2({
788785 instanceId,
789786 flavor: {
@@ -2197,7 +2194,7 @@ describe("AcpAdapterV2", () => {
21972194 });
21982195 const sourceThreadId = ThreadId.make("thread-acp-native-fork-source");
21992196 const targetThreadId = ThreadId.make("thread-acp-native-fork-target");
2200- McpProviderSession.setMcpProviderSession ({
2197+ yield* (yield* McpProviderSessions.McpProviderSessions).set ({
22012198 environmentId: EnvironmentId.make("environment-acp-native-fork-source"),
22022199 threadId: sourceThreadId,
22032200 providerSessionId: "mcp-session-acp-native-fork-source",
@@ -2206,7 +2203,7 @@ describe("AcpAdapterV2", () => {
22062203 authorizationHeader: "Bearer source-thread-token",
22072204 browserToolsAvailable: true,
22082205 });
2209- McpProviderSession.setMcpProviderSession ({
2206+ yield* (yield* McpProviderSessions.McpProviderSessions).set ({
22102207 environmentId: EnvironmentId.make("environment-acp-native-fork"),
22112208 threadId: targetThreadId,
22122209 providerSessionId: "mcp-session-acp-native-fork",
@@ -2215,12 +2212,6 @@ describe("AcpAdapterV2", () => {
22152212 authorizationHeader: "Bearer target-thread-token",
22162213 browserToolsAvailable: true,
22172214 });
2218- yield* Effect.addFinalizer(() =>
2219- Effect.sync(() => {
2220- McpProviderSession.clearMcpProviderSession(sourceThreadId);
2221- McpProviderSession.clearMcpProviderSession(targetThreadId);
2222- }),
2223- );
22242215 const runtimePolicy = ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
22252216 runtimeMode: "full-access",
22262217 interactionMode: "default",
@@ -2640,7 +2631,7 @@ describe("AcpAdapterV2", () => {
26402631 );
26412632 const instanceId = ProviderInstanceId.make("acp-test-rollback-session");
26422633 const rollbackThreadId = ThreadId.make("thread-acp-rollback-session-target");
2643- McpProviderSession.setMcpProviderSession ({
2634+ yield* (yield* McpProviderSessions.McpProviderSessions).set ({
26442635 environmentId: EnvironmentId.make("environment-acp-rollback-session-target"),
26452636 threadId: rollbackThreadId,
26462637 providerSessionId: "mcp-session-acp-rollback-session-target",
@@ -2649,9 +2640,6 @@ describe("AcpAdapterV2", () => {
26492640 authorizationHeader: "Bearer rollback-target-token",
26502641 browserToolsAvailable: false,
26512642 });
2652- yield* Effect.addFinalizer(() =>
2653- Effect.sync(() => McpProviderSession.clearMcpProviderSession(rollbackThreadId)),
2654- );
26552643 const runtimeInputs: Array<AcpAdapterV2RuntimeInput> = [];
26562644 const makeRuntime = makeMockRuntime({
26572645 childProcessSpawner,
0 commit comments