Improves branch isolation and vector store access

Optimizes code index management by:

- Providing more direct vector store access via the orchestrator
- Enhancing error handling when the vector store is unavailable
- Clarifying the branch isolation feature description in settings
These changes increase reliability during branch switches and improve user experience through more precise search results.

Author: yavpungggi

src/services/code-index/manager.ts

@@ -432,14 +432,21 @@ export class CodeIndexManager {
 
 				// Smart re-indexing: only do full scan if collection doesn't exist or is empty
 				// If collection exists with data, file watcher will handle incremental updates
-				const collectionExists = await this._serviceFactory?.getVectorStore()?.collectionExists()
+				const vectorStore = this._orchestrator?.getVectorStore()
+				if (!vectorStore) {
+					// No orchestrator yet, just start indexing
+					this._orchestrator?.startIndexing()
+					return
+				}
+
+				const collectionExists = await vectorStore.collectionExists()
 				if (!collectionExists) {
 					// New branch or first time indexing this branch - do full scan
 					this._orchestrator?.startIndexing()
 				} else {
 					// Collection exists - just validate/initialize without full scan
 					// File watcher will detect any file changes from the branch switch
-					await this._serviceFactory?.getVectorStore()?.initialize()
+					await vectorStore.initialize()
 				}
 			} catch (error) {
 				console.error("Failed to handle Git branch change:", error)

src/services/code-index/orchestrator.ts

@@ -26,6 +26,13 @@ export class CodeIndexOrchestrator {
 		private readonly fileWatcher: IFileWatcher,
 	) {}
 
+	/**
+	 * Gets the vector store instance
+	 */
+	public getVectorStore(): IVectorStore {
+		return this.vectorStore
+	}
+
 	/**
 	 * Starts the file watcher if not already running.
 	 */

webview-ui/src/i18n/locales/en/settings.json

@@ -124,7 +124,7 @@
 		"close": "Close",
 		"branchIsolation": {
 			"enableLabel": "Enable Branch Isolation",
-			"enableDescription": "Index each Git branch separately to prevent conflicts when switching branches. Requires more storage space.",
+			"enableDescription": "Index each Git branch separately to get better search results and prevent conflicts when switching branches. Requires more storage space.",
 			"storageWarning": "Each branch will have its own index, increasing storage requirements."
 		},
 		"validation": {
@@ -892,4 +892,4 @@
 			"cacheReads": "Cache reads"
 		}
 	}
-}
+}