From 6c907814bfc223e842aa0d82e69a467ce4f76223 Mon Sep 17 00:00:00 2001
From: Joyce Er <joyce.er@microsoft.com>
Date: Mon, 8 Jul 2024 14:40:09 -0700
Subject: [PATCH] feat: support button titles in chat confirmation api
 (#221223)

---
 src/vs/workbench/api/common/extHostChatAgents2.ts  |  4 ++--
 .../workbench/api/common/extHostTypeConverters.ts  |  3 ++-
 src/vs/workbench/api/common/extHostTypes.ts        |  5 ++++-
 .../chatConfirmationContentPart.ts                 | 14 ++++++++++----
 .../workbench/contrib/chat/common/chatService.ts   |  1 +
 .../vscode.proposed.chatParticipantAdditions.d.ts  |  5 +++--
 6 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/api/common/extHostChatAgents2.ts b/src/vs/workbench/api/common/extHostChatAgents2.ts
index 8b2209b5363..e029c680e42 100644
--- a/src/vs/workbench/api/common/extHostChatAgents2.ts
+++ b/src/vs/workbench/api/common/extHostChatAgents2.ts
@@ -212,11 +212,11 @@ class ChatAgentResponseStream {
 					_report(dto);
 					return this;
 				},
-				confirmation(title, message, data) {
+				confirmation(title, message, data, buttons) {
 					throwIfDone(this.confirmation);
 					checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
 
-					const part = new extHostTypes.ChatResponseConfirmationPart(title, message, data);
+					const part = new extHostTypes.ChatResponseConfirmationPart(title, message, data, buttons);
 					const dto = typeConvert.ChatResponseConfirmationPart.from(part);
 					_report(dto);
 					return this;
diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts
index 6fad560a437..527139f87f4 100644
--- a/src/vs/workbench/api/common/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/common/extHostTypeConverters.ts
@@ -2354,7 +2354,8 @@ export namespace ChatResponseConfirmationPart {
 			kind: 'confirmation',
 			title: part.title,
 			message: part.message,
-			data: part.data
+			data: part.data,
+			buttons: part.buttons
 		};
 	}
 }
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index 18c2eefe79d..581f4020c8c 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -4377,10 +4377,13 @@ export class ChatResponseConfirmationPart {
 	title: string;
 	message: string;
 	data: any;
-	constructor(title: string, message: string, data: any) {
+	buttons?: string[];
+
+	constructor(title: string, message: string, data: any, buttons?: string[]) {
 		this.title = title;
 		this.message = message;
 		this.data = data;
+		this.buttons = buttons;
 	}
 }
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.ts
index 4159f07c919..37486118762 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.ts
@@ -28,10 +28,16 @@ export class ChatConfirmationContentPart extends Disposable implements IChatCont
 		super();
 
 		const element = context.element;
-		const confirmationWidget = this._register(this.instantiationService.createInstance(ChatConfirmationWidget, confirmation.title, confirmation.message, [
-			{ label: localize('accept', "Accept"), data: confirmation.data },
-			{ label: localize('dismiss', "Dismiss"), data: confirmation.data, isSecondary: true },
-		]));
+		const buttons = confirmation.buttons
+			? confirmation.buttons.map(button => ({
+				label: button,
+				data: confirmation.data
+			}))
+			: [
+				{ label: localize('accept', "Accept"), data: confirmation.data },
+				{ label: localize('dismiss', "Dismiss"), data: confirmation.data, isSecondary: true },
+			];
+		const confirmationWidget = this._register(this.instantiationService.createInstance(ChatConfirmationWidget, confirmation.title, confirmation.message, buttons));
 		confirmationWidget.setShowButtons(!confirmation.isUsed);
 
 		this._register(confirmationWidget.onDidClick(async e => {
diff --git a/src/vs/workbench/contrib/chat/common/chatService.ts b/src/vs/workbench/contrib/chat/common/chatService.ts
index f10564d7828..645ba778d36 100644
--- a/src/vs/workbench/contrib/chat/common/chatService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatService.ts
@@ -160,6 +160,7 @@ export interface IChatConfirmation {
 	title: string;
 	message: string;
 	data: any;
+	buttons?: string[];
 	isUsed?: boolean;
 	kind: 'confirmation';
 }
diff --git a/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts b/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts
index cd2ec7ba919..ab43814c4f4 100644
--- a/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts
@@ -59,7 +59,8 @@ declare module 'vscode' {
 		title: string;
 		message: string;
 		data: any;
-		constructor(title: string, message: string, data: any);
+		buttons?: string[];
+		constructor(title: string, message: string, data: any, buttons?: string[]);
 	}
 
 	export type ExtendedChatResponsePart = ChatResponsePart | ChatResponseTextEditPart | ChatResponseDetectedParticipantPart | ChatResponseConfirmationPart;
@@ -102,7 +103,7 @@ declare module 'vscode' {
 		 * TODO@API should this be MarkdownString?
 		 * TODO@API should actually be a more generic function that takes an array of buttons
 		 */
-		confirmation(title: string, message: string, data: any): void;
+		confirmation(title: string, message: string, data: any, buttons?: string[]): void;
 
 		/**
 		 * Push a warning to this stream. Short-hand for