checkpoints cleanup (microsoft#255942)

Author: justschen

src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts

@@ -163,7 +163,7 @@ export function registerNewChatActions() {
 		constructor() {
 			super({
 				id: 'workbench.action.chat.redoEdit',
-				title: localize2('chat.redoEdit.label', "Redo Last Request"),
+				title: localize2('chat.redoEdit.label', "Redo Checkpoint Restore"),
 				category: CHAT_CATEGORY,
 				icon: Codicon.redo,
 				precondition: ContextKeyExpr.and(ChatContextKeys.chatEditingCanRedo, ChatContextKeys.enabled, ChatContextKeys.editingParticipantRegistered),
@@ -189,7 +189,7 @@ export function registerNewChatActions() {
 		constructor() {
 			super({
 				id: 'workbench.action.chat.redoEdit2',
-				title: localize2('chat.redoEdit.label2', "Redo Last Request"),
+				title: localize2('chat.redoEdit.label2', "Redo Checkpoint Restore"),
 				category: CHAT_CATEGORY,
 				precondition: ContextKeyExpr.and(ChatContextKeys.chatEditingCanRedo, ChatContextKeys.enabled, ChatContextKeys.editingParticipantRegistered),
 				f1: true,
@@ -205,16 +205,9 @@ export function registerNewChatActions() {
 		async runEditingSessionAction(accessor: ServicesAccessor, editingSession: IChatEditingSession) {
 			const widget = accessor.get(IChatWidgetService);
 
-			const redoUntilDone = async () => {
-				if (!editingSession.canRedo.get()) {
-					return;
-				}
-
+			while (editingSession.canRedo.get()) {
 				await editingSession.redoInteraction();
-				setTimeout(() => redoUntilDone(), 0);
-			};
-
-			await redoUntilDone();
+			}
 			widget.lastFocusedWidget?.viewModel?.model.setCheckpoint(undefined);
 		}
 	});

src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts

@@ -308,6 +308,8 @@ registerAction2(ChatEditingShowChangesAction);
 async function restoreSnapshotWithConfirmation(accessor: ServicesAccessor, item: ChatTreeItem): Promise<void> {
 	const configurationService = accessor.get(IConfigurationService);
 	const dialogService = accessor.get(IDialogService);
+	const chatWidgetService = accessor.get(IChatWidgetService);
+	const widget = chatWidgetService.lastFocusedWidget;
 	const chatService = accessor.get(IChatService);
 	const chatModel = chatService.getSession(item.sessionId);
 	if (!chatModel) {
@@ -360,6 +362,7 @@ async function restoreSnapshotWithConfirmation(accessor: ServicesAccessor, item:
 			: { confirmed: true };
 
 		if (!confirmation.confirmed) {
+			widget?.viewModel?.model.setCheckpoint(undefined);
 			return;
 		}
 

src/vs/workbench/contrib/chat/browser/chatWidget.ts

@@ -361,7 +361,9 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		this._register(this.configurationService.onDidChangeConfiguration((e) => {
 			if (e.affectsConfiguration('chat.renderRelatedFiles')) {
 				this.renderChatEditingSessionState();
-			} else if (e.affectsConfiguration(ChatConfiguration.EditRequests) || e.affectsConfiguration(ChatConfiguration.CheckpointsEnabled)) {
+			}
+
+			if (e.affectsConfiguration(ChatConfiguration.EditRequests) || e.affectsConfiguration(ChatConfiguration.CheckpointsEnabled)) {
 				this.settingChangeCounter++;
 				this.onDidChangeItems();
 			}