fix(hooks): scope MCP health cache to the resolved server

This commit is contained in:
Neo committed 2026-11-13 15:17:12 -05:00
1 parent d2ef268059
commit e6538e2428
2 files changed
+221 -81

No files matched your search

+29 -7
View File
@@ -13,6 +13,7 @@
*/
const fs = require('fs');
const crypto = require('crypto');
const os = require('os');
const path = require('path');
const http = require('http');
@@ -223,6 +224,22 @@ function resolveServerConfig(serverName) {
return null;
}
// Aliases are local names: two projects can both call different servers "db".
// Hash configuration values (which can contain credentials) rather than storing
// another copy in the cache. Cwd matters for relative commands and arguments.
function serverCacheIdentity(resolvedConfig) {
return crypto.createHash('sha256').update(JSON.stringify([
process.cwd(),
resolvedConfig?.source || null,
resolvedConfig?.config || null
])).digest('hex');
}
function matchingServerState(state, serverName, cacheIdentity) {
const previous = state.servers[serverName];
return previous?.cacheIdentity === cacheIdentity ? previous : {};
}
function markHealthy(state, serverName, now, details = {}) {
state.servers[serverName] = {
status: 'healthy',
@@ -237,14 +254,15 @@ function markHealthy(state, serverName, now, details = {}) {
};
}
function markUnhealthy(state, serverName, now, failureCode, errorMessage) {
const previous = state.servers[serverName] || {};
function markUnhealthy(state, serverName, now, failureCode, errorMessage, cacheIdentity) {
const previous = matchingServerState(state, serverName, cacheIdentity);
const failureCount = Number(previous.failureCount || 0) + 1;
const backoffBase = envNumber('ECC_MCP_HEALTH_BACKOFF_MS', DEFAULT_BACKOFF_MS);
const nextRetryDelay = Math.min(backoffBase * (2 ** Math.max(failureCount - 1, 0)), MAX_BACKOFF_MS);
state.servers[serverName] = {
status: 'unhealthy',
cacheIdentity,
checkedAt: now,
expiresAt: now,
failureCount,
@@ -728,7 +746,9 @@ function emitLogs(logs) {
async function handlePreToolUse(rawInput, input, target, statePathValue, now) {
const logs = [];
const state = loadState(statePathValue);
const previous = state.servers[target.server] || {};
const resolvedConfig = resolveServerConfig(target.server);
const cacheIdentity = serverCacheIdentity(resolvedConfig);
const previous = matchingServerState(state, target.server, cacheIdentity);
if (previous.status === 'healthy' && Number(previous.expiresAt || 0) > now) {
return { rawInput, exitCode: 0, logs };
@@ -741,7 +761,6 @@ async function handlePreToolUse(rawInput, input, target, statePathValue, now) {
return { rawInput, exitCode: shouldFailOpen() ? 0 : 2, logs };
}
const resolvedConfig = resolveServerConfig(target.server);
if (!resolvedConfig) {
logs.push(`[MCPHealthCheck] No MCP config found for ${target.server}; skipping preflight probe`);
return { rawInput, exitCode: 0, logs };
@@ -749,7 +768,7 @@ async function handlePreToolUse(rawInput, input, target, statePathValue, now) {
const probe = await probeServer(target.server, resolvedConfig);
if (probe.ok) {
markHealthy(state, target.server, now, { source: resolvedConfig.source });
markHealthy(state, target.server, now, { source: resolvedConfig.source, cacheIdentity });
saveState(statePathValue, state);
if (previous.status === 'unhealthy') {
@@ -767,6 +786,7 @@ async function handlePreToolUse(rawInput, input, target, statePathValue, now) {
if (reprobe.ok) {
markHealthy(state, target.server, now, {
source: resolvedConfig.source,
cacheIdentity,
restoredBy: 'reconnect-command'
});
saveState(statePathValue, state);
@@ -777,7 +797,7 @@ async function handlePreToolUse(rawInput, input, target, statePathValue, now) {
}
}
markUnhealthy(state, target.server, now, probe.failureCode, probe.reason);
markUnhealthy(state, target.server, now, probe.failureCode, probe.reason, cacheIdentity);
saveState(statePathValue, state);
const reconnectSuffix = reconnect.attempted
@@ -800,7 +820,8 @@ async function handlePostToolUseFailure(rawInput, input, target, statePathValue,
}
const state = loadState(statePathValue);
markUnhealthy(state, target.server, now, failureCode, summary.slice(0, 500));
const cacheIdentity = serverCacheIdentity(resolveServerConfig(target.server));
markUnhealthy(state, target.server, now, failureCode, summary.slice(0, 500), cacheIdentity);
saveState(statePathValue, state);
logs.push(`[MCPHealthCheck] ${target.server} reported ${failureCode}; marking server unhealthy and attempting reconnect`);
@@ -831,6 +852,7 @@ async function handlePostToolUseFailure(rawInput, input, target, statePathValue,
const refreshed = loadState(statePathValue);
markHealthy(refreshed, target.server, now, {
source: resolvedConfig.source,
cacheIdentity: serverCacheIdentity(resolvedConfig),
restoredBy: 'post-failure-reconnect'
});
saveState(statePathValue, refreshed);