Fix 1: Removed early _setupGitHeadWatcher call

Fix 2: Added _setupGitHeadWatcher to _recreateServices
Fix 3: Removed redundant call in handleSettingsChange
Fix 4: Ensured watcher disposal when feature disabled

Author: yavpungggi

src/services/code-index/manager.ts

@@ -153,10 +153,6 @@ export class CodeIndexManager {
 			await this._cacheManager.initialize()
 		}
 
-		// Ensure Git branch watcher is set up (when branch isolation is enabled)
-		await this._setupGitHeadWatcher()
-
-
 		// 4. Determine if Core Services Need Recreation
 		const needsServiceRecreation = !this._serviceFactory || requiresRestart
 
@@ -397,6 +393,9 @@ export class CodeIndexManager {
 
 		// Clear any error state after successful recreation
 		this._stateManager.setSystemState("Standby", "")
+
+		// Ensure Git branch watcher is set up with current branch after service recreation
+		await this._setupGitHeadWatcher()
 	}
 
 	// --- Git branch watcher (Phase 1: auto branch switch handling) ---
@@ -458,6 +457,8 @@ export class CodeIndexManager {
 				if (this._orchestrator) {
 					this._orchestrator.stopWatcher()
 				}
+				// Dispose Git branch watcher if it exists
+				await this._setupGitHeadWatcher()
 				// Set state to indicate service is disabled
 				this._stateManager.setSystemState("Standby", "Code indexing is disabled")
 				return
@@ -486,9 +487,6 @@ export class CodeIndexManager {
 				}
 			}
 
-			// Ensure Git branch watcher reflects latest settings
-			await this._setupGitHeadWatcher()
-
 		}
 	}
 }