Session - add confirmation dialog for discarding changes (#4787)

* Pull request feedback

* Fix dialog

Author: lszomoru

package.json

@@ -5639,6 +5639,7 @@
 			"chat/input/editing/sessionChangeToolbar": [
 				{
 					"command": "github.copilot.sessions.discardChanges",
+					"when": "chatSessionType == copilotcli && isSessionsWindow",
 					"group": "navigation@1"
 				}
 			]

src/extension/chatSessions/vscode-node/copilotCLIChatSessions.ts

@@ -2303,7 +2303,7 @@ export function registerCLIChatCommands(
 	}));
 
 	disposableStore.add(vscode.commands.registerCommand('github.copilot.sessions.discardChanges', async (sessionResource: vscode.Uri, ref: string, ...resources: vscode.Uri[]) => {
-		if (!isUri(sessionResource) || resources.some(r => !isUri(r))) {
+		if (!isUri(sessionResource) || !ref || resources.length === 0 || resources.some(r => !isUri(r))) {
 			return;
 		}
 
@@ -2317,6 +2317,16 @@ export function registerCLIChatCommands(
 			return;
 		}
 
+		const confirmAction = l10n.t('Discard Changes');
+		const message = resources.length === 1
+			? l10n.t('Are you sure you want to discard the changes in \'{0}\'? This action cannot be undone.', basename(resources[0]))
+			: l10n.t('Are you sure you want to discard the changes in these {0} files? This action cannot be undone.', resources.length);
+
+		const choice = await vscode.window.showWarningMessage(message, { modal: true }, confirmAction);
+		if (choice !== confirmAction) {
+			return;
+		}
+
 		await gitService.restore(repository.rootUri, resources.map(r => r.fsPath), { ref });
 	}));
 

src/extension/chatSessions/vscode-node/copilotCLIChatSessionsContribution.ts

@@ -2374,7 +2374,7 @@ export function registerCLIChatCommands(
 	}));
 
 	disposableStore.add(vscode.commands.registerCommand('github.copilot.sessions.discardChanges', async (sessionResource: vscode.Uri, ref: string, ...resources: vscode.Uri[]) => {
-		if (!isUri(sessionResource) || resources.some(r => !isUri(r))) {
+		if (!isUri(sessionResource) || !ref || resources.length === 0 || resources.some(r => !isUri(r))) {
 			return;
 		}
 
@@ -2388,6 +2388,16 @@ export function registerCLIChatCommands(
 			return;
 		}
 
+		const confirmAction = l10n.t('Discard Changes');
+		const message = resources.length === 1
+			? l10n.t('Are you sure you want to discard the changes in \'{0}\'? This action cannot be undone.', basename(resources[0]))
+			: l10n.t('Are you sure you want to discard the changes in these {0} files? This action cannot be undone.', resources.length);
+
+		const choice = await vscode.window.showWarningMessage(message, { modal: true }, confirmAction);
+		if (choice !== confirmAction) {
+			return;
+		}
+
 		await gitService.restore(repository.rootUri, resources.map(r => r.fsPath), { ref });
 	}));