Skip to content

Commit 083abf0

Browse files
committed
fix(opencode): auto-reconnect MCP clients on unexpected transport close
When an MCP server process dies or the HTTP transport drops, the client was left in connected state with stale tool definitions. No reconnect was attempted, so tools permanently vanished for the session. Register an onclose handler on each MCP client that: - Detects unexpected transport closure (not intentional disconnect) - Marks the server as failed and clears cached defs - Re-creates the client via createAndStore() using the original config - Publishes ToolsChanged event so the UI updates Guard all intentional close paths (disconnect, finalizer, closeClient) by deleting s.clients[name] BEFORE calling client.close(), so the onclose handler sees s.clients[name] !== client and returns early. Fixes anomalyco#17099
1 parent f116a55 commit 083abf0

2 files changed

Lines changed: 135 additions & 3 deletions

File tree

‎packages/opencode/src/mcp/index.ts‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,32 @@ export const layer = Layer.effect(
509509

510510
function watch(s: State, name: string, client: MCPClient, bridge: EffectBridge.Shape, timeout?: number) {
511511
if (!client.getServerCapabilities()?.tools) return
512+
513+
client.onclose = () => {
514+
if (s.clients[name] !== client) return
515+
516+
log.warn("MCP transport closed unexpectedly", { server: name })
517+
s.status[name] = { status: "failed", error: "Transport closed unexpectedly" }
518+
delete s.defs[name]
519+
520+
bridge
521+
.promise(
522+
Effect.gen(function* () {
523+
const mcpConfig = yield* getMcpConfig(name)
524+
if (!mcpConfig) {
525+
log.error("MCP config not found, cannot reconnect", { name })
526+
return
527+
}
528+
yield* createAndStore(name, mcpConfig)
529+
yield* events.publish(ToolsChanged, { server: name }).pipe(Effect.ignore)
530+
log.info("MCP reconnected after transport close", { server: name })
531+
}),
532+
)
533+
.catch((error) => {
534+
log.error("MCP reconnect failed after transport close", { server: name, error: String(error) })
535+
})
536+
}
537+
512538
client.setNotificationHandler(ToolListChangedNotificationSchema, async () => {
513539
log.info("tools list changed notification received", { server: name })
514540
if (s.clients[name] !== client || s.status[name]?.status !== "connected") return
@@ -563,9 +589,12 @@ export const layer = Layer.effect(
563589

564590
yield* Effect.addFinalizer(() =>
565591
Effect.gen(function* () {
592+
const clientsToClose = Object.entries(s.clients)
593+
s.clients = {}
594+
s.defs = {}
566595
yield* Effect.forEach(
567-
Object.values(s.clients),
568-
(client) =>
596+
clientsToClose,
597+
([, client]) =>
569598
Effect.gen(function* () {
570599
const pid = client.transport instanceof StdioClientTransport ? client.transport.pid : null
571600
if (typeof pid === "number") {
@@ -591,6 +620,7 @@ export const layer = Layer.effect(
591620
function closeClient(s: State, name: string) {
592621
const client = s.clients[name]
593622
delete s.defs[name]
623+
delete s.clients[name]
594624
if (!client) return Effect.void
595625
return Effect.tryPromise(() => client.close()).pipe(Effect.ignore)
596626
}
@@ -665,7 +695,6 @@ export const layer = Layer.effect(
665695
yield* requireMcpConfig(name)
666696
const s = yield* InstanceState.get(state)
667697
yield* closeClient(s, name)
668-
delete s.clients[name]
669698
s.status[name] = { status: "disabled" }
670699
})
671700

‎packages/opencode/test/mcp/lifecycle.test.ts‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ void mock.module("@modelcontextprotocol/sdk/client/index.js", () => ({
123123
Client: class MockClient {
124124
_state!: MockClientState
125125
transport: any
126+
onclose?: () => void
126127

127128
constructor(_opts: any) {
128129
clientCreateCount++
@@ -976,3 +977,105 @@ it.instance(
976977
),
977978
{ config: { mcp: {} } },
978979
)
980+
981+
// ========================================================================
982+
// Test: onclose triggers automatic reconnect (#17099)
983+
// ========================================================================
984+
985+
it.instance(
986+
"onclose triggers automatic reconnect when transport closes unexpectedly",
987+
() =>
988+
MCP.Service.use((mcp: MCPNS.Interface) =>
989+
Effect.gen(function* () {
990+
lastCreatedClientName = "reconnect-server"
991+
const firstState = getOrCreateClientState("reconnect-server")
992+
firstState.tools = [
993+
{ name: "tool_v1", description: "first", inputSchema: { type: "object", properties: {} } },
994+
]
995+
996+
yield* mcp.add("reconnect-server", {
997+
type: "local",
998+
command: ["echo", "test"],
999+
})
1000+
1001+
const toolsBefore = yield* mcp.tools()
1002+
expect(Object.keys(toolsBefore).some((k) => k.includes("tool_v1"))).toBe(true)
1003+
expect((yield* mcp.status())["reconnect-server"]?.status).toBe("connected")
1004+
1005+
const clientsBefore = yield* mcp.clients()
1006+
const client = clientsBefore["reconnect-server"]
1007+
expect(client).toBeDefined()
1008+
1009+
clientStates.delete("reconnect-server")
1010+
const secondState = getOrCreateClientState("reconnect-server")
1011+
secondState.tools = [
1012+
{ name: "tool_v2", description: "reconnected", inputSchema: { type: "object", properties: {} } },
1013+
]
1014+
1015+
// Trigger onclose (simulating unexpected transport close)
1016+
lastCreatedClientName = "reconnect-server"
1017+
client.onclose?.()
1018+
1019+
// Give the async reconnect a moment to complete
1020+
yield* Effect.sleep("100 millis")
1021+
1022+
const statusAfter = yield* mcp.status()
1023+
expect(statusAfter["reconnect-server"]?.status).toBe("connected")
1024+
1025+
const toolsAfter = yield* mcp.tools()
1026+
expect(Object.keys(toolsAfter).some((k) => k.includes("tool_v2"))).toBe(true)
1027+
expect(Object.keys(toolsAfter).some((k) => k.includes("tool_v1"))).toBe(false)
1028+
}),
1029+
),
1030+
{ config: { mcp: {} } },
1031+
)
1032+
1033+
// ========================================================================
1034+
// Test: onclose does NOT reconnect on intentional disconnect
1035+
// ========================================================================
1036+
1037+
it.instance(
1038+
"onclose does not trigger reconnect on intentional disconnect()",
1039+
() =>
1040+
MCP.Service.use((mcp: MCPNS.Interface) =>
1041+
Effect.gen(function* () {
1042+
lastCreatedClientName = "intentional-disc"
1043+
const serverState = getOrCreateClientState("intentional-disc")
1044+
serverState.tools = [
1045+
{ name: "my_tool", description: "a tool", inputSchema: { type: "object", properties: {} } },
1046+
]
1047+
1048+
yield* mcp.add("intentional-disc", {
1049+
type: "local",
1050+
command: ["echo", "test"],
1051+
})
1052+
1053+
expect((yield* mcp.status())["intentional-disc"]?.status).toBe("connected")
1054+
1055+
// Intentional disconnect should NOT trigger reconnect
1056+
yield* mcp.disconnect("intentional-disc")
1057+
1058+
const statusAfter = yield* mcp.status()
1059+
expect(statusAfter["intentional-disc"]?.status).toBe("disabled")
1060+
1061+
// Wait to confirm no reconnect fires
1062+
yield* Effect.sleep("100 millis")
1063+
1064+
const statusFinal = yield* mcp.status()
1065+
expect(statusFinal["intentional-disc"]?.status).toBe("disabled")
1066+
1067+
const tools = yield* mcp.tools()
1068+
expect(Object.keys(tools).some((k) => k.includes("my_tool"))).toBe(false)
1069+
}),
1070+
),
1071+
{
1072+
config: {
1073+
mcp: {
1074+
"intentional-disc": {
1075+
type: "local",
1076+
command: ["echo", "test"],
1077+
},
1078+
},
1079+
},
1080+
},
1081+
)

0 commit comments

Comments
 (0)