mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-20 02:10:15 +01:00
* WIP: app.locals refactoring
WIP: appConfig
fix: update memory configuration retrieval to use getAppConfig based on user role
fix: update comment for AppConfig interface to clarify purpose
🏷️ refactor: Update tests to use getAppConfig for endpoint configurations
ci: Update AppService tests to initialize app config instead of app.locals
ci: Integrate getAppConfig into remaining tests
refactor: Update multer storage destination to use promise-based getAppConfig and improve error handling in tests
refactor: Rename initializeAppConfig to setAppConfig and update related tests
ci: Mock getAppConfig in various tests to provide default configurations
refactor: Update convertMCPToolsToPlugins to use mcpManager for server configuration and adjust related tests
chore: rename `Config/getAppConfig` -> `Config/app`
fix: streamline OpenAI image tools configuration by removing direct appConfig dependency and using function parameters
chore: correct parameter documentation for imageOutputType in ToolService.js
refactor: remove `getCustomConfig` dependency in config route
refactor: update domain validation to use appConfig for allowed domains
refactor: use appConfig registration property
chore: remove app parameter from AppService invocation
refactor: update AppConfig interface to correct registration and turnstile configurations
refactor: remove getCustomConfig dependency and use getAppConfig in PluginController, multer, and MCP services
refactor: replace getCustomConfig with getAppConfig in STTService, TTSService, and related files
refactor: replace getCustomConfig with getAppConfig in Conversation and Message models, update tempChatRetention functions to use AppConfig type
refactor: update getAppConfig calls in Conversation and Message models to include user role for temporary chat expiration
ci: update related tests
refactor: update getAppConfig call in getCustomConfigSpeech to include user role
fix: update appConfig usage to access allowedDomains from actions instead of registration
refactor: enhance AppConfig to include fileStrategies and update related file strategy logic
refactor: update imports to use normalizeEndpointName from @librechat/api and remove redundant definitions
chore: remove deprecated unused RunManager
refactor: get balance config primarily from appConfig
refactor: remove customConfig dependency for appConfig and streamline loadConfigModels logic
refactor: remove getCustomConfig usage and use app config in file citations
refactor: consolidate endpoint loading logic into loadEndpoints function
refactor: update appConfig access to use endpoints structure across various services
refactor: implement custom endpoints configuration and streamline endpoint loading logic
refactor: update getAppConfig call to include user role parameter
refactor: streamline endpoint configuration and enhance appConfig usage across services
refactor: replace getMCPAuthMap with getUserMCPAuthMap and remove unused getCustomConfig file
refactor: add type annotation for loadedEndpoints in loadEndpoints function
refactor: move /services/Files/images/parse to TS API
chore: add missing FILE_CITATIONS permission to IRole interface
refactor: restructure toolkits to TS API
refactor: separate manifest logic into its own module
refactor: consolidate tool loading logic into a new tools module for startup logic
refactor: move interface config logic to TS API
refactor: migrate checkEmailConfig to TypeScript and update imports
refactor: add FunctionTool interface and availableTools to AppConfig
refactor: decouple caching and DB operations from AppService, make part of consolidated `getAppConfig`
WIP: fix tests
* fix: rebase conflicts
* refactor: remove app.locals references
* refactor: replace getBalanceConfig with getAppConfig in various strategies and middleware
* refactor: replace appConfig?.balance with getBalanceConfig in various controllers and clients
* test: add balance configuration to titleConvo method in AgentClient tests
* chore: remove unused `openai-chat-tokens` package
* chore: remove unused imports in initializeMCPs.js
* refactor: update balance configuration to use getAppConfig instead of getBalanceConfig
* refactor: integrate configMiddleware for centralized configuration handling
* refactor: optimize email domain validation by removing unnecessary async calls
* refactor: simplify multer storage configuration by removing async calls
* refactor: reorder imports for better readability in user.js
* refactor: replace getAppConfig calls with req.config for improved performance
* chore: replace getAppConfig calls with req.config in tests for centralized configuration handling
* chore: remove unused override config
* refactor: add configMiddleware to endpoint route and replace getAppConfig with req.config
* chore: remove customConfig parameter from TTSService constructor
* refactor: pass appConfig from request to processFileCitations for improved configuration handling
* refactor: remove configMiddleware from endpoint route and retrieve appConfig directly in getEndpointsConfig if not in `req.config`
* test: add mockAppConfig to processFileCitations tests for improved configuration handling
* fix: pass req.config to hasCustomUserVars and call without await after synchronous refactor
* fix: type safety in useExportConversation
* refactor: retrieve appConfig using getAppConfig in PluginController and remove configMiddleware from plugins route, to avoid always retrieving when plugins are cached
* chore: change `MongoUser` typedef to `IUser`
* fix: Add `user` and `config` fields to ServerRequest and update JSDoc type annotations from Express.Request to ServerRequest
* fix: remove unused setAppConfig mock from Server configuration tests
298 lines
10 KiB
TypeScript
298 lines
10 KiB
TypeScript
import pick from 'lodash/pick';
|
|
import { logger } from '@librechat/data-schemas';
|
|
import { CallToolResultSchema, ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';
|
|
import type { RequestOptions } from '@modelcontextprotocol/sdk/shared/protocol.js';
|
|
import type { TokenMethods } from '@librechat/data-schemas';
|
|
import type { FlowStateManager } from '~/flow/manager';
|
|
import type { TUser } from 'librechat-data-provider';
|
|
import type { MCPOAuthTokens } from '~/mcp/oauth';
|
|
import type { RequestBody } from '~/types';
|
|
import type * as t from './types';
|
|
import { UserConnectionManager } from '~/mcp/UserConnectionManager';
|
|
import { ConnectionsRepository } from '~/mcp/ConnectionsRepository';
|
|
import { formatToolContent } from './parsers';
|
|
import { MCPConnection } from './connection';
|
|
import { processMCPEnv } from '~/utils/env';
|
|
import { CONSTANTS } from './enum';
|
|
|
|
/**
|
|
* Centralized manager for MCP server connections and tool execution.
|
|
* Extends UserConnectionManager to handle both app-level and user-specific connections.
|
|
*/
|
|
export class MCPManager extends UserConnectionManager {
|
|
private static instance: MCPManager | null;
|
|
// Connections shared by all users.
|
|
private appConnections: ConnectionsRepository | null = null;
|
|
|
|
/** Creates and initializes the singleton MCPManager instance */
|
|
public static async createInstance(configs: t.MCPServers): Promise<MCPManager> {
|
|
if (MCPManager.instance) throw new Error('MCPManager has already been initialized.');
|
|
MCPManager.instance = new MCPManager(configs);
|
|
await MCPManager.instance.initialize();
|
|
return MCPManager.instance;
|
|
}
|
|
|
|
/** Returns the singleton MCPManager instance */
|
|
public static getInstance(): MCPManager {
|
|
if (!MCPManager.instance) throw new Error('MCPManager has not been initialized.');
|
|
return MCPManager.instance;
|
|
}
|
|
|
|
/** Initializes the MCPManager by setting up server registry and app connections */
|
|
public async initialize() {
|
|
await this.serversRegistry.initialize();
|
|
this.appConnections = new ConnectionsRepository(this.serversRegistry.appServerConfigs!);
|
|
}
|
|
|
|
/** Returns all app-level connections */
|
|
public async getAllConnections(): Promise<Map<string, MCPConnection> | null> {
|
|
return this.appConnections!.getAll();
|
|
}
|
|
|
|
/** Get servers that require OAuth */
|
|
public getOAuthServers(): Set<string> | null {
|
|
return this.serversRegistry.oauthServers!;
|
|
}
|
|
|
|
/** Get all servers */
|
|
public getAllServers(): t.MCPServers | null {
|
|
return this.serversRegistry.rawConfigs!;
|
|
}
|
|
|
|
/** Returns all available tool functions from app-level connections */
|
|
public getAppToolFunctions(): t.LCAvailableTools | null {
|
|
return this.serversRegistry.toolFunctions!;
|
|
}
|
|
/** Returns all available tool functions from all connections available to user */
|
|
public async getAllToolFunctions(userId: string): Promise<t.LCAvailableTools | null> {
|
|
const allToolFunctions: t.LCAvailableTools = this.getAppToolFunctions() ?? {};
|
|
const userConnections = this.getUserConnections(userId);
|
|
if (!userConnections || userConnections.size === 0) {
|
|
return allToolFunctions;
|
|
}
|
|
|
|
for (const [serverName, connection] of userConnections.entries()) {
|
|
const toolFunctions = await this.serversRegistry.getToolFunctions(serverName, connection);
|
|
Object.assign(allToolFunctions, toolFunctions);
|
|
}
|
|
|
|
return allToolFunctions;
|
|
}
|
|
|
|
/**
|
|
* Get instructions for MCP servers
|
|
* @param serverNames Optional array of server names. If not provided or empty, returns all servers.
|
|
* @returns Object mapping server names to their instructions
|
|
*/
|
|
public getInstructions(serverNames?: string[]): Record<string, string> {
|
|
const instructions = this.serversRegistry.serverInstructions!;
|
|
if (!serverNames) return instructions;
|
|
return pick(instructions, serverNames);
|
|
}
|
|
|
|
/**
|
|
* Format MCP server instructions for injection into context
|
|
* @param serverNames Optional array of server names to include. If not provided, includes all servers.
|
|
* @returns Formatted instructions string ready for context injection
|
|
*/
|
|
public formatInstructionsForContext(serverNames?: string[]): string {
|
|
/** Instructions for specified servers or all stored instructions */
|
|
const instructionsToInclude = this.getInstructions(serverNames);
|
|
|
|
if (Object.keys(instructionsToInclude).length === 0) {
|
|
return '';
|
|
}
|
|
|
|
// Format instructions for context injection
|
|
const formattedInstructions = Object.entries(instructionsToInclude)
|
|
.map(([serverName, instructions]) => {
|
|
return `## ${serverName} MCP Server Instructions
|
|
|
|
${instructions}`;
|
|
})
|
|
.join('\n\n');
|
|
|
|
return `# MCP Server Instructions
|
|
|
|
The following MCP servers are available with their specific instructions:
|
|
|
|
${formattedInstructions}
|
|
|
|
Please follow these instructions when using tools from the respective MCP servers.`;
|
|
}
|
|
|
|
private async loadAppManifestTools(): Promise<t.LCManifestTool[]> {
|
|
const connections = await this.appConnections!.getAll();
|
|
return await this.loadManifestTools(connections);
|
|
}
|
|
|
|
private async loadUserManifestTools(userId: string): Promise<t.LCManifestTool[]> {
|
|
const connections = this.getUserConnections(userId);
|
|
return await this.loadManifestTools(connections);
|
|
}
|
|
|
|
public async loadAllManifestTools(userId: string): Promise<t.LCManifestTool[]> {
|
|
const appTools = await this.loadAppManifestTools();
|
|
const userTools = await this.loadUserManifestTools(userId);
|
|
return [...appTools, ...userTools];
|
|
}
|
|
|
|
/** Loads tools from all app-level connections into the manifest. */
|
|
private async loadManifestTools(
|
|
connections?: Map<string, MCPConnection> | null,
|
|
): Promise<t.LCToolManifest> {
|
|
const mcpTools: t.LCManifestTool[] = [];
|
|
if (!connections || connections.size === 0) {
|
|
return mcpTools;
|
|
}
|
|
for (const [serverName, connection] of connections.entries()) {
|
|
try {
|
|
if (!(await connection.isConnected())) {
|
|
logger.warn(
|
|
`[MCP][${serverName}] Connection not available for ${serverName} manifest tools.`,
|
|
);
|
|
continue;
|
|
}
|
|
|
|
const tools = await connection.fetchTools();
|
|
const serverTools: t.LCManifestTool[] = [];
|
|
for (const tool of tools) {
|
|
const pluginKey = `${tool.name}${CONSTANTS.mcp_delimiter}${serverName}`;
|
|
|
|
const config = this.serversRegistry.parsedConfigs[serverName];
|
|
const manifestTool: t.LCManifestTool = {
|
|
name: tool.name,
|
|
pluginKey,
|
|
description: tool.description ?? '',
|
|
icon: connection.iconPath,
|
|
authConfig: config?.customUserVars
|
|
? Object.entries(config.customUserVars).map(([key, value]) => ({
|
|
authField: key,
|
|
label: value.title || key,
|
|
description: value.description || '',
|
|
}))
|
|
: undefined,
|
|
};
|
|
if (config?.chatMenu === false) {
|
|
manifestTool.chatMenu = false;
|
|
}
|
|
mcpTools.push(manifestTool);
|
|
serverTools.push(manifestTool);
|
|
}
|
|
} catch (error) {
|
|
logger.error(`[MCP][${serverName}] Error fetching tools for manifest:`, error);
|
|
}
|
|
}
|
|
|
|
return mcpTools;
|
|
}
|
|
|
|
/**
|
|
* Calls a tool on an MCP server, using either a user-specific connection
|
|
* (if userId is provided) or an app-level connection. Updates the last activity timestamp
|
|
* for user-specific connections upon successful call initiation.
|
|
*/
|
|
async callTool({
|
|
user,
|
|
serverName,
|
|
toolName,
|
|
provider,
|
|
toolArguments,
|
|
options,
|
|
tokenMethods,
|
|
requestBody,
|
|
flowManager,
|
|
oauthStart,
|
|
oauthEnd,
|
|
customUserVars,
|
|
}: {
|
|
user?: TUser;
|
|
serverName: string;
|
|
toolName: string;
|
|
provider: t.Provider;
|
|
toolArguments?: Record<string, unknown>;
|
|
options?: RequestOptions;
|
|
requestBody?: RequestBody;
|
|
tokenMethods?: TokenMethods;
|
|
customUserVars?: Record<string, string>;
|
|
flowManager: FlowStateManager<MCPOAuthTokens | null>;
|
|
oauthStart?: (authURL: string) => Promise<void>;
|
|
oauthEnd?: () => Promise<void>;
|
|
}): Promise<t.FormattedToolResponse> {
|
|
/** User-specific connection */
|
|
let connection: MCPConnection | undefined;
|
|
const userId = user?.id;
|
|
const logPrefix = userId ? `[MCP][User: ${userId}][${serverName}]` : `[MCP][${serverName}]`;
|
|
|
|
try {
|
|
if (!this.appConnections?.has(serverName) && userId && user) {
|
|
this.updateUserLastActivity(userId);
|
|
/** Get or create user-specific connection */
|
|
connection = await this.getUserConnection({
|
|
user,
|
|
serverName,
|
|
flowManager,
|
|
tokenMethods,
|
|
oauthStart,
|
|
oauthEnd,
|
|
signal: options?.signal,
|
|
customUserVars,
|
|
requestBody,
|
|
});
|
|
} else {
|
|
/** App-level connection */
|
|
connection = await this.appConnections!.get(serverName);
|
|
if (!connection) {
|
|
throw new McpError(
|
|
ErrorCode.InvalidRequest,
|
|
`${logPrefix} No app-level connection found. Cannot execute tool ${toolName}.`,
|
|
);
|
|
}
|
|
}
|
|
|
|
if (!(await connection.isConnected())) {
|
|
/** May happen if getUserConnection failed silently or app connection dropped */
|
|
throw new McpError(
|
|
ErrorCode.InternalError, // Use InternalError for connection issues
|
|
`${logPrefix} Connection is not active. Cannot execute tool ${toolName}.`,
|
|
);
|
|
}
|
|
|
|
const rawConfig = this.getRawConfig(serverName) as t.MCPOptions;
|
|
const currentOptions = processMCPEnv({
|
|
user,
|
|
options: rawConfig,
|
|
customUserVars: customUserVars,
|
|
body: requestBody,
|
|
});
|
|
if ('headers' in currentOptions) {
|
|
connection.setRequestHeaders(currentOptions.headers || {});
|
|
}
|
|
|
|
const result = await connection.client.request(
|
|
{
|
|
method: 'tools/call',
|
|
params: {
|
|
name: toolName,
|
|
arguments: toolArguments,
|
|
},
|
|
},
|
|
CallToolResultSchema,
|
|
{
|
|
timeout: connection.timeout,
|
|
...options,
|
|
},
|
|
);
|
|
if (userId) {
|
|
this.updateUserLastActivity(userId);
|
|
}
|
|
this.checkIdleConnections();
|
|
return formatToolContent(result as t.MCPToolCallResponse, provider);
|
|
} catch (error) {
|
|
// Log with context and re-throw or handle as needed
|
|
logger.error(`${logPrefix}[${toolName}] Tool call failed`, error);
|
|
// Rethrowing allows the caller (createMCPTool) to handle the final user message
|
|
throw error;
|
|
}
|
|
}
|
|
}
|