Add mcp configuration button

bywang56 · bywang56 · commit 75ebc3792f6c · 2025-04-17T08:37:45.000-07:00
diff --git a/packages/core/src/amazonq/webview/ui/main.ts b/packages/core/src/amazonq/webview/ui/main.ts
@@ -1011,6 +1011,11 @@ export const createMynahUI = (
             feedbackOptions: feedbackOptions,
             texts: uiComponentsTexts,
             tabBarButtons: [
+                {
+                    id: 'mcp_configuration',
+                    icon: MynahIcons.MAGIC,
+                    description: 'MCP configuration',
+                },
                 {
                     id: 'history_sheet',
                     icon: MynahIcons.HISTORY,
diff --git a/packages/core/src/codewhisperer/activation.ts b/packages/core/src/codewhisperer/activation.ts
@@ -90,6 +90,10 @@ import { SecurityIssueTreeViewProvider } from './service/securityIssueTreeViewPr
 import { setContext } from '../shared/vscode/setContext'
 import { syncSecurityIssueWebview } from './views/securityIssue/securityIssueWebview'
 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
 
@@ -373,6 +377,8 @@ export async function activate(context: ExtContext): Promise<void> {
 
     setSubscriptionsForCodeIssues()
 
+    setSubscriptionsForMcp()
+
     function shouldRunAutoScan(editor: vscode.TextEditor | undefined, isScansEnabled?: boolean) {
         return (
             (isScansEnabled ?? CodeScansState.instance.isScansEnabled()) &&
@@ -499,6 +505,35 @@ export async function activate(context: ExtContext): Promise<void> {
             })
         )
     }
+
+    function setSubscriptionsForMcp() {
+        let lastMcpContent: string | undefined
+        const updateLastContent = (document: vscode.TextDocument) => {
+            lastMcpContent = document.getText()
+        }
+        const mcpOpenListener = vscode.workspace.onDidOpenTextDocument((document: vscode.TextDocument) => {
+            if (document.uri.fsPath === globalMcpConfigPath) {
+                updateLastContent(document)
+            }
+        })
+        context.extensionContext.subscriptions.push(mcpOpenListener)
+        const mcpSaveListener = vscode.workspace.onDidSaveTextDocument(async (doc) => {
+            // eslint-disable-next-line aws-toolkits/no-console-log
+            console.log('1111')
+            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
+                        ToolUtils.mcpManager = manager
+                    }
+                    lastMcpContent = newContent
+                }
+            }
+        })
+        context.extensionContext.subscriptions.push(mcpSaveListener)
+    }
 }
 
 export async function shutdown() {
diff --git a/packages/core/src/codewhispererChat/constants.ts b/packages/core/src/codewhispererChat/constants.ts
@@ -66,3 +66,5 @@ export const ignoredDirectoriesAndFiles = [
     // OS specific files
     '.DS_Store',
 ]
+
+export const globalMcpConfigPath = path.join(process.env.HOME ?? '', '.aws', 'amazonq', 'mcp.json')
diff --git a/packages/core/src/codewhispererChat/controllers/chat/controller.ts b/packages/core/src/codewhispererChat/controllers/chat/controller.ts
@@ -93,6 +93,7 @@ import {
     workspaceChunkMaxSize,
     defaultContextLengths,
     tools,
+    globalMcpConfigPath,
 } from '../../constants'
 import { ChatSession } from '../../clients/chat/v0/chat'
 import { amazonQTabSuffix } from '../../../shared/constants'
@@ -180,7 +181,6 @@ export class ChatController {
     private userPromptsWatcher: vscode.FileSystemWatcher | undefined
     private chatHistoryDb = Database.getInstance()
     private cancelTokenSource: vscode.CancellationTokenSource = new vscode.CancellationTokenSource()
-    private mcpManager: McpManager | undefined
 
     public constructor(
         private readonly chatControllerMessageListeners: ChatControllerMessageListeners,
@@ -200,26 +200,16 @@ export class ChatController {
         this.userIntentRecognizer = new UserIntentRecognizer()
         this.tabBarController = new TabBarController(this.messenger)
 
-        // MCP intitialzation
-        const mcpConfigPath = path.join(process.env.HOME ?? '', '.aws', 'amazonq', 'mcp.json')
-        McpManager.create(mcpConfigPath)
+        // todo: move to activate function?
+        McpManager.initMcpManager(globalMcpConfigPath)
             .then((manager) => {
-                this.mcpManager = manager
-                ToolUtils.mcpManager = manager
-                const discovered = manager.getAllMcpTools()
-                for (const def of discovered) {
-                    tools.push({
-                        toolSpecification: {
-                            name: def.toolName,
-                            description: def.description,
-                            inputSchema: { json: def.inputSchema },
-                        },
-                    })
+                if (manager) {
+                    globals.mcpManager = manager
+                    ToolUtils.mcpManager = manager
                 }
-                getLogger().info(`MCP: successfully discovered ${discovered.length} new tools.`)
             })
             .catch((err) => {
-                getLogger().error(`Failed to init MCP manager: ${err}`)
+                getLogger().error(`Failed to initialize MCP manager in controller: ${err}`)
             })
 
         onDidChangeAmazonQVisibility((visible) => {
diff --git a/packages/core/src/codewhispererChat/controllers/chat/tabBarController.ts b/packages/core/src/codewhispererChat/controllers/chat/tabBarController.ts
@@ -15,6 +15,9 @@ 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 {
     private readonly messenger: Messenger
@@ -144,11 +147,29 @@ export class TabBarController {
             case 'history_sheet':
                 await this.historyButtonClicked(message)
                 break
+            case 'mcp_configuration':
+                await this.mcpButtonClicked(message)
+                break
             case 'export_chat':
                 await this.exportChatButtonClicked(message)
                 break
         }
     }
+    private async mcpButtonClicked(message: TabBarButtonClick) {
+        let fileExists = false
+        try {
+            await fs.stat(globalMcpConfigPath)
+            fileExists = true
+        } catch (error) {
+            fileExists = false
+        }
+        if (!fileExists) {
+            const defaultContent = JSON.stringify({ mcpServers: {} }, undefined, 2)
+            await fs.writeFile(globalMcpConfigPath, defaultContent, { encoding: 'utf8' })
+        }
+        const document = await vscode.workspace.openTextDocument(globalMcpConfigPath)
+        await vscode.window.showTextDocument(document, { preview: false })
+    }
 
     private async exportChatButtonClicked(message: TabBarButtonClick) {
         const defaultFileName = `q-dev-chat-${new Date().toISOString().split('T')[0]}.md`
diff --git a/packages/core/src/codewhispererChat/tools/mcp/mcpManager.ts b/packages/core/src/codewhispererChat/tools/mcp/mcpManager.ts
@@ -8,6 +8,8 @@ import { Client } from '@modelcontextprotocol/sdk/client/index.js'
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'
 import fs from '../../../shared/fs/fs'
 import { getLogger } from '../../../shared/logger/logger'
+import { tools } from '../../constants'
+import { ToolType } from '../toolUtils'
 
 export interface McpToolDefinition {
     serverName: string
@@ -21,7 +23,7 @@ export class McpManager {
     private clients: Map<string, Client> = new Map() // key: serverName, val: MCP client
     private mcpTools: McpToolDefinition[] = []
 
-    private constructor(private configPath: string) {}
+    private constructor(private readonly configPath: string) {}
 
     public static async create(configPath: string): Promise<McpManager> {
         const instance = new McpManager(configPath)
@@ -79,6 +81,7 @@ export class McpManager {
                 getLogger().info(`Found MCP tool [${toolDef.toolName}] from server [${serverName}]`)
             }
         } catch (err) {
+            // Log the error for this server but allow the initialization of others to continue.
             getLogger().error(`Failed to init server [${serverName}]: ${(err as Error).message}`)
         }
     }
@@ -101,4 +104,53 @@ export class McpManager {
     public findTool(toolName: string): McpToolDefinition | undefined {
         return this.mcpTools.find((t) => t.toolName === toolName)
     }
+
+    public static async initMcpManager(configPath: string): Promise<McpManager | undefined> {
+        try {
+            const manager = await McpManager.create(configPath)
+            const discovered = manager.getAllMcpTools()
+            const builtInNames = new Set<string>(Object.values(ToolType))
+            const discoveredNames = new Set(discovered.map((d) => d.toolName))
+
+            for (const def of discovered) {
+                const spec = {
+                    toolSpecification: {
+                        name: def.toolName,
+                        description: def.description,
+                        inputSchema: { json: def.inputSchema },
+                    },
+                }
+                const idx = tools.findIndex((t) => t.toolSpecification!.name === def.toolName)
+                if (idx >= 0) {
+                    // replace existing entry
+                    tools[idx] = spec
+                } else {
+                    // append new entry
+                    tools.push(spec)
+                }
+            }
+
+            // Prune stale _dynamic_ tools (leave built‑ins intact)
+            for (let i = tools.length - 1; i >= 0; --i) {
+                const name = tools[i].toolSpecification!.name
+                if (!name || builtInNames.has(name)) {
+                    continue
+                }
+                // if it wasn’t rediscovered in new MCP config, remove it
+                if (!discoveredNames.has(name)) {
+                    tools.splice(i, 1)
+                }
+            }
+            getLogger().info(`MCP: successfully discovered ${discovered.length} new tools.`)
+            return manager
+        } catch (err) {
+            getLogger().error(`Failed to init MCP manager: ${(err as Error).message}`)
+            return undefined
+        }
+    }
+
+    // public async dispose(): Promise<void> {
+    //     this.clients.clear()
+    //     this.mcpTools = []
+    // }
 }
diff --git a/packages/core/src/dynamicResources/activation.ts b/packages/core/src/dynamicResources/activation.ts
@@ -18,6 +18,9 @@ import { resourceFileGlobPattern } from './awsResourceManager'
 import { Commands } from '../shared/vscode/commands2'
 import globals from '../shared/extensionGlobals'
 import { openUrl } from '../shared/utilities/vsCodeUtils'
+import { globalMcpConfigPath } from '../codewhispererChat/constants'
+import { McpManager } from '../codewhispererChat/tools/mcp/mcpManager'
+import { ToolUtils } from '../codewhispererChat/tools/toolUtils'
 
 const localize = nls.loadMessageBundle()
 
diff --git a/packages/core/src/shared/extensionGlobals.ts b/packages/core/src/shared/extensionGlobals.ts
@@ -20,6 +20,7 @@ import { GlobalState } from './globalState'
 import { setContext } from './vscode/setContext'
 import { getLogger } from './logger/logger'
 import { AWSClientBuilderV3 } from './awsClientBuilderV3'
+import { McpManager } from '../codewhispererChat/tools/mcp/mcpManager'
 
 type Clock = Pick<
     typeof globalThis,
@@ -154,6 +155,7 @@ export function initialize(context: ExtensionContext, isWeb: boolean = false): T
         globalState: new GlobalState(context.globalState),
         manifestPaths: {} as ToolkitGlobals['manifestPaths'],
         isWeb,
+        mcpManager: undefined,
     })
     void setContext('aws.isWebExtHost', isWeb)
 
@@ -227,4 +229,5 @@ export interface ToolkitGlobals {
     }
     /** If this extension is running in Web mode (the browser), compared to running on the desktop (node) */
     isWeb: boolean
+    mcpManager?: McpManager
 }

Original file line number	Diff line number	Diff line change
`@@ -66,3 +66,5 @@ export const ignoredDirectoriesAndFiles = [`
`66`	`66`	`// OS specific files`
`67`	`67`	`'.DS_Store',`
`68`	`68`	`]`
	`69`	`+`
	`70`	`+export const globalMcpConfigPath = path.join(process.env.HOME ?? '', '.aws', 'amazonq', 'mcp.json')`