fix small issue

Author: denis567denis

src/services/code-index/config-manager.ts

@@ -269,6 +269,8 @@ export class CodeIndexConfigManager {
 		const prevGeminiApiKey = prev?.geminiApiKey ?? ""
 		const prevMistralApiKey = prev?.mistralApiKey ?? ""
 		const prevQdrantUrl = prev?.qdrantUrl ?? ""
+		const prevValkeyUrl = prev?.valkeyUrl ?? ""
+		const prevSearchProvider = prev?.searchProvider ?? ""
 		const prevQdrantApiKey = prev?.qdrantApiKey ?? ""
 
 		// 1. Transition from disabled/unconfigured to enabled/configured
@@ -306,6 +308,8 @@ export class CodeIndexConfigManager {
 		const currentGeminiApiKey = this.geminiOptions?.apiKey ?? ""
 		const currentMistralApiKey = this.mistralOptions?.apiKey ?? ""
 		const currentQdrantUrl = this.qdrantUrl ?? ""
+		const currentValkeyUrl = this.valkeyUrl ?? ""
+		const currentSearchProvider = this.searchProvider ?? ""
 		const currentQdrantApiKey = this.qdrantApiKey ?? ""
 
 		if (prevOpenAiKey !== currentOpenAiKey) {
@@ -340,6 +344,14 @@ export class CodeIndexConfigManager {
 			return true
 		}
 
+		if (prevValkeyUrl !== currentValkeyUrl) {
+			return true
+		}
+
+		if (currentSearchProvider != this.searchProvider) {
+			return true
+		}
+
 		// Vector dimension changes (still important for compatibility)
 		if (this._hasVectorDimensionChanged(prevProvider, prev?.modelId)) {
 			return true

src/services/code-index/vector-store/valkey-search-client.ts

@@ -35,39 +35,38 @@ export class ValkeySearchVectorStore implements IVectorStore {
 
 		this.isInitializing = true
 
-		try {
-			if (this.client && this.client.disconnect) {
-				this.client.disconnect()
-			}
+		return new Promise<void>((resolve, reject) => {
+			try {
+				const { hostname, port, password, username } = this.parseConnectionOptions()
+				this.client = new Valkey({
+					host: hostname,
+					port,
+					password,
+					username,
+				})
 
-			const { hostname, port, password } = this.parseConnectionOptions()
-			this.client = new Valkey({
-				host: hostname,
-				port,
-				password,
-				retryStrategy: (times) => Math.min(times * 100, 5000),
-			})
+				this.client.on("error", (err: Error) => {
+					this.destroy()
+					this.isInitializing = false
+					reject(new Error("Valkey connection error", err))
+				})
 
-			this.client.on("error", (err: Error) => {
-				console.error("[ValkeySearch] Connection error:", err)
-			})
+				this.client.on("ready", () => {
+					this.isInitializing = false
+					resolve()
+				})
 
-			this.client.on("ready", () => {
-				console.log("[ValkeySearch] Connection established")
-				this.isInitializing = false
-			})
+				this.client.on("end", () => {
+					this.destroy()
+					reject(new Error("Valkey connection closed"))
+				})
 
-			this.client.on("end", () => {
-				console.log("[ValkeySearch] Connection closed")
+				this.client.connect().catch(reject)
+			} catch (error) {
 				this.isInitializing = false
-			})
-
-			await this.client.connect()
-		} catch (error) {
-			console.error("[ValkeySearch] Failed to initialize client:", error)
-			this.isInitializing = false
-			setTimeout(async () => await this.initializeClient(), 5000)
-		}
+				reject(new Error("Valkey initialization failed", error))
+			}
+		})
 	}
 
 	private parseConnectionOptions() {
@@ -76,6 +75,7 @@ export class ValkeySearchVectorStore implements IVectorStore {
 			hostname: url.hostname,
 			port: Number(url.port) || 6379,
 			password: url.password || undefined,
+			username: url.username || undefined,
 		}
 	}
 

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

@@ -193,9 +193,6 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 	// Current settings state - tracks user changes
 	const [currentSettings, setCurrentSettings] = useState<LocalCodeIndexSettings>(getDefaultSettings())
 
-	// Search provider selection
-	const [searchProvider, setSearchProvider] = useState<SearchProvider>((currentSettings.searchProvider = ""))
-
 	// Update indexing status from parent
 	useEffect(() => {
 		setIndexingStatus(externalIndexingStatus)
@@ -345,6 +342,10 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 		// Use a Set to ensure unique keys
 		const uniqueKeys = Array.from(new Set(allKeys))
 
+		if (currentSettings.searchProvider !== initialSettings.searchProvider) {
+			return true
+		}
+
 		for (const key of uniqueKeys) {
 			const currentValue = currentSettings[key]
 			const initialValue = initialSettings[key]
@@ -461,7 +462,6 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 		setSaveError(null)
 
 		// Prepare settings to save
-		currentSettings.searchProvider = searchProvider
 		const settingsToSave: any = {
 			codebaseIndexEnabled: currentSettings.codebaseIndexEnabled,
 		}
@@ -542,7 +542,9 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 							<div className="flex items-center gap-2">
 								<VSCodeCheckbox
 									checked={currentSettings.codebaseIndexEnabled}
-									onChange={(e: any) => updateSetting("codebaseIndexEnabled", e.target.checked)}>
+									onChange={(e: any) => {
+										updateSetting("codebaseIndexEnabled", e.target.checked)
+									}}>
 									<span className="font-medium">{t("settings:codeIndex.enableLabel")}</span>
 								</VSCodeCheckbox>
 								<StandardTooltip content={t("settings:codeIndex.enableDescription")}>
@@ -1027,8 +1029,10 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 											{t("settings:codeIndex.searchProviderLabel")}
 										</label>
 										<Select
-											value={searchProvider}
-											onValueChange={(value: SearchProvider) => setSearchProvider(value)}>
+											value={currentSettings.searchProvider}
+											onValueChange={(value: SearchProvider) => {
+												updateSetting("searchProvider", value)
+											}}>
 											<SelectTrigger className="w-full">
 												<SelectValue />
 											</SelectTrigger>
@@ -1043,7 +1047,7 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 										</Select>
 									</div>
 
-									{searchProvider === "qdrant" && (
+									{currentSettings.searchProvider === "qdrant" && (
 										<>
 											<div className="space-y-2">
 												<label className="text-sm font-medium">
@@ -1096,7 +1100,7 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 										</>
 									)}
 
-									{searchProvider === "valkey" && (
+									{currentSettings.searchProvider === "valkey" && (
 										<>
 											<div className="space-y-2">
 												<label className="text-sm font-medium">