@codingame/monaco-vscode-katex-common 29.1.1 → 30.0.0

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

@@ -22,6 +22,7 @@ import { EditorActivation } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IAgentSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service';
+import { isImplicitVariableEntry, isWorkspaceVariableEntry, isStringVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
 import { isChatViewTitleActionContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatActions';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { chatEditingWidgetFileStateContextKey, ModifiedFileEntryState, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, chatEditingResourceContextKey, decidedChatEditingResourceContextKey, applyingChatEditsFailedContextKey, hasUndecidedChatEditingResourceContextKey, hasAppliedChatEditsContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
@@ -85,7 +86,7 @@ registerAction2(class OpenFileInDiffAction extends WorkingSetAction {
     constructor() {
         super({
             id: "chatEditing.openFileInDiff",
-            title: ( localize2(5918, "Open Changes in Diff Editor")),
+            title: ( localize2(5964, "Open Changes in Diff Editor")),
             icon: Codicon.diffSingle,
             menu: [{
                 id: MenuId.ChatEditingWidgetModifiedFilesToolbar,
@@ -116,7 +117,7 @@ registerAction2(class AcceptAction extends WorkingSetAction {
     constructor() {
         super({
             id: "chatEditing.acceptFile",
-            title: ( localize2(5919, "Keep")),
+            title: ( localize2(5965, "Keep")),
             icon: Codicon.check,
             menu: [{
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("resourceScheme", CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)), ContextKeyExpr.notIn(
@@ -142,7 +143,7 @@ registerAction2(class DiscardAction extends WorkingSetAction {
     constructor() {
         super({
             id: "chatEditing.discardFile",
-            title: ( localize2(5920, "Undo")),
+            title: ( localize2(5966, "Undo")),
             icon: Codicon.discard,
             menu: [{
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("resourceScheme", CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)), ContextKeyExpr.notIn(
@@ -168,9 +169,9 @@ class ChatEditingAcceptAllAction extends EditingSessionAction {
     constructor() {
         super({
             id: "chatEditing.acceptAllFiles",
-            title: ( localize(5921, "Keep")),
+            title: ( localize(5967, "Keep")),
             icon: Codicon.check,
-            tooltip: ( localize(5922, "Keep All Edits")),
+            tooltip: ( localize(5968, "Keep All Edits")),
             precondition: hasUndecidedChatEditingResourceContextKey,
             keybinding: {
                 primary: KeyMod.CtrlCmd | KeyCode.Enter,
@@ -194,9 +195,9 @@ class ChatEditingDiscardAllAction extends EditingSessionAction {
     constructor() {
         super({
             id: "chatEditing.discardAllFiles",
-            title: ( localize(5923, "Undo")),
+            title: ( localize(5969, "Undo")),
             icon: Codicon.discard,
-            tooltip: ( localize(5924, "Undo All Edits")),
+            tooltip: ( localize(5970, "Undo All Edits")),
             precondition: hasUndecidedChatEditingResourceContextKey,
             menu: [{
                 id: MenuId.ChatEditingWidgetToolbar,
@@ -227,8 +228,8 @@ class ToggleExplanationWidgetAction extends EditingSessionAction {
     constructor() {
         super({
             id: ToggleExplanationWidgetAction.ID,
-            title: ( localize(5925, "Explain")),
-            tooltip: ( localize(5926, "Toggle Change Explanations")),
+            title: ( localize(5971, "Explain")),
+            tooltip: ( localize(5972, "Toggle Change Explanations")),
             precondition: hasUndecidedChatEditingResourceContextKey,
             menu: [{
                 id: MenuId.ChatEditingWidgetToolbar,
@@ -252,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(5927, "Undo all edits?")),
+            title: ( localize(5973, "Undo all edits?")),
             message: entries.length === 1 ? ( localize(
-                5928,
+                5974,
                 "This will undo changes made in {0}. Do you want to proceed?",
                 basename(entries[0].modifiedURI)
             )) : ( localize(
-                5929,
+                5975,
                 "This will undo changes made in {0} files. Do you want to proceed?",
                 entries.length
             )),
-            primaryButton: ( localize(5930, "Yes")),
+            primaryButton: ( localize(5976, "Yes")),
             type: "info"
         });
         if (!confirmation.confirmed) {
@@ -277,7 +278,7 @@ class ChatEditingShowChangesAction extends EditingSessionAction {
         this.ID = "chatEditing.viewChanges";
     }
     static {
-        this.LABEL = ( localize(5931, "View All Edits"));
+        this.LABEL = ( localize(5977, "View All Edits"));
     }
     constructor() {
         super({
@@ -310,15 +311,14 @@ class ViewAllSessionChangesAction extends Action2 {
     constructor() {
         super({
             id: ViewAllSessionChangesAction.ID,
-            title: ( localize2(5932, "View All Changes")),
+            title: ( localize2(5978, "View All Changes")),
             icon: Codicon.diffMultiple,
             category: CHAT_CATEGORY,
             precondition: ChatContextKeys.hasAgentSessionChanges,
             menu: [{
                 id: MenuId.ChatEditingSessionChangesToolbar,
                 group: "navigation",
-                order: 10,
-                when: ChatContextKeys.hasAgentSessionChanges
+                order: 10
             }]
         });
     }
@@ -347,7 +347,7 @@ class ViewAllSessionChangesAction extends Action2 {
                 multiDiffSourceUri: sessionResource.with({
                     scheme: sessionResource.scheme + "-worktree-changes"
                 }),
-                title: ( localize(5933, "All Session Changes")),
+                title: ( localize(5979, "All Session Changes")),
                 resources
             });
             session?.setRead(true);
@@ -359,6 +359,14 @@ class ViewAllSessionChangesAction extends Action2 {
     }
 }
 registerAction2(ViewAllSessionChangesAction);
+function filterToUserAttachedContext(attachedContext) {
+    if (!attachedContext?.length) {
+        return [];
+    }
+    return attachedContext.filter(
+        a => !isImplicitVariableEntry(a) && !isWorkspaceVariableEntry(a) && !isStringVariableEntry(a) && !(isPromptFileVariableEntry(a) && a.automaticallyAdded) && !(isPromptTextVariableEntry(a) && a.automaticallyAdded)
+    );
+}
 async function restoreSnapshotWithConfirmationByRequestId(accessor, sessionResource, requestId) {
     const configurationService = accessor.get(IConfigurationService);
     const dialogService = accessor.get(IDialogService);
@@ -367,16 +375,16 @@ async function restoreSnapshotWithConfirmationByRequestId(accessor, sessionResou
     const chatService = accessor.get(IChatService);
     const chatModel = chatService.getSession(sessionResource);
     if (!chatModel) {
-        return;
+        return false;
     }
     const session = chatModel.editingSession;
     if (!session) {
-        return;
+        return false;
     }
     const chatRequests = chatModel.getRequests();
     const itemIndex = chatRequests.findIndex(request => request.id === requestId);
     if (itemIndex === -1) {
-        return;
+        return false;
     }
     const editsToUndo = chatRequests.length - itemIndex;
     const requestsToRemove = chatRequests.slice(itemIndex);
@@ -387,13 +395,13 @@ async function restoreSnapshotWithConfirmationByRequestId(accessor, sessionResou
     if (editsToUndo === 1) {
         if (entriesModifiedInRequestsToRemove.length === 1) {
             message = ( localize(
-                5934,
+                5980,
                 "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(
-                5935,
+                5981,
                 "This will remove your last request and undo edits made to {0} files in your working set. Do you want to proceed?",
                 entriesModifiedInRequestsToRemove.length
             ));
@@ -401,24 +409,24 @@ async function restoreSnapshotWithConfirmationByRequestId(accessor, sessionResou
     } else {
         if (entriesModifiedInRequestsToRemove.length === 1) {
             message = ( localize(
-                5936,
+                5982,
                 "This will remove all subsequent requests and undo edits made to {0}. Do you want to proceed?",
                 basename(entriesModifiedInRequestsToRemove[0].modifiedURI)
             ));
         } else {
             message = ( localize(
-                5937,
+                5983,
                 "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(5938, "Do you want to undo your last edit?")) : ( localize(5939, "Do you want to undo {0} edits?", editsToUndo)),
+        title: editsToUndo === 1 ? ( localize(5984, "Do you want to undo your last edit?")) : ( localize(5985, "Do you want to undo {0} edits?", editsToUndo)),
         message: message,
-        primaryButton: ( localize(5940, "Yes")),
+        primaryButton: ( localize(5986, "Yes")),
         checkbox: {
-            label: ( localize(5941, "Don't ask again")),
+            label: ( localize(5987, "Don't ask again")),
             checked: false
         },
         type: "info"
@@ -427,26 +435,27 @@ async function restoreSnapshotWithConfirmationByRequestId(accessor, sessionResou
     };
     if (!confirmation.confirmed) {
         widget?.viewModel?.model.setCheckpoint(undefined);
-        return;
+        return false;
     }
     if (confirmation.checkboxChecked) {
         await configurationService.updateValue("chat.editing.confirmEditRequestRemoval", false);
     }
     const snapshotRequestId = chatRequests[itemIndex].id;
     await session.restoreSnapshot(snapshotRequestId, undefined);
+    return true;
 }
 async function restoreSnapshotWithConfirmation(accessor, item) {
     const requestId = isRequestVM(item) ? item.id : isResponseVM(item) ? item.requestId : undefined;
     if (!requestId) {
-        return;
+        return false;
     }
-    await restoreSnapshotWithConfirmationByRequestId(accessor, item.sessionResource, requestId);
+    return restoreSnapshotWithConfirmationByRequestId(accessor, item.sessionResource, requestId);
 }
 registerAction2(class RemoveAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.undoEdits",
-            title: ( localize2(5942, "Undo Requests")),
+            title: ( localize2(5988, "Undo Requests")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.discard,
@@ -477,10 +486,14 @@ registerAction2(class RemoveAction extends Action2 {
         if (!item) {
             return;
         }
-        await restoreSnapshotWithConfirmation(accessor, item);
-        if (isRequestVM(item) && configurationService.getValue("chat.undoRequests.restoreInput")) {
+        const confirmed = await restoreSnapshotWithConfirmation(accessor, item);
+        if (confirmed && isRequestVM(item) && configurationService.getValue("chat.undoRequests.restoreInput")) {
             widget?.focusInput();
             widget?.input.setValue(item.messageText, false);
+            const userAttachments = filterToUserAttachedContext(item.attachedContext);
+            if (userAttachments.length) {
+                await widget?.input.restoreAttachments(userAttachments);
+            }
         }
     }
 });
@@ -488,8 +501,8 @@ registerAction2(class RestoreCheckpointAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.restoreCheckpoint",
-            title: ( localize2(5943, "Restore Checkpoint")),
-            tooltip: ( localize2(5944, "Restores workspace and chat to this point")),
+            title: ( localize2(5989, "Restore Checkpoint")),
+            tooltip: ( localize2(5990, "Restores workspace and chat to this point")),
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -504,7 +517,7 @@ registerAction2(class RestoreCheckpointAction extends Action2 {
                 id: MenuId.ChatMessageCheckpoint,
                 group: "navigation",
                 order: 2,
-                when: ( ContextKeyExpr.and(ChatContextKeys.isRequest, ( ChatContextKeys.lockedToCodingAgent.negate())))
+                when: ( ContextKeyExpr.and(ChatContextKeys.isRequest, ( ChatContextKeys.lockedToCodingAgent.negate()), ( ChatContextKeys.isFirstRequest.negate())))
             }]
         });
     }
@@ -518,11 +531,45 @@ registerAction2(class RestoreCheckpointAction extends Action2 {
         if (!item) {
             return;
         }
+        const userAttachments = isRequestVM(item) ? filterToUserAttachedContext(item.attachedContext) : [];
         if (isRequestVM(item)) {
             widget?.focusInput();
             widget?.input.setValue(item.messageText, false);
         }
         widget?.viewModel?.model.setCheckpoint(item.id);
+        const confirmed = await restoreSnapshotWithConfirmation(accessor, item);
+        if (confirmed && userAttachments.length) {
+            await widget?.input.restoreAttachments(userAttachments);
+        }
+    }
+});
+registerAction2(class StartOverAction extends Action2 {
+    constructor() {
+        super({
+            id: "workbench.action.chat.startOver",
+            title: ( localize2(5991, "Start Over")),
+            tooltip: ( localize2(5992, "Clears the chat and undoes all changes")),
+            f1: false,
+            category: CHAT_CATEGORY,
+            menu: [{
+                id: MenuId.ChatMessageCheckpoint,
+                group: "navigation",
+                order: 2,
+                when: ( ContextKeyExpr.and(ChatContextKeys.isRequest, ( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeys.isFirstRequest))
+            }]
+        });
+    }
+    async run(accessor, ...args) {
+        let item = args[0];
+        const chatWidgetService = accessor.get(IChatWidgetService);
+        const widget = (isChatTreeItem(item) && chatWidgetService.getWidgetBySessionResource(item.sessionResource)) || chatWidgetService.lastFocusedWidget;
+        if (!isResponseVM(item) && !isRequestVM(item)) {
+            item = widget?.getFocus();
+        }
+        if (!item) {
+            return;
+        }
+        widget?.viewModel?.model.setCheckpoint(item.id);
         await restoreSnapshotWithConfirmation(accessor, item);
     }
 });
@@ -530,7 +577,7 @@ registerAction2(class RestoreLastCheckpoint extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.restoreLastCheckpoint",
-            title: ( localize2(5945, "Restore to Last Checkpoint")),
+            title: ( localize2(5993, "Restore to Last Checkpoint")),
             f1: true,
             category: CHAT_CATEGORY,
             icon: Codicon.discard,
@@ -555,7 +602,7 @@ registerAction2(class RestoreLastCheckpoint extends Action2 {
         }
         const checkpointRequest = chatModel.checkpoint;
         if (!checkpointRequest) {
-            alert(( localize(5946, "There is no checkpoint to restore.")));
+            alert(( localize(5994, "There is no checkpoint to restore.")));
             return;
         }
         widget?.viewModel?.model.setCheckpoint(checkpointRequest.id);
@@ -568,7 +615,7 @@ registerAction2(class EditAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.editRequests",
-            title: ( localize2(5947, "Edit Request")),
+            title: ( localize2(5995, "Edit Request")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.edit,
@@ -607,7 +654,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkingSetHistoryAction.id,
-            title: ( localize(5948, "Open File")),
+            title: ( localize(5996, "Open File")),
             menu: [{
                 id: MenuId.ChatEditingCodeBlockContext,
                 group: "navigation",
@@ -633,7 +680,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkingSetHistoryAction.id,
-            title: ( localize(5949, "Open File Snapshot")),
+            title: ( localize(5997, "Open File Snapshot")),
             menu: [{
                 id: MenuId.ChatEditingCodeBlockContext,
                 group: "navigation",
@@ -657,7 +704,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
         if (snapshot) {
             const editor = await editorService.openEditor({
                 resource: snapshot,
-                label: ( localize(5950, "{0} (Snapshot)", basename(context.uri))),
+                label: ( localize(5998, "{0} (Snapshot)", basename(context.uri))),
                 options: {
                     activation: EditorActivation.ACTIVATE
                 }
@@ -674,7 +721,7 @@ registerAction2(class ResolveSymbolsContextAction extends EditingSessionAction {
     constructor() {
         super({
             id: "workbench.action.edits.addFilesFromReferences",
-            title: ( localize2(5951, "Add Files From References")),
+            title: ( localize2(5999, "Add Files From References")),
             f1: false,
             category: CHAT_CATEGORY,
             menu: {
@@ -693,21 +740,25 @@ registerAction2(class ResolveSymbolsContextAction extends EditingSessionAction {
         const languageFeaturesService = accessor.get(ILanguageFeaturesService);
         const symbol = args[0];
         const modelReference = await textModelService.createModelReference(symbol.uri);
-        const textModel = modelReference.object.textEditorModel;
-        if (!textModel) {
-            return;
-        }
-        const position = ( new Position(symbol.range.startLineNumber, symbol.range.startColumn));
-        const [references, definitions, implementations] = await Promise.all([
-            this.getReferences(position, textModel, languageFeaturesService),
-            this.getDefinitions(position, textModel, languageFeaturesService),
-            this.getImplementations(position, textModel, languageFeaturesService)
-        ]);
-        const attachments = [];
-        for (const reference of [...definitions, ...implementations, ...references]) {
-            attachments.push(chatWidget.attachmentModel.asFileVariableEntry(reference.uri));
+        try {
+            const textModel = modelReference.object.textEditorModel;
+            if (!textModel) {
+                return;
+            }
+            const position = ( new Position(symbol.range.startLineNumber, symbol.range.startColumn));
+            const [references, definitions, implementations] = await Promise.all([
+                this.getReferences(position, textModel, languageFeaturesService),
+                this.getDefinitions(position, textModel, languageFeaturesService),
+                this.getImplementations(position, textModel, languageFeaturesService)
+            ]);
+            const attachments = [];
+            for (const reference of [...definitions, ...implementations, ...references]) {
+                attachments.push(chatWidget.attachmentModel.asFileVariableEntry(reference.uri));
+            }
+            chatWidget.attachmentModel.addContext(...attachments);
+        } finally {
+            modelReference.dispose();
         }
-        chatWidget.attachmentModel.addContext(...attachments);
     }
     async getReferences(position, textModel, languageFeaturesService) {
         const referenceProviders = languageFeaturesService.referenceProvider.all(textModel);
@@ -738,7 +789,7 @@ class ViewPreviousEditsAction extends EditingSessionAction {
         this.Id = "chatEditing.viewPreviousEdits";
     }
     static {
-        this.Label = ( localize(5952, "View Previous Edits"));
+        this.Label = ( localize(6000, "View Previous Edits"));
     }
     constructor() {
         super({

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

@@ -65,7 +65,7 @@ class NavigateAction extends ChatEditingEditorAction {
     constructor(next) {
         super({
             id: next ? "chatEditor.action.navigateNext" : "chatEditor.action.navigatePrevious",
-            title: next ? ( localize2(5954, "Go to Next Chat Edit")) : ( localize2(5955, "Go to Previous Chat Edit")),
+            title: next ? ( localize2(6002, "Go to Next Chat Edit")) : ( localize2(6003, "Go to Previous Chat Edit")),
             icon: next ? Codicon.arrowDown : Codicon.arrowUp,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ctxHasEditorModification)),
             keybinding: {
@@ -129,9 +129,9 @@ class KeepOrUndoAction extends ChatEditingEditorAction {
     constructor(id, _keep) {
         super({
             id,
-            title: _keep ? ( localize2(5956, "Keep Chat Edits")) : ( localize2(5957, "Undo Chat Edits")),
-            shortTitle: _keep ? ( localize2(5958, "Keep")) : ( localize2(5959, "Undo")),
-            tooltip: _keep ? ( localize2(5960, "Keep Chat Edits in this File")) : ( localize2(5961, "Undo Chat Edits in this File")),
+            title: _keep ? ( localize2(6004, "Keep Chat Edits")) : ( localize2(6005, "Undo Chat Edits")),
+            shortTitle: _keep ? ( localize2(6006, "Keep")) : ( localize2(6007, "Undo")),
+            tooltip: _keep ? ( localize2(6008, "Keep Chat Edits in this File")) : ( localize2(6009, "Undo Chat Edits in this File")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             icon: _keep ? Codicon.check : Codicon.discard,
             f1: true,
@@ -184,8 +184,8 @@ class AcceptRejectHunkAction extends ChatEditingEditorAction {
     constructor(_accept) {
         super({
             id: _accept ? acceptHunkId : undoHunkId,
-            title: _accept ? ( localize2(5962, "Keep this Change")) : ( localize2(5963, "Undo this Change")),
-            shortTitle: _accept ? ( localize2(5964, "Keep")) : ( localize2(5965, "Undo")),
+            title: _accept ? ( localize2(6010, "Keep this Change")) : ( localize2(6011, "Undo this Change")),
+            shortTitle: _accept ? ( localize2(6012, "Keep")) : ( localize2(6013, "Undo")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             f1: true,
             keybinding: {
@@ -233,7 +233,7 @@ class ToggleDiffAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: "chatEditor.action.toggleDiff",
-            title: ( localize2(5966, "Toggle Diff Editor for Chat Edits")),
+            title: ( localize2(6014, "Toggle Diff Editor for Chat Edits")),
             category: CHAT_CATEGORY,
             toggled: {
                 condition: ( ContextKeyExpr.or(EditorContextKeys.inDiffEditor, ( ActiveEditorContext.isEqualTo(TEXT_DIFF_EDITOR_ID)))),
@@ -270,7 +270,7 @@ class ToggleAccessibleDiffViewAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: "chatEditor.action.showAccessibleDiffView",
-            title: ( localize2(5967, "Show Accessible Diff View for Chat Edits")),
+            title: ( localize2(6015, "Show Accessible Diff View for Chat Edits")),
             f1: true,
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             keybinding: {
@@ -288,7 +288,7 @@ class ReviewChangesAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: "chatEditor.action.reviewChanges",
-            title: ( localize2(5968, "Review")),
+            title: ( localize2(6016, "Review")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             menu: [{
                 id: MenuId.ChatEditingEditorContent,
@@ -309,8 +309,8 @@ class AcceptAllEditsAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: AcceptAllEditsAction.ID,
-            title: ( localize2(5969, "Keep All Chat Edits")),
-            tooltip: ( localize2(5970, "Keep All Chat Edits in this Session")),
+            title: ( localize2(6017, "Keep All Chat Edits")),
+            tooltip: ( localize2(6018, "Keep All Chat Edits in this Session")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             icon: Codicon.checkAll,
             f1: true,
@@ -329,7 +329,7 @@ class MultiDiffAcceptDiscardAction extends Action2 {
     constructor(accept) {
         super({
             id: accept ? "chatEditing.multidiff.acceptAllFiles" : "chatEditing.multidiff.discardAllFiles",
-            title: accept ? ( localize(5971, "Keep All Edits")) : ( localize(5972, "Undo All Edits")),
+            title: accept ? ( localize(6019, "Keep All Edits")) : ( localize(6020, "Undo All Edits")),
             icon: accept ? Codicon.check : Codicon.discard,
             menu: {
                 when: ( ContextKeyExpr.equals("resourceScheme", CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)),
@@ -380,7 +380,7 @@ class ExplainMultiDiffAction extends Action2 {
     constructor() {
         super({
             id: "chatEditing.multidiff.explain",
-            title: ( localize(5973, "Explain")),
+            title: ( localize(6021, "Explain")),
             menu: {
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.or(...( explainMultiDiffSchemes.map(scheme => ( ContextKeyExpr.equals("resourceScheme", scheme)))))), ( ContextKeyExpr.has(`config.${ChatConfiguration.ExplainChangesEnabled}`)))),
                 id: MenuId.MultiDiffEditorContent,
@@ -526,7 +526,7 @@ function registerChatEditorActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatEditingEditorContent, {
         command: {
             id: navigationBearingFakeActionId,
-            title: ( localize(5974, "Navigation Status")),
+            title: ( localize(6022, "Navigation Status")),
             precondition: ( ContextKeyExpr.false())
         },
         group: "navigate",

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

@@ -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(5982, "{0} of {1}", n, changeCount));
+                                        this.label.innerText = ( localize(6030, "{0} of {1}", n, changeCount));
                                     } else {
-                                        this.label.innerText = ( localize(5983, "—"));
+                                        this.label.innerText = ( localize(6031, "—"));
                                     }
                                     this.updateTooltip();
                                 }));
@@ -217,18 +217,18 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                                 }
                                 let result;
                                 if (changeCount === 1 && entriesCount === 1) {
-                                    result = ( localize(5984, "1 change in 1 file"));
+                                    result = ( localize(6032, "1 change in 1 file"));
                                 } else if (changeCount === 1) {
-                                    result = ( localize(5985, "1 change in {0} files", entriesCount));
+                                    result = ( localize(6033, "1 change in {0} files", entriesCount));
                                 } else if (entriesCount === 1) {
-                                    result = ( localize(5986, "{0} changes in 1 file", changeCount));
+                                    result = ( localize(6034, "{0} changes in 1 file", changeCount));
                                 } else {
-                                    result = ( localize(5987, "{0} changes in {1} files", changeCount, entriesCount));
+                                    result = ( localize(6035, "{0} changes in {1} files", changeCount, entriesCount));
                                 }
                                 if (!that._isBusy.get()) {
                                     return result;
                                 }
-                                return localize(5988, "{0} - Working...", result);
+                                return localize(6036, "{0} - Working...", result);
                             }
                         })();
                     }

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

@@ -95,7 +95,7 @@ class ChatEditingExplanationWidget extends Disposable {
             return {
                 startLineNumber: change.modified.startLineNumber,
                 endLineNumber: change.modified.endLineNumberExclusive - 1,
-                explanation: ( localize(5992, "Generating explanation...")),
+                explanation: ( localize(6040, "Generating explanation...")),
                 read: false,
                 loading: true,
                 originalText,
@@ -116,7 +116,7 @@ class ChatEditingExplanationWidget extends Disposable {
         this._headerNode.appendChild(this._toggleButton);
         this._dismissButton = $("div.chat-explanation-dismiss");
         this._dismissButton.appendChild(renderIcon(Codicon.close));
-        this._dismissButton.title = ( localize(5993, "Dismiss"));
+        this._dismissButton.title = ( localize(6041, "Dismiss"));
         this._headerNode.appendChild(this._dismissButton);
         this._domNode.appendChild(this._headerNode);
         this._bodyNode = $("div.chat-explanation-body");
@@ -178,35 +178,35 @@ class ChatEditingExplanationWidget extends Disposable {
             this._readIndicator.appendChild(renderIcon(Codicon.circle));
             this._readIndicator.classList.add("read");
             this._readIndicator.classList.remove("partial", "unread");
-            this._readIndicator.title = ( localize(5994, "Mark as unread"));
+            this._readIndicator.title = ( localize(6042, "Mark as unread"));
         } else if (someRead) {
             this._readIndicator.appendChild(renderIcon(Codicon.circleFilled));
             this._readIndicator.classList.remove("read", "unread");
             this._readIndicator.classList.add("partial");
-            this._readIndicator.title = ( localize(5995, "Mark all as read"));
+            this._readIndicator.title = ( localize(6043, "Mark all as read"));
         } else {
             this._readIndicator.appendChild(renderIcon(Codicon.circleFilled));
             this._readIndicator.classList.remove("read", "partial");
             this._readIndicator.classList.add("unread");
-            this._readIndicator.title = ( localize(5996, "Mark as read"));
+            this._readIndicator.title = ( localize(6044, "Mark as read"));
         }
     }
     _updateTitle() {
         const count = this._explanations.length;
         if (count === 1) {
-            this._titleNode.textContent = ( localize(5997, "1 change"));
+            this._titleNode.textContent = ( localize(6045, "1 change"));
         } else {
-            this._titleNode.textContent = ( localize(5998, "{0} changes", count));
+            this._titleNode.textContent = ( localize(6046, "{0} changes", count));
         }
     }
     _updateToggleButton() {
         clearNode(this._toggleButton);
         if (this._isExpanded) {
             this._toggleButton.appendChild(renderIcon(Codicon.chevronUp));
-            this._toggleButton.title = ( localize(5999, "Collapse"));
+            this._toggleButton.title = ( localize(6047, "Collapse"));
         } else {
             this._toggleButton.appendChild(renderIcon(Codicon.chevronDown));
-            this._toggleButton.title = ( localize(6000, "Expand"));
+            this._toggleButton.title = ( localize(6048, "Expand"));
         }
     }
     _buildExplanationItems() {
@@ -217,9 +217,9 @@ class ChatEditingExplanationWidget extends Disposable {
             const item = $("div.chat-explanation-item");
             const lineInfo = $("span.chat-explanation-line-info");
             if (exp.startLineNumber === exp.endLineNumber) {
-                lineInfo.textContent = ( localize(6001, "Line {0}", exp.startLineNumber));
+                lineInfo.textContent = ( localize(6049, "Line {0}", exp.startLineNumber));
             } else {
-                lineInfo.textContent = ( localize(6002, "Lines {0}-{1}", exp.startLineNumber, exp.endLineNumber));
+                lineInfo.textContent = ( localize(6050, "Lines {0}-{1}", exp.startLineNumber, exp.endLineNumber));
             }
             item.appendChild(lineInfo);
             const text = $("span.chat-explanation-text");
@@ -238,7 +238,7 @@ class ChatEditingExplanationWidget extends Disposable {
             item.appendChild(itemReadIndicator);
             const replyButton = $("div.chat-explanation-reply-button");
             replyButton.appendChild(renderIcon(Codicon.arrowRight));
-            replyButton.title = ( localize(6003, "Follow up on this change"));
+            replyButton.title = ( localize(6051, "Follow up on this change"));
             item.appendChild(replyButton);
             this._eventStore.add(addDisposableListener(replyButton, "click", async e => {
                 e.stopPropagation();

package/vscode/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionPickerActionItem.js

@@ -151,7 +151,7 @@ let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends Acti
             domChildren.push($(
                 "span.chat-session-option-label",
                 undefined,
-                this.currentOption?.name ?? group?.description ?? ( localize(6142, "Pick Option"))
+                this.currentOption?.name ?? group?.description ?? ( localize(6192, "Pick Option"))
             ));
         }
         domChildren.push(...renderLabelWithIcons(`$(chevron-down)`));