Fix possible race with external ingest not seeing code search repos (#4796)

* Fix possible race with external ingest not seeing code search repos

Also improve message for status in this case

* Update test file

Author: mjbvz

src/extension/workspaceChunkSearch/vscode-node/workspaceIndexingStatus.ts

@@ -217,14 +217,14 @@ export class ChatStatusWorkspaceIndexingStatus extends Disposable {
 						},
 					});
 				} else if (typeof state.remoteIndexState.externalIngestState !== 'undefined') {
-					// External indexing is enabled but not yet built
+					// External indexing is enabled but not yet fully built
 					return this._writeStatusItem({
 						title: {
-							title: t('Index not yet built'),
+							title: t('Codebase index out of date'),
 							learnMoreLink: 'https://aka.ms/vscode-copilot-workspace-remote-index',
 						},
 						details: {
-							message: `[${t`Build index`}](command:${buildRemoteIndexCommandId} "${t('Build Codebase Index')}")`,
+							message: `[${t`Update index`}](command:${buildRemoteIndexCommandId} "${t('Build Codebase Index')}")`,
 							busy: false,
 						}
 					});

src/platform/workspaceChunkSearch/node/codeSearch/codeSearchChunkSearch.ts

@@ -155,7 +155,7 @@ export class CodeSearchChunkSearch extends Disposable {
 		this._repoTracker = this._register(instantiationService.createInstance(CodeSearchRepoTracker));
 		this._externalIngestIndex = new Lazy(() => {
 			const client = instantiationService.createInstance(ExternalIngestClient);
-			return this._register(instantiationService.createInstance(ExternalIngestIndex, client));
+			return this._register(instantiationService.createInstance(ExternalIngestIndex, client, this.getExternalIngestRoots()));
 		});
 
 		this._register(this._repoTracker.onDidAddOrUpdateRepo(info => {
@@ -243,10 +243,6 @@ export class CodeSearchChunkSearch extends Disposable {
 					// Update external ingest index with the code search repo roots (if external ingest is enabled)
 					if (this.isExternalIngestEnabled()) {
 						this.updateExternalIngestRoots();
-					}
-
-					// Initialize external ingest index if enabled
-					if (this.isExternalIngestEnabled()) {
 						this._register(this._externalIngestIndex.value.onDidChangeState(() => {
 							this._onDidChangeIndexState.fire();
 						}));
@@ -262,15 +258,14 @@ export class CodeSearchChunkSearch extends Disposable {
 		await this._initializePromise;
 	}
 
-	/**
-	 * Updates the external ingest index with the current code search repo roots.
-	 * Files under these roots will be excluded from external ingest indexing.
-	 */
-	private updateExternalIngestRoots(): void {
-		const readyRepos = Array.from(this._codeSearchRepos.values())
+	private getExternalIngestRoots(): URI[] {
+		return Array.from(this._codeSearchRepos.values())
 			.filter(entry => entry.repo.status === CodeSearchRepoStatus.Ready)
 			.map(entry => entry.repo.repoInfo.rootUri);
-		this._externalIngestIndex.rawValue?.updateCodeSearchRoots(readyRepos);
+	}
+
+	private updateExternalIngestRoots(): void {
+		this._externalIngestIndex.rawValue?.updateCodeSearchRoots(this.getExternalIngestRoots());
 	}
 
 	private isInitializing(): boolean {

src/platform/workspaceChunkSearch/node/codeSearch/externalIngestIndex.ts

@@ -145,6 +145,7 @@ export class ExternalIngestIndex extends Disposable {
 
 	constructor(
 		client: IExternalIngestClient,
+		initialCodeSearchRoots: URI[],
 		@IEnvService private readonly _envService: IEnvService,
 		@IFileSystemService private readonly _fileSystemService: IFileSystemService,
 		@IIgnoreService private readonly _ignoreService: IIgnoreService,
@@ -160,6 +161,10 @@ export class ExternalIngestIndex extends Disposable {
 		this._client = client;
 		this.workspaceFolderIdMap = new WorkspaceFolderIdMap(this._vsExtensionContext.workspaceState);
 
+		for (const root of initialCodeSearchRoots) {
+			this._codeSearchRepoRoots.add(root);
+		}
+
 		let dbPath: string;
 		if (debug || !this._vsExtensionContext.storageUri || this._vsExtensionContext.storageUri.scheme !== Schemas.file) {
 			dbPath = ':memory:';

src/platform/workspaceChunkSearch/test/node/externalIngest.spec.ts

@@ -175,7 +175,7 @@ function createExternalIngestIndex(
 	client?: IExternalIngestClient,
 ): ExternalIngestIndex {
 	const resolvedClient = client ?? instantiationService.createInstance(ExternalIngestClient);
-	return instantiationService.createInstance(ExternalIngestIndex, resolvedClient);
+	return instantiationService.createInstance(ExternalIngestIndex, resolvedClient, []);
 }
 
 type MockExternalIngestClient = ReturnType<typeof createMockExternalIngestClient>;
@@ -217,7 +217,7 @@ suite('ExternalIngestIndex', () => {
 
 		const accessor = disposables.add(testingServiceCollection.createTestingAccessor());
 		const instantiationService = accessor.get(IInstantiationService);
-		const index = disposables.add(instantiationService.createInstance(ExternalIngestIndex, mockClient));
+		const index = disposables.add(instantiationService.createInstance(ExternalIngestIndex, mockClient, []));
 
 		return { files, mockFs, mockClient, index };
 	}
@@ -241,7 +241,7 @@ suite('ExternalIngestIndex', () => {
 		const instantiationService = accessor.get(IInstantiationService);
 
 		const mockClient = createMockExternalIngestClient();
-		const index = disposables.add(instantiationService.createInstance(ExternalIngestIndex, mockClient));
+		const index = disposables.add(instantiationService.createInstance(ExternalIngestIndex, mockClient, []));
 
 		index.updateCodeSearchRoots([codeSearchRoot]);
 
@@ -260,7 +260,7 @@ suite('ExternalIngestIndex', () => {
 		const instantiationService = accessor.get(IInstantiationService);
 
 		const mockClient = createMockExternalIngestClient();
-		const index = disposables.add(instantiationService.createInstance(ExternalIngestIndex, mockClient));
+		const index = disposables.add(instantiationService.createInstance(ExternalIngestIndex, mockClient, []));
 
 		index.updateCodeSearchRoots([codeSearchRoot]);
 
@@ -279,7 +279,7 @@ suite('ExternalIngestIndex', () => {
 		const instantiationService = accessor.get(IInstantiationService);
 
 		const mockClient = createMockExternalIngestClient();
-		const index = disposables.add(instantiationService.createInstance(ExternalIngestIndex, mockClient));
+		const index = disposables.add(instantiationService.createInstance(ExternalIngestIndex, mockClient, []));
 
 		const file1 = URI.joinPath(root1, 'file.ts');
 		const file2 = URI.joinPath(root2, 'file.ts');
@@ -299,7 +299,7 @@ suite('ExternalIngestIndex', () => {
 		const instantiationService = accessor.get(IInstantiationService);
 
 		const mockClient = createMockExternalIngestClient();
-		disposables.add(instantiationService.createInstance(ExternalIngestIndex, mockClient));
+		disposables.add(instantiationService.createInstance(ExternalIngestIndex, mockClient, []));
 
 		// The mock client is now injected - tests can verify what files would be ingested
 		assert.strictEqual(mockClient.ingestedFiles.length, 0, 'No files ingested yet');
@@ -318,7 +318,7 @@ suite('ExternalIngestIndex', () => {
 		testingServiceCollection.set(IWorkspaceService, new MockWorkspaceService([URI.file('/workspace')]));
 		const customAccessor = disposables.add(testingServiceCollection.createTestingAccessor());
 		const customInstantiationService = customAccessor.get(IInstantiationService);
-		disposables.add(customInstantiationService.createInstance(ExternalIngestIndex, mockClient));
+		disposables.add(customInstantiationService.createInstance(ExternalIngestIndex, mockClient, []));
 
 		// The mock file system and client are now injected
 		// Tests can verify file operations and ingestion behavior