Fix elicitation message duplicating and buttons not hiding

Author: Tyriar

src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts

@@ -432,6 +432,17 @@ abstract class BaseChatConfirmationWidget extends Disposable {
 		}
 	}
 
+
+	// protected renderMessage(element: HTMLElement, listContainer: HTMLElement): void {
+	// 	this.messageElement.append(element);
+
+	// 	if (this.showingButtons && this._configurationService.getValue<boolean>('chat.notifyWindowOnConfirmation')) {
+	// 		const targetWindow = dom.getWindow(listContainer);
+	// 		if (!targetWindow.document.hasFocus()) {
+	// 			this.notifyConfirmationNeeded(targetWindow);
+	// 		}
+	// 	}
+	// }
 	protected renderMessage(element: HTMLElement | IMarkdownString | string, listContainer: HTMLElement): void {
 		if (!dom.isHTMLElement(element)) {
 			const messageElement = this._register(this.markdownRenderer.render(
@@ -441,6 +452,9 @@ abstract class BaseChatConfirmationWidget extends Disposable {
 			element = messageElement.element;
 		}
 
+		for (const child of this.messageElement.children) {
+			child.remove();
+		}
 		this.messageElement.append(element);
 
 		if (this.showingButtons && this._configurationService.getValue<boolean>('chat.notifyWindowOnConfirmation')) {

src/vs/workbench/contrib/chat/browser/chatContentParts/chatElicitationContentPart.ts

@@ -10,7 +10,7 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
 import { IChatProgressRenderableResponseContent } from '../../common/chatModel.js';
 import { IChatElicitationRequest } from '../../common/chatService.js';
 import { IChatAccessibilityService } from '../chat.js';
-import { ChatConfirmationWidget } from './chatConfirmationWidget.js';
+import { ChatConfirmationWidget, SimpleChatConfirmationWidget } from './chatConfirmationWidget.js';
 import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
 
 export class ChatElicitationContentPart extends Disposable implements IChatContentPart {
@@ -31,7 +31,7 @@ export class ChatElicitationContentPart extends Disposable implements IChatConte
 			{ label: elicitation.acceptButtonLabel, data: true },
 			{ label: elicitation.rejectButtonLabel, data: false, isSecondary: true },
 		];
-		const confirmationWidget = this._register(this.instantiationService.createInstance(ChatConfirmationWidget, context.container, { title: elicitation.title, icon: undefined, subtitle: elicitation.subtitle, buttons, message: this.getMessageToRender(elicitation), toolbarData: { partType: 'elicitation', partSource: elicitation.source?.type, arg: elicitation } }));
+		const confirmationWidget = this._register(this.instantiationService.createInstance(ChatConfirmationWidget, context.container, { title: elicitation.title, subtitle: elicitation.subtitle, buttons, message: this.getMessageToRender(elicitation), toolbarData: { partType: 'elicitation', partSource: elicitation.source?.type, arg: elicitation } }));
 		confirmationWidget.setShowButtons(elicitation.state === 'pending');
 
 		if (elicitation.onDidRequestHide) {

src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatConfirmationWidget.css

@@ -240,6 +240,6 @@
 	border-top-right-radius: 0px;
 }
 
-.chat-confirmation-widget2.hideButtons .chat-buttons-container {
+.chat-confirmation-widget2.hideButtons .chat-buttons {
 	display: none;
 }