Add mcp configuration button

Author: bywang56

packages/core/src/codewhisperer/activation.ts

@@ -93,7 +93,6 @@ 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
 
@@ -382,6 +381,8 @@ export async function activate(context: ExtContext): Promise<void> {
      */
     const mgr = await McpManager.initMcpManager(globalMcpConfigPath)
     globals.mcpManager = mgr
+    // const mgr = await McpManager.initMcpManager(globalMcpConfigPath)
+    // globals.mcpManager = mgr
     setSubscriptionsForMcp()
 
     function shouldRunAutoScan(editor: vscode.TextEditor | undefined, isScansEnabled?: boolean) {

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

@@ -200,15 +200,15 @@ export class ChatController {
         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}`)
-        //     })
+        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) {

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

@@ -436,7 +436,7 @@ export class Messenger {
                                     )
                                 }
 
-                                this.telemetryHelper.recordToolUseSuggested(toolUse, messageID)
+                                // this.telemetryHelper.recordToolUseSuggested(toolUse, messageID)
                             } else {
                                 throw new Error('Tool not found')
                             }

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/mcpTool.ts

@@ -4,7 +4,6 @@
  */
 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'
 

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

@@ -60,7 +60,7 @@ export class ToolUtils {
             case ToolType.ListDirectory:
                 return tool.tool.requiresAcceptance()
             case ToolType.Mcp:
-                return { requiresAcceptance: false }
+                return { requiresAcceptance: true }
         }
     }
 

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()