Skip to content

Commit e35a980

Browse files
committed
test(acp): preserve native MCP priority for Copilot
1 parent 0cfd13e commit e35a980

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1044,7 +1044,6 @@ describe("AcpRegistryAdapterV2", () => {
10441044
}).pipe(Effect.provide(layerTest), Effect.scoped),
10451045
);
10461046

1047-
// regression: #22806 Copilot rejects T3's stdio MCP bridge
10481047
it.effect("gives Copilot T3's MCP server over HTTP when it advertises HTTP", () =>
10491048
Effect.gen(function* () {
10501049
const selfInvocation = yield* resolveSelfInvocation();
@@ -1156,6 +1155,14 @@ describe("AcpRegistryAdapterV2", () => {
11561155
yield* sessionMcpServers({ agentId: "github-copilot-cli" }, { T3_ACP_MCP_HTTP: "1" }),
11571156
{ new: http("Bearer opened-token"), load: http("Bearer rotated-token") },
11581157
);
1158+
const acp = [{ type: "acp", name: "t3-code", serverId: "t3-code" }];
1159+
assert.deepEqual(
1160+
yield* sessionMcpServers(
1161+
{ agentId: "github-copilot-cli" },
1162+
{ T3_ACP_MCP_HTTP: "1", T3_ACP_MCP_ACP: "1" },
1163+
),
1164+
{ new: acp, load: acp },
1165+
);
11591166
assert.deepEqual(yield* sessionMcpServers({ agentId: "github-copilot-cli" }), {
11601167
new: stdio("Bearer opened-token"),
11611168
load: stdio("Bearer rotated-token"),

‎packages/provider-acp/src/server/adapter.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7209,7 +7209,7 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
72097209
const mcpSession = yield* mcpSessions.read(turnInput.threadId);
72107210
const instructionState = {
72117211
interactionMode: turnInput.runtimePolicy.interactionMode,
7212-
hasT3Mcp: acpMcpContext(mcpSession, self, flavor.mcpOverHttp).servers.length > 0,
7212+
hasT3Mcp: mcpSession !== undefined,
72137213
hasDeviceTools: mcpSession?.capabilities?.has("device") === true,
72147214
} satisfies T3AcpInstructionState;
72157215
const previousInstructionState = (yield* Ref.get(promptInstructionStates)).get(sessionId);

0 commit comments

Comments
 (0)