feat: Add Refresh MCP Servers capability, fix state changes in MCP server management UI view

src/core/webview/webviewMessageHandler.ts

@@ -556,6 +556,13 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 			await updateGlobalState("enableMcpServerCreation", message.bool ?? true)
 			await provider.postStateToWebview()
 			break
+		case "refreshAllMcpServers": {
+			const mcpHub = provider.getMcpHub()
+			if (mcpHub) {
+				await mcpHub.refreshAllConnections()
+			}
+			break
+		}
 		// playSound handler removed - now handled directly in the webview
 		case "soundEnabled":
 			const soundEnabled = message.bool ?? true

src/i18n/locales/ca/common.json

@@ -79,7 +79,11 @@
 		"mcp_server_not_found": "Servidor \"{{serverName}}\" no trobat a la configuració",
 		"custom_storage_path_set": "Ruta d'emmagatzematge personalitzada establerta: {{path}}",
 		"default_storage_path": "S'ha reprès l'ús de la ruta d'emmagatzematge predeterminada",
-		"settings_imported": "Configuració importada correctament."
+		"settings_imported": "Configuració importada correctament.",
+		"mcp_servers_active": "Servidors MCP actius: {{mcpServers}}",
+		"mcp_already_refreshing": "Els servidors MCP ja s'estan actualitzant.",
+		"mcp_refreshing_all": "Actualitzant tots els servidors MCP...",
+		"mcp_all_refreshed": "Tots els servidors MCP han estat actualitzats."
 	},
 	"answers": {
 		"yes": "Sí",

src/i18n/locales/de/common.json

@@ -75,7 +75,11 @@
 		"mcp_server_not_found": "Server \"{{serverName}}\" nicht in der Konfiguration gefunden",
 		"custom_storage_path_set": "Benutzerdefinierter Speicherpfad festgelegt: {{path}}",
 		"default_storage_path": "Auf Standardspeicherpfad zurückgesetzt",
-		"settings_imported": "Einstellungen erfolgreich importiert."
+		"settings_imported": "Einstellungen erfolgreich importiert.",
+		"mcp_servers_active": "Aktive MCP-Server: {{mcpServers}}",
+		"mcp_already_refreshing": "MCP-Server werden bereits aktualisiert.",
+		"mcp_refreshing_all": "Alle MCP-Server werden aktualisiert...",
+		"mcp_all_refreshed": "Alle MCP-Server wurden aktualisiert."
 	},
 	"answers": {
 		"yes": "Ja",

src/i18n/locales/en/common.json

@@ -72,7 +72,11 @@
 		"mcp_server_restarting": "Restarting {{serverName}} MCP server...",
 		"mcp_server_connected": "{{serverName}} MCP server connected",
 		"mcp_server_deleted": "Deleted MCP server: {{serverName}}",
+		"mcp_servers_active": "Active MCP Servers: {{mcpServers}}",
 		"mcp_server_not_found": "Server \"{{serverName}}\" not found in configuration",
+		"mcp_already_refreshing": "MCP servers are already refreshing.",
+		"mcp_refreshing_all": "Refreshing all MCP servers...",
+		"mcp_all_refreshed": "All MCP servers have been refreshed.",
 		"custom_storage_path_set": "Custom storage path set: {{path}}",
 		"default_storage_path": "Reverted to using default storage path",
 		"settings_imported": "Settings imported successfully."

src/i18n/locales/es/common.json

@@ -75,7 +75,11 @@
 		"mcp_server_not_found": "Servidor \"{{serverName}}\" no encontrado en la configuración",
 		"custom_storage_path_set": "Ruta de almacenamiento personalizada establecida: {{path}}",
 		"default_storage_path": "Se ha vuelto a usar la ruta de almacenamiento predeterminada",
-		"settings_imported": "Configuración importada correctamente."
+		"settings_imported": "Configuración importada correctamente.",
+		"mcp_servers_active": "Servidores MCP activos: {{mcpServers}}",
+		"mcp_already_refreshing": "Los servidores MCP ya se están actualizando.",
+		"mcp_refreshing_all": "Actualizando todos los servidores MCP...",
+		"mcp_all_refreshed": "Todos los servidores MCP han sido actualizados."
 	},
 	"answers": {
 		"yes": "Sí",

src/i18n/locales/fr/common.json

@@ -75,7 +75,11 @@
 		"mcp_server_not_found": "Serveur \"{{serverName}}\" introuvable dans la configuration",
 		"custom_storage_path_set": "Chemin de stockage personnalisé défini : {{path}}",
 		"default_storage_path": "Retour au chemin de stockage par défaut",
-		"settings_imported": "Paramètres importés avec succès."
+		"settings_imported": "Paramètres importés avec succès.",
+		"mcp_servers_active": "Serveurs MCP actifs : {{mcpServers}}",
+		"mcp_already_refreshing": "Les serveurs MCP sont déjà en cours de rafraîchissement.",
+		"mcp_refreshing_all": "Rafraîchissement de tous les serveurs MCP...",
+		"mcp_all_refreshed": "Tous les serveurs MCP ont été rafraîchis."
 	},
 	"answers": {
 		"yes": "Oui",

src/i18n/locales/hi/common.json

@@ -75,7 +75,11 @@
 		"mcp_server_not_found": "सर्वर \"{{serverName}}\" कॉन्फ़िगरेशन में नहीं मिला",
 		"custom_storage_path_set": "कस्टम स्टोरेज पाथ सेट किया गया: {{path}}",
 		"default_storage_path": "डिफ़ॉल्ट स्टोरेज पाथ का उपयोग पुनः शुरू किया गया",
-		"settings_imported": "सेटिंग्स सफलतापूर्वक इम्पोर्ट की गईं।"
+		"settings_imported": "सेटिंग्स सफलतापूर्वक इम्पोर्ट की गईं.",
+		"mcp_servers_active": "सक्रिय एमसीपी सर्वर: {{mcpServers}}",
+		"mcp_already_refreshing": "एमसीपी सर्वर पहले से ही रीफ्रेश हो रहे हैं।",
+		"mcp_refreshing_all": "सभी एमसीपी सर्वर रीफ्रेश हो रहे हैं...",
+		"mcp_all_refreshed": "सभी एमसीपी सर्वर रीफ्रेश हो गए हैं।"
 	},
 	"answers": {
 		"yes": "हां",

src/i18n/locales/it/common.json

@@ -75,7 +75,11 @@
 		"mcp_server_not_found": "Server \"{{serverName}}\" non trovato nella configurazione",
 		"custom_storage_path_set": "Percorso di archiviazione personalizzato impostato: {{path}}",
 		"default_storage_path": "Tornato al percorso di archiviazione predefinito",
-		"settings_imported": "Impostazioni importate con successo."
+		"settings_imported": "Impostazioni importate con successo.",
+		"mcp_servers_active": "Server MCP attivi: {{mcpServers}}",
+		"mcp_already_refreshing": "I server MCP sono già in aggiornamento.",
+		"mcp_refreshing_all": "Aggiornamento di tutti i server MCP...",
+		"mcp_all_refreshed": "Tutti i server MCP sono stati aggiornati."
 	},
 	"answers": {
 		"yes": "Sì",

src/i18n/locales/ja/common.json

@@ -75,7 +75,11 @@
 		"mcp_server_not_found": "サーバー\"{{serverName}}\"が設定内に見つかりません",
 		"custom_storage_path_set": "カスタムストレージパスが設定されました：{{path}}",
 		"default_storage_path": "デフォルトのストレージパスに戻りました",
-		"settings_imported": "設定が正常にインポートされました。"
+		"settings_imported": "設定が正常にインポートされました。",
+		"mcp_servers_active": "アクティブなMCPサーバー: {{mcpServers}}",
+		"mcp_already_refreshing": "MCPサーバーはすでに更新中です。",
+		"mcp_refreshing_all": "すべてのMCPサーバーを更新しています...",
+		"mcp_all_refreshed": "すべてのMCPサーバーが更新されました。"
 	},
 	"answers": {
 		"yes": "はい",

src/i18n/locales/ko/common.json

@@ -75,7 +75,11 @@
 		"mcp_server_not_found": "구성에서 서버 \"{{serverName}}\"을(를) 찾을 수 없습니다",
 		"custom_storage_path_set": "사용자 지정 저장 경로 설정됨: {{path}}",
 		"default_storage_path": "기본 저장 경로로 되돌아갔습니다",
-		"settings_imported": "설정이 성공적으로 가져와졌습니다."
+		"settings_imported": "설정이 성공적으로 가져와졌습니다.",
+		"mcp_servers_active": "활성 MCP 서버: {{mcpServers}}",
+		"mcp_already_refreshing": "MCP 서버가 이미 새로 고쳐지고 있습니다.",
+		"mcp_refreshing_all": "모든 MCP 서버를 새로 고치는 중...",
+		"mcp_all_refreshed": "모든 MCP 서버가 새로 고쳐졌습니다."
 	},
 	"answers": {
 		"yes": "예",

src/i18n/locales/nl/common.json

@@ -75,7 +75,11 @@
 		"mcp_server_not_found": "Server \"{{serverName}}\" niet gevonden in configuratie",
 		"custom_storage_path_set": "Aangepast opslagpad ingesteld: {{path}}",
 		"default_storage_path": "Terug naar standaard opslagpad",
-		"settings_imported": "Instellingen succesvol geïmporteerd."
+		"settings_imported": "Instellingen succesvol geïmporteerd.",
+		"mcp_servers_active": "Actieve MCP-servers: {{mcpServers}}",
+		"mcp_already_refreshing": "MCP-servers worden al vernieuwd.",
+		"mcp_refreshing_all": "Alle MCP-servers worden vernieuwd...",
+		"mcp_all_refreshed": "Alle MCP-servers zijn vernieuwd."
 	},
 	"answers": {
 		"yes": "Ja",

src/i18n/locales/pl/common.json

@@ -75,7 +75,11 @@
 		"mcp_server_not_found": "Serwer \"{{serverName}}\" nie znaleziony w konfiguracji",
 		"custom_storage_path_set": "Ustawiono niestandardową ścieżkę przechowywania: {{path}}",
 		"default_storage_path": "Wznowiono używanie domyślnej ścieżki przechowywania",
-		"settings_imported": "Ustawienia zaimportowane pomyślnie."
+		"settings_imported": "Ustawienia zaimportowane pomyślnie.",
+		"mcp_servers_active": "Aktywne serwery MCP: {{mcpServers}}",
+		"mcp_already_refreshing": "Serwery MCP są już odświeżane.",
+		"mcp_refreshing_all": "Odświeżanie wszystkich serwerów MCP...",
+		"mcp_all_refreshed": "Wszystkie serwery MCP zostały odświeżone."
 	},
 	"answers": {
 		"yes": "Tak",

src/i18n/locales/pt-BR/common.json

@@ -79,7 +79,11 @@
 		"mcp_server_not_found": "Servidor \"{{serverName}}\" não encontrado na configuração",
 		"custom_storage_path_set": "Caminho de armazenamento personalizado definido: {{path}}",
 		"default_storage_path": "Retornado ao caminho de armazenamento padrão",
-		"settings_imported": "Configurações importadas com sucesso."
+		"settings_imported": "Configurações importadas com sucesso.",
+		"mcp_servers_active": "Servidores MCP ativos: {{mcpServers}}",
+		"mcp_already_refreshing": "Os servidores MCP já estão atualizando.",
+		"mcp_refreshing_all": "Atualizando todos os servidores MCP...",
+		"mcp_all_refreshed": "Todos os servidores MCP foram atualizados."
 	},
 	"answers": {
 		"yes": "Sim",

src/i18n/locales/ru/common.json

@@ -75,7 +75,11 @@
 		"mcp_server_not_found": "Сервер \"{{serverName}}\" не найден в конфигурации",
 		"custom_storage_path_set": "Установлен пользовательский путь хранения: {{path}}",
 		"default_storage_path": "Возвращено использование пути хранения по умолчанию",
-		"settings_imported": "Настройки успешно импортированы."
+		"settings_imported": "Настройки успешно импортированы.",
+		"mcp_servers_active": "Активные MCP серверы: {{mcpServers}}",
+		"mcp_already_refreshing": "MCP серверы уже обновляются.",
+		"mcp_refreshing_all": "Обновление всех MCP серверов...",
+		"mcp_all_refreshed": "Все MCP серверы обновлены."
 	},
 	"answers": {
 		"yes": "Да",

src/i18n/locales/tr/common.json

@@ -75,7 +75,11 @@
 		"mcp_server_not_found": "Yapılandırmada \"{{serverName}}\" sunucusu bulunamadı",
 		"custom_storage_path_set": "Özel depolama yolu ayarlandı: {{path}}",
 		"default_storage_path": "Varsayılan depolama yoluna geri dönüldü",
-		"settings_imported": "Ayarlar başarıyla içe aktarıldı."
+		"settings_imported": "Ayarlar başarıyla içe aktarıldı.",
+		"mcp_servers_active": "Aktif MCP Sunucuları: {{mcpServers}}",
+		"mcp_already_refreshing": "MCP sunucuları zaten yenileniyor.",
+		"mcp_refreshing_all": "Tüm MCP sunucuları yenileniyor...",
+		"mcp_all_refreshed": "Tüm MCP sunucuları yenilendi."
 	},
 	"answers": {
 		"yes": "Evet",

src/i18n/locales/vi/common.json

@@ -75,7 +75,11 @@
 		"mcp_server_not_found": "Không tìm thấy máy chủ \"{{serverName}}\" trong cấu hình",
 		"custom_storage_path_set": "Đã thiết lập đường dẫn lưu trữ tùy chỉnh: {{path}}",
 		"default_storage_path": "Đã quay lại sử dụng đường dẫn lưu trữ mặc định",
-		"settings_imported": "Cài đặt đã được nhập thành công."
+		"settings_imported": "Cài đặt đã được nhập thành công.",
+		"mcp_servers_active": "Các máy chủ MCP đang hoạt động: {{mcpServers}}",
+		"mcp_already_refreshing": "Các máy chủ MCP đã đang làm mới.",
+		"mcp_refreshing_all": "Đang làm mới tất cả các máy chủ MCP...",
+		"mcp_all_refreshed": "Tất cả các máy chủ MCP đã được làm mới."
 	},
 	"answers": {
 		"yes": "Có",

src/i18n/locales/zh-CN/common.json

@@ -75,7 +75,11 @@
 		"mcp_server_not_found": "在配置中未找到服务器\"{{serverName}}\"",
 		"custom_storage_path_set": "自定义存储路径已设置：{{path}}",
 		"default_storage_path": "已恢复使用默认存储路径",
-		"settings_imported": "设置已成功导入。"
+		"settings_imported": "设置已成功导入。",
+		"mcp_servers_active": "活动的 MCP 服务器: {{mcpServers}}",
+		"mcp_already_refreshing": "MCP 服务器已在刷新中。",
+		"mcp_refreshing_all": "正在刷新所有 MCP 服务器...",
+		"mcp_all_refreshed": "所有 MCP 服务器已刷新。"
 	},
 	"answers": {
 		"yes": "是",

src/i18n/locales/zh-TW/common.json

@@ -75,7 +75,11 @@
 		"mcp_server_not_found": "在設定中沒有找到伺服器\"{{serverName}}\"",
 		"custom_storage_path_set": "自訂儲存路徑已設定：{{path}}",
 		"default_storage_path": "已恢復使用預設儲存路徑",
-		"settings_imported": "設定已成功匯入。"
+		"settings_imported": "設定已成功匯入。",
+		"mcp_servers_active": "活動的 MCP 伺服器: {{mcpServers}}",
+		"mcp_already_refreshing": "MCP 伺服器已在重新整理中。",
+		"mcp_refreshing_all": "正在重新整理所有 MCP 伺服器...",
+		"mcp_all_refreshed": "所有 MCP 伺服器已重新整理。"
 	},
 	"answers": {
 		"yes": "是",

src/services/mcp/McpHub.ts

@@ -398,7 +398,7 @@ export class McpHub {
 			const result = McpSettingsSchema.safeParse(config)
 
 			if (result.success) {
-				await this.updateServerConnections(result.data.mcpServers || {}, source)
+				await this.updateServerConnections(result.data.mcpServers || {}, source, false)
 			} else {
 				const errorMessages = result.error.errors
 					.map((err) => `${err.path.join(".")}: ${err.message}`)
@@ -409,7 +409,7 @@ export class McpHub {
 				if (source === "global") {
 					// Still try to connect with the raw config, but show warnings
 					try {
-						await this.updateServerConnections(config.mcpServers || {}, source)
+						await this.updateServerConnections(config.mcpServers || {}, source, false)
 					} catch (error) {
 						this.showErrorMessage(`Failed to initialize ${source} MCP servers with raw config`, error)
 					}
@@ -816,8 +816,11 @@ export class McpHub {
 	async updateServerConnections(
 		newServers: Record<string, any>,
 		source: "global" | "project" = "global",
+		manageConnectingState: boolean = true,
 	): Promise<void> {
-		this.isConnecting = true
+		if (manageConnectingState) {
+			this.isConnecting = true
+		}
 		this.removeAllFileWatchers()
 		// Filter connections by source
 		const currentConnections = this.connections.filter(
@@ -868,7 +871,9 @@ export class McpHub {
 			// If server exists with same config, do nothing
 		}
 		await this.notifyWebviewOfServerChanges()
-		this.isConnecting = false
+		if (manageConnectingState) {
+			this.isConnecting = false
+		}
 	}
 
 	private setupFileWatcher(
@@ -978,6 +983,73 @@ export class McpHub {
 		this.isConnecting = false
 	}
 
+	public async refreshAllConnections(): Promise<void> {
+		if (this.isConnecting) {
+			vscode.window.showInformationMessage(t("common:info.mcp_already_refreshing"))
+			return
+		}
+
+		this.isConnecting = true
+		vscode.window.showInformationMessage(t("common:info.mcp_refreshing_all"))
+
+		try {
+			const globalPath = await this.getMcpSettingsFilePath()
+			let globalServers: Record<string, any> = {}
+			try {
+				const globalContent = await fs.readFile(globalPath, "utf-8")
+				const globalConfig = JSON.parse(globalContent)
+				globalServers = globalConfig.mcpServers || {}
+				const globalServerNames = Object.keys(globalServers)
+				vscode.window.showInformationMessage(
+					t("common:info.mcp_servers_active", {
+						mcpServers: `Global: ${globalServerNames.join(", ") || "none"}`,
+					}),
+				)
+			} catch (error) {
+				console.log("Error reading global MCP config:", error)
+			}
+
+			const projectPath = await this.getProjectMcpPath()
+			let projectServers: Record<string, any> = {}
+			if (projectPath) {
+				try {
+					const projectContent = await fs.readFile(projectPath, "utf-8")
+					const projectConfig = JSON.parse(projectContent)
+					projectServers = projectConfig.mcpServers || {}
+					const projectServerNames = Object.keys(projectServers)
+					vscode.window.showInformationMessage(
+						t("common:info.mcp_servers_active", {
+							mcpServers: `Project: ${projectServerNames.join(", ") || "none"}`,
+						}),
+					)
+				} catch (error) {
+					console.log("Error reading project MCP config:", error)
+				}
+			}
+
+			// Clear all existing connections first
+			const existingConnections = [...this.connections]
+			for (const conn of existingConnections) {
+				await this.deleteConnection(conn.server.name, conn.server.source)
+			}
+
+			// Re-initialize all servers from scratch
+			// This ensures proper initialization including fetching tools, resources, etc.
+			await this.initializeMcpServers("global")
+			await this.initializeMcpServers("project")
+
+			await delay(100)
+
+			await this.notifyWebviewOfServerChanges()
+
+			vscode.window.showInformationMessage(t("common:info.mcp_all_refreshed"))
+		} catch (error) {
+			this.showErrorMessage("Failed to refresh MCP servers", error)
+		} finally {
+			this.isConnecting = false
+		}
+	}
+
 	private async notifyWebviewOfServerChanges(): Promise<void> {
 		// Get global server order from settings file
 		const settingsPath = await this.getMcpSettingsFilePath()
@@ -1020,10 +1092,40 @@ export class McpHub {
 		})
 
 		// Send sorted servers to webview
-		await this.providerRef.deref()?.postMessageToWebview({
-			type: "mcpServers",
-			mcpServers: sortedConnections.map((connection) => connection.server),
-		})
+		// Try to get the currently visible ClineProvider instance first
+		let targetProvider: ClineProvider | undefined = undefined
+		try {
+			// ClineProvider.getInstance() can focus the view if not visible,
+			// and returns a Promise<ClineProvider | undefined>
+			const instancePromise = ClineProvider.getInstance()
+			if (instancePromise) {
+				targetProvider = await instancePromise
+			}
+		} catch (error) {}
+
+		// Fallback to the providerRef if getInstance didn't yield a provider
+		if (!targetProvider) {
+			targetProvider = this.providerRef.deref()
+		}
+
+		if (targetProvider) {
+			const serversToSend = sortedConnections.map((connection) => connection.server)
+
+			const message = {
+				type: "mcpServers" as const,
+				mcpServers: serversToSend,
+			}
+
+			try {
+				await targetProvider.postMessageToWebview(message)
+			} catch (error) {
+				console.error("[McpHub] Error calling targetProvider.postMessageToWebview:", error)
+			}
+		} else {
+			console.error(
+				"[McpHub] No target provider available (neither from getInstance nor providerRef) - cannot send mcpServers message to webview",
+			)
+		}
 	}
 
 	public async toggleServerDisabled(