Merge branch 'main' into refactor-mcp && optimize ConnectionHandler

Author: aheizi

src/core/webview/webviewMessageHandler.ts

@@ -393,7 +393,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 			break
 		}
 		case "openMcpSettings": {
-			const mcpSettingsFilePath = await provider.getMcpHub()?.getMcpSettingsFilePath()
+			const mcpSettingsFilePath = await provider.getMcpHub()?.getGlobalMcpSettingsFilePath()
 
 			if (mcpSettingsFilePath) {
 				openFile(mcpSettingsFilePath)

src/services/mcp/McpHub.ts

@@ -3,7 +3,8 @@ import { ClineProvider } from "../../core/webview/ClineProvider"
 import type { ConfigChangeEvent } from "./config"
 import { ConfigManager } from "./config"
 import { ConnectionFactory, ConnectionManager, SseHandler, StdioHandler } from "./connection"
-import { ConfigSource, McpConnection, McpResourceResponse, McpServer, McpToolCallResponse, ServerConfig } from "./types"
+import { McpConnection, McpResourceResponse, McpToolCallResponse, ServerConfig } from "./types"
+import { ConfigSource, McpServer } from "../../shared/mcp"
 
 export class McpHub {
 	private configManager: ConfigManager

src/services/mcp/config/ConfigManager.ts

@@ -7,9 +7,10 @@ import { t } from "../../../i18n"
 import { ClineProvider } from "../../../core/webview/ClineProvider"
 import { GlobalFileNames } from "../../../shared/globalFileNames"
 import { fileExistsAtPath } from "../../../utils/fs"
-import { ServerConfig, McpServer, ConfigSource } from "../types"
+import { ServerConfig } from "../types"
 import { ConfigChangeEvent, ConfigChangeListener } from "./types"
 import { safeParseServerConfig } from "./validation"
+import { ConfigSource, McpServer } from "../../../shared/mcp"
 
 /**
  * Configuration Manager

src/services/mcp/config/types.ts

@@ -1,4 +1,5 @@
-import { ConfigSource, ServerConfig } from "../types"
+import { ServerConfig } from "../types"
+import { ConfigSource } from "../../../shared/mcp"
 
 /**
  * Configuration change event

src/services/mcp/connection/ConnectionFactory.ts

@@ -1,7 +1,8 @@
-import { ServerConfig, McpConnection, McpServer, ConfigSource } from "../types"
+import { ServerConfig, McpConnection } from "../types"
 import { ConnectionHandler } from "./ConnectionHandler"
 import { FileWatcher } from "./FileWatcher"
 import { ConfigManager } from "../config"
+import { ConfigSource, McpServer } from "../../../shared/mcp"
 
 /**
  * Connection factory class

src/services/mcp/connection/ConnectionHandler.ts

@@ -1,4 +1,5 @@
-import { ServerConfig, McpConnection, McpServer, ConfigSource } from "../types"
+import { ServerConfig, McpConnection } from "../types"
+import { ConfigSource, McpServer } from "../../../shared/mcp"
 
 /**
  * Connection handler interface

src/services/mcp/connection/ConnectionManager.ts

@@ -1,9 +1,10 @@
 import * as vscode from "vscode"
 import { t } from "../../../i18n"
-import { ConfigManager } from "../config/ConfigManager"
-import { ServerConfig, McpConnection, McpServer, ConfigSource } from "../types"
+import { ConfigManager } from "../config"
+import { ServerConfig, McpConnection } from "../types"
 import { ConnectionFactory } from "./ConnectionFactory"
 import deepEqual from "fast-deep-equal"
+import { ConfigSource, McpServer } from "../../../shared/mcp"
 
 /**
  * Connection manager class

src/services/mcp/connection/handlers/SseHandler.ts

@@ -1,28 +1,13 @@
-import { Client } from "@modelcontextprotocol/sdk/client/index.js"
-const packageJson = require("../../../../../package.json")
-const version: string = packageJson.version ?? "1.0.0"
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js"
-import {
-	ListToolsResultSchema,
-	ListResourcesResultSchema,
-	ListResourceTemplatesResultSchema,
-} from "@modelcontextprotocol/sdk/types.js"
-import { ConnectionHandler } from "../ConnectionHandler"
-import {
-	ServerConfig,
-	McpConnection,
-	ConfigSource,
-	McpTool,
-	McpResource,
-	McpResourceTemplate,
-	McpServer,
-} from "../../types"
+import { ServerConfig, McpConnection } from "../../types"
+import { ConfigSource, McpServer } from "../../../../shared/mcp"
+import { BaseHandler } from "./base/BaseHandler"
 
 /**
  * SSE connection handler
  * Responsible for creating and managing MCP connections based on Server-Sent Events
  */
-export class SseHandler implements ConnectionHandler {
+export class SseHandler extends BaseHandler {
 	/**
 	 * Check if a specific connection type is supported
 	 * @param type Connection type
@@ -51,15 +36,7 @@ export class SseHandler implements ConnectionHandler {
 		}
 
 		// Create client
-		const client = new Client(
-			{
-				name: "Roo Code",
-				version,
-			},
-			{
-				capabilities: {},
-			},
-		)
+		const client = this.createClient()
 
 		// Create transport
 		const transport = new SSEClientTransport(new URL(config.url), {
@@ -79,6 +56,7 @@ export class SseHandler implements ConnectionHandler {
 				status: "connecting",
 				disabled: config.disabled,
 				source,
+				errorHistory: [],
 			},
 			client,
 			transport,
@@ -100,38 +78,20 @@ export class SseHandler implements ConnectionHandler {
 			connection.server.resourceTemplates = await this.fetchResourceTemplatesList(connection)
 		} catch (error) {
 			connection.server.status = "disconnected"
-			connection.server.error = error instanceof Error ? error.message : `${error}`
+			this.appendErrorMessage(connection, error instanceof Error ? error.message : `${error}`)
 			if (onStatusChange) onStatusChange(connection.server)
 		}
 
 		return connection
 	}
 
-	/**
-	 * Close connection
-	 * @param connection Connection to close
-	 */
-	async closeConnection(connection: McpConnection): Promise<void> {
-		try {
-			await connection.client.close()
-		} catch (error) {
-			console.error(`Error disconnecting client for ${connection.server.name}:`, error)
-		}
-
-		try {
-			await connection.transport.close()
-		} catch (error) {
-			console.error(`Error closing transport for ${connection.server.name}:`, error)
-		}
-	}
-
 	/**
 	 * Setup error handling
 	 * @param connection MCP connection
 	 * @param transport SSE transport
 	 * @param onStatusChange
 	 */
-	private setupErrorHandling(
+	protected setupErrorHandling(
 		connection: McpConnection,
 		transport: SSEClientTransport,
 		onStatusChange?: (server: McpServer) => void,
@@ -151,70 +111,4 @@ export class SseHandler implements ConnectionHandler {
 			if (onStatusChange) onStatusChange(connection.server)
 		}
 	}
-
-	/**
-	 * Fetch tool list
-	 * @param connection MCP connection
-	 * @returns Tool list
-	 */
-	private async fetchToolsList(connection: McpConnection): Promise<McpTool[]> {
-		try {
-			const result = await connection.client.listTools()
-			const parsed = ListToolsResultSchema.parse(result)
-
-			return parsed.tools.map((tool: any) => ({
-				name: tool.name,
-				description: tool.description,
-				inputSchema: tool.input_schema as object | undefined,
-				alwaysAllow: false,
-			}))
-		} catch (error) {
-			// console.error(`Failed to fetch tools list for ${connection.server.name}:`, error)
-			return []
-		}
-	}
-
-	/**
-	 * Fetch resource list
-	 * @param connection MCP connection
-	 * @returns Resource list
-	 */
-	private async fetchResourcesList(connection: McpConnection): Promise<McpResource[]> {
-		try {
-			const result = await connection.client.listResources()
-			const parsed = ListResourcesResultSchema.parse(result)
-
-			return parsed.resources.map((resource: any) => ({
-				uri: resource.uri,
-				name: resource.name,
-				mimeType: resource.mime_type as string | undefined,
-				description: resource.description,
-			}))
-		} catch (error) {
-			// console.error(`Failed to fetch resources list for ${connection.server.name}:`, error)
-			return []
-		}
-	}
-
-	/**
-	 * Fetch resource template list
-	 * @param connection MCP connection
-	 * @returns Resource template list
-	 */
-	private async fetchResourceTemplatesList(connection: McpConnection): Promise<McpResourceTemplate[]> {
-		try {
-			const result = await connection.client.listResourceTemplates()
-			const parsed = ListResourceTemplatesResultSchema.parse(result)
-
-			return (parsed as any).templates.map((template: any) => ({
-				uri: template.uri,
-				name: template.name,
-				description: template.description,
-				inputSchema: template.input_schema as object | undefined,
-			}))
-		} catch (error) {
-			// console.error(`Failed to fetch resource templates list for ${connection.server.name}:`, error)
-			return []
-		}
-	}
 }