merge conflicts

.changeset/six-rice-end.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": minor
+---
+
+Migrate fetchLatestServersFromHub to protobus

proto/mcp.proto

@@ -19,6 +19,7 @@ service McpService {
   
   // Subscribe to MCP marketplace catalog updates
   rpc subscribeToMcpMarketplaceCatalog(EmptyRequest) returns (stream McpMarketplaceCatalog);
+  rpc getLatestMcpServers(Empty) returns (McpServers);
 }
 
 message ToggleMcpServerRequest {

src/core/controller/index.ts

@@ -255,10 +255,7 @@ export class Controller {
 
 			// 	break
 			// }
-			case "fetchLatestMcpServersFromHub": {
-				this.mcpHub?.sendLatestMcpServers()
-				break
-			}
+
 			// telemetry
 			case "telemetrySetting": {
 				if (message.telemetrySetting) {

src/core/controller/mcp/getLatestMcpServers.ts

@@ -0,0 +1,25 @@
+import type { Empty } from "@shared/proto/common"
+import { McpServers } from "@shared/proto/mcp"
+import type { Controller } from "../index"
+import { convertMcpServersToProtoMcpServers } from "@/shared/proto-conversions/mcp/mcp-server-conversion"
+
+/**
+ * RPC handler for getting the latest MCP servers
+ * @param controller The controller instance
+ * @param _request Empty request
+ * @returns McpServers response with list of all MCP servers
+ */
+export async function getLatestMcpServers(controller: Controller, _request: Empty): Promise<McpServers> {
+	try {
+		// Get sorted servers from mcpHub using the RPC variant
+		const mcpServers = (await controller.mcpHub?.getLatestMcpServersRPC()) || []
+
+		// Convert to proto format
+		const protoServers = convertMcpServersToProtoMcpServers(mcpServers)
+
+		return McpServers.create({ mcpServers: protoServers })
+	} catch (error) {
+		console.error("Error fetching latest MCP servers:", error)
+		throw error
+	}
+}

src/services/mcp/McpHub.ts

@@ -616,6 +616,17 @@ export class McpHub {
 		await this.notifyWebviewOfServerChanges()
 	}
 
+	async getLatestMcpServersRPC(): Promise<McpServer[]> {
+		const settings = await this.readAndValidateMcpSettingsFile()
+		if (!settings) {
+			// Return empty array if settings can't be read or validated
+			return []
+		}
+
+		const serverOrder = Object.keys(settings.mcpServers || {})
+		return this.getSortedMcpServers(serverOrder)
+	}
+
 	// Using server
 
 	// Public methods for server management

src/shared/WebviewMessage.ts

@@ -13,13 +13,11 @@ export interface WebviewMessage {
 		| "authStateChanged"
 		| "fetchMcpMarketplace"
 		| "searchCommits"
-		| "fetchLatestMcpServersFromHub"
 		| "telemetrySetting"
 		| "clearAllTaskHistory"
 		| "fetchUserCreditsData"
 		| "grpc_request"
 		| "grpc_request_cancel"
-		| "toggleWorkflow"
 
 	text?: string
 	disabled?: boolean

webview-ui/src/components/chat/ServersToggleModal.tsx

@@ -3,12 +3,16 @@ import { useClickAway, useWindowSize } from "react-use"
 import { useExtensionState } from "@/context/ExtensionStateContext"
 import { CODE_BLOCK_BG_COLOR } from "@/components/common/CodeBlock"
 import ServersToggleList from "@/components/mcp/configuration/tabs/installed/ServersToggleList"
-import { vscode } from "@/utils/vscode"
+
+import { McpServiceClient } from "@/services/grpc-client"
 import { VSCodeButton } from "@vscode/webview-ui-toolkit/react"
 import Tooltip from "@/components/common/Tooltip"
+import { McpServers } from "@shared/proto/mcp"
+import { convertProtoMcpServersToMcpServers } from "@shared/proto-conversions/mcp/mcp-server-conversion"
+import { EmptyRequest } from "@shared/proto/common"
 
 const ServersToggleModal: React.FC = () => {
-	const { mcpServers, navigateToMcp } = useExtensionState()
+	const { mcpServers, navigateToMcp, setMcpServers } = useExtensionState()
 	const [isVisible, setIsVisible] = useState(false)
 	const buttonRef = useRef<HTMLDivElement>(null)
 	const modalRef = useRef<HTMLDivElement>(null)
@@ -35,7 +39,16 @@ const ServersToggleModal: React.FC = () => {
 
 	useEffect(() => {
 		if (isVisible) {
-			vscode.postMessage({ type: "fetchLatestMcpServersFromHub" })
+			McpServiceClient.getLatestMcpServers(EmptyRequest.create({}))
+				.then((response: McpServers) => {
+					if (response.mcpServers) {
+						const mcpServers = convertProtoMcpServersToMcpServers(response.mcpServers)
+						setMcpServers(mcpServers)
+					}
+				})
+				.catch((error) => {
+					console.error("Failed to fetch MCP servers:", error)
+				})
 		}
 	}, [isVisible])
 

webview-ui/src/components/mcp/configuration/McpConfigurationView.tsx

@@ -9,6 +9,8 @@ import styled from "styled-components"
 import AddRemoteServerForm from "./tabs/add-server/AddRemoteServerForm"
 import InstalledServersView from "./tabs/installed/InstalledServersView"
 import McpMarketplaceView from "./tabs/marketplace/McpMarketplaceView"
+import { convertProtoMcpServersToMcpServers } from "@shared/proto-conversions/mcp/mcp-server-conversion"
+import { McpServers } from "@shared/proto/mcp"
 
 type McpViewProps = {
 	onDone: () => void
@@ -16,7 +18,7 @@ type McpViewProps = {
 }
 
 const McpConfigurationView = ({ onDone, initialTab }: McpViewProps) => {
-	const { mcpMarketplaceEnabled } = useExtensionState()
+	const { mcpMarketplaceEnabled, setMcpServers } = useExtensionState()
 	const [activeTab, setActiveTab] = useState<McpViewTab>(initialTab || (mcpMarketplaceEnabled ? "marketplace" : "installed"))
 
 	const handleTabChange = (tab: McpViewTab) => {
@@ -37,14 +39,22 @@ const McpConfigurationView = ({ onDone, initialTab }: McpViewProps) => {
 		if (mcpMarketplaceEnabled) {
 			McpServiceClient.refreshMcpMarketplace(EmptyRequest.create({}))
 				.then((response) => {
-					// Types are structurally identical, use response directly
 					setMcpMarketplaceCatalog(response)
 				})
 				.catch((error) => {
 					console.error("Error refreshing MCP marketplace:", error)
 				})
 
-			vscode.postMessage({ type: "fetchLatestMcpServersFromHub" })
+			McpServiceClient.getLatestMcpServers(EmptyRequest.create({}))
+				.then((response: McpServers) => {
+					if (response.mcpServers) {
+						const mcpServers = convertProtoMcpServersToMcpServers(response.mcpServers)
+						setMcpServers(mcpServers)
+					}
+				})
+				.catch((error) => {
+					console.error("Failed to fetch MCP servers:", error)
+				})
 		}
 	}, [mcpMarketplaceEnabled])