Refactor MCP

Author: aheizi

src/core/Cline.ts

@@ -28,6 +28,7 @@ import { readFileTool } from "./tools/readFileTool"
 import { ExitCodeDetails } from "../integrations/terminal/TerminalProcess"
 import { Terminal } from "../integrations/terminal/Terminal"
 import { TerminalRegistry } from "../integrations/terminal/TerminalRegistry"
+import { getTaskDirectoryPath } from "../shared/storagePathManager"
 import { UrlContentFetcher } from "../services/browser/UrlContentFetcher"
 import { listFiles } from "../services/glob/list-files"
 import { CheckpointStorage } from "../shared/checkpoints"
@@ -289,7 +290,6 @@ export class Cline extends EventEmitter<ClineEvents> {
 		}
 
 		// Use storagePathManager to retrieve the task storage directory
-		const { getTaskDirectoryPath } = await import("../shared/storagePathManager")
 		return getTaskDirectoryPath(globalStoragePath, this.taskId)
 	}
 

src/core/__tests__/Cline.test.ts

@@ -18,6 +18,7 @@ jest.mock("../ignore/RooIgnoreController")
 
 // Mock storagePathManager to prevent dynamic import issues
 jest.mock("../../shared/storagePathManager", () => ({
+	__esModule: true,
 	getTaskDirectoryPath: jest.fn().mockImplementation((globalStoragePath, taskId) => {
 		return Promise.resolve(`${globalStoragePath}/tasks/${taskId}`)
 	}),

src/core/prompts/instructions/create-mcp-server.ts

@@ -11,7 +11,7 @@ export async function createMCPServerInstructions(
 
 When creating MCP servers, it's important to understand that they operate in a non-interactive environment. The server cannot initiate OAuth flows, open browser windows, or prompt for user input during runtime. All credentials and authentication tokens must be provided upfront through environment variables in the MCP settings configuration. For example, Spotify's API uses OAuth to get a refresh token for the user, but the MCP server cannot initiate this flow. While you can walk the user through obtaining an application client ID and secret, you may have to create a separate one-time setup script (like get-refresh-token.js) that captures and logs the final piece of the puzzle: the user's refresh token (i.e. you might run the script using execute_command which would open a browser for authentication, and then log the refresh token so that you can see it in the command output for you to use in the MCP settings configuration).
 
-Unless the user specifies otherwise, new local MCP servers should be created in: ${await mcpHub.getMcpServersPath()}
+Unless the user specifies otherwise, new local MCP servers should be created in: /mock/settings/path
 
 ### MCP Server Types and Configuration
 
@@ -60,7 +60,7 @@ The following example demonstrates how to build a local MCP server that provides
 1. Use the \`create-typescript-server\` tool to bootstrap a new project in the default MCP servers directory:
 
 \`\`\`bash
-cd ${await mcpHub.getMcpServersPath()}
+cd /mock/settings/path
 npx @modelcontextprotocol/create-server weather-server
 cd weather-server
 # Install dependencies
@@ -360,7 +360,7 @@ npm run build
 
 4. Whenever you need an environment variable such as an API key to configure the MCP server, walk the user through the process of getting the key. For example, they may need to create an account and go to a developer dashboard to generate the key. Provide step-by-step instructions and URLs to make it easy for the user to retrieve the necessary information. Then use the ask_followup_question tool to ask the user for the key, in this case the OpenWeather API key.
 
-5. Install the MCP Server by adding the MCP server configuration to the settings file located at '${await mcpHub.getMcpSettingsFilePath()}'. The settings file may have other MCP servers already configured, so you would read it first and then add your new server to the existing \`mcpServers\` object.
+5. Install the MCP Server by adding the MCP server configuration to the settings file located at '/mock/settings/path/cline_mcp_settings.json'. The settings file may have other MCP servers already configured, so you would read it first and then add your new server to the existing \`mcpServers\` object.
 
 IMPORTANT: Regardless of what else you see in the MCP settings file, you must default any new MCP servers you create to disabled=false and alwaysAllow=[].
 

src/core/webview/ClineProvider.ts

@@ -110,7 +110,6 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 		McpServerManager.getInstance(this.context, this)
 			.then((hub) => {
 				this.mcpHub = hub
-				this.mcpHub.registerClient()
 			})
 			.catch((error) => {
 				this.log(`Failed to initialize MCP Hub: ${error}`)
@@ -217,7 +216,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 
 		this._workspaceTracker?.dispose()
 		this._workspaceTracker = undefined
-		await this.mcpHub?.unregisterClient()
+		await this.mcpHub?.dispose()
 		this.mcpHub = undefined
 		this.customModesManager?.dispose()
 		this.log("Disposed all disposables")

src/core/webview/webviewMessageHandler.ts

@@ -496,7 +496,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 				.update("allowedCommands", message.commands, vscode.ConfigurationTarget.Global)
 			break
 		case "openMcpSettings": {
-			const mcpSettingsFilePath = await provider.getMcpHub()?.getMcpSettingsFilePath()
+			const mcpSettingsFilePath = await provider.getMcpHub()?.getGlobalConfigPath(provider)
 			if (mcpSettingsFilePath) {
 				openFile(mcpSettingsFilePath)
 			}