@codingame/monaco-vscode-katex-common 26.2.2 → 28.0.0

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';
@@ -32,6 +33,7 @@ import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { isAgentSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel';
 import { AgentSessionProviders } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
+import { IsSessionsWindowContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 
 class EditingSessionAction extends Action2 {
     constructor(opts) {
@@ -84,7 +86,7 @@ registerAction2(class OpenFileInDiffAction extends WorkingSetAction {
     constructor() {
         super({
             id: "chatEditing.openFileInDiff",
-            title: ( localize2(5286, "Open Changes in Diff Editor")),
+            title: ( localize2(5787, "Open Changes in Diff Editor")),
             icon: Codicon.diffSingle,
             menu: [{
                 id: MenuId.ChatEditingWidgetModifiedFilesToolbar,
@@ -115,7 +117,7 @@ registerAction2(class AcceptAction extends WorkingSetAction {
     constructor() {
         super({
             id: "chatEditing.acceptFile",
-            title: ( localize2(5287, "Keep")),
+            title: ( localize2(5788, "Keep")),
             icon: Codicon.check,
             menu: [{
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("resourceScheme", CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)), ContextKeyExpr.notIn(
@@ -141,7 +143,7 @@ registerAction2(class DiscardAction extends WorkingSetAction {
     constructor() {
         super({
             id: "chatEditing.discardFile",
-            title: ( localize2(5288, "Undo")),
+            title: ( localize2(5789, "Undo")),
             icon: Codicon.discard,
             menu: [{
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("resourceScheme", CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)), ContextKeyExpr.notIn(
@@ -167,9 +169,9 @@ class ChatEditingAcceptAllAction extends EditingSessionAction {
     constructor() {
         super({
             id: "chatEditing.acceptAllFiles",
-            title: ( localize(5289, "Keep")),
+            title: ( localize(5790, "Keep")),
             icon: Codicon.check,
-            tooltip: ( localize(5290, "Keep All Edits")),
+            tooltip: ( localize(5791, "Keep All Edits")),
             precondition: hasUndecidedChatEditingResourceContextKey,
             keybinding: {
                 primary: KeyMod.CtrlCmd | KeyCode.Enter,
@@ -193,9 +195,9 @@ class ChatEditingDiscardAllAction extends EditingSessionAction {
     constructor() {
         super({
             id: "chatEditing.discardAllFiles",
-            title: ( localize(5291, "Undo")),
+            title: ( localize(5792, "Undo")),
             icon: Codicon.discard,
-            tooltip: ( localize(5292, "Undo All Edits")),
+            tooltip: ( localize(5793, "Undo All Edits")),
             precondition: hasUndecidedChatEditingResourceContextKey,
             menu: [{
                 id: MenuId.ChatEditingWidgetToolbar,
@@ -226,8 +228,8 @@ class ToggleExplanationWidgetAction extends EditingSessionAction {
     constructor() {
         super({
             id: ToggleExplanationWidgetAction.ID,
-            title: ( localize(5293, "Explain")),
-            tooltip: ( localize(5294, "Toggle Change Explanations")),
+            title: ( localize(5794, "Explain")),
+            tooltip: ( localize(5795, "Toggle Change Explanations")),
             precondition: hasUndecidedChatEditingResourceContextKey,
             menu: [{
                 id: MenuId.ChatEditingWidgetToolbar,
@@ -251,17 +253,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(5796, "Undo all edits?")),
             message: entries.length === 1 ? ( localize(
-                5296,
+                5797,
                 "This will undo changes made in {0}. Do you want to proceed?",
                 basename(entries[0].modifiedURI)
             )) : ( localize(
-                5297,
+                5798,
                 "This will undo changes made in {0} files. Do you want to proceed?",
                 entries.length
             )),
-            primaryButton: ( localize(5298, "Yes")),
+            primaryButton: ( localize(5799, "Yes")),
             type: "info"
         });
         if (!confirmation.confirmed) {
@@ -276,7 +278,7 @@ class ChatEditingShowChangesAction extends EditingSessionAction {
         this.ID = "chatEditing.viewChanges";
     }
     static {
-        this.LABEL = ( localize(5299, "View All Edits"));
+        this.LABEL = ( localize(5800, "View All Edits"));
     }
     constructor() {
         super({
@@ -309,7 +311,7 @@ class ViewAllSessionChangesAction extends Action2 {
     constructor() {
         super({
             id: ViewAllSessionChangesAction.ID,
-            title: ( localize2(5300, "View All Changes")),
+            title: ( localize2(5801, "View All Changes")),
             icon: Codicon.diffMultiple,
             category: CHAT_CATEGORY,
             precondition: ChatContextKeys.hasAgentSessionChanges,
@@ -322,7 +324,7 @@ class ViewAllSessionChangesAction extends Action2 {
                 id: MenuId.AgentSessionItemToolbar,
                 group: "navigation",
                 order: 0,
-                when: ChatContextKeys.hasAgentSessionChanges
+                when: ( ContextKeyExpr.and(ChatContextKeys.hasAgentSessionChanges, ( IsSessionsWindowContext.negate())))
             }]
         });
     }
@@ -351,7 +353,7 @@ class ViewAllSessionChangesAction extends Action2 {
                 multiDiffSourceUri: sessionResource.with({
                     scheme: sessionResource.scheme + "-worktree-changes"
                 }),
-                title: ( localize(5301, "All Session Changes")),
+                title: ( localize(5802, "All Session Changes")),
                 resources
             });
             session?.setRead(true);
@@ -363,13 +365,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 +379,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(
+                5803,
+                "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(
+                5804,
+                "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(
+                5805,
+                "This will remove all subsequent requests and undo edits made to {0}. Do you want to proceed?",
+                basename(entriesModifiedInRequestsToRemove[0].modifiedURI)
+            ));
+        } else {
+            message = ( localize(
+                5806,
+                "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(5807, "Do you want to undo your last edit?")) : ( localize(5808, "Do you want to undo {0} edits?", editsToUndo)),
+        message: message,
+        primaryButton: ( localize(5809, "Yes")),
+        checkbox: {
+            label: ( localize(5810, "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(5811, "Undo Requests")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.discard,
@@ -452,7 +461,7 @@ registerAction2(class RemoveAction extends Action2 {
                 mac: {
                     primary: KeyMod.CtrlCmd | KeyCode.Backspace
                 },
-                when: ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ( EditorContextKeys.textInputFocus.negate()))),
+                when: ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ( EditorContextKeys.textInputFocus.negate()), ( ChatContextKeys.inChatQuestionCarousel.negate()))),
                 weight: KeybindingWeight.WorkbenchContrib
             },
             menu: [{
@@ -485,8 +494,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(5812, "Restore Checkpoint")),
+            tooltip: ( localize2(5813, "Restores workspace and chat to this point")),
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -494,7 +503,7 @@ registerAction2(class RestoreCheckpointAction extends Action2 {
                 mac: {
                     primary: KeyMod.CtrlCmd | KeyCode.Backspace
                 },
-                when: ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ( EditorContextKeys.textInputFocus.negate()))),
+                when: ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ( EditorContextKeys.textInputFocus.negate()), ( ChatContextKeys.inChatQuestionCarousel.negate()))),
                 weight: KeybindingWeight.WorkbenchContrib
             },
             menu: [{
@@ -527,20 +536,11 @@ registerAction2(class RestoreLastCheckpoint extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.restoreLastCheckpoint",
-            title: ( localize2(5313, "Restore to Last Checkpoint")),
-            f1: false,
+            title: ( localize2(5814, "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 +551,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(5815, "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(5816, "Edit Request")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.edit,
@@ -616,7 +613,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkingSetHistoryAction.id,
-            title: ( localize(5315, "Open File")),
+            title: ( localize(5817, "Open File")),
             menu: [{
                 id: MenuId.ChatEditingCodeBlockContext,
                 group: "navigation",
@@ -642,7 +639,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkingSetHistoryAction.id,
-            title: ( localize(5316, "Open File Snapshot")),
+            title: ( localize(5818, "Open File Snapshot")),
             menu: [{
                 id: MenuId.ChatEditingCodeBlockContext,
                 group: "navigation",
@@ -666,7 +663,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(5819, "{0} (Snapshot)", basename(context.uri))),
                 options: {
                     activation: EditorActivation.ACTIVATE
                 }
@@ -683,7 +680,7 @@ registerAction2(class ResolveSymbolsContextAction extends EditingSessionAction {
     constructor() {
         super({
             id: "workbench.action.edits.addFilesFromReferences",
-            title: ( localize2(5318, "Add Files From References")),
+            title: ( localize2(5820, "Add Files From References")),
             f1: false,
             category: CHAT_CATEGORY,
             menu: {
@@ -747,7 +744,7 @@ class ViewPreviousEditsAction extends EditingSessionAction {
         this.Id = "chatEditing.viewPreviousEdits";
     }
     static {
-        this.Label = ( localize(5319, "View Previous Edits"));
+        this.Label = ( localize(5821, "View Previous Edits"));
     }
     constructor() {
         super({

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

@@ -4,6 +4,7 @@ import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/c
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility';
 import { Action2, MenuId, registerAction2, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -63,7 +64,7 @@ class NavigateAction extends ChatEditingEditorAction {
     constructor(next) {
         super({
             id: next ? "chatEditor.action.navigateNext" : "chatEditor.action.navigatePrevious",
-            title: next ? ( localize2(5321, "Go to Next Chat Edit")) : ( localize2(5322, "Go to Previous Chat Edit")),
+            title: next ? ( localize2(5823, "Go to Next Chat Edit")) : ( localize2(5824, "Go to Previous Chat Edit")),
             icon: next ? Codicon.arrowDown : Codicon.arrowUp,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ctxHasEditorModification)),
             keybinding: {
@@ -127,9 +128,9 @@ class KeepOrUndoAction extends ChatEditingEditorAction {
     constructor(id, _keep) {
         super({
             id,
-            title: _keep ? ( localize2(5323, "Keep Chat Edits")) : ( localize2(5324, "Undo Chat Edits")),
-            shortTitle: _keep ? ( localize2(5325, "Keep")) : ( localize2(5326, "Undo")),
-            tooltip: _keep ? ( localize2(5327, "Keep Chat Edits in this File")) : ( localize2(5328, "Undo Chat Edits in this File")),
+            title: _keep ? ( localize2(5825, "Keep Chat Edits")) : ( localize2(5826, "Undo Chat Edits")),
+            shortTitle: _keep ? ( localize2(5827, "Keep")) : ( localize2(5828, "Undo")),
+            tooltip: _keep ? ( localize2(5829, "Keep Chat Edits in this File")) : ( localize2(5830, "Undo Chat Edits in this File")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             icon: _keep ? Codicon.check : Codicon.discard,
             f1: true,
@@ -179,8 +180,8 @@ class AcceptRejectHunkAction extends ChatEditingEditorAction {
     constructor(_accept) {
         super({
             id: _accept ? acceptHunkId : undoHunkId,
-            title: _accept ? ( localize2(5329, "Keep this Change")) : ( localize2(5330, "Undo this Change")),
-            shortTitle: _accept ? ( localize2(5331, "Keep")) : ( localize2(5332, "Undo")),
+            title: _accept ? ( localize2(5831, "Keep this Change")) : ( localize2(5832, "Undo this Change")),
+            shortTitle: _accept ? ( localize2(5833, "Keep")) : ( localize2(5834, "Undo")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             f1: true,
             keybinding: {
@@ -227,7 +228,7 @@ class ToggleDiffAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: "chatEditor.action.toggleDiff",
-            title: ( localize2(5333, "Toggle Diff Editor for Chat Edits")),
+            title: ( localize2(5835, "Toggle Diff Editor for Chat Edits")),
             category: CHAT_CATEGORY,
             toggled: {
                 condition: ( ContextKeyExpr.or(EditorContextKeys.inDiffEditor, ( ActiveEditorContext.isEqualTo(TEXT_DIFF_EDITOR_ID)))),
@@ -264,11 +265,11 @@ class ToggleAccessibleDiffViewAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: "chatEditor.action.showAccessibleDiffView",
-            title: ( localize2(5334, "Show Accessible Diff View for Chat Edits")),
+            title: ( localize2(5836, "Show Accessible Diff View for Chat Edits")),
             f1: true,
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             keybinding: {
-                when: EditorContextKeys.focus,
+                when: ( ContextKeyExpr.and(EditorContextKeys.focus, CONTEXT_ACCESSIBILITY_MODE_ENABLED)),
                 weight: KeybindingWeight.WorkbenchContrib,
                 primary: KeyCode.F7
             }
@@ -282,7 +283,7 @@ class ReviewChangesAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: "chatEditor.action.reviewChanges",
-            title: ( localize2(5335, "Review")),
+            title: ( localize2(5837, "Review")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             menu: [{
                 id: MenuId.ChatEditingEditorContent,
@@ -303,8 +304,8 @@ class AcceptAllEditsAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: AcceptAllEditsAction.ID,
-            title: ( localize2(5336, "Keep All Chat Edits")),
-            tooltip: ( localize2(5337, "Keep All Chat Edits in this Session")),
+            title: ( localize2(5838, "Keep All Chat Edits")),
+            tooltip: ( localize2(5839, "Keep All Chat Edits in this Session")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             icon: Codicon.checkAll,
             f1: true,
@@ -323,7 +324,7 @@ class MultiDiffAcceptDiscardAction extends Action2 {
     constructor(accept) {
         super({
             id: accept ? "chatEditing.multidiff.acceptAllFiles" : "chatEditing.multidiff.discardAllFiles",
-            title: accept ? ( localize(5338, "Keep All Edits")) : ( localize(5339, "Undo All Edits")),
+            title: accept ? ( localize(5840, "Keep All Edits")) : ( localize(5841, "Undo All Edits")),
             icon: accept ? Codicon.check : Codicon.discard,
             menu: {
                 when: ( ContextKeyExpr.equals("resourceScheme", CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)),
@@ -374,7 +375,7 @@ class ExplainMultiDiffAction extends Action2 {
     constructor() {
         super({
             id: "chatEditing.multidiff.explain",
-            title: ( localize(5340, "Explain")),
+            title: ( localize(5842, "Explain")),
             menu: {
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.or(...( explainMultiDiffSchemes.map(scheme => ( ContextKeyExpr.equals("resourceScheme", scheme)))))), ( ContextKeyExpr.has(`config.${ChatConfiguration.ExplainChangesEnabled}`)))),
                 id: MenuId.MultiDiffEditorContent,
@@ -520,7 +521,7 @@ function registerChatEditorActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatEditingEditorContent, {
         command: {
             id: navigationBearingFakeActionId,
-            title: ( localize(5341, "Navigation Status")),
+            title: ( localize(5843, "Navigation Status")),
             precondition: ( ContextKeyExpr.false())
         },
         group: "navigate",

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.d.ts

@@ -1,7 +1,7 @@
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IModifiedFileEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
-import { ActionViewItem, IBaseActionViewItemOptions } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems";
+import { ActionViewItem, IActionViewItemOptions } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems";
 import { IAction, IActionRunner } from "@codingame/monaco-vscode-api/vscode/vs/base/common/actions";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
@@ -12,7 +12,7 @@ export declare class ChatEditingAcceptRejectActionViewItem extends ActionViewIte
     private readonly _keybindingService;
     private readonly _primaryActionIds;
     private readonly _reveal;
-    constructor(action: IAction, options: IBaseActionViewItemOptions, _entry: IObservable<IModifiedFileEntry | undefined>, _editor: {
+    constructor(action: IAction, options: IActionViewItemOptions, _entry: IObservable<IModifiedFileEntry | undefined>, _editor: {
         focus(): void;
     } | undefined, _keybindingService: IKeybindingService, _primaryActionIds?: readonly string[]);
     render(container: HTMLElement): void;

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

@@ -90,7 +90,7 @@ class ChatEditingAcceptRejectActionViewItem extends ActionViewItem {
     }
     getTooltip() {
         const value = super.getTooltip();
-        if (!value || this.options.keybinding) {
+        if (!value) {
             return value;
         }
         return this._keybindingService.appendKeybinding(value, this._action.id);
@@ -200,9 +200,9 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                                     } = that._navigationBearings.read(r);
                                     if (changeCount > 0) {
                                         const n = activeIdx === -1 ? "1" : `${activeIdx + 1}`;
-                                        this.label.innerText = ( localize(5349, "{0} of {1}", n, changeCount));
+                                        this.label.innerText = ( localize(5851, "{0} of {1}", n, changeCount));
                                     } else {
-                                        this.label.innerText = ( localize(5350, "—"));
+                                        this.label.innerText = ( localize(5852, "—"));
                                     }
                                     this.updateTooltip();
                                 }));
@@ -217,18 +217,18 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                                 }
                                 let result;
                                 if (changeCount === 1 && entriesCount === 1) {
-                                    result = ( localize(5351, "1 change in 1 file"));
+                                    result = ( localize(5853, "1 change in 1 file"));
                                 } else if (changeCount === 1) {
-                                    result = ( localize(5352, "1 change in {0} files", entriesCount));
+                                    result = ( localize(5854, "1 change in {0} files", entriesCount));
                                 } else if (entriesCount === 1) {
-                                    result = ( localize(5353, "{0} changes in 1 file", changeCount));
+                                    result = ( localize(5855, "{0} changes in 1 file", changeCount));
                                 } else {
-                                    result = ( localize(5354, "{0} changes in {1} files", changeCount, entriesCount));
+                                    result = ( localize(5856, "{0} changes in {1} files", changeCount, entriesCount));
                                 }
                                 if (!that._isBusy.get()) {
                                     return result;
                                 }
-                                return localize(5355, "{0} - Working...", result);
+                                return localize(5857, "{0} - Working...", result);
                             }
                         })();
                     }