app: Replace mcp config if server config changes

Author: ashu8912

app/electron/main.ts

@@ -1474,10 +1474,7 @@ function startElecron() {
     if (mainWindow) {
       mainWindow.removeAllListeners('close');
     }
-    // Cleanup MCP client
-    if (mcpClient) {
-      mcpClient.cleanup().catch(console.error);
-    }
+
     // Cleanup MCP client
     if (mcpClient) {
       mcpClient.cleanup().catch(console.error);

app/electron/mcp-client.ts

@@ -57,10 +57,13 @@ class ElectronMCPClient {
 
   /**
    * Initialize tools configuration for all available tools
+   * This completely replaces the existing config with current tools
    */
   private initializeToolsConfiguration(): void {
     if (!this.tools || this.tools.length === 0) {
       console.log('No tools available for configuration initialization');
+      // Clear the config if no tools are available
+      this.configManager.replaceConfig({});
       return;
     }
 
@@ -75,16 +78,16 @@ class ElectronMCPClient {
     > = {};
 
     for (const tool of this.tools) {
-      console.log('Initializing tools configuration...', tool);
       // Extract server name from tool name (format: "serverName__toolName")
       const toolName = tool.name;
       const parts = toolName.split('__');
 
       // Extract schema from the tool (LangChain tools use .schema property)
       const toolSchema = (tool as any).schema || tool.inputSchema || null;
-      console.log('tool schema is ', toolSchema);
       console.log(
-        `Processing tool: ${toolName}, has inputSchema: ${toolSchema}, description: "${tool.description}"`
+        `Processing tool: ${toolName}, has inputSchema: ${!!toolSchema}, description: "${
+          tool.description
+        }"`
       );
 
       if (parts.length >= 2) {
@@ -114,11 +117,8 @@ class ElectronMCPClient {
 
     console.log('Tools grouped by server:', Object.keys(toolsByServer));
 
-    // Initialize configuration for each server's tools
-    for (const [serverName, toolsInfo] of Object.entries(toolsByServer)) {
-      console.log(`Initializing ${toolsInfo.length} tools for server: ${serverName}`);
-      this.configManager.initializeToolsConfig(serverName, toolsInfo);
-    }
+    // Replace the entire configuration with current tools
+    this.configManager.replaceToolsConfig(toolsByServer);
   }
 
   /**
@@ -608,6 +608,7 @@ class ElectronMCPClient {
         additionalToolNamePrefix: '',
         useStandardContentBlocks: true,
         mcpServers,
+        defaultToolTimeout: 2 * 60 * 1000, // 2 minutes
       });
 
       // Get and cache the tools

app/electron/mcp-config.ts

@@ -191,7 +191,6 @@ export class MCPConfigManager {
       description?: string;
     }>
   ): void {
-    console.log('MCP config called ', this.config, serverName, toolsInfo);
     if (!this.config[serverName]) {
       this.config[serverName] = {};
     }
@@ -203,7 +202,6 @@ export class MCPConfigManager {
       const toolName = toolInfo.name;
 
       if (!serverConfig[toolName]) {
-        console.log(`Creating new tool config for: ${toolName}`);
         serverConfig[toolName] = {
           enabled: true,
           usageCount: 0,
@@ -212,15 +210,13 @@ export class MCPConfigManager {
         };
         hasChanges = true;
       } else {
-        console.log(`Updating existing tool config for: ${toolName}`);
         // Always update schema and description for existing tools
         let toolChanged = false;
 
         // Update schema if it's different or missing
         const currentSchema = JSON.stringify(serverConfig[toolName].inputSchema || null);
         const newSchema = JSON.stringify(toolInfo.inputSchema || null);
         if (currentSchema !== newSchema) {
-          console.log(`Updating schema for tool: ${toolName}`);
           serverConfig[toolName].inputSchema = toolInfo.inputSchema || null;
           toolChanged = true;
         }
@@ -229,7 +225,6 @@ export class MCPConfigManager {
         const currentDescription = serverConfig[toolName].description || '';
         const newDescription = toolInfo.description || '';
         if (currentDescription !== newDescription) {
-          console.log(`Updating description for tool: ${toolName}`);
           serverConfig[toolName].description = newDescription;
           toolChanged = true;
         }
@@ -241,10 +236,7 @@ export class MCPConfigManager {
     }
 
     if (hasChanges) {
-      console.log(`Saving configuration changes for server: ${serverName}`);
       this.saveConfig();
-    } else {
-      console.log(`No changes needed for server: ${serverName}`);
     }
   }
 
@@ -259,4 +251,52 @@ export class MCPConfigManager {
 
     return { ...serverConfig[toolName] };
   }
+
+  /**
+   * Replace the entire tools configuration with a new set of tools
+   * This overwrites all existing tools with only the current ones
+   */
+  replaceToolsConfig(
+    toolsByServer: Record<
+      string,
+      Array<{
+        name: string;
+        inputSchema?: any;
+        description?: string;
+      }>
+    >
+  ): void {
+    // Create a new config object
+    const newConfig: MCPToolsConfig = {};
+
+    for (const [serverName, toolsInfo] of Object.entries(toolsByServer)) {
+      newConfig[serverName] = {};
+
+      for (const toolInfo of toolsInfo) {
+        const toolName = toolInfo.name;
+
+        // Check if this tool existed in the old config to preserve enabled state and usage count
+        const oldToolState = this.config[serverName]?.[toolName];
+
+        newConfig[serverName][toolName] = {
+          enabled: oldToolState?.enabled ?? true, // Preserve enabled state or default to true
+          usageCount: oldToolState?.usageCount ?? 0, // Preserve usage count or default to 0
+          inputSchema: toolInfo.inputSchema || null,
+          description: toolInfo.description || '',
+        };
+      }
+    }
+
+    // Replace the entire config
+    this.config = newConfig;
+    this.saveConfig();
+  }
+
+  /**
+   * Replace the entire configuration with a new config object
+   */
+  replaceConfig(newConfig: MCPToolsConfig): void {
+    this.config = newConfig;
+    this.saveConfig();
+  }
 }