fix: correct icon for mcp button (#1605)

Author: chungjac

chat-client/src/client/tabs/tabFactory.ts

@@ -142,7 +142,7 @@ export class TabFactory {
         if (this.mcp) {
             tabBarButtons.push({
                 id: McpServerTabButtonId,
-                icon: MynahIcons.MCP,
+                icon: MynahIcons.TOOLS,
                 description: 'Configure MCP servers',
             })
         }

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

@@ -306,7 +306,10 @@ export class McpEventHandler {
         if (existingValues.name) {
             const serverName = existingValues.name
             const serverState = McpManager.instance.getAllServerConfigs().get(serverName)
-            if (serverState?.__configPath__ === getGlobalMcpConfigPath(this.#features.workspace.fs.getUserHomeDir())) {
+            if (
+                !serverState ||
+                serverState?.__configPath__ === getGlobalMcpConfigPath(this.#features.workspace.fs.getUserHomeDir())
+            ) {
                 existingValues.scope = 'global'
             } else {
                 existingValues.scope = 'workspace'