Skip to content

Commit 19ba124

Browse files
refactor(provider-core): MCP provider sessions live in a McpProviderSessions service
The per-thread MCP credentials were a module-level Map in mcpSession.ts. The session manager now writes them through McpProviderSessions and adapters yield it, reading the session once per launch and handing it to their pure option builders. The server provides one instance; tests get a fresh one per layer. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent d3b5917 commit 19ba124

48 files changed

Lines changed: 1467 additions & 653 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/server/src/mcp/OrchestratorMcpToolkit.integration.test.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ import * as Orchestrator from "../orchestration-v2/Orchestrator.ts";
5959
import * as ThreadManagementService from "../orchestration-v2/ThreadManagementService.ts";
6060
import * as ProviderAdapterRegistry from "../orchestration-v2/ProviderAdapterRegistry.ts";
6161
import * as ProviderContinuationRequests from "@t3tools/provider-core/server/ProviderContinuationRequests";
62+
import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
6263
import { checkpointWorkspace } from "@t3tools/provider-testing/replayWorkspace";
6364
import * as ProviderReplayHarness from "../orchestration-v2/testkit/ProviderReplayHarness.ts";
6465
import {
@@ -3810,7 +3811,9 @@ describe("orchestrator MCP toolkit", () => {
38103811
Layer.provideMerge(McpServer.McpServer.layer),
38113812
Layer.provideMerge(layerOrchestration),
38123813
Layer.provide(
3813-
CodexOrchestratorReplayHarness.makeProviderAdapterRegistryLayer(transcript),
3814+
CodexOrchestratorReplayHarness.makeProviderAdapterRegistryLayer(transcript).pipe(
3815+
Layer.provide(McpProviderSessions.layer),
3816+
),
38143817
),
38153818
Layer.provide(layerProviderRegistry),
38163819
Layer.provide(layerUnusedScheduledTaskStub),

‎apps/server/src/orchestration-v2/AcpRegistryOrchestratorV2.live.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
3030
import * as ModelManifest from "../provider/ModelManifest.ts";
3131
import * as ProviderInstanceRegistryHydration from "../provider/ProviderInstanceRegistryHydration.ts";
3232
import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderLatestVersions";
33+
import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
3334
import * as ProviderEventLoggers from "@t3tools/provider-core/server/ProviderEventLoggers";
3435
import * as OpenCodeRuntime from "@t3tools/provider-opencode/server/OpenCodeRuntime";
3536
import * as OpenCodeServerLedger from "@t3tools/provider-opencode/server/OpenCodeServerLedger";
@@ -144,6 +145,7 @@ const layerLive = RuntimeLayer.layer.pipe(
144145
Layer.provide(layerBackgroundPolicy),
145146
Layer.provide(ProviderTurnStartServiceTestkit.layer),
146147
Layer.provide(layerPlatformTest),
148+
Layer.provide(McpProviderSessions.layer),
147149
);
148150

149151
const waitForIdle = Effect.fn("AcpRegistryOrchestratorV2Live.waitForIdle")(function* (

‎apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ import type * as EffectAcpProtocol from "effect-acp/protocol";
5454
import type * as EffectAcpSchema from "effect-acp/compat";
5555

5656
import { 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";
5858
import * as AcpSessionRuntime from "@t3tools/provider-acp/server/AcpSessionRuntime";
5959
import {
6060
extractXAiAcpSubagentEndNotice,
@@ -96,7 +96,12 @@ const DEFAULT_GROK_SETTINGS = Schema.decodeSync(GrokSettings)({});
9696

9797
const 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+
);
100105
const ACP_TEST_DRIVER = ProviderDriverKind.make("acp-test");
101106
const 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,

‎apps/server/src/orchestration-v2/Adapters/AcpRegistryAdapterV2.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { ChildProcessSpawner } from "effect/process";
1414
import * as EffectAcpErrors from "effect-acp/errors";
1515

1616
import * as ProviderHost from "@t3tools/provider-core/server/ProviderHost";
17+
import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
1718
import { layerTestProviderHost } from "@t3tools/provider-testing/host";
1819
import * as ServerSettings from "../../serverSettings.ts";
1920
import type {
@@ -84,6 +85,7 @@ const layerRegistry = Layer.succeed(
8485
const layerTest = Layer.mergeAll(
8586
NodeServices.layer,
8687
IdAllocator.layer,
88+
McpProviderSessions.layer,
8789
layerHost,
8890
layerRegistry,
8991
ServerSettings.layerTest(),

‎apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import { ChildProcessSpawner } from "effect/process";
2323
import type * as EffectAcpSchema from "effect-acp/compat";
2424

2525
import * as ProviderHost from "@t3tools/provider-core/server/ProviderHost";
26+
import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
2627
import { layerTestProviderHost } from "@t3tools/provider-testing/host";
2728
import type * as AcpSessionRuntime from "@t3tools/provider-acp/server/AcpSessionRuntime";
2829
import { makeAntigravityAcpRuntime } from "../../provider/acp/AntigravityAcpSupport.ts";
@@ -129,6 +130,7 @@ describe("AntigravityAdapterV2 flavor", () => {
129130
const layerSession = Layer.mergeAll(
130131
NodeServices.layer,
131132
IdAllocator.layer,
133+
McpProviderSessions.layer,
132134
layerTestProviderHost().pipe(Layer.provide(NodeServices.layer)),
133135
);
134136

0 commit comments

Comments
 (0)