feat: add global auto-enable default for backward-compatible workspace indexing

Author: James Mtendamema

packages/types/src/vscode-extension-host.ts

@@ -512,6 +512,7 @@ export interface WebviewMessage {
 		| "indexingStatusUpdate"
 		| "indexCleared"
 		| "toggleWorkspaceIndexing"
+		| "setAutoEnableDefault"
 		| "focusPanelRequest"
 		| "openExternal"
 		| "filterMarketplaceItems"
@@ -741,6 +742,7 @@ export interface IndexingStatus {
 	currentItemUnit?: string
 	workspacePath?: string
 	workspaceEnabled?: boolean
+	autoEnableDefault?: boolean
 }
 
 export interface IndexingStatusUpdateMessage {

src/core/webview/webviewMessageHandler.ts

@@ -2691,6 +2691,25 @@ export const webviewMessageHandler = async (
 			}
 			break
 		}
+		case "setAutoEnableDefault": {
+			try {
+				const manager = provider.getCurrentWorkspaceCodeIndexManager()
+				if (!manager) {
+					provider.log("Cannot set auto-enable default: No workspace folder open")
+					return
+				}
+				await manager.setAutoEnableDefault(message.bool ?? true)
+				provider.postMessageToWebview({
+					type: "indexingStatusUpdate",
+					values: manager.getCurrentStatus(),
+				})
+			} catch (error) {
+				provider.log(
+					`Error setting auto-enable default: ${error instanceof Error ? error.message : String(error)}`,
+				)
+			}
+			break
+		}
 		case "clearIndexData": {
 			try {
 				const manager = provider.getCurrentWorkspaceCodeIndexManager()

src/services/code-index/__tests__/manager.spec.ts

@@ -96,6 +96,7 @@ describe("CodeIndexManager - handleSettingsChange regression", () => {
 		CodeIndexManager.disposeAll()
 
 		const workspaceStateStore: Record<string, any> = {}
+		const globalStateStore: Record<string, any> = {}
 		mockContext = {
 			subscriptions: [],
 			workspaceState: {
@@ -104,7 +105,12 @@ describe("CodeIndexManager - handleSettingsChange regression", () => {
 					workspaceStateStore[key] = value
 				}),
 			} as any,
-			globalState: {} as any,
+			globalState: {
+				get: vi.fn((key: string, defaultValue?: any) => globalStateStore[key] ?? defaultValue),
+				update: vi.fn(async (key: string, value: any) => {
+					globalStateStore[key] = value
+				}),
+			} as any,
 			extensionUri: {} as any,
 			extensionPath: testExtensionPath,
 			asAbsolutePath: vi.fn(),
@@ -228,7 +234,7 @@ describe("CodeIndexManager - handleSettingsChange regression", () => {
 			;(manager as any)._cacheManager = mockCacheManager
 
 			// Simulate an initialized manager by setting the required properties
-			;(manager as any)._orchestrator = { stopWatcher: vi.fn() }
+			;(manager as any)._orchestrator = { stopWatcher: vi.fn(), stopIndexing: vi.fn() }
 			;(manager as any)._searchService = {}
 
 			// Verify manager is considered initialized
@@ -462,7 +468,7 @@ describe("CodeIndexManager - handleSettingsChange regression", () => {
 			})
 
 			// Mock orchestrator and search service to simulate initialized state
-			;(manager as any)._orchestrator = { stopWatcher: vi.fn(), state: "Error" }
+			;(manager as any)._orchestrator = { stopWatcher: vi.fn(), stopIndexing: vi.fn(), state: "Error" }
 			;(manager as any)._searchService = {}
 			;(manager as any)._serviceFactory = {}
 		})
@@ -592,7 +598,7 @@ describe("CodeIndexManager - handleSettingsChange regression", () => {
 			// Setup manager with service instances
 			;(manager as any)._configManager = mockConfigManager
 			;(manager as any)._serviceFactory = {}
-			;(manager as any)._orchestrator = { stopWatcher: vi.fn() }
+			;(manager as any)._orchestrator = { stopWatcher: vi.fn(), stopIndexing: vi.fn() }
 			;(manager as any)._searchService = {}
 
 			// Spy on console.error
@@ -620,6 +626,8 @@ describe("CodeIndexManager - handleSettingsChange regression", () => {
 
 	describe("workspace-enabled gating", () => {
 		it("should not start indexing when workspace is not enabled", async () => {
+			await manager.setAutoEnableDefault(false)
+
 			const mockStateManager = (manager as any)._stateManager
 			mockStateManager.setSystemState = vi.fn()
 			mockStateManager.getCurrentStatus = vi.fn().mockReturnValue({
@@ -637,7 +645,9 @@ describe("CodeIndexManager - handleSettingsChange regression", () => {
 			expect(mockStateManager.setSystemState).not.toHaveBeenCalledWith("Indexing", expect.any(String))
 		})
 
-		it("should include workspaceEnabled in getCurrentStatus", () => {
+		it("should include workspaceEnabled in getCurrentStatus", async () => {
+			await manager.setAutoEnableDefault(false)
+
 			const mockStateManager = (manager as any)._stateManager
 			mockStateManager.getCurrentStatus = vi.fn().mockReturnValue({
 				systemStatus: "Standby",
@@ -652,6 +662,7 @@ describe("CodeIndexManager - handleSettingsChange regression", () => {
 		})
 
 		it("should persist workspace enabled state", async () => {
+			await manager.setAutoEnableDefault(false)
 			expect(manager.isWorkspaceEnabled).toBe(false)
 
 			await manager.setWorkspaceEnabled(true)
@@ -662,6 +673,8 @@ describe("CodeIndexManager - handleSettingsChange regression", () => {
 		})
 
 		it("should store enablement per folder, not per window", async () => {
+			await manager.setAutoEnableDefault(false)
+
 			// Enable indexing for the current manager's folder
 			await manager.setWorkspaceEnabled(true)
 			expect(manager.isWorkspaceEnabled).toBe(true)

src/services/code-index/manager.ts

@@ -76,13 +76,26 @@ export class CodeIndexManager {
 	// --- Public API ---
 
 	public get isWorkspaceEnabled(): boolean {
-		return this.context.workspaceState.get(`codeIndexWorkspaceEnabled:${this.workspacePath}`, false)
+		const explicit = this.context.workspaceState.get<boolean | undefined>(
+			`codeIndexWorkspaceEnabled:${this.workspacePath}`,
+			undefined,
+		)
+		if (explicit !== undefined) return explicit
+		return this.autoEnableDefault
 	}
 
 	public async setWorkspaceEnabled(enabled: boolean): Promise<void> {
 		await this.context.workspaceState.update(`codeIndexWorkspaceEnabled:${this.workspacePath}`, enabled)
 	}
 
+	public get autoEnableDefault(): boolean {
+		return this.context.globalState.get("codeIndexAutoEnableDefault", true)
+	}
+
+	public async setAutoEnableDefault(enabled: boolean): Promise<void> {
+		await this.context.globalState.update("codeIndexAutoEnableDefault", enabled)
+	}
+
 	public get onProgressUpdate() {
 		return this._stateManager.onProgressUpdate
 	}
@@ -293,6 +306,7 @@ export class CodeIndexManager {
 			...status,
 			workspacePath: this.workspacePath,
 			workspaceEnabled: this.isWorkspaceEnabled,
+			autoEnableDefault: this.autoEnableDefault,
 		}
 	}
 

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

@@ -1590,9 +1590,32 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 							)}
 						</div>
 
+						{/* Auto-enable default */}
+						{currentSettings.codebaseIndexEnabled && (
+							<div className="flex items-center gap-2 pt-4 pb-1">
+								<input
+									type="checkbox"
+									id="auto-enable-default-toggle"
+									checked={indexingStatus.autoEnableDefault ?? true}
+									onChange={(e) =>
+										vscode.postMessage({
+											type: "setAutoEnableDefault",
+											bool: e.target.checked,
+										})
+									}
+									className="accent-vscode-focusBorder"
+								/>
+								<label
+									htmlFor="auto-enable-default-toggle"
+									className="text-xs text-vscode-foreground cursor-pointer">
+									{t("settings:codeIndex.autoEnableDefaultLabel")}
+								</label>
+							</div>
+						)}
+
 						{/* Workspace Toggle */}
 						{currentSettings.codebaseIndexEnabled && (
-							<div className="flex items-center gap-2 pt-4 pb-2">
+							<div className="flex items-center gap-2 pt-1 pb-2">
 								<input
 									type="checkbox"
 									id="workspace-indexing-toggle"

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

@@ -278,7 +278,8 @@
 		"stopIndexingButton": "Stop Indexing",
 		"stoppingButton": "Stopping...",
 		"workspaceToggleLabel": "Enable indexing for this workspace",
-		"workspaceDisabledMessage": "Indexing is configured but not enabled for this workspace."
+		"workspaceDisabledMessage": "Indexing is configured but not enabled for this workspace.",
+		"autoEnableDefaultLabel": "Auto-enable indexing for new workspaces"
 	},
 	"autoApprove": {
 		"description": "Run these actions without asking for permission. Only enable for actions you fully trust and if you understand the security risks.",