fix: fix for mcp tool resgistration on smus (#2524)

Author: ashishrp-aws

package-lock.json

@@ -39,7 +39,7 @@
         "@aws/chat-client-ui-types": "0.1.68",
         "@aws/language-server-runtimes": "0.3.6",
         "@aws/lsp-core": "^0.0.17",
-        "@modelcontextprotocol/sdk": "^1.15.0",
+        "@modelcontextprotocol/sdk": "1.19.1",
         "@smithy/node-http-handler": "^2.5.0",
         "adm-zip": "^0.5.10",
         "archiver": "^7.0.1",

server/aws-lsp-codewhisperer/package.json

@@ -382,10 +382,6 @@ export const McpToolsServer: Server = ({
             registerServerTools(server, defs)
         }
 
-        McpManager.instance.events.on(AGENT_TOOLS_CHANGED, (server: string, defs: McpToolDefinition[]) => {
-            registerServerTools(server, defs)
-        })
-
         // Emit metrics after tools are registered
         McpManager.instance.emitMcpConfigMetrics()
     }
@@ -466,6 +462,14 @@ export const McpToolsServer: Server = ({
             // Wait for auth to be initialized before discovering servers
             const waitForAuthAndDiscover = async () => {
                 try {
+                    // Set up event listener for tool changes during server initialization
+                    McpManager.instance.events.on(AGENT_TOOLS_CHANGED, (server: string, defs: McpToolDefinition[]) => {
+                        if (!ProfileStatusMonitor.getMcpState()) {
+                            return
+                        }
+                        registerServerTools(server, defs)
+                    })
+
                     const serviceManager = AmazonQTokenServiceManager.getInstance()
                     const authState = serviceManager.getState()