use InlineChatWidget feedback logic instead of custom commands

Author: jrieken

src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts

@@ -55,6 +55,7 @@ import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
 import { ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
 import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
 import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController';
+import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
 
 
 export interface InlineChatWidgetViewState {
@@ -145,8 +146,6 @@ export class InlineChatWidget {
 	private _isLayouting: boolean = false;
 
 	private _followUpDisposables = this._store.add(new DisposableStore());
-
-
 	constructor(
 		location: ChatAgentLocation,
 		options: IInlineChatWidgetConstructionOptions,
@@ -157,6 +156,7 @@ export class InlineChatWidget {
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IAccessibleViewService private readonly _accessibleViewService: IAccessibleViewService,
 		@ITextModelService protected readonly _textModelResolverService: ITextModelService,
+		@IChatService private readonly _chatService: IChatService,
 	) {
 		// Share hover delegates between toolbars to support instant hover between both
 		// TODO@jrieken move into chat widget
@@ -165,6 +165,9 @@ export class InlineChatWidget {
 		this._store.add(this._configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(AccessibilityVerbositySettingId.InlineChat)) {
 				this._updateAriaLabel();
+				// TODO@jrieken	FIX THIS
+				// this._chatWidget.ariaLabel = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.InlineChat);
+				this._elements.followUps.ariaLabel = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.InlineChat);
 			}
 		}));
 
@@ -285,11 +288,9 @@ export class InlineChatWidget {
 
 		this._elements.statusLabel.tabIndex = 0;
 
-		this._store.add(this._configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(AccessibilityVerbositySettingId.InlineChat)) {
-				// TODO@jrieken	FIX THIS
-				// this._chatWidget.ariaLabel = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.InlineChat);
-				this._elements.followUps.ariaLabel = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.InlineChat);
+		this._store.add(this._chatService.onDidPerformUserAction(e => {
+			if (e.sessionId === this._chatWidget.viewModel?.model.sessionId && e.action.kind === 'vote') {
+				this.updateStatus('Thank you for your feedback!', { resetAfter: 1250 });
 			}
 		}));
 
@@ -432,6 +433,10 @@ export class InlineChatWidget {
 		return tail(requests).response?.response.asString();
 	}
 
+	getChatModel(): IChatModel {
+		return this._chatWidget.viewModel?.model ?? this._defaultChatModel;
+	}
+
 	setChatModel(chatModel: IChatModel) {
 		this._chatWidget.setModel(chatModel, { inputValue: undefined });
 	}
@@ -605,8 +610,9 @@ export class EditorBasedInlineChatWidget extends InlineChatWidget {
 		@IConfigurationService configurationService: IConfigurationService,
 		@IAccessibleViewService accessibleViewService: IAccessibleViewService,
 		@ITextModelService textModelResolverService: ITextModelService,
+		@IChatService chatService: IChatService,
 	) {
-		super(ChatAgentLocation.Editor, options, instantiationService, contextKeyService, keybindingService, accessibilityService, configurationService, accessibleViewService, textModelResolverService);
+		super(ChatAgentLocation.Editor, options, instantiationService, contextKeyService, keybindingService, accessibilityService, configurationService, accessibleViewService, textModelResolverService, chatService);
 
 		// preview editors
 		this._previewDiffEditor = new Lazy(() => this._store.add(instantiationService.createInstance(EmbeddedDiffEditorWidget, this._elements.previewDiff, {

src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts

@@ -294,54 +294,6 @@ registerActiveXtermAction({
 	}
 });
 
-registerActiveXtermAction({
-	id: TerminalChatCommandId.FeedbackHelpful,
-	title: localize2('feedbackHelpful', 'Helpful'),
-	precondition: ContextKeyExpr.and(
-		ContextKeyExpr.has(`config.${TerminalSettingId.ExperimentalInlineChat}`),
-		TerminalChatContextKeys.responseContainsCodeBlock.notEqualsTo(undefined)
-	),
-	icon: Codicon.thumbsup,
-	toggled: TerminalChatContextKeys.sessionResponseVote.isEqualTo('up'),
-	menu: {
-		id: MENU_TERMINAL_CHAT_WIDGET_FEEDBACK,
-		group: 'inline',
-		order: 1,
-		when: TerminalChatContextKeys.responseContainsCodeBlock.notEqualsTo(undefined),
-	},
-	run: (_xterm, _accessor, activeInstance) => {
-		if (isDetachedTerminalInstance(activeInstance)) {
-			return;
-		}
-		const contr = TerminalChatController.activeChatWidget || TerminalChatController.get(activeInstance);
-		contr?.acceptFeedback(true);
-	}
-});
-
-registerActiveXtermAction({
-	id: TerminalChatCommandId.FeedbackUnhelpful,
-	title: localize2('feedbackUnhelpful', 'Unhelpful'),
-	precondition: ContextKeyExpr.and(
-		ContextKeyExpr.has(`config.${TerminalSettingId.ExperimentalInlineChat}`),
-		TerminalChatContextKeys.responseContainsCodeBlock.notEqualsTo(undefined),
-	),
-	toggled: TerminalChatContextKeys.sessionResponseVote.isEqualTo('down'),
-	icon: Codicon.thumbsdown,
-	menu: {
-		id: MENU_TERMINAL_CHAT_WIDGET_FEEDBACK,
-		group: 'inline',
-		order: 2,
-		when: TerminalChatContextKeys.responseContainsCodeBlock.notEqualsTo(undefined),
-	},
-	run: (_xterm, _accessor, activeInstance) => {
-		if (isDetachedTerminalInstance(activeInstance)) {
-			return;
-		}
-		const contr = TerminalChatController.activeChatWidget || TerminalChatController.get(activeInstance);
-		contr?.acceptFeedback(false);
-	}
-});
-
 registerActiveXtermAction({
 	id: TerminalChatCommandId.FeedbackReportIssue,
 	title: localize2('reportIssue', 'Report Issue'),

src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts

@@ -130,6 +130,20 @@ export class TerminalChatController extends Disposable implements ITerminalContr
 				};
 			}
 		}, 'terminal'));
+
+		// TODO
+		// This is glue/debt that's needed while ChatModel isn't yet adopted. The chat model uses
+		// a default chat model (unless configured) and feedback is reported against that one. This
+		// code forwards the feedback to an actual registered provider
+		this._chatService.onDidPerformUserAction(e => {
+			if (e.providerId === this._chatWidget?.rawValue?.inlineChatWidget.getChatModel().providerId) {
+				if (e.action.kind === 'bug') {
+					this.acceptFeedback(undefined);
+				} else if (e.action.kind === 'vote') {
+					this.acceptFeedback(e.action.direction === InteractiveSessionVoteDirection.Up);
+				}
+			}
+		});
 	}
 
 	private initTerminalAgent(): boolean {