@codingame/monaco-vscode-katex-common 26.2.1 → 27.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/chatImplicitContext.d.ts

@@ -40,6 +40,7 @@ export declare class ChatImplicitContexts extends Disposable {
     readonly onDidChangeValue: Event<void>;
     private _values;
     private readonly _valuesDisposables;
+    private _enabled;
     setValues(values: ImplicitContextWithSelection[]): void;
     get values(): ChatImplicitContext[];
     get hasEnabled(): boolean;

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/chatImplicitContext.js

@@ -251,13 +251,16 @@ let ChatImplicitContextContribution = class ChatImplicitContextContribution exte
             const setting = this._implicitContextEnablement[widget.location];
             const isFirstInteraction = widget.viewModel?.getItems().length === 0;
             if ((setting === "always" || setting === "first" && isFirstInteraction) && !isPromptFile) {
-                widget.input.implicitContext.setValues([{
-                    value: newValue,
-                    isSelection
-                }, {
-                    value: providerContext,
-                    isSelection: false
-                }]);
+                const hasActiveEditor = !!this.editorService.activeEditor;
+                if (newValue !== undefined || !widget.input.implicitContext.hasValue || !hasActiveEditor) {
+                    widget.input.implicitContext.setValues([{
+                        value: newValue,
+                        isSelection
+                    }, {
+                        value: providerContext,
+                        isSelection: false
+                    }]);
+                }
             } else {
                 widget.input.implicitContext.setValues([]);
             }
@@ -278,6 +281,7 @@ class ChatImplicitContexts extends Disposable {
         this.onDidChangeValue = this._onDidChangeValue.event;
         this._values = this._register(( new DisposableMap()));
         this._valuesDisposables = this._register(( new DisposableStore()));
+        this._enabled = false;
     }
     setValues(values) {
         this._valuesDisposables.clear();
@@ -290,6 +294,7 @@ class ChatImplicitContexts extends Disposable {
         for (const value of definedValues) {
             const implicitContext = ( new ChatImplicitContext());
             implicitContext.setValue(value.value, value.isSelection);
+            implicitContext.enabled = this._enabled;
             const disposableStore = ( new DisposableStore());
             disposableStore.add(implicitContext.onDidChangeValue(() => {
                 this._onDidChangeValue.fire();
@@ -306,6 +311,7 @@ class ChatImplicitContexts extends Disposable {
         return ( Array.from(( this._values.keys())).some(v => v.enabled));
     }
     setEnabled(enabled) {
+        this._enabled = enabled;
         this.values.forEach(v => v.enabled = enabled);
     }
     get hasValue() {
@@ -362,19 +368,27 @@ class ChatImplicitContext extends Disposable {
     get name() {
         if (URI.isUri(this.value)) {
             return `file:${basename(this.value)}`;
-        } else if (isStringImplicitContextValue(this.value)) {
-            return this.value.name;
-        } else if (this.value) {
+        }
+        if (isLocation(this.value)) {
             return `file:${basename(this.value.uri)}`;
-        } else {
-            return "implicit";
         }
+        if (isStringImplicitContextValue(this.value)) {
+            if (this.value.name === undefined && this.value.resourceUri === undefined) {
+                throw ( new Error("ChatContextItem must have either a label or a resourceUri"));
+            }
+            return this.value.name ?? basename(this.value.resourceUri);
+        }
+        return "implicit";
     }
     get modelDescription() {
         if (URI.isUri(this.value)) {
             return `User's active file`;
         } else if (isStringImplicitContextValue(this.value)) {
-            return this.value.modelDescription ?? `User's active context from ${this.value.name}`;
+            if (this.value.name === undefined && this.value.resourceUri === undefined) {
+                throw ( new Error("ChatContextItem must have either a label or a resourceUri"));
+            }
+            const contextName = this.value.name ?? basename(this.value.resourceUri);
+            return this.value.modelDescription ?? `User's active context from ${contextName}`;
         } else if (this._isSelection) {
             return `User's active selection`;
         } else {
@@ -429,6 +443,7 @@ class ChatImplicitContext extends Disposable {
                 modelDescription: this.modelDescription,
                 icon: this.value.icon,
                 uri: this.value.uri,
+                resourceUri: this.value.resourceUri,
                 handle: this.value.handle,
                 commandId: this.value.commandId
             }];

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/implicitContextAttachment.js

@@ -5,12 +5,14 @@ import { StandardKeyboardEvent } from '@codingame/monaco-vscode-api/vscode/vs/ba
 import { StandardMouseEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/mouseEvent';
 import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { basename, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { isLocation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
+import { getIconClasses } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/getIconClasses';
 import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -88,13 +90,14 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
     renderMainContext(context, isSelection) {
         const contextNode = $(".chat-attached-context-attachment.show-file-icons.implicit");
         this.domNode.appendChild(contextNode);
+        contextNode.tabIndex = 0;
         contextNode.classList.toggle("disabled", !context.enabled);
         const file = context.uri;
-        const attachmentTypeName = file?.scheme === Schemas.vscodeNotebookCell ? ( localize(5111, "cell")) : ( localize(5112, "file"));
+        const attachmentTypeName = file?.scheme === Schemas.vscodeNotebookCell ? ( localize(5362, "cell")) : ( localize(5363, "file"));
         const isSuggestedEnabled = this.configService.getValue("chat.implicitContext.suggestedContext");
         if (isSuggestedEnabled) {
             if (!isSelection) {
-                const buttonMsg = context.enabled ? ( localize(5113, "Disable current {0} context", attachmentTypeName)) : "";
+                const buttonMsg = context.enabled ? ( localize(5364, "Disable current {0} context", attachmentTypeName)) : "";
                 const toggleButton = this.renderDisposables.add(( new Button(contextNode, {
                     supportIcons: true,
                     title: buttonMsg
@@ -109,7 +112,7 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
                     context.enabled = false;
                 }));
             } else {
-                const pinButtonMsg = ( localize(5114, "Pin selection"));
+                const pinButtonMsg = ( localize(5365, "Pin selection"));
                 const pinButton = this.renderDisposables.add(( new Button(contextNode, {
                     supportIcons: true,
                     title: pinButtonMsg
@@ -142,7 +145,7 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
                 })
             );
         } else {
-            const buttonMsg = context.enabled ? ( localize(5113, "Disable current {0} context", attachmentTypeName)) : ( localize(5115, "Enable current {0} context", attachmentTypeName));
+            const buttonMsg = context.enabled ? ( localize(5364, "Disable current {0} context", attachmentTypeName)) : ( localize(5366, "Enable current {0} context", attachmentTypeName));
             const toggleButton = this.renderDisposables.add(( new Button(contextNode, {
                 supportIcons: true,
                 title: buttonMsg
@@ -160,9 +163,16 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
         let markdownTooltip;
         if (isStringImplicitContextValue(context.value)) {
             markdownTooltip = context.value.tooltip;
-            title = this.renderString(label, context.name, context.icon, markdownTooltip, ( localize(5116, "Current file context")));
+            title = this.renderString(
+                label,
+                context.name,
+                context.icon,
+                context.value.resourceUri,
+                markdownTooltip,
+                ( localize(5367, "Current file context"))
+            );
         } else {
-            title = this.renderResource(context.value, context.isSelection, context.enabled, label);
+            title = this.renderResource(context.value, context.isSelection, context.enabled, label, contextNode);
         }
         if (markdownTooltip || title) {
             this.renderDisposables.add(this.hoverService.setupDelayedHover(contextNode, {
@@ -197,34 +207,43 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
             })
         );
     }
-    renderString(resourceLabel, name, icon, markdownTooltip, defaultTitle) {
+    renderString(resourceLabel, name, icon, resourceUri, markdownTooltip, defaultTitle) {
         const title = markdownTooltip ? undefined : defaultTitle;
-        resourceLabel.setLabel(name, undefined, {
-            iconPath: icon,
-            title
-        });
+        if (icon && (ThemeIcon.isFile(icon) || ThemeIcon.isFolder(icon)) && resourceUri) {
+            const fileKind = ThemeIcon.isFolder(icon) ? FileKind.FOLDER : FileKind.FILE;
+            const iconClasses = getIconClasses(this.modelService, this.languageService, resourceUri, fileKind);
+            resourceLabel.setLabel(name, undefined, {
+                extraClasses: iconClasses,
+                title
+            });
+        } else {
+            resourceLabel.setLabel(name, undefined, {
+                iconPath: icon,
+                title
+            });
+        }
         return title;
     }
-    renderResource(attachmentValue, isSelection, enabled, label) {
+    renderResource(attachmentValue, isSelection, enabled, label, contextNode) {
         const file = URI.isUri(attachmentValue) ? attachmentValue : attachmentValue.uri;
         const range = URI.isUri(attachmentValue) || !isSelection ? undefined : attachmentValue.range;
-        const attachmentTypeName = file.scheme === Schemas.vscodeNotebookCell ? ( localize(5111, "cell")) : ( localize(5112, "file"));
+        const attachmentTypeName = file.scheme === Schemas.vscodeNotebookCell ? ( localize(5362, "cell")) : ( localize(5363, "file"));
         const fileBasename = basename(file);
         const fileDirname = dirname(file);
         const friendlyName = `${fileBasename} ${fileDirname}`;
         const ariaLabel = range ? ( localize(
-            5117,
+            5368,
             "Attached {0}, {1}, line {2} to line {3}",
             attachmentTypeName,
             friendlyName,
             range.startLineNumber,
             range.endLineNumber
-        )) : ( localize(5118, "Attached {0}, {1}", attachmentTypeName, friendlyName));
+        )) : ( localize(5369, "Attached {0}, {1}", attachmentTypeName, friendlyName));
         const uriLabel = this.labelService.getUriLabel(file, {
             relative: true
         });
-        const currentFile = ( localize(5119, "Current {0} context", attachmentTypeName));
-        const inactive = ( localize(5120, "Enable current {0} context", attachmentTypeName));
+        const currentFile = ( localize(5370, "Current {0} context", attachmentTypeName));
+        const inactive = ( localize(5371, "Enable current {0} context", attachmentTypeName));
         const currentFileHint = enabled || isSelection ? currentFile : inactive;
         const title = `${currentFileHint}\n${uriLabel}`;
         label.setFile(file, {
@@ -233,8 +252,7 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
             range,
             title
         });
-        this.domNode.ariaLabel = ariaLabel;
-        this.domNode.tabIndex = 0;
+        contextNode.ariaLabel = ariaLabel;
         return title;
     }
     async convertToRegularAttachment(attachment) {
@@ -253,6 +271,7 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
                 icon: attachment.value.icon,
                 modelDescription: attachment.modelDescription,
                 uri: attachment.value.uri,
+                resourceUri: attachment.value.resourceUri,
                 tooltip: attachment.value.tooltip,
                 commandId: attachment.value.commandId,
                 handle: attachment.value.handle

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.js

@@ -2,6 +2,7 @@
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
+import { alert } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { isCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
@@ -84,7 +85,7 @@ registerAction2(class OpenFileInDiffAction extends WorkingSetAction {
     constructor() {
         super({
             id: "chatEditing.openFileInDiff",
-            title: ( localize2(5286, "Open Changes in Diff Editor")),
+            title: ( localize2(5718, "Open Changes in Diff Editor")),
             icon: Codicon.diffSingle,
             menu: [{
                 id: MenuId.ChatEditingWidgetModifiedFilesToolbar,
@@ -115,7 +116,7 @@ registerAction2(class AcceptAction extends WorkingSetAction {
     constructor() {
         super({
             id: "chatEditing.acceptFile",
-            title: ( localize2(5287, "Keep")),
+            title: ( localize2(5719, "Keep")),
             icon: Codicon.check,
             menu: [{
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("resourceScheme", CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)), ContextKeyExpr.notIn(
@@ -141,7 +142,7 @@ registerAction2(class DiscardAction extends WorkingSetAction {
     constructor() {
         super({
             id: "chatEditing.discardFile",
-            title: ( localize2(5288, "Undo")),
+            title: ( localize2(5720, "Undo")),
             icon: Codicon.discard,
             menu: [{
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("resourceScheme", CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)), ContextKeyExpr.notIn(
@@ -167,9 +168,9 @@ class ChatEditingAcceptAllAction extends EditingSessionAction {
     constructor() {
         super({
             id: "chatEditing.acceptAllFiles",
-            title: ( localize(5289, "Keep")),
+            title: ( localize(5721, "Keep")),
             icon: Codicon.check,
-            tooltip: ( localize(5290, "Keep All Edits")),
+            tooltip: ( localize(5722, "Keep All Edits")),
             precondition: hasUndecidedChatEditingResourceContextKey,
             keybinding: {
                 primary: KeyMod.CtrlCmd | KeyCode.Enter,
@@ -193,9 +194,9 @@ class ChatEditingDiscardAllAction extends EditingSessionAction {
     constructor() {
         super({
             id: "chatEditing.discardAllFiles",
-            title: ( localize(5291, "Undo")),
+            title: ( localize(5723, "Undo")),
             icon: Codicon.discard,
-            tooltip: ( localize(5292, "Undo All Edits")),
+            tooltip: ( localize(5724, "Undo All Edits")),
             precondition: hasUndecidedChatEditingResourceContextKey,
             menu: [{
                 id: MenuId.ChatEditingWidgetToolbar,
@@ -226,8 +227,8 @@ class ToggleExplanationWidgetAction extends EditingSessionAction {
     constructor() {
         super({
             id: ToggleExplanationWidgetAction.ID,
-            title: ( localize(5293, "Explain")),
-            tooltip: ( localize(5294, "Toggle Change Explanations")),
+            title: ( localize(5725, "Explain")),
+            tooltip: ( localize(5726, "Toggle Change Explanations")),
             precondition: hasUndecidedChatEditingResourceContextKey,
             menu: [{
                 id: MenuId.ChatEditingWidgetToolbar,
@@ -251,17 +252,17 @@ async function discardAllEditsWithConfirmation(accessor, currentEditingSession)
     const entries = currentEditingSession.entries.get().filter(e => e.state.get() === ModifiedFileEntryState.Modified);
     if (entries.length > 0) {
         const confirmation = await dialogService.confirm({
-            title: ( localize(5295, "Undo all edits?")),
+            title: ( localize(5727, "Undo all edits?")),
             message: entries.length === 1 ? ( localize(
-                5296,
+                5728,
                 "This will undo changes made in {0}. Do you want to proceed?",
                 basename(entries[0].modifiedURI)
             )) : ( localize(
-                5297,
+                5729,
                 "This will undo changes made in {0} files. Do you want to proceed?",
                 entries.length
             )),
-            primaryButton: ( localize(5298, "Yes")),
+            primaryButton: ( localize(5730, "Yes")),
             type: "info"
         });
         if (!confirmation.confirmed) {
@@ -276,7 +277,7 @@ class ChatEditingShowChangesAction extends EditingSessionAction {
         this.ID = "chatEditing.viewChanges";
     }
     static {
-        this.LABEL = ( localize(5299, "View All Edits"));
+        this.LABEL = ( localize(5731, "View All Edits"));
     }
     constructor() {
         super({
@@ -309,7 +310,7 @@ class ViewAllSessionChangesAction extends Action2 {
     constructor() {
         super({
             id: ViewAllSessionChangesAction.ID,
-            title: ( localize2(5300, "View All Changes")),
+            title: ( localize2(5732, "View All Changes")),
             icon: Codicon.diffMultiple,
             category: CHAT_CATEGORY,
             precondition: ChatContextKeys.hasAgentSessionChanges,
@@ -351,7 +352,7 @@ class ViewAllSessionChangesAction extends Action2 {
                 multiDiffSourceUri: sessionResource.with({
                     scheme: sessionResource.scheme + "-worktree-changes"
                 }),
-                title: ( localize(5301, "All Session Changes")),
+                title: ( localize(5733, "All Session Changes")),
                 resources
             });
             session?.setRead(true);
@@ -363,13 +364,13 @@ class ViewAllSessionChangesAction extends Action2 {
     }
 }
 registerAction2(ViewAllSessionChangesAction);
-async function restoreSnapshotWithConfirmation(accessor, item) {
+async function restoreSnapshotWithConfirmationByRequestId(accessor, sessionResource, requestId) {
     const configurationService = accessor.get(IConfigurationService);
     const dialogService = accessor.get(IDialogService);
     const chatWidgetService = accessor.get(IChatWidgetService);
-    const widget = chatWidgetService.getWidgetBySessionResource(item.sessionResource);
+    const widget = chatWidgetService.getWidgetBySessionResource(sessionResource);
     const chatService = accessor.get(IChatService);
-    const chatModel = chatService.getSession(item.sessionResource);
+    const chatModel = chatService.getSession(sessionResource);
     if (!chatModel) {
         return;
     }
@@ -377,73 +378,80 @@ async function restoreSnapshotWithConfirmation(accessor, item) {
     if (!session) {
         return;
     }
-    const requestId = isRequestVM(item) ? item.id : isResponseVM(item) ? item.requestId : undefined;
-    if (requestId) {
-        const chatRequests = chatModel.getRequests();
-        const itemIndex = chatRequests.findIndex(request => request.id === requestId);
-        const editsToUndo = chatRequests.length - itemIndex;
-        const requestsToRemove = chatRequests.slice(itemIndex);
-        const requestIdsToRemove = ( new Set(( requestsToRemove.map(request => request.id))));
-        const entriesModifiedInRequestsToRemove = session.entries.get().filter(entry => ( requestIdsToRemove.has(entry.lastModifyingRequestId))) ?? [];
-        const shouldPrompt = entriesModifiedInRequestsToRemove.length > 0 && configurationService.getValue("chat.editing.confirmEditRequestRemoval") === true;
-        let message;
-        if (editsToUndo === 1) {
-            if (entriesModifiedInRequestsToRemove.length === 1) {
-                message = ( localize(
-                    5302,
-                    "This will remove your last request and undo the edits made to {0}. Do you want to proceed?",
-                    basename(entriesModifiedInRequestsToRemove[0].modifiedURI)
-                ));
-            } else {
-                message = ( localize(
-                    5303,
-                    "This will remove your last request and undo edits made to {0} files in your working set. Do you want to proceed?",
-                    entriesModifiedInRequestsToRemove.length
-                ));
-            }
+    const chatRequests = chatModel.getRequests();
+    const itemIndex = chatRequests.findIndex(request => request.id === requestId);
+    if (itemIndex === -1) {
+        return;
+    }
+    const editsToUndo = chatRequests.length - itemIndex;
+    const requestsToRemove = chatRequests.slice(itemIndex);
+    const requestIdsToRemove = ( new Set(( requestsToRemove.map(request => request.id))));
+    const entriesModifiedInRequestsToRemove = session.entries.get().filter(entry => ( requestIdsToRemove.has(entry.lastModifyingRequestId))) ?? [];
+    const shouldPrompt = entriesModifiedInRequestsToRemove.length > 0 && configurationService.getValue("chat.editing.confirmEditRequestRemoval") === true;
+    let message;
+    if (editsToUndo === 1) {
+        if (entriesModifiedInRequestsToRemove.length === 1) {
+            message = ( localize(
+                5734,
+                "This will remove your last request and undo the edits made to {0}. Do you want to proceed?",
+                basename(entriesModifiedInRequestsToRemove[0].modifiedURI)
+            ));
         } else {
-            if (entriesModifiedInRequestsToRemove.length === 1) {
-                message = ( localize(
-                    5304,
-                    "This will remove all subsequent requests and undo edits made to {0}. Do you want to proceed?",
-                    basename(entriesModifiedInRequestsToRemove[0].modifiedURI)
-                ));
-            } else {
-                message = ( localize(
-                    5305,
-                    "This will remove all subsequent requests and undo edits made to {0} files in your working set. Do you want to proceed?",
-                    entriesModifiedInRequestsToRemove.length
-                ));
-            }
-        }
-        const confirmation = shouldPrompt ? await dialogService.confirm({
-            title: editsToUndo === 1 ? ( localize(5306, "Do you want to undo your last edit?")) : ( localize(5307, "Do you want to undo {0} edits?", editsToUndo)),
-            message: message,
-            primaryButton: ( localize(5308, "Yes")),
-            checkbox: {
-                label: ( localize(5309, "Don't ask again")),
-                checked: false
-            },
-            type: "info"
-        }) : {
-            confirmed: true
-        };
-        if (!confirmation.confirmed) {
-            widget?.viewModel?.model.setCheckpoint(undefined);
-            return;
-        }
-        if (confirmation.checkboxChecked) {
-            await configurationService.updateValue("chat.editing.confirmEditRequestRemoval", false);
-        }
-        const snapshotRequestId = chatRequests[itemIndex].id;
-        await session.restoreSnapshot(snapshotRequestId, undefined);
+            message = ( localize(
+                5735,
+                "This will remove your last request and undo edits made to {0} files in your working set. Do you want to proceed?",
+                entriesModifiedInRequestsToRemove.length
+            ));
+        }
+    } else {
+        if (entriesModifiedInRequestsToRemove.length === 1) {
+            message = ( localize(
+                5736,
+                "This will remove all subsequent requests and undo edits made to {0}. Do you want to proceed?",
+                basename(entriesModifiedInRequestsToRemove[0].modifiedURI)
+            ));
+        } else {
+            message = ( localize(
+                5737,
+                "This will remove all subsequent requests and undo edits made to {0} files in your working set. Do you want to proceed?",
+                entriesModifiedInRequestsToRemove.length
+            ));
+        }
+    }
+    const confirmation = shouldPrompt ? await dialogService.confirm({
+        title: editsToUndo === 1 ? ( localize(5738, "Do you want to undo your last edit?")) : ( localize(5739, "Do you want to undo {0} edits?", editsToUndo)),
+        message: message,
+        primaryButton: ( localize(5740, "Yes")),
+        checkbox: {
+            label: ( localize(5741, "Don't ask again")),
+            checked: false
+        },
+        type: "info"
+    }) : {
+        confirmed: true
+    };
+    if (!confirmation.confirmed) {
+        widget?.viewModel?.model.setCheckpoint(undefined);
+        return;
+    }
+    if (confirmation.checkboxChecked) {
+        await configurationService.updateValue("chat.editing.confirmEditRequestRemoval", false);
     }
+    const snapshotRequestId = chatRequests[itemIndex].id;
+    await session.restoreSnapshot(snapshotRequestId, undefined);
+}
+async function restoreSnapshotWithConfirmation(accessor, item) {
+    const requestId = isRequestVM(item) ? item.id : isResponseVM(item) ? item.requestId : undefined;
+    if (!requestId) {
+        return;
+    }
+    await restoreSnapshotWithConfirmationByRequestId(accessor, item.sessionResource, requestId);
 }
 registerAction2(class RemoveAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.undoEdits",
-            title: ( localize2(5310, "Undo Requests")),
+            title: ( localize2(5742, "Undo Requests")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.discard,
@@ -485,8 +493,8 @@ registerAction2(class RestoreCheckpointAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.restoreCheckpoint",
-            title: ( localize2(5311, "Restore Checkpoint")),
-            tooltip: ( localize2(5312, "Restores workspace and chat to this point")),
+            title: ( localize2(5743, "Restore Checkpoint")),
+            tooltip: ( localize2(5744, "Restores workspace and chat to this point")),
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -527,20 +535,11 @@ registerAction2(class RestoreLastCheckpoint extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.restoreLastCheckpoint",
-            title: ( localize2(5313, "Restore to Last Checkpoint")),
-            f1: false,
+            title: ( localize2(5745, "Restore to Last Checkpoint")),
+            f1: true,
             category: CHAT_CATEGORY,
             icon: Codicon.discard,
-            menu: [{
-                id: MenuId.ChatMessageFooter,
-                group: "navigation",
-                order: 1,
-                when: ( ContextKeyExpr.and(
-                    ContextKeyExpr.in(ChatContextKeys.itemId.key, ChatContextKeys.lastItemId.key),
-                    ( ContextKeyExpr.equals(`config.${ChatConfiguration.CheckpointsEnabled}`, true)),
-                    ( ChatContextKeys.lockedToCodingAgent.negate())
-                ))
-            }]
+            precondition: ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ( ContextKeyExpr.equals(`config.${ChatConfiguration.CheckpointsEnabled}`, true)), ( ChatContextKeys.lockedToCodingAgent.negate())))
         });
     }
     async run(accessor, ...args) {
@@ -551,33 +550,30 @@ registerAction2(class RestoreLastCheckpoint extends Action2 {
         if (!isResponseVM(item) && !isRequestVM(item)) {
             item = widget?.getFocus();
         }
-        if (!item) {
+        const sessionResource = widget?.viewModel?.sessionResource ?? (isChatTreeItem(item) ? item.sessionResource : undefined);
+        if (!sessionResource) {
             return;
         }
-        const chatModel = chatService.getSession(item.sessionResource);
-        if (!chatModel) {
+        const chatModel = chatService.getSession(sessionResource);
+        if (!chatModel?.editingSession) {
             return;
         }
-        const session = chatModel.editingSession;
-        if (!session) {
+        const checkpointRequest = chatModel.checkpoint;
+        if (!checkpointRequest) {
+            alert(( localize(5746, "There is no checkpoint to restore.")));
             return;
         }
-        await restoreSnapshotWithConfirmation(accessor, item);
-        if (isResponseVM(item)) {
-            widget?.viewModel?.model.setCheckpoint(item.requestId);
-            const request = chatModel.getRequests().find(request => request.id === item.requestId);
-            if (request) {
-                widget?.focusInput();
-                widget?.input.setValue(request.message.text, false);
-            }
-        }
+        widget?.viewModel?.model.setCheckpoint(checkpointRequest.id);
+        widget?.focusInput();
+        widget?.input.setValue(checkpointRequest.message.text, false);
+        await restoreSnapshotWithConfirmationByRequestId(accessor, sessionResource, checkpointRequest.id);
     }
 });
 registerAction2(class EditAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.editRequests",
-            title: ( localize2(5314, "Edit Request")),
+            title: ( localize2(5747, "Edit Request")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.edit,
@@ -616,7 +612,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkingSetHistoryAction.id,
-            title: ( localize(5315, "Open File")),
+            title: ( localize(5748, "Open File")),
             menu: [{
                 id: MenuId.ChatEditingCodeBlockContext,
                 group: "navigation",
@@ -642,7 +638,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkingSetHistoryAction.id,
-            title: ( localize(5316, "Open File Snapshot")),
+            title: ( localize(5749, "Open File Snapshot")),
             menu: [{
                 id: MenuId.ChatEditingCodeBlockContext,
                 group: "navigation",
@@ -666,7 +662,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
         if (snapshot) {
             const editor = await editorService.openEditor({
                 resource: snapshot,
-                label: ( localize(5317, "{0} (Snapshot)", basename(context.uri))),
+                label: ( localize(5750, "{0} (Snapshot)", basename(context.uri))),
                 options: {
                     activation: EditorActivation.ACTIVATE
                 }
@@ -683,7 +679,7 @@ registerAction2(class ResolveSymbolsContextAction extends EditingSessionAction {
     constructor() {
         super({
             id: "workbench.action.edits.addFilesFromReferences",
-            title: ( localize2(5318, "Add Files From References")),
+            title: ( localize2(5751, "Add Files From References")),
             f1: false,
             category: CHAT_CATEGORY,
             menu: {
@@ -747,7 +743,7 @@ class ViewPreviousEditsAction extends EditingSessionAction {
         this.Id = "chatEditing.viewPreviousEdits";
     }
     static {
-        this.Label = ( localize(5319, "View Previous Edits"));
+        this.Label = ( localize(5752, "View Previous Edits"));
     }
     constructor() {
         super({