From 213b27d7c3ed1ee61367b9ce8356f900e4b23ace Mon Sep 17 00:00:00 2001
From: Justin Chen <54879025+justschen@users.noreply.github.com>
Date: Tue, 31 Mar 2026 11:41:40 -0700
Subject: [PATCH] make sure to cancel current request on restore checkpoints
 (#306901)

---
 .../contrib/chat/browser/chatEditing/chatEditingActions.ts      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
index 709c7664063..c0d6a47f9fe 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
@@ -495,6 +495,8 @@ async function restoreSnapshotWithConfirmationByRequestId(accessor: ServicesAcce
 		await configurationService.updateValue('chat.editing.confirmEditRequestRemoval', false);
 	}
 
+	await chatService.cancelCurrentRequestForSession(sessionResource, 'restoreCheckpoint');
+
 	// Restore the snapshot to what it was before the request(s) that we deleted
 	const snapshotRequestId = chatRequests[itemIndex].id;
 	await session.restoreSnapshot(snapshotRequestId, undefined);