Add mcp configuration button

Author: bywang56

packages/core/src/codewhisperer/activation.ts

@@ -92,8 +92,6 @@ import { syncSecurityIssueWebview } from './views/securityIssue/securityIssueWeb
 import { detectCommentAboveLine } from '../shared/utilities/commentUtils'
 import { globalMcpConfigPath } from '../codewhispererChat/constants'
 import { McpManager } from '../codewhispererChat/tools/mcp/mcpManager'
-import globals from '../shared/extensionGlobals'
-import { ToolUtils } from '../codewhispererChat/tools/toolUtils'
 
 let localize: nls.LocalizeFunc
 
@@ -380,8 +378,7 @@ export async function activate(context: ExtContext): Promise<void> {
     /**
      * MCP client initialization
      */
-    const mgr = await McpManager.initMcpManager(globalMcpConfigPath)
-    globals.mcpManager = mgr
+    await McpManager.initMcpManager(globalMcpConfigPath)
     setSubscriptionsForMcp()
 
     function shouldRunAutoScan(editor: vscode.TextEditor | undefined, isScansEnabled?: boolean) {
@@ -526,10 +523,7 @@ export async function activate(context: ExtContext): Promise<void> {
             if (doc.uri.fsPath === globalMcpConfigPath) {
                 const newContent = doc.getText()
                 if (lastMcpContent === undefined || newContent !== lastMcpContent) {
-                    const manager = await McpManager.initMcpManager(globalMcpConfigPath)
-                    if (manager) {
-                        globals.mcpManager = manager
-                    }
+                    await McpManager.initMcpManager(globalMcpConfigPath)
                     lastMcpContent = newContent
                 }
             }

packages/core/src/codewhispererChat/controllers/chat/controller.ts

@@ -92,7 +92,6 @@ import {
     additionalContentInnerContextLimit,
     workspaceChunkMaxSize,
     defaultContextLengths,
-    globalMcpConfigPath,
 } from '../../constants'
 import { ChatSession } from '../../clients/chat/v0/chat'
 import { amazonQTabSuffix } from '../../../shared/constants'
@@ -103,7 +102,6 @@ import { tempDirPath } from '../../../shared/filesystemUtilities'
 import { Database } from '../../../shared/db/chatDb/chatDb'
 import { TabBarController } from './tabBarController'
 import { messageToChatMessage } from '../../../shared/db/chatDb/util'
-import { McpManager } from '../../tools/mcp/mcpManager'
 
 export interface ChatControllerMessagePublishers {
     readonly processPromptChatMessage: MessagePublisher<PromptMessage>
@@ -199,17 +197,6 @@ export class ChatController {
         this.userIntentRecognizer = new UserIntentRecognizer()
         this.tabBarController = new TabBarController(this.messenger)
 
-        // todo: move to activate function?
-        // McpManager.initMcpManager(globalMcpConfigPath)
-        //     .then((manager) => {
-        //         if (manager) {
-        //             globals.mcpManager = manager
-        //         }
-        //     })
-        //     .catch((err) => {
-        //         getLogger().error(`Failed to initialize MCP manager in controller: ${err}`)
-        //     })
-
         onDidChangeAmazonQVisibility((visible) => {
             if (visible) {
                 this.telemetryHelper.recordOpenChat()

packages/core/src/codewhispererChat/controllers/chat/tabBarController.ts

@@ -15,8 +15,6 @@ import { Database } from '../../../shared/db/chatDb/chatDb'
 import { TabBarButtonClick, SaveChatMessage } from './model'
 import { Conversation, messageToChatItem, Tab } from '../../../shared/db/chatDb/util'
 import { DetailedListItemGroup, MynahIconsType } from '@aws/mynah-ui'
-import path from 'path'
-import { UserWrittenCodeTracker } from '../../../codewhisperer/tracker/userWrittenCodeTracker'
 import { globalMcpConfigPath } from '../../constants'
 
 export class TabBarController {

packages/core/src/codewhispererChat/tools/mcp/mcpManager.ts

@@ -19,17 +19,18 @@ export interface McpToolDefinition {
 }
 
 export class McpManager {
+    static #instance: McpManager | undefined
     private mcpServers: Record<string, MCPServerConfig> = {}
     private clients: Map<string, Client> = new Map() // key: serverName, val: MCP client
     private mcpTools: McpToolDefinition[] = []
 
     private constructor(private readonly configPath: string) {}
 
-    public static async create(configPath: string): Promise<McpManager> {
-        const instance = new McpManager(configPath)
-        await instance.loadConfig()
-        await instance.initAllServers()
-        return instance
+    public static get instance(): McpManager {
+        if (!McpManager.#instance) {
+            throw new Error('McpManager not initialized—call initMcpManager() first')
+        }
+        return McpManager.#instance
     }
 
     public async loadConfig(): Promise<void> {
@@ -45,6 +46,7 @@ export class McpManager {
     }
 
     public async initAllServers(): Promise<void> {
+        this.mcpTools = []
         for (const [serverName, serverConfig] of Object.entries(this.mcpServers)) {
             if (serverConfig.disabled) {
                 getLogger().info(`MCP server [${serverName}] is disabled, skipping.`)
@@ -107,8 +109,13 @@ export class McpManager {
 
     public static async initMcpManager(configPath: string): Promise<McpManager | undefined> {
         try {
-            const manager = await McpManager.create(configPath)
-            const discovered = manager.getAllMcpTools()
+            if (!McpManager.#instance) {
+                const mgr = new McpManager(configPath)
+                McpManager.#instance = mgr
+            }
+            await McpManager.#instance.loadConfig()
+            await McpManager.#instance.initAllServers()
+            const discovered = McpManager.#instance.getAllMcpTools()
             const builtInNames = new Set<string>(Object.values(ToolType))
             const discoveredNames = new Set(discovered.map((d) => d.toolName))
 
@@ -142,7 +149,7 @@ export class McpManager {
                 }
             }
             getLogger().info(`MCP: successfully discovered ${discovered.length} new tools.`)
-            return manager
+            return McpManager.instance
         } catch (err) {
             getLogger().error(`Failed to init MCP manager: ${(err as Error).message}`)
             return undefined

packages/core/src/codewhispererChat/tools/mcp/mcpTool.ts

@@ -4,9 +4,8 @@
  */
 import { Writable } from 'stream'
 import { getLogger } from '../../../shared/logger/logger'
-import { ToolUtils } from '../toolUtils'
 import { CommandValidation, InvokeOutput, OutputKind } from '../toolShared'
-import globals from '../../../shared/extensionGlobals'
+import { McpManager } from './mcpManager'
 
 export interface McpToolParams {
     serverName: string
@@ -39,8 +38,7 @@ export class McpTool {
 
     public async invoke(updates?: Writable): Promise<InvokeOutput> {
         try {
-            const mcpManager = globals.mcpManager
-            const result = await mcpManager?.callTool(this.serverName, this.toolName, this.input)
+            const result = await McpManager.instance.callTool(this.serverName, this.toolName, this.input)
             const content = typeof result === 'object' ? JSON.stringify(result) : String(result)
 
             return {

packages/core/src/codewhispererChat/tools/toolUtils.ts

@@ -16,7 +16,7 @@ import {
 } from './toolShared'
 import { ListDirectory, ListDirectoryParams } from './listDirectory'
 import { McpTool } from './mcp/mcpTool'
-import globals from '../../shared/extensionGlobals'
+import { McpManager } from './mcp/mcpManager'
 
 export enum ToolType {
     FsRead = 'fsRead',
@@ -60,7 +60,7 @@ export class ToolUtils {
             case ToolType.ListDirectory:
                 return tool.tool.requiresAcceptance()
             case ToolType.Mcp:
-                return { requiresAcceptance: false }
+                return { requiresAcceptance: true }
         }
     }
 
@@ -170,8 +170,7 @@ export class ToolUtils {
                         tool: new ListDirectory(value.input as unknown as ListDirectoryParams),
                     }
                 default: {
-                    const mcpMgr = globals.mcpManager
-                    const mcpToolDef = mcpMgr?.findTool(value.name as string)
+                    const mcpToolDef = McpManager.instance.findTool(value.name as string)
                     if (mcpToolDef) {
                         return {
                             type: ToolType.Mcp,

packages/core/src/extension.ts

@@ -55,8 +55,6 @@ import { setupUninstallHandler } from './shared/handleUninstall'
 import { maybeShowMinVscodeWarning } from './shared/extensionStartup'
 import { getLogger } from './shared/logger/logger'
 import { setContext } from './shared/vscode/setContext'
-import { McpManager } from './codewhispererChat/tools/mcp/mcpManager'
-import { globalMcpConfigPath } from './codewhispererChat/constants'
 
 disableAwsSdkWarning()
 
@@ -118,12 +116,6 @@ export async function activateCommon(
     )
     globals.regionProvider = RegionProvider.fromEndpointsProvider(makeEndpointsProvider())
 
-    /**
-     * MCP client initialization
-     */
-    // const mgr = await McpManager.initMcpManager(globalMcpConfigPath)
-    // globals.mcpManager = mgr
-
     // telemetry
     await activateTelemetry(context, globals.awsContext, Settings.instance, 'AWS Toolkit For VS Code')
 

packages/core/src/shared/extensionGlobals.ts

@@ -228,5 +228,4 @@ export interface ToolkitGlobals {
     }
     /** If this extension is running in Web mode (the browser), compared to running on the desktop (node) */
     isWeb: boolean
-    mcpManager?: McpManager
 }