From 809e8cd6bc63e1be4f90137c6663d2cdbcd888af Mon Sep 17 00:00:00 2001
From: Rian Santos <109045233+01Rian@users.noreply.github.com>
Date: Mon, 24 Mar 2025 16:33:30 -0300
Subject: [PATCH] #906 - Add watchPaths option to McpHub for file change
 detection (#1755)

* #906 Add watchPaths option to McpHub for file change detection

* #906 Refactor file watcher management in McpHub

add support multiple watchers per server.

modified the setupFileWatcher method to properly handle asynchronous operations and prevent unhandled promise rejections.

error handling now includes specific error messages that identify exactly where the error occurred.

---------

Co-authored-by: Matt Rubens <mrubens@users.noreply.github.com>
---
 src/services/mcp/McpHub.ts | 54 +++++++++++++++++++++++++++++++++-----
 1 file changed, 47 insertions(+), 7 deletions(-)

diff --git a/src/services/mcp/McpHub.ts b/src/services/mcp/McpHub.ts
index 8ca7429176..9c52787f4d 100644
--- a/src/services/mcp/McpHub.ts
+++ b/src/services/mcp/McpHub.ts
@@ -42,6 +42,7 @@ const BaseConfigSchema = z.object({
 	disabled: z.boolean().optional(),
 	timeout: z.number().min(1).max(3600).optional().default(60),
 	alwaysAllow: z.array(z.string()).default([]),
+	watchPaths: z.array(z.string()).optional(), // paths to watch for changes and restart server
 })
 
 // Custom error messages for better user feedback
@@ -102,7 +103,7 @@ export class McpHub {
 	private providerRef: WeakRef<ClineProvider>
 	private disposables: vscode.Disposable[] = []
 	private settingsWatcher?: vscode.FileSystemWatcher
-	private fileWatchers: Map<string, FSWatcher> = new Map()
+	private fileWatchers: Map<string, FSWatcher[]> = new Map()
 	private isDisposed: boolean = false
 	connections: McpConnection[] = []
 	isConnecting: boolean = false
@@ -562,29 +563,68 @@ export class McpHub {
 	}
 
 	private setupFileWatcher(name: string, config: z.infer<typeof ServerConfigSchema>) {
+		// Initialize an empty array for this server if it doesn't exist
+		if (!this.fileWatchers.has(name)) {
+			this.fileWatchers.set(name, [])
+		}
+
+		const watchers = this.fileWatchers.get(name) || []
+
 		// Only stdio type has args
 		if (config.type === "stdio") {
+			// Setup watchers for custom watchPaths if defined
+			if (config.watchPaths && config.watchPaths.length > 0) {
+				console.log(`Setting up custom path watchers for ${name} MCP server...`)
+				const watchPathsWatcher = chokidar.watch(config.watchPaths, {
+					// persistent: true,
+					// ignoreInitial: true,
+					// awaitWriteFinish: true,
+				})
+
+				watchPathsWatcher.on("change", async (changedPath) => {
+					console.log(`Detected change in custom path ${changedPath}. Restarting server ${name}...`)
+					try {
+						await this.restartConnection(name)
+					} catch (error) {
+						console.error(`Failed to restart server ${name} after change in ${changedPath}:`, error)
+					}
+				})
+
+				watchers.push(watchPathsWatcher)
+			}
+
+			// Also setup the fallback build/index.js watcher if applicable
 			const filePath = config.args?.find((arg: string) => arg.includes("build/index.js"))
 			if (filePath) {
-				// we use chokidar instead of onDidSaveTextDocument because it doesn't require the file to be open in the editor. The settings config is better suited for onDidSave since that will be manually updated by the user or Cline (and we want to detect save events, not every file change)
-				const watcher = chokidar.watch(filePath, {
+				console.log(`Setting up build/index.js watcher for ${name} MCP server...`)
+				// we use chokidar instead of onDidSaveTextDocument because it doesn't require the file to be open in the editor
+				const indexJsWatcher = chokidar.watch(filePath, {
 					// persistent: true,
 					// ignoreInitial: true,
 					// awaitWriteFinish: true, // This helps with atomic writes
 				})
 
-				watcher.on("change", () => {
+				indexJsWatcher.on("change", async () => {
 					console.log(`Detected change in ${filePath}. Restarting server ${name}...`)
-					this.restartConnection(name)
+					try {
+						await this.restartConnection(name)
+					} catch (error) {
+						console.error(`Failed to restart server ${name} after change in ${filePath}:`, error)
+					}
 				})
 
-				this.fileWatchers.set(name, watcher)
+				watchers.push(indexJsWatcher)
+			}
+
+			// Update the fileWatchers map with all watchers for this server
+			if (watchers.length > 0) {
+				this.fileWatchers.set(name, watchers)
 			}
 		}
 	}
 
 	private removeAllFileWatchers() {
-		this.fileWatchers.forEach((watcher) => watcher.close())
+		this.fileWatchers.forEach((watchers) => watchers.forEach((watcher) => watcher.close()))
 		this.fileWatchers.clear()
 	}