Skip to content

Commit f4268bb

Browse files
committed
fix(opencode): retain mcp cleanup ownership across stream reconnects
1 parent 6e78010 commit f4268bb

2 files changed

Lines changed: 72 additions & 5 deletions

File tree

‎packages/provider-opencode/src/server/v2/adapter.test.ts‎

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { assert, describe, it } from "@effect/vitest";
22
import * as NodeServices from "@effect/platform-node/NodeServices";
33
import * as Effect from "effect/Effect";
4+
import * as Deferred from "effect/Deferred";
45
import * as Layer from "effect/Layer";
56
import * as Stream from "effect/Stream";
67

@@ -58,10 +59,13 @@ const recordingClient = (calls: Array<RecordedCall>) =>
5859
message: { list: () => Effect.succeed({ data: [] }) },
5960
}) as unknown as OpenCode2Server.OpenCode2Connection["client"];
6061

61-
const makeLayers = (calls: Array<RecordedCall>) => {
62+
const makeLayers = (
63+
calls: Array<RecordedCall>,
64+
events: OpenCode2Server.OpenCode2Connection["events"] = Effect.succeed(Stream.never),
65+
) => {
6266
const connection = {
6367
client: recordingClient(calls),
64-
events: Effect.succeed(Stream.never),
68+
events,
6569
url: "http://127.0.0.1:4096",
6670
version: "2.1.2",
6771
external: false,
@@ -123,6 +127,57 @@ const openFor = (
123127
}),
124128
});
125129

130+
it.effect.each(["unload", "create"] as const)(
131+
"keeps pre-registration cleanup after reconnect before %s",
132+
(action) =>
133+
Effect.gen(function* () {
134+
const disconnect = yield* Deferred.make<void>();
135+
const reconnected = yield* Deferred.make<void>();
136+
const calls: Array<RecordedCall> = [];
137+
let subscriptions = 0;
138+
const events = Effect.sync(() =>
139+
++subscriptions === 1
140+
? Stream.fromEffect(Deferred.await(disconnect)).pipe(Stream.drain)
141+
: Stream.fromEffect(Deferred.succeed(reconnected, undefined)).pipe(
142+
Stream.flatMap(() => Stream.never),
143+
),
144+
);
145+
yield* Effect.gen(function* () {
146+
const threadId = ThreadId.make("thread-reconnect");
147+
const sessions = yield* McpProviderSessions.McpProviderSessions;
148+
yield* sessions.set(mcpConfig(threadId));
149+
const adapter = yield* make(ProviderInstanceId.make("opencode-test"));
150+
const runtime = yield* openFor(adapter, threadId);
151+
const input = {
152+
threadId,
153+
runtimePolicy: runtimePolicy(),
154+
modelSelection: {
155+
instanceId: ProviderInstanceId.make("opencode-test"),
156+
model: "anthropic/claude-sonnet",
157+
options: [],
158+
},
159+
};
160+
const providerThread = yield* runtime.ensureThread(input);
161+
calls.length = 0;
162+
yield* Deferred.succeed(disconnect, undefined);
163+
yield* Deferred.await(reconnected);
164+
if (action === "unload") {
165+
yield* runtime.unloadThread!({ providerThread });
166+
assert.deepStrictEqual(
167+
calls.map((call) => call.op),
168+
["mcp.remove"],
169+
);
170+
} else {
171+
yield* runtime.ensureThread(input);
172+
assert.deepStrictEqual(
173+
calls.map((call) => call.op),
174+
["mcp.remove", "mcp.add", "session.create"],
175+
);
176+
}
177+
}).pipe(Effect.provide(makeLayers(calls, events)));
178+
}),
179+
);
180+
126181
it.effect(
127182
"registers the thread's T3 MCP server when the session opens, before any OpenCode session exists",
128183
() => {

‎packages/provider-opencode/src/server/v2/adapter.ts‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -708,8 +708,14 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
708708
const threads = new Map<string, ThreadState>();
709709
const registeredMcp = new Map<
710710
ThreadId,
711-
{ readonly name: string; readonly directory: string; readonly credential: string }
711+
{
712+
readonly name: string;
713+
readonly directory: string;
714+
readonly credential: string;
715+
readonly generation: number;
716+
}
712717
>();
718+
let mcpGeneration = 0;
713719
const childOwners = new Map<string, ThreadState>();
714720
const announced = new Map<string, EventOf<"session.created">["data"]>();
715721
const strays = new Map<string, ThreadState>();
@@ -2645,7 +2651,8 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
26452651
yield* Scope.close(previous, Exit.void);
26462652
// A restarted server forgot T3's MCP servers; the next turn adds them again.
26472653
for (const state of threads.values()) state.mcp = undefined;
2648-
registeredMcp.clear();
2654+
// A stream reconnect can reuse the process; retain ownership until refresh or unload.
2655+
mcpGeneration++;
26492656
yield* lock.withPermit(reconcile).pipe(Effect.timeout(RECONCILE_TIMEOUT));
26502657
return stream;
26512658
}).pipe(
@@ -3020,7 +3027,11 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
30203027
const mcpSession = yield* mcpSessions.read(threadId);
30213028
if (mcpSession === undefined) return;
30223029
const known = registeredMcp.get(threadId);
3023-
if (known?.directory === directory && known.credential === mcpSession.authorizationHeader)
3030+
if (
3031+
known?.directory === directory &&
3032+
known.credential === mcpSession.authorizationHeader &&
3033+
known.generation === mcpGeneration
3034+
)
30243035
return;
30253036
if (known !== undefined) {
30263037
yield* removeMcp(known);
@@ -3052,6 +3063,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
30523063
name,
30533064
directory,
30543065
credential: mcpSession.authorizationHeader,
3066+
generation: mcpGeneration,
30553067
});
30563068
}
30573069
});

0 commit comments

Comments
 (0)