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

ℹ️ fix: Add back Removed Icons for MCP Servers in Tools Dialog (#8636)

Sebastien Bruel283c9cff6f91
diff --git a/api/server/controllers/PluginController.js b/api/server/controllers/PluginController.js
index 1dbc7633ac..dfabf37f67 100644
--- a/api/server/controllers/PluginController.js
+++ b/api/server/controllers/PluginController.js
@@ -253,16 +253,17 @@ function convertMCPToolsToPlugins(functionTools, customConfig) {
const parts = toolKey.split(Constants.mcp_delimiter);
const serverName = parts[parts.length - 1];
+ const serverConfig = customConfig?.mcpServers?.[serverName];
+
const plugin = {
name: parts[0], // Use the tool name without server suffix
pluginKey: toolKey,
description: functionData.description || '',
authenticated: true,
- icon: undefined,
+ icon: serverConfig?.iconPath,
};
// Build authConfig for MCP tools
- const serverConfig = customConfig?.mcpServers?.[serverName];
if (!serverConfig?.customUserVars) {
plugin.authConfig = [];
plugins.push(plugin);
diff --git a/api/server/controllers/PluginController.spec.js b/api/server/controllers/PluginController.spec.js
new file mode 100644
index 0000000000..218d3255f9
--- /dev/null
+++ b/api/server/controllers/PluginController.spec.js
@@ -0,0 +1,89 @@
+const { Constants } = require('librechat-data-provider');
+const { getCustomConfig, getCachedTools } = require('~/server/services/Config');
+const { getLogStores } = require('~/cache');
+
+// Mock the dependencies
+jest.mock('@librechat/data-schemas', () => ({
+ logger: {
+ debug: jest.fn(),
+ error: jest.fn(),
+ },
+}));
+
+jest.mock('~/server/services/Config', () => ({
+ getCustomConfig: jest.fn(),
+ getCachedTools: jest.fn(),
+}));
+
+jest.mock('~/server/services/ToolService', () => ({
+ getToolkitKey: jest.fn(),
+}));
+
+jest.mock('~/config', () => ({
+ getMCPManager: jest.fn(() => ({
+ loadManifestTools: jest.fn().mockResolvedValue([]),
+ })),
+ getFlowStateManager: jest.fn(),
+}));
+
+jest.mock('~/app/clients/tools', () => ({
+ availableTools: [],
+}));
+
+jest.mock('~/cache', () => ({
+ getLogStores: jest.fn(),
+}));
+
+// Import the actual module with the function we want to test
+const { getAvailableTools } = require('./PluginController');
+
+describe('PluginController', () => {
+ describe('plugin.icon behavior', () => {
+ let mockReq, mockRes, mockCache;
+
+ const callGetAvailableToolsWithMCPServer = async (mcpServers) => {
+ mockCache.get.mockResolvedValue(null);
+ getCustomConfig.mockResolvedValue({ mcpServers });
+
+ const functionTools = {
+ [`test-tool${Constants.mcp_delimiter}test-server`]: {
+ function: { name: 'test-tool', description: 'A test tool' },
+ },
+ };
+ getCachedTools.mockResolvedValueOnce(functionTools);
+ getCachedTools.mockResolvedValueOnce({
+ [`test-tool${Constants.mcp_delimiter}test-server`]: true,
+ });
+
+ await getAvailableTools(mockReq, mockRes);
+ const responseData = mockRes.json.mock.calls[0][0];
+ return responseData.find((tool) => tool.name === 'test-tool');
+ };
+
+ beforeEach(() => {
+ jest.clearAllMocks();
+ mockReq = { user: { id: 'test-user-id' } };
+ mockRes = { status: jest.fn().mockReturnThis(), json: jest.fn() };
+ mockCache = { get: jest.fn(), set: jest.fn() };
+ getLogStores.mockReturnValue(mockCache);
+ });
+
+ it('should set plugin.icon when iconPath is defined', async () => {
+ const mcpServers = {
+ 'test-server': {
+ iconPath: '/path/to/icon.png',
+ },
+ };
+ const testTool = await callGetAvailableToolsWithMCPServer(mcpServers);
+ expect(testTool.icon).toBe('/path/to/icon.png');
+ });
+
+ it('should set plugin.icon to undefined when iconPath is not defined', async () => {
+ const mcpServers = {
+ 'test-server': {},
+ };
+ const testTool = await callGetAvailableToolsWithMCPServer(mcpServers);
+ expect(testTool.icon).toBeUndefined();
+ });
+ });
+});
diff --git a/api/test/jestSetup.js b/api/test/jestSetup.js
index ed92afd214..ae30db72cf 100644
--- a/api/test/jestSetup.js
+++ b/api/test/jestSetup.js
@@ -10,3 +10,4 @@ process.env.JWT_SECRET = 'test';
process.env.JWT_REFRESH_SECRET = 'test';
process.env.CREDS_KEY = 'test';
process.env.CREDS_IV = 'test';
+process.env.OPENAI_API_KEY = 'test';