Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-08 07:44:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correctly pass user selected LM for intent detection (#230014) (#230028)

Browse Source 
Fix #229616
This commit is contained in:
Rob Lourens
2024-09-27 16:18:40 -07:00
committed by GitHub
parent 6bbcad9bdd
commit ef69ffe1cb
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/api/common/extHost.api.impl.ts
+1 -1
View File
@@ -1454,7 +1454,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
},
registerChatParticipantDetectionProvider(provider: vscode.ChatParticipantDetectionProvider) {
checkProposedApiEnabled(extension, 'chatParticipantAdditions');
return extHostChatAgents2.registerChatParticipantDetectionProvider(provider);
return extHostChatAgents2.registerChatParticipantDetectionProvider(extension, provider);
},
};
src/vs/workbench/api/common/extHostChatAgents2.ts
+19 -7
View File
@@ -285,7 +285,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
private readonly _proxy: MainThreadChatAgentsShape2;
private static _participantDetectionProviderIdPool = 0;
private readonly _participantDetectionProviders = new Map<number, vscode.ChatParticipantDetectionProvider>();
private readonly _participantDetectionProviders = new Map<number, ExtHostParticipantDetector>();
private readonly _sessionDisposables: DisposableMap<string, DisposableStore> = this._register(new DisposableMap());
private readonly _completionDisposables: DisposableMap<number, DisposableStore> = this._register(new DisposableMap());
@@ -323,9 +323,9 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
return agent.apiAgent;
}
registerChatParticipantDetectionProvider(provider: vscode.ChatParticipantDetectionProvider): vscode.Disposable {
registerChatParticipantDetectionProvider(extension: IExtensionDescription, provider: vscode.ChatParticipantDetectionProvider): vscode.Disposable {
const handle = ExtHostChatAgents2._participantDetectionProviderIdPool++;
this._participantDetectionProviders.set(handle, provider);
this._participantDetectionProviders.set(handle, new ExtHostParticipantDetector(extension, provider));
this._proxy.$registerChatParticipantDetectionProvider(handle);
return toDisposable(() => {
this._participantDetectionProviders.delete(handle);
@@ -336,13 +336,18 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
async $detectChatParticipant(handle: number, requestDto: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[] }, options: { location: ChatAgentLocation; participants?: vscode.ChatParticipantMetadata[] }, token: CancellationToken): Promise<vscode.ChatParticipantDetectionResult | null | undefined> {
const { request, location, history } = await this._createRequest(requestDto, context);
const provider = this._participantDetectionProviders.get(handle);
if (!provider) {
const detector = this._participantDetectionProviders.get(handle);
if (!detector) {
return undefined;
}
return provider.provideParticipantDetection(
typeConvert.ChatAgentRequest.to(request, location),
const extRequest = typeConvert.ChatAgentRequest.to(request, location);
if (request.userSelectedModelId && isProposedApiEnabled(detector.extension, 'chatParticipantAdditions')) {
extRequest.userSelectedModel = await this._languageModels.getLanguageModelByIdentifier(detector.extension, request.userSelectedModelId);
}
return detector.provider.provideParticipantDetection(
extRequest,
{ history },
{ participants: options.participants, location: typeConvert.ChatLocation.to(options.location) },
token
@@ -588,6 +593,13 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
}
}
class ExtHostParticipantDetector {
constructor(
public readonly extension: IExtensionDescription,
public readonly provider: vscode.ChatParticipantDetectionProvider,
) { }
}
class ExtHostChatAgent {
private _followupProvider: vscode.ChatFollowupProvider | undefined;