fix: improve error handling and validation in code indexing process

Author: daniel-lxs

src/core/webview/webviewMessageHandler.ts

@@ -1869,9 +1869,6 @@ export const webviewMessageHandler = async (
 					)
 				}
 
-				// Verify secrets are actually stored
-				const storedOpenAiKey = provider.contextProxy.getSecret("codeIndexOpenAiKey")
-
 				// Send success response first - settings are saved regardless of validation
 				await provider.postMessageToWebview({
 					type: "codeIndexSettingsSaved",
@@ -1904,35 +1901,35 @@ export const webviewMessageHandler = async (
 						}
 					} else {
 						// No provider change, just handle settings normally
-						await provider.codeIndexManager.handleSettingsChange()
+						try {
+							await provider.codeIndexManager.handleSettingsChange()
+						} catch (error) {
+							// Log but don't fail - settings are saved
+							provider.log(
+								`Settings change handling error: ${error instanceof Error ? error.message : String(error)}`,
+							)
+						}
 					}
 
+					// Wait a bit more to ensure everything is ready
+					await new Promise((resolve) => setTimeout(resolve, 200))
+
 					// Auto-start indexing if now enabled and configured
 					if (provider.codeIndexManager.isFeatureEnabled && provider.codeIndexManager.isFeatureConfigured) {
 						if (!provider.codeIndexManager.isInitialized) {
 							try {
-								// Initialize will validate embedder configuration
-								const { requiresRestart } = await provider.codeIndexManager.initialize(
-									provider.contextProxy,
-								)
-
-								// If initialization succeeded (no exception thrown), start indexing
-								provider.codeIndexManager.startIndexing()
+								await provider.codeIndexManager.initialize(provider.contextProxy)
+								provider.log(`Code index manager initialized after settings save`)
 							} catch (error) {
-								// Log the specific validation error for debugging
 								provider.log(
-									`Code index initialization failed during settings save: ${error instanceof Error ? error.message : String(error)}`,
+									`Code index initialization failed: ${error instanceof Error ? error.message : String(error)}`,
 								)
 								// Send error status to webview
 								await provider.postMessageToWebview({
 									type: "indexingStatusUpdate",
 									values: provider.codeIndexManager.getCurrentStatus(),
 								})
-								// Don't re-throw - settings are already saved successfully
 							}
-						} else {
-							// Already initialized, just start indexing
-							provider.codeIndexManager.startIndexing()
 						}
 					}
 				}

src/services/code-index/manager.ts

@@ -118,7 +118,14 @@ export class CodeIndexManager {
 			return { requiresRestart }
 		}
 
-		// 3. CacheManager Initialization
+		// 3. Check if workspace is available
+		const workspacePath = getWorkspacePath()
+		if (!workspacePath) {
+			this._stateManager.setSystemState("Standby", "No workspace folder open")
+			return { requiresRestart }
+		}
+
+		// 4. CacheManager Initialization
 		if (!this._cacheManager) {
 			this._cacheManager = new CacheManager(this.context, this.workspacePath)
 			await this._cacheManager.initialize()
@@ -215,6 +222,9 @@ export class CodeIndexManager {
 		if (this._orchestrator) {
 			this.stopWatcher()
 		}
+		// Clear existing services to ensure clean state
+		this._orchestrator = undefined
+		this._searchService = undefined
 
 		// (Re)Initialize service factory
 		this._serviceFactory = new CodeIndexServiceFactory(
@@ -224,7 +234,14 @@ export class CodeIndexManager {
 		)
 
 		const ignoreInstance = ignore()
-		const ignorePath = path.join(getWorkspacePath(), ".gitignore")
+		const workspacePath = getWorkspacePath()
+
+		if (!workspacePath) {
+			this._stateManager.setSystemState("Standby", "")
+			return
+		}
+
+		const ignorePath = path.join(workspacePath, ".gitignore")
 		try {
 			const content = await fs.readFile(ignorePath, "utf8")
 			ignoreInstance.add(content)
@@ -270,6 +287,9 @@ export class CodeIndexManager {
 			embedder,
 			vectorStore,
 		)
+
+		// Clear any error state after successful recreation
+		this._stateManager.setSystemState("Standby", "")
 	}
 
 	/**
@@ -285,14 +305,10 @@ export class CodeIndexManager {
 			const isFeatureEnabled = this.isFeatureEnabled
 			const isFeatureConfigured = this.isFeatureConfigured
 
-			// If configuration changes require a restart and the manager is initialized, restart the service
-			if (requiresRestart && isFeatureEnabled && isFeatureConfigured && this.isInitialized) {
+			if (requiresRestart && isFeatureEnabled && isFeatureConfigured) {
 				try {
 					// Recreate services with new configuration
 					await this._recreateServices()
-
-					// Start indexing with new services
-					this.startIndexing()
 				} catch (error) {
 					// Error state already set in _recreateServices
 					console.error("Failed to recreate services:", error)

src/services/code-index/orchestrator.ts

@@ -164,6 +164,31 @@ export class CodeIndexOrchestrator {
 				}
 			}
 
+			// Check for partial failures - if a significant portion of blocks failed
+			const failureRate = (cumulativeBlocksFoundSoFar - cumulativeBlocksIndexed) / cumulativeBlocksFoundSoFar
+			if (batchErrors.length > 0 && failureRate > 0.1) {
+				// More than 10% of blocks failed to index
+				const firstError = batchErrors[0]
+				throw new Error(
+					`Indexing partially failed: Only ${cumulativeBlocksIndexed} of ${cumulativeBlocksFoundSoFar} blocks were indexed. ${firstError.message}`,
+				)
+			}
+
+			// CRITICAL: If there were ANY batch errors and NO blocks were successfully indexed,
+			// this is a complete failure regardless of the failure rate calculation
+			if (batchErrors.length > 0 && cumulativeBlocksIndexed === 0) {
+				const firstError = batchErrors[0]
+				throw new Error(`Indexing failed completely: ${firstError.message}`)
+			}
+
+			// Final sanity check: If we found blocks but indexed none and somehow no errors were reported,
+			// this is still a failure
+			if (cumulativeBlocksFoundSoFar > 0 && cumulativeBlocksIndexed === 0) {
+				throw new Error(
+					"Indexing failed: No code blocks were successfully indexed despite finding files to process. This indicates a critical embedder failure.",
+				)
+			}
+
 			await this._startWatcher()
 
 			this.stateManager.setSystemState("Indexed", "File watcher started.")