CERBERUS/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2026-10-25 03:32:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

🧺 fix: Funnel MCP Catalog Work Through a Shared Gate (#15429)

Browse source 
* 🧯 fix: Bound MCP Catalog Work Across Requests

* 🛑 fix: Reject Saturated MCP Discovery

* fix: fairly bound MCP catalog work

* test: type catalog snapshot mock arguments

* test: assert snapshot deadline forwarding

* fix: harden MCP catalog scheduling
This commit is contained in:
Danny Avila 2026-08-31 14:13:31 -04:00 • committed by GitHub
parent 2e2c29e10d
commit 49e1e32f3a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 357 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

49
api/server/controllers/mcp.js
View file

@ -13,6 +13,7 @@ const {
createAuthIdentityContext,
MCPConnection,
MCPErrorCodes,
MCPCatalogCapacityError,
splitMCPToolKey,
normalizeServerName,
findShadowedServerNames,
@ -201,21 +202,35 @@ const getMCPTools = async (req, res) => {
user: req.user,
tenantId: getTenantId(),
});
const { serverTools: serverToolsMap, serversWithoutTools } = await loadMCPServerCatalogs({
user: req.user,
servers: configuredServers.map((serverName) => ({
serverName,
serverConfig: mcpConfig[serverName],
})),
upstreamTokenProvider: createOpenIDSessionTokenProvider({
req,
res,
const catalogAbortController = new AbortController();
const abortCatalogLoad = () => {
if (!res.writableEnded) {
catalogAbortController.abort();
}
};
res.once('close', abortCatalogLoad);
let catalogResult;
try {
catalogResult = await loadMCPServerCatalogs({
user: req.user,
identityContext: oboIdentityContext,
tokenPreference: 'access_token',
}),
oboIdentityContext,
});
servers: configuredServers.map((serverName) => ({
serverName,
serverConfig: mcpConfig[serverName],
})),
upstreamTokenProvider: createOpenIDSessionTokenProvider({
req,
res,
user: req.user,
identityContext: oboIdentityContext,
tokenPreference: 'access_token',
}),
oboIdentityContext,
signal: catalogAbortController.signal,
});
} finally {
res.off('close', abortCatalogLoad);
}
const { serverTools: serverToolsMap, serversWithoutTools } = catalogResult;
if (serversWithoutTools.length > 0) {
logger.debug(
`[getMCPTools] No tools (${serversWithoutTools.length}): ${serversWithoutTools.join(', ')}`,
@ -286,7 +301,11 @@ const getMCPTools = async (req, res) => {
res.status(200).json({ servers: mcpServers });
} catch (error) {
logger.error('[getMCPTools]', error);
res.status(500).json({ message: error.message });
if (res.destroyed || res.headersSent) {
return;
}
const status = error instanceof MCPCatalogCapacityError ? 503 : 500;
res.status(status).json({ message: error.message });
}
};
/**