Merge pull request #1531 from ashishrp-aws/agentic-mcp-tool-number

fix: fix for correct initialization of tools with namespacing for ref…

Author: ashishrp-aws

chat-client/src/client/mynahUi.ts

@@ -1593,8 +1593,6 @@ ${params.message}`,
             )
         } else if (['mcp-disable-server', 'mcp-delete-server', 'mcp-enable-server'].includes(params.id)) {
             messager.onListMcpServers()
-        } else if (params.id === 'refresh-mcp-list') {
-            messager.onListMcpServers({ 'refresh-mcp-list': 'refresh-mcp-list' })
         } else if (params.id === 'update-mcp-list') {
             if (isMcpServersListActive) {
                 messager.onListMcpServers()

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/mcp/mcpManager.ts

@@ -552,8 +552,15 @@ export class McpManager {
         this.features.logging.info('Reinitializing MCP servers')
 
         try {
+            // Save the current tool name mapping to preserve tool names across reinitializations
+            const savedToolNameMapping = this.getToolNameMapping()
+
             // close clients, clear state, but don't reset singleton
             await this.close(true)
+
+            // Restore the saved tool name mapping
+            this.setToolNameMapping(savedToolNameMapping)
+
             await this.discoverAllServers()
 
             const reinitializedServerCount = McpManager.#instance?.mcpServers.size

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/mcp/mcpUtils.ts

@@ -337,6 +337,19 @@ export function createNamespacedToolName(
     allNamespacedTools: Set<string>,
     toolNameMapping: Map<string, { serverName: string; toolName: string }>
 ): string {
+    // First, check if this server/tool combination already has a mapping
+    // If it does, reuse that name to maintain consistency across reinitializations
+    for (const [existingName, mapping] of toolNameMapping.entries()) {
+        if (mapping.serverName === serverName && mapping.toolName === toolName) {
+            // If the name is already in the set, it's already registered
+            // If not, add it to the set
+            if (!allNamespacedTools.has(existingName)) {
+                allNamespacedTools.add(existingName)
+            }
+            return existingName
+        }
+    }
+
     const sep = '___'
     // If tool name alone isn't unique or is too long, try adding server prefix
     const fullName = `${serverName}${sep}${toolName}`