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

Hook up feedback/user-action events for inline chat participants (#210040)

Browse Source 
- add a special user-action
- inline chat controller doesn't call handleFeedback directly anymore
- ReplyResonse knows its chat model response
This commit is contained in:
Johannes Rieken
2024-04-10 13:15:40 +02:00
committed by GitHub
parent 13a88a8da4
commit 6a06de0033
8 changed files with 86 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
View File

@@ -59,7 +59,7 @@ class BridgeAgent implements IChatAgentImplementation {
return data;
}
async invoke(request: IChatAgentRequest, progress: (part: IChatProgress) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult> {
async invoke(request: IChatAgentRequest, progress: (part: IChatProgress) => void, _history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult> {
if (token.isCancellationRequested) {
return {};
@@ -129,7 +129,9 @@ class BridgeAgent implements IChatAgentImplementation {
const markdownContents = result.message ?? new MarkdownString('', { supportThemeIcons: true, supportHtml: true, isTrusted: false });
response = this._instaService.createInstance(ReplyResponse, result, markdownContents, session.textModelN.uri, modelAltVersionIdNow, progressEdits, request.requestId);
const chatModelRequest = session.chatModel.getRequests().find(candidate => candidate.id === request.requestId);
response = this._instaService.createInstance(ReplyResponse, result, markdownContents, session.textModelN.uri, modelAltVersionIdNow, progressEdits, request.requestId, chatModelRequest?.response);
} else {
response = new EmptyResponse();
@@ -141,9 +143,6 @@ class BridgeAgent implements IChatAgentImplementation {
this._postLastResponse({ id: request.requestId, response });
// TODO@jrieken
// result?.placeholder
// result?.wholeRange
return {
metadata: {
@@ -315,18 +314,19 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
}
if (otherEditorAgent) {
brigdeAgent.clear();
_logService.debug(`REMOVED bridge agent "${agentData.id}", found "${otherEditorAgent.id}"`);
bridgeStore.clear();
_logService.info(`REMOVED bridge agent "${agentData.id}", found "${otherEditorAgent.id}"`);
} else if (!myEditorAgent) {
brigdeAgent.value = this._chatAgentService.registerDynamicAgent(agentData, this._instaService.createInstance(BridgeAgent, agentData, this._sessions, data => {
bridgeStore.value = this._chatAgentService.registerDynamicAgent(agentData, this._instaService.createInstance(BridgeAgent, agentData, this._sessions, data => {
this._lastResponsesFromBridgeAgent.set(data.id, data.response);
}));
_logService.debug(`ADDED bridge agent "${agentData.id}"`);
_logService.info(`ADDED bridge agent "${agentData.id}"`);
}
};
this._store.add(this._chatAgentService.onDidChangeAgents(() => addOrRemoveBridgeAgent()));
const brigdeAgent = this._store.add(new MutableDisposable());
const bridgeStore = this._store.add(new MutableDisposable());
addOrRemoveBridgeAgent();
@@ -465,7 +465,8 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
session.textModelN.uri,
modelAltVersionIdNow,
[],
e.request.id
e.request.id,
e.request.response
);
}
}
@@ -475,20 +476,32 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
}));
store.add(this._chatService.onDidPerformUserAction(e => {
if (e.sessionId !== chatModel.sessionId || e.action.kind !== 'vote') {
if (e.sessionId !== chatModel.sessionId) {
return;
}
// TODO@jrieken VALIDATE candidate is proper, e.g check with `session.exchanges`
const request = chatModel.getRequests().find(request => request.id === e.requestId);
const candidate = request?.response?.result?.metadata?.inlineChatResponse;
if (candidate) {
provider.handleInlineChatResponseFeedback?.(
rawSession,
candidate,
e.action.direction === InteractiveSessionVoteDirection.Down ? InlineChatResponseFeedbackKind.Unhelpful : InlineChatResponseFeedbackKind.Helpful
);
if (!candidate) {
return;
}
let kind: InlineChatResponseFeedbackKind | undefined;
if (e.action.kind === 'vote') {
kind = e.action.direction === InteractiveSessionVoteDirection.Down ? InlineChatResponseFeedbackKind.Unhelpful : InlineChatResponseFeedbackKind.Helpful;
} else if (e.action.kind === 'bug') {
kind = InlineChatResponseFeedbackKind.Bug;
} else if (e.action.kind === 'inlineChat') {
kind = e.action.action === 'accepted' ? InlineChatResponseFeedbackKind.Accepted : InlineChatResponseFeedbackKind.Undone;
}
if (!kind) {
return;
}
provider.handleInlineChatResponseFeedback?.(rawSession, candidate, kind);
}));
store.add(this._inlineChatService.onDidChangeProviders(e => {