Merge branch 'main' into my-main

Author: Kevin White

src/core/diff/strategies/multi-search-replace.ts

@@ -91,10 +91,8 @@ export class MultiSearchReplaceDiffStrategy implements DiffStrategy {
 
 	getToolDescription(args: { cwd: string; toolOptions?: { [key: string]: string } }): string {
 		return `## apply_diff
-Description: Request to replace existing code using a search and replace block.
-This tool allows for precise, surgical replaces to files by specifying exactly what content to search for and what to replace it with.
-The tool will maintain proper indentation and formatting while making changes.
-Only a single operation is allowed per tool use.
+Description: Request to apply targeted modifications to an existing file by searching for specific sections of content and replacing them. This tool is ideal for precise, surgical edits when you know the exact content to change. It helps maintain proper indentation and formatting.
+You can perform multiple distinct search and replace operations within a single \`apply_diff\` call by providing multiple SEARCH/REPLACE blocks in the \`diff\` parameter. This is the preferred way to make several targeted changes to one file efficiently.
 The SEARCH section must exactly match existing content including whitespace and indentation.
 If you're not confident in the exact content to search for, use the read_file tool first to get the exact content.
 When applying the diffs, be extra careful to remember to change any closing brackets or other syntax that may be affected by the diff farther down in the file.

src/core/prompts/__tests__/__snapshots__/system.test.ts.snap

@@ -2,10 +2,10 @@ import { ToolArgs } from "./types"
 
 export function getWriteToFileDescription(args: ToolArgs): string {
 	return `## write_to_file
-Description: Request to write full content to a file at the specified path. If the file exists, it will be overwritten with the provided content. If the file doesn't exist, it will be created. This tool will automatically create any directories needed to write the file.
+Description: Request to write content to a file. This tool is primarily used for **creating new files** or for scenarios where a **complete rewrite of an existing file is intentionally required**. If the file exists, it will be overwritten. If it doesn't exist, it will be created. This tool will automatically create any directories needed to write the file.
 Parameters:
 - path: (required) The path of the file to write to (relative to the current workspace directory ${args.cwd})
-- content: (required) The content to write to the file. ALWAYS provide the COMPLETE intended content of the file, without any truncation or omissions. You MUST include ALL parts of the file, even if they haven't been modified. Do NOT include the line numbers in the content though, just the actual content of the file.
+- content: (required) The content to write to the file. When performing a full rewrite of an existing file or creating a new one, ALWAYS provide the COMPLETE intended content of the file, without any truncation or omissions. You MUST include ALL parts of the file, even if they haven't been modified. Do NOT include the line numbers in the content though, just the actual content of the file.
 - line_count: (required) The number of lines in the file. Make sure to compute this based on the actual content of the file, not the number of lines in the content you're providing.
 Usage:
 <write_to_file>

src/core/prompts/tools/write-to-file.ts

@@ -824,6 +824,11 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 					this.contextProxy.setProviderSettings(providerSettings),
 				])
 
+				// Notify CodeIndexManager about the settings change
+				if (this.codeIndexManager) {
+					await this.codeIndexManager.handleExternalSettingsChange()
+				}
+
 				// Change the provider for the current task.
 				// TODO: We should rename `buildApiHandler` for clarity (e.g. `getProviderClient`).
 				const task = this.getCurrentCline()

src/core/webview/ClineProvider.ts

@@ -14,7 +14,7 @@ export class CodeIndexConfigManager {
 	private modelId?: string
 	private openAiOptions?: ApiHandlerOptions
 	private ollamaOptions?: ApiHandlerOptions
-	private qdrantUrl?: string
+	private qdrantUrl?: string = "http://localhost:6333"
 	private qdrantApiKey?: string
 	private searchMinScore?: number
 
@@ -103,11 +103,18 @@ export class CodeIndexConfigManager {
 	 * Checks if the service is properly configured based on the embedder type.
 	 */
 	public isConfigured(): boolean {
+
 		if (this.embedderProvider === "openai") {
-			return !!(this.openAiOptions?.openAiNativeApiKey && this.qdrantUrl)
+			const openAiKey = this.openAiOptions?.openAiNativeApiKey
+			const qdrantUrl = this.qdrantUrl
+			const isConfigured = !!(openAiKey && qdrantUrl)
+			return isConfigured
 		} else if (this.embedderProvider === "ollama") {
 			// Ollama model ID has a default, so only base URL is strictly required for config
-			return !!(this.ollamaOptions?.ollamaBaseUrl && this.qdrantUrl)
+			const ollamaBaseUrl = this.ollamaOptions?.ollamaBaseUrl
+			const qdrantUrl = this.qdrantUrl
+			const isConfigured = !!(ollamaBaseUrl && qdrantUrl)
+			return isConfigured
 		}
 		return false // Should not happen if embedderProvider is always set correctly
 	}

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

@@ -244,4 +244,15 @@ export class CodeIndexManager {
 		this.assertInitialized()
 		return this._searchService!.searchIndex(query, directoryPrefix)
 	}
+
+	/**
+	 * Handles external settings changes by reloading configuration.
+	 * This method should be called when API provider settings are updated
+	 * to ensure the CodeIndexConfigManager picks up the new configuration.
+	 */
+	public async handleExternalSettingsChange(): Promise<void> {
+		if (this._configManager) {
+			await this._configManager.loadConfiguration()
+		}
+	}
 }

src/services/code-index/manager.ts

@@ -300,7 +300,7 @@ export const CodeIndexSettings: React.FC<CodeIndexSettingsProps> = ({
 						</div>
 						<div>
 							<VSCodeTextField
-								value={codebaseIndexConfig.codebaseIndexQdrantUrl}
+								value={codebaseIndexConfig.codebaseIndexQdrantUrl || "http://localhost:6333"}
 								onInput={(e: any) =>
 									setCachedStateField("codebaseIndexConfig", {
 										...codebaseIndexConfig,