feat: show related file provider results in chat # completions

Author: joyceerhl

src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { compareBy, delta } from '../../../../../base/common/arrays.js';
-import { AsyncIterableSource } from '../../../../../base/common/async.js';
+import { AsyncIterableSource, raceTimeout } from '../../../../../base/common/async.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { BugIndicatingError } from '../../../../../base/common/errors.js';
@@ -393,6 +393,30 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 			this._chatRelatedFilesProviders.delete(handle);
 		});
 	}
+
+	async getRelatedFiles(chatSessionId: string, prompt: string, token: CancellationToken): Promise<readonly URI[] | undefined> {
+		const currentSession = this._currentSessionObs.get();
+		if (!currentSession || chatSessionId !== currentSession.chatSessionId) {
+			return undefined;
+		}
+		const currentWorkingSet = [...currentSession.workingSet.keys()];
+
+		const providers = Array.from(this._chatRelatedFilesProviders.values());
+		const result = await Promise.all(providers.map(async provider => {
+			try {
+				return await raceTimeout(provider.provideRelatedFiles({ prompt, files: currentWorkingSet }, token), 2000);
+			} catch (e) {
+				return undefined;
+			}
+		}));
+
+		return result.reduce<URI[]>((acc, cur) => {
+			if (cur) {
+				acc.push(...cur);
+			}
+			return acc;
+		}, []);
+	}
 }
 
 /**

src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts

@@ -29,6 +29,7 @@ import { LifecyclePhase } from '../../../../services/lifecycle/common/lifecycle.
 import { QueryBuilder } from '../../../../services/search/common/queryBuilder.js';
 import { ISearchService } from '../../../../services/search/common/search.js';
 import { ChatAgentLocation, IChatAgentData, IChatAgentNameService, IChatAgentService, getFullyQualifiedId } from '../../common/chatAgents.js';
+import { IChatEditingService } from '../../common/chatEditingService.js';
 import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestTextPart, ChatRequestToolPart, ChatRequestVariablePart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader } from '../../common/chatParserTypes.js';
 import { IChatSlashCommandService } from '../../common/chatSlashCommands.js';
 import { IChatVariablesService, IDynamicVariable } from '../../common/chatVariables.js';
@@ -437,6 +438,7 @@ class BuiltinDynamicCompletions extends Disposable {
 		@ILabelService private readonly labelService: ILabelService,
 		@ILanguageFeaturesService private readonly languageFeaturesService: ILanguageFeaturesService,
 		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+		@IChatEditingService private readonly _chatEditingService: IChatEditingService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
 		super();
@@ -574,6 +576,16 @@ class BuiltinDynamicCompletions extends Disposable {
 			}
 		}
 
+		// RELATED FILES
+		if (widget.location === ChatAgentLocation.EditingSession && widget.viewModel && this._chatEditingService.currentEditingSessionObs.get()?.chatSessionId === widget.viewModel?.sessionId) {
+			for (const relatedFile of (await this._chatEditingService.getRelatedFiles(widget.viewModel.sessionId, widget.getInput(), token) ?? [])) {
+				if (seen.has(relatedFile)) {
+					continue;
+				}
+				result.suggestions.push(makeFileCompletionItem(relatedFile));
+			}
+		}
+
 		// mark results as incomplete because further typing might yield
 		// in more search results
 		result.incomplete = true;

src/vs/workbench/contrib/chat/common/chatEditingService.ts

@@ -43,6 +43,7 @@ export interface IChatEditingService {
 	restoreSnapshot(requestId: string | undefined): Promise<void>;
 
 	registerRelatedFilesProvider(handle: number, provider: IChatRelatedFilesProvider): IDisposable;
+	getRelatedFiles(chatSessionId: string, prompt: string, token: CancellationToken): Promise<readonly URI[] | undefined>;
 }
 
 export interface IChatRequestDraft {