Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

🪂 refactor: MCP Server Init Fallback (#10608)

Danny Avilab49545d91607
diff --git a/api/server/routes/config.js b/api/server/routes/config.js
index f1d2332047..6f97639dd1 100644
--- a/api/server/routes/config.js
+++ b/api/server/routes/config.js
@@ -30,11 +30,46 @@ const publicSharedLinksEnabled =
const sharePointFilePickerEnabled = isEnabled(process.env.ENABLE_SHAREPOINT_FILEPICKER);
const openidReuseTokens = isEnabled(process.env.OPENID_REUSE_TOKENS);
+/**
+ * Fetches MCP servers from registry and adds them to the payload.
+ * Registry now includes all configured servers (from YAML) plus inspection data when available.
+ * Always fetches fresh to avoid caching incomplete initialization state.
+ */
+const getMCPServers = async (payload, appConfig) => {
+ try {
+ if (appConfig?.mcpConfig == null) {
+ return;
+ }
+ const mcpManager = getMCPManager();
+ if (!mcpManager) {
+ return;
+ }
+ const mcpServers = await mcpServersRegistry.getAllServerConfigs();
+ if (!mcpServers) return;
+ for (const serverName in mcpServers) {
+ if (!payload.mcpServers) {
+ payload.mcpServers = {};
+ }
+ const serverConfig = mcpServers[serverName];
+ payload.mcpServers[serverName] = removeNullishValues({
+ startup: serverConfig?.startup,
+ chatMenu: serverConfig?.chatMenu,
+ isOAuth: serverConfig.requiresOAuth,
+ customUserVars: serverConfig?.customUserVars,
+ });
+ }
+ } catch (error) {
+ logger.error('Error loading MCP servers', error);
+ }
+};
+
router.get('/', async function (req, res) {
const cache = getLogStores(CacheKeys.CONFIG_STORE);
const cachedStartupConfig = await cache.get(CacheKeys.STARTUP_CONFIG);
if (cachedStartupConfig) {
+ const appConfig = await getAppConfig({ role: req.user?.role });
+ await getMCPServers(cachedStartupConfig, appConfig);
res.send(cachedStartupConfig);
return;
}
@@ -126,35 +161,6 @@ router.get('/', async function (req, res) {
payload.minPasswordLength = minPasswordLength;
}
- const getMCPServers = async () => {
- try {
- if (appConfig?.mcpConfig == null) {
- return;
- }
- const mcpManager = getMCPManager();
- if (!mcpManager) {
- return;
- }
- const mcpServers = await mcpServersRegistry.getAllServerConfigs();
- if (!mcpServers) return;
- for (const serverName in mcpServers) {
- if (!payload.mcpServers) {
- payload.mcpServers = {};
- }
- const serverConfig = mcpServers[serverName];
- payload.mcpServers[serverName] = removeNullishValues({
- startup: serverConfig?.startup,
- chatMenu: serverConfig?.chatMenu,
- isOAuth: serverConfig.requiresOAuth,
- customUserVars: serverConfig?.customUserVars,
- });
- }
- } catch (error) {
- logger.error('Error loading MCP servers', error);
- }
- };
-
- await getMCPServers();
const webSearchConfig = appConfig?.webSearch;
if (
webSearchConfig != null &&
@@ -184,6 +190,7 @@ router.get('/', async function (req, res) {
}
await cache.set(CacheKeys.STARTUP_CONFIG, payload);
+ await getMCPServers(payload, appConfig);
return res.status(200).send(payload);
} catch (err) {
logger.error('Error in startup config', err);
diff --git a/config/flush-cache.js b/config/flush-cache.js
index 07c744ca4e..05cf23c720 100644
--- a/config/flush-cache.js
+++ b/config/flush-cache.js
@@ -158,12 +158,22 @@ async function flushRedisCache(dryRun = false, verbose = false) {
if (dryRun) {
console.log('🔍 [DRY RUN] Would flush Redis cache');
try {
- const keys = await redis.keys('*');
- console.log(` Would delete ${keys.length} keys`);
- if (verbose && keys.length > 0) {
+ let allKeys = [];
+ if (useCluster) {
+ const nodes = redis.nodes('master');
+ console.log(` Cluster detected: ${nodes.length} master nodes`);
+ for (const node of nodes) {
+ const keys = await node.keys('*');
+ allKeys = allKeys.concat(keys);
+ }
+ } else {
+ allKeys = await redis.keys('*');
+ }
+ console.log(` Would delete ${allKeys.length} keys`);
+ if (verbose && allKeys.length > 0) {
console.log(
' Sample keys:',
- keys.slice(0, 10).join(', ') + (keys.length > 10 ? '...' : ''),
+ allKeys.slice(0, 10).join(', ') + (allKeys.length > 10 ? '...' : ''),
);
}
} catch (error) {
@@ -176,15 +186,29 @@ async function flushRedisCache(dryRun = false, verbose = false) {
// Get key count before flushing
let keyCount = 0;
try {
- const keys = await redis.keys('*');
- keyCount = keys.length;
+ if (useCluster) {
+ const nodes = redis.nodes('master');
+ for (const node of nodes) {
+ const keys = await node.keys('*');
+ keyCount += keys.length;
+ }
+ } else {
+ const keys = await redis.keys('*');
+ keyCount = keys.length;
+ }
} catch (_error) {
// Continue with flush even if we can't count keys
}
// Flush the Redis cache
- await redis.flushdb();
- console.log('✅ Redis cache flushed successfully');
+ if (useCluster) {
+ const nodes = redis.nodes('master');
+ await Promise.all(nodes.map((node) => node.flushdb()));
+ console.log(`✅ Redis cluster cache flushed successfully (${nodes.length} master nodes)`);
+ } else {
+ await redis.flushdb();
+ console.log('✅ Redis cache flushed successfully');
+ }
if (keyCount > 0) {
console.log(` Deleted ${keyCount} keys`);
diff --git a/packages/api/src/mcp/registry/MCPServersInitializer.ts b/packages/api/src/mcp/registry/MCPServersInitializer.ts
index f29cd6769f..1828ac2103 100644
--- a/packages/api/src/mcp/registry/MCPServersInitializer.ts
+++ b/packages/api/src/mcp/registry/MCPServersInitializer.ts
@@ -34,6 +34,9 @@ export class MCPServersInitializer {
public static async initialize(rawConfigs: t.MCPServers): Promise<void> {
if (await statusCache.isInitialized()) return;
+ /** Store raw configs immediately so they're available even if initialization fails/is slow */
+ registry.setRawConfigs(rawConfigs);
+
if (await isLeader()) {
// Leader performs initialization
await statusCache.reset();
diff --git a/packages/api/src/mcp/registry/MCPServersRegistry.ts b/packages/api/src/mcp/registry/MCPServersRegistry.ts
index 80f5765392..b145eb3705 100644
--- a/packages/api/src/mcp/registry/MCPServersRegistry.ts
+++ b/packages/api/src/mcp/registry/MCPServersRegistry.ts
@@ -13,12 +13,22 @@ import {
*
* Provides a unified interface for retrieving server configs with proper fallback hierarchy:
* checks shared app servers first, then shared user servers, then private user servers.
+ * Falls back to raw config when servers haven't been initialized yet or failed to initialize.
* Handles server lifecycle operations including adding, removing, and querying configurations.
*/
class MCPServersRegistry {
public readonly sharedAppServers = ServerConfigsCacheFactory.create('App', false);
public readonly sharedUserServers = ServerConfigsCacheFactory.create('User', false);
private readonly privateUserServers: Map<string | undefined, ServerConfigsCache> = new Map();
+ private rawConfigs: t.MCPServers = {};
+
+ /**
+ * Stores the raw MCP configuration as a fallback when servers haven't been initialized yet.
+ * Should be called during initialization before inspecting servers.
+ */
+ public setRawConfigs(configs: t.MCPServers): void {
+ this.rawConfigs = configs;
+ }
public async addPrivateUserServer(
userId: string,
@@ -59,15 +69,32 @@ class MCPServersRegistry {
const privateUserServer = await this.privateUserServers.get(userId)?.get(serverName);
if (privateUserServer) return privateUserServer;
+ /** Fallback to raw config if server hasn't been initialized yet */
+ const rawConfig = this.rawConfigs[serverName];
+ if (rawConfig) return rawConfig as t.ParsedServerConfig;
+
return undefined;
}
public async getAllServerConfigs(userId?: string): Promise<Record<string, t.ParsedServerConfig>> {
- return {
+ const registryConfigs = {
...(await this.sharedAppServers.getAll()),
...(await this.sharedUserServers.getAll()),
...((await this.privateUserServers.get(userId)?.getAll()) ?? {}),
};
+
+ /** Include all raw configs, but registry configs take precedence (they have inspection data) */
+ const allConfigs: Record<string, t.ParsedServerConfig> = {};
+ for (const serverName in this.rawConfigs) {
+ allConfigs[serverName] = this.rawConfigs[serverName] as t.ParsedServerConfig;
+ }
+
+ /** Override with registry configs where available (they have richer data) */
+ for (const serverName in registryConfigs) {
+ allConfigs[serverName] = registryConfigs[serverName];
+ }
+
+ return allConfigs;
}
// TODO: This is currently used to determine if a server requires OAuth. However, this info can