e1d864eb83
- C3: include command args in auto-slash-command dedup key - H2: track completed task summaries for ALL COMPLETE message - H9: increment tmux close retry count on re-mark - H8: detect stale MCP connections after disconnect+reconnect race - H8: guard disconnectedSessions growth for non-MCP sessions - C1: await tmux cleanup in plugin dispose lifecycle
116 lines
3.8 KiB
TypeScript
116 lines
3.8 KiB
TypeScript
import type { Client } from "@modelcontextprotocol/sdk/client/index.js"
|
|
import type { ClaudeCodeMcpServer } from "../claude-code-mcp-loader/types"
|
|
import { expandEnvVarsInObject } from "../claude-code-mcp-loader/env-expander"
|
|
import { forceReconnect } from "./cleanup"
|
|
import { getConnectionType } from "./connection-type"
|
|
import { createHttpClient } from "./http-client"
|
|
import { createStdioClient } from "./stdio-client"
|
|
import type { SkillMcpClientConnectionParams, SkillMcpClientInfo, SkillMcpManagerState } from "./types"
|
|
|
|
export async function getOrCreateClient(params: {
|
|
state: SkillMcpManagerState
|
|
clientKey: string
|
|
info: SkillMcpClientInfo
|
|
config: ClaudeCodeMcpServer
|
|
}): Promise<Client> {
|
|
const { state, clientKey, info, config } = params
|
|
state.disconnectedSessions.delete(info.sessionID)
|
|
|
|
const existing = state.clients.get(clientKey)
|
|
if (existing) {
|
|
existing.lastUsedAt = Date.now()
|
|
return existing.client
|
|
}
|
|
|
|
// Prevent race condition: if a connection is already in progress, wait for it
|
|
const pending = state.pendingConnections.get(clientKey)
|
|
if (pending) {
|
|
return pending
|
|
}
|
|
|
|
const expandedConfig = expandEnvVarsInObject(config)
|
|
let currentConnectionPromise!: Promise<Client>
|
|
currentConnectionPromise = (async () => {
|
|
const client = await createClient({ state, clientKey, info, config: expandedConfig })
|
|
|
|
const isStale = state.pendingConnections.has(clientKey) && state.pendingConnections.get(clientKey) !== currentConnectionPromise
|
|
if (isStale) {
|
|
try { await client.close() } catch {}
|
|
throw new Error(`Connection for "${info.sessionID}" was superseded by a newer connection attempt.`)
|
|
}
|
|
|
|
if (state.disconnectedSessions.has(info.sessionID)) {
|
|
await forceReconnect(state, clientKey)
|
|
throw new Error(`Session "${info.sessionID}" disconnected during MCP connection setup.`)
|
|
}
|
|
|
|
return client
|
|
})()
|
|
|
|
state.pendingConnections.set(clientKey, currentConnectionPromise)
|
|
|
|
try {
|
|
const client = await currentConnectionPromise
|
|
return client
|
|
} finally {
|
|
if (state.pendingConnections.get(clientKey) === currentConnectionPromise) {
|
|
state.pendingConnections.delete(clientKey)
|
|
}
|
|
}
|
|
}
|
|
|
|
export async function getOrCreateClientWithRetryImpl(params: {
|
|
state: SkillMcpManagerState
|
|
clientKey: string
|
|
info: SkillMcpClientInfo
|
|
config: ClaudeCodeMcpServer
|
|
}): Promise<Client> {
|
|
const { state, clientKey } = params
|
|
|
|
try {
|
|
return await getOrCreateClient(params)
|
|
} catch (error) {
|
|
const didReconnect = await forceReconnect(state, clientKey)
|
|
if (!didReconnect) {
|
|
throw error
|
|
}
|
|
return await getOrCreateClient(params)
|
|
}
|
|
}
|
|
|
|
async function createClient(params: {
|
|
state: SkillMcpManagerState
|
|
clientKey: string
|
|
info: SkillMcpClientInfo
|
|
config: ClaudeCodeMcpServer
|
|
}): Promise<Client> {
|
|
const { info, config } = params
|
|
const connectionType = getConnectionType(config)
|
|
|
|
if (!connectionType) {
|
|
throw new Error(
|
|
`MCP server "${info.serverName}" has no valid connection configuration.\n\n` +
|
|
`The MCP configuration in skill "${info.skillName}" must specify either:\n` +
|
|
` - A URL for HTTP connection (remote MCP server)\n` +
|
|
` - A command for stdio connection (local MCP process)\n\n` +
|
|
`Examples:\n` +
|
|
` HTTP:\n` +
|
|
` mcp:\n` +
|
|
` ${info.serverName}:\n` +
|
|
` url: https://mcp.example.com/mcp\n` +
|
|
` headers:\n` +
|
|
" Authorization: Bearer ${API_KEY}\n\n" +
|
|
` Stdio:\n` +
|
|
` mcp:\n` +
|
|
` ${info.serverName}:\n` +
|
|
` command: npx\n` +
|
|
` args: [-y, @some/mcp-server]`
|
|
)
|
|
}
|
|
|
|
if (connectionType === "http") {
|
|
return await createHttpClient(params satisfies SkillMcpClientConnectionParams)
|
|
}
|
|
return await createStdioClient(params satisfies SkillMcpClientConnectionParams)
|
|
}
|