diff --git a/packages/types/src/codebase-index.ts b/packages/types/src/codebase-index.ts index 90bd42a82d..1babc7244d 100644 --- a/packages/types/src/codebase-index.ts +++ b/packages/types/src/codebase-index.ts @@ -51,7 +51,7 @@ export const codebaseIndexConfigSchema = z.object({ // OpenRouter specific fields codebaseIndexOpenRouterSpecificProvider: z.string().optional(), // Gitignore behavior - respectGitIgnore: z.boolean().optional(), + codebaseIndexRespectGitIgnore: z.boolean().optional(), }) export type CodebaseIndexConfig = z.infer diff --git a/packages/types/src/vscode-extension-host.ts b/packages/types/src/vscode-extension-host.ts index c293150bfa..5936fa4190 100644 --- a/packages/types/src/vscode-extension-host.ts +++ b/packages/types/src/vscode-extension-host.ts @@ -695,7 +695,7 @@ export interface WebviewMessage { codebaseIndexSearchMaxResults?: number codebaseIndexSearchMinScore?: number codebaseIndexOpenRouterSpecificProvider?: string // OpenRouter provider routing - respectGitIgnore?: boolean // Whether to respect .gitignore when listing files + codebaseIndexRespectGitIgnore?: boolean // Whether to respect .gitignore when listing files // Secret settings codeIndexOpenAiKey?: string diff --git a/src/core/environment/getEnvironmentDetails.ts b/src/core/environment/getEnvironmentDetails.ts index cb88e00ced..e829df0050 100644 --- a/src/core/environment/getEnvironmentDetails.ts +++ b/src/core/environment/getEnvironmentDetails.ts @@ -270,7 +270,7 @@ export async function getEnvironmentDetails(cline: Task, includeFileDetails: boo if (maxFiles === 0) { details += "(Workspace files context disabled. Use list_files to explore if needed.)" } else { - const respectGitIgnore = state?.codebaseIndexConfig?.respectGitIgnore ?? true + const respectGitIgnore = state?.codebaseIndexConfig?.codebaseIndexRespectGitIgnore ?? true const [files, didHitLimit] = await listFiles(cline.cwd, true, maxFiles, respectGitIgnore) const { showRooIgnoredFiles = false } = state ?? {} diff --git a/src/core/tools/ListFilesTool.ts b/src/core/tools/ListFilesTool.ts index f9e95766a5..7d92734ba4 100644 --- a/src/core/tools/ListFilesTool.ts +++ b/src/core/tools/ListFilesTool.ts @@ -38,7 +38,7 @@ export class ListFilesTool extends BaseTool<"list_files"> { const isOutsideWorkspace = isPathOutsideWorkspace(absolutePath) const state = await task.providerRef.deref()?.getState() - const respectGitIgnore = state?.codebaseIndexConfig?.respectGitIgnore ?? true + const respectGitIgnore = state?.codebaseIndexConfig?.codebaseIndexRespectGitIgnore ?? true const [files, didHitLimit] = await listFiles(absolutePath, recursive || false, 200, respectGitIgnore) const { showRooIgnoredFiles = false } = state ?? {} diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index 153b785d97..2245dd6f5c 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -2211,7 +2211,7 @@ export class ClineProvider codebaseIndexBedrockRegion: codebaseIndexConfig?.codebaseIndexBedrockRegion, codebaseIndexBedrockProfile: codebaseIndexConfig?.codebaseIndexBedrockProfile, codebaseIndexOpenRouterSpecificProvider: codebaseIndexConfig?.codebaseIndexOpenRouterSpecificProvider, - respectGitIgnore: codebaseIndexConfig?.respectGitIgnore, + codebaseIndexRespectGitIgnore: codebaseIndexConfig?.codebaseIndexRespectGitIgnore, }, // Only set mdmCompliant if there's an actual MDM policy // undefined means no MDM policy, true means compliant, false means non-compliant @@ -2451,7 +2451,7 @@ export class ClineProvider codebaseIndexBedrockProfile: stateValues.codebaseIndexConfig?.codebaseIndexBedrockProfile, codebaseIndexOpenRouterSpecificProvider: stateValues.codebaseIndexConfig?.codebaseIndexOpenRouterSpecificProvider, - respectGitIgnore: stateValues.codebaseIndexConfig?.respectGitIgnore, + codebaseIndexRespectGitIgnore: stateValues.codebaseIndexConfig?.codebaseIndexRespectGitIgnore, }, profileThresholds: stateValues.profileThresholds ?? {}, includeDiagnosticMessages: stateValues.includeDiagnosticMessages ?? true, diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts index 3d9b7a9267..c81b30db04 100644 --- a/src/core/webview/webviewMessageHandler.ts +++ b/src/core/webview/webviewMessageHandler.ts @@ -2543,7 +2543,7 @@ export const webviewMessageHandler = async ( codebaseIndexSearchMaxResults: settings.codebaseIndexSearchMaxResults, codebaseIndexSearchMinScore: settings.codebaseIndexSearchMinScore, codebaseIndexOpenRouterSpecificProvider: settings.codebaseIndexOpenRouterSpecificProvider, - respectGitIgnore: settings.respectGitIgnore, + codebaseIndexRespectGitIgnore: settings.codebaseIndexRespectGitIgnore, } // Save global state first diff --git a/src/integrations/workspace/WorkspaceTracker.ts b/src/integrations/workspace/WorkspaceTracker.ts index 6bd2f2aa3d..46475efd24 100644 --- a/src/integrations/workspace/WorkspaceTracker.ts +++ b/src/integrations/workspace/WorkspaceTracker.ts @@ -33,7 +33,7 @@ class WorkspaceTracker { let respectGitIgnore = true try { const state = await this.providerRef.deref()?.getState() - respectGitIgnore = state?.codebaseIndexConfig?.respectGitIgnore ?? true + respectGitIgnore = state?.codebaseIndexConfig?.codebaseIndexRespectGitIgnore ?? true } catch { // Fall back to default (respect .gitignore) if state is not available } diff --git a/src/services/code-index/config-manager.ts b/src/services/code-index/config-manager.ts index 54769e2dfb..ce6e878ec2 100644 --- a/src/services/code-index/config-manager.ts +++ b/src/services/code-index/config-manager.ts @@ -26,7 +26,7 @@ export class CodeIndexConfigManager { private qdrantApiKey?: string private searchMinScore?: number private searchMaxResults?: number - private respectGitIgnore: boolean = true + private codebaseIndexRespectGitIgnore: boolean = true constructor(private readonly contextProxy: ContextProxy) { // Initialize with current configuration to avoid false restart triggers @@ -87,7 +87,7 @@ export class CodeIndexConfigManager { this.qdrantApiKey = qdrantApiKey ?? "" this.searchMinScore = codebaseIndexSearchMinScore this.searchMaxResults = codebaseIndexSearchMaxResults - this.respectGitIgnore = codebaseIndexConfig.respectGitIgnore ?? true + this.codebaseIndexRespectGitIgnore = codebaseIndexConfig.codebaseIndexRespectGitIgnore ?? true // Validate and set model dimension const rawDimension = codebaseIndexConfig.codebaseIndexEmbedderModelDimension @@ -196,7 +196,7 @@ export class CodeIndexConfigManager { openRouterSpecificProvider: this.openRouterOptions?.specificProvider ?? "", qdrantUrl: this.qdrantUrl ?? "", qdrantApiKey: this.qdrantApiKey ?? "", - respectGitIgnore: this.respectGitIgnore, + codebaseIndexRespectGitIgnore: this.codebaseIndexRespectGitIgnore, } // Refresh secrets from VSCode storage to ensure we have the latest values @@ -413,9 +413,9 @@ export class CodeIndexConfigManager { return true } - // respectGitIgnore change - const prevRespectGitIgnore = prev?.respectGitIgnore ?? true - if (prevRespectGitIgnore !== this.respectGitIgnore) { + // codebaseIndexRespectGitIgnore change + const prevRespectGitIgnore = prev?.codebaseIndexRespectGitIgnore ?? true + if (prevRespectGitIgnore !== this.codebaseIndexRespectGitIgnore) { return true } diff --git a/src/services/code-index/interfaces/config.ts b/src/services/code-index/interfaces/config.ts index ec2244c8e6..14fbf3d880 100644 --- a/src/services/code-index/interfaces/config.ts +++ b/src/services/code-index/interfaces/config.ts @@ -45,5 +45,5 @@ export type PreviousConfigSnapshot = { openRouterSpecificProvider?: string qdrantUrl?: string qdrantApiKey?: string - respectGitIgnore?: boolean + codebaseIndexRespectGitIgnore?: boolean } diff --git a/src/services/code-index/manager.ts b/src/services/code-index/manager.ts index 3bcfc395be..e606000290 100644 --- a/src/services/code-index/manager.ts +++ b/src/services/code-index/manager.ts @@ -316,7 +316,7 @@ export class CodeIndexManager { let respectGitIgnore = true try { const codebaseIndexConfig = this._configManager!.getContextProxy()?.getGlobalState("codebaseIndexConfig") - respectGitIgnore = codebaseIndexConfig?.respectGitIgnore ?? true + respectGitIgnore = codebaseIndexConfig?.codebaseIndexRespectGitIgnore ?? true } catch { // Fall back to default (respect .gitignore) if config proxy is not available } diff --git a/webview-ui/src/components/chat/CodeIndexPopover.tsx b/webview-ui/src/components/chat/CodeIndexPopover.tsx index da51f81dd2..4bcfadfa31 100644 --- a/webview-ui/src/components/chat/CodeIndexPopover.tsx +++ b/webview-ui/src/components/chat/CodeIndexPopover.tsx @@ -81,7 +81,7 @@ interface LocalCodeIndexSettings { codebaseIndexVercelAiGatewayApiKey?: string codebaseIndexOpenRouterApiKey?: string codebaseIndexOpenRouterSpecificProvider?: string - respectGitIgnore?: boolean + codebaseIndexRespectGitIgnore?: boolean } // Validation schema for codebase index settings @@ -226,7 +226,7 @@ export const CodeIndexPopover: React.FC = ({ codebaseIndexVercelAiGatewayApiKey: "", codebaseIndexOpenRouterApiKey: "", codebaseIndexOpenRouterSpecificProvider: "", - respectGitIgnore: true, + codebaseIndexRespectGitIgnore: true, }) // Initial settings state - stores the settings when popover opens @@ -267,7 +267,7 @@ export const CodeIndexPopover: React.FC = ({ codebaseIndexOpenRouterApiKey: "", codebaseIndexOpenRouterSpecificProvider: codebaseIndexConfig.codebaseIndexOpenRouterSpecificProvider || "", - respectGitIgnore: codebaseIndexConfig.respectGitIgnore ?? true, + codebaseIndexRespectGitIgnore: codebaseIndexConfig.codebaseIndexRespectGitIgnore ?? true, } setInitialSettings(settings) setCurrentSettings(settings) @@ -1593,9 +1593,9 @@ export const CodeIndexPopover: React.FC = ({
- updateSetting("respectGitIgnore", e.target.checked) + updateSetting("codebaseIndexRespectGitIgnore", e.target.checked) }> {t("settings:codeIndex.respectGitIgnoreLabel")}