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

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

@@ -93,12 +93,12 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
         contextNode.tabIndex = 0;
         contextNode.classList.toggle("disabled", !context.enabled);
         const file = context.uri;
-        const attachmentTypeName = file?.scheme === Schemas.vscodeNotebookCell ? ( localize(5550, "cell")) : ( localize(5551, "file"));
-        const contextLabel = context.name ?? (file ? basename(file) : ( localize(5552, "context")));
+        const attachmentTypeName = file?.scheme === Schemas.vscodeNotebookCell ? ( localize(5619, "cell")) : ( localize(5620, "file"));
+        const contextLabel = context.name ?? (file ? basename(file) : ( localize(5621, "context")));
         const isSuggestedEnabled = this.configService.getValue("chat.implicitContext.suggestedContext");
         if (isSuggestedEnabled) {
             if (!isSelection) {
-                const buttonMsg = context.enabled ? ( localize(5553, "Disable {0} context {1}", attachmentTypeName, contextLabel)) : ( localize(5554, "Add {0} to context", contextLabel));
+                const buttonMsg = context.enabled ? ( localize(5622, "Disable {0} context {1}", attachmentTypeName, contextLabel)) : ( localize(5623, "Add {0} to context", contextLabel));
                 const toggleButton = this.renderDisposables.add(( new Button(contextNode, {
                     supportIcons: true,
                     title: buttonMsg
@@ -113,7 +113,7 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
                     context.enabled = false;
                 }));
             } else {
-                const pinButtonMsg = ( localize(5555, "Pin selection"));
+                const pinButtonMsg = ( localize(5624, "Pin selection"));
                 const pinButton = this.renderDisposables.add(( new Button(contextNode, {
                     supportIcons: true,
                     title: pinButtonMsg
@@ -146,7 +146,7 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
                 })
             );
         } else {
-            const buttonMsg = context.enabled ? ( localize(5556, "Disable current {0} context", attachmentTypeName)) : ( localize(5557, "Enable current {0} context", attachmentTypeName));
+            const buttonMsg = context.enabled ? ( localize(5625, "Disable current {0} context", attachmentTypeName)) : ( localize(5626, "Enable current {0} context", attachmentTypeName));
             const toggleButton = this.renderDisposables.add(( new Button(contextNode, {
                 supportIcons: true,
                 title: buttonMsg
@@ -170,9 +170,9 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
                 context.icon,
                 context.value.resourceUri,
                 markdownTooltip,
-                ( localize(5558, "Current file context"))
+                ( localize(5627, "Current file context"))
             );
-            contextNode.ariaLabel = ( localize(5559, "Suggested context, {0}", context.name));
+            contextNode.ariaLabel = ( localize(5628, "Suggested context, {0}", context.name));
         } else {
             title = this.renderResource(context.value, context.isSelection, context.enabled, label, contextNode);
         }
@@ -229,23 +229,23 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
     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(5550, "cell")) : ( localize(5551, "file"));
+        const attachmentTypeName = file.scheme === Schemas.vscodeNotebookCell ? ( localize(5619, "cell")) : ( localize(5620, "file"));
         const fileBasename = basename(file);
         const fileDirname = dirname(file);
         const friendlyName = `${fileBasename} ${fileDirname}`;
         const ariaLabel = range ? ( localize(
-            5560,
+            5629,
             "Suggested context, {0}, {1}, line {2} to line {3}",
             attachmentTypeName,
             friendlyName,
             range.startLineNumber,
             range.endLineNumber
-        )) : ( localize(5561, "Suggested context, {0}, {1}", attachmentTypeName, friendlyName));
+        )) : ( localize(5630, "Suggested context, {0}, {1}", attachmentTypeName, friendlyName));
         const uriLabel = this.labelService.getUriLabel(file, {
             relative: true
         });
-        const currentFile = ( localize(5562, "Current {0} context", attachmentTypeName));
-        const inactive = ( localize(5563, "Enable current {0} context", attachmentTypeName));
+        const currentFile = ( localize(5631, "Current {0} context", attachmentTypeName));
+        const inactive = ( localize(5632, "Enable current {0} context", attachmentTypeName));
         const currentFileHint = enabled || isSelection ? currentFile : inactive;
         const title = `${currentFileHint}\n${uriLabel}`;
         label.setFile(file, {

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

@@ -3,7 +3,6 @@ import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/
 import { Action2, IAction2Options } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
 import { IChatEditingSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
 import { IChatWidget } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
-import { IAgentSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel";
 export declare abstract class EditingSessionAction extends Action2 {
     constructor(opts: Readonly<IAction2Options>);
     run(accessor: ServicesAccessor, ...args: unknown[]): any;
@@ -37,11 +36,6 @@ export declare class ChatEditingShowChangesAction extends EditingSessionAction {
     constructor();
     runEditingSessionAction(accessor: ServicesAccessor, editingSession: IChatEditingSession, chatWidget: IChatWidget, ...args: unknown[]): Promise<void>;
 }
-export declare class ViewAllSessionChangesAction extends Action2 {
-    static readonly ID = "chatEditing.viewAllSessionChanges";
-    constructor();
-    run(accessor: ServicesAccessor, sessionOrSessionResource?: URI | IAgentSession): Promise<void>;
-}
 export interface ChatEditingActionContext {
     readonly sessionResource: URI;
     readonly requestId: string;

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

@@ -14,17 +14,15 @@ import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Action2, registerAction2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
-import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { EditorActivation } from '@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor';
 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 { ChatContextKeys, ChatContextKeyExprs } 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';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
@@ -32,8 +30,6 @@ import { isRequestVM, isResponseVM, isChatTreeItem } from '@codingame/monaco-vsc
 import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 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';
 
 class EditingSessionAction extends Action2 {
     constructor(opts) {
@@ -86,7 +82,7 @@ registerAction2(class OpenFileInDiffAction extends WorkingSetAction {
     constructor() {
         super({
             id: "chatEditing.openFileInDiff",
-            title: ( localize2(5964, "Open Changes in Diff Editor")),
+            title: ( localize2(6057, "Open Changes in Diff Editor")),
             icon: Codicon.diffSingle,
             menu: [{
                 id: MenuId.ChatEditingWidgetModifiedFilesToolbar,
@@ -117,7 +113,7 @@ registerAction2(class AcceptAction extends WorkingSetAction {
     constructor() {
         super({
             id: "chatEditing.acceptFile",
-            title: ( localize2(5965, "Keep")),
+            title: ( localize2(6058, "Keep")),
             icon: Codicon.check,
             menu: [{
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("resourceScheme", CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)), ContextKeyExpr.notIn(
@@ -143,7 +139,7 @@ registerAction2(class DiscardAction extends WorkingSetAction {
     constructor() {
         super({
             id: "chatEditing.discardFile",
-            title: ( localize2(5966, "Undo")),
+            title: ( localize2(6059, "Undo")),
             icon: Codicon.discard,
             menu: [{
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("resourceScheme", CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)), ContextKeyExpr.notIn(
@@ -169,9 +165,9 @@ class ChatEditingAcceptAllAction extends EditingSessionAction {
     constructor() {
         super({
             id: "chatEditing.acceptAllFiles",
-            title: ( localize(5967, "Keep")),
+            title: ( localize(6060, "Keep")),
             icon: Codicon.check,
-            tooltip: ( localize(5968, "Keep All Edits")),
+            tooltip: ( localize(6061, "Keep All Edits")),
             precondition: hasUndecidedChatEditingResourceContextKey,
             keybinding: {
                 primary: KeyMod.CtrlCmd | KeyCode.Enter,
@@ -195,9 +191,9 @@ class ChatEditingDiscardAllAction extends EditingSessionAction {
     constructor() {
         super({
             id: "chatEditing.discardAllFiles",
-            title: ( localize(5969, "Undo")),
+            title: ( localize(6062, "Undo")),
             icon: Codicon.discard,
-            tooltip: ( localize(5970, "Undo All Edits")),
+            tooltip: ( localize(6063, "Undo All Edits")),
             precondition: hasUndecidedChatEditingResourceContextKey,
             menu: [{
                 id: MenuId.ChatEditingWidgetToolbar,
@@ -228,8 +224,8 @@ class ToggleExplanationWidgetAction extends EditingSessionAction {
     constructor() {
         super({
             id: ToggleExplanationWidgetAction.ID,
-            title: ( localize(5971, "Explain")),
-            tooltip: ( localize(5972, "Toggle Change Explanations")),
+            title: ( localize(6064, "Explain")),
+            tooltip: ( localize(6065, "Toggle Change Explanations")),
             precondition: hasUndecidedChatEditingResourceContextKey,
             menu: [{
                 id: MenuId.ChatEditingWidgetToolbar,
@@ -253,17 +249,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(5973, "Undo all edits?")),
+            title: ( localize(6066, "Undo all edits?")),
             message: entries.length === 1 ? ( localize(
-                5974,
+                6067,
                 "This will undo changes made in {0}. Do you want to proceed?",
                 basename(entries[0].modifiedURI)
             )) : ( localize(
-                5975,
+                6068,
                 "This will undo changes made in {0} files. Do you want to proceed?",
                 entries.length
             )),
-            primaryButton: ( localize(5976, "Yes")),
+            primaryButton: ( localize(6069, "Yes")),
             type: "info"
         });
         if (!confirmation.confirmed) {
@@ -278,7 +274,7 @@ class ChatEditingShowChangesAction extends EditingSessionAction {
         this.ID = "chatEditing.viewChanges";
     }
     static {
-        this.LABEL = ( localize(5977, "View All Edits"));
+        this.LABEL = ( localize(6070, "View All Edits"));
     }
     constructor() {
         super({
@@ -304,61 +300,6 @@ class ChatEditingShowChangesAction extends EditingSessionAction {
     }
 }
 registerAction2(ChatEditingShowChangesAction);
-class ViewAllSessionChangesAction extends Action2 {
-    static {
-        this.ID = "chatEditing.viewAllSessionChanges";
-    }
-    constructor() {
-        super({
-            id: ViewAllSessionChangesAction.ID,
-            title: ( localize2(5978, "View All Changes")),
-            icon: Codicon.diffMultiple,
-            category: CHAT_CATEGORY,
-            precondition: ChatContextKeys.hasAgentSessionChanges,
-            menu: [{
-                id: MenuId.ChatEditingSessionChangesToolbar,
-                group: "navigation",
-                order: 10
-            }]
-        });
-    }
-    async run(accessor, sessionOrSessionResource) {
-        const agentSessionsService = accessor.get(IAgentSessionsService);
-        const commandService = accessor.get(ICommandService);
-        const chatEditingService = accessor.get(IChatEditingService);
-        if (!URI.isUri(sessionOrSessionResource) && !isAgentSession(sessionOrSessionResource)) {
-            return;
-        }
-        const sessionResource = URI.isUri(sessionOrSessionResource) ? sessionOrSessionResource : sessionOrSessionResource.resource;
-        const session = agentSessionsService.getSession(sessionResource);
-        const changes = session?.changes;
-        if (!session || !changes) {
-            return;
-        }
-        if (session.providerType === AgentSessionProviders.Background || session.providerType === AgentSessionProviders.Cloud) {
-            if (!Array.isArray(changes) || changes.length === 0) {
-                return;
-            }
-            const resources = ( changes.map(d => ({
-                originalUri: d.originalUri,
-                modifiedUri: d.modifiedUri
-            })));
-            await commandService.executeCommand("_workbench.openMultiDiffEditor", {
-                multiDiffSourceUri: sessionResource.with({
-                    scheme: sessionResource.scheme + "-worktree-changes"
-                }),
-                title: ( localize(5979, "All Session Changes")),
-                resources
-            });
-            session?.setRead(true);
-            return;
-        }
-        const editingSession = chatEditingService.getEditingSession(sessionResource);
-        await editingSession?.show();
-        session?.setRead(true);
-    }
-}
-registerAction2(ViewAllSessionChangesAction);
 function filterToUserAttachedContext(attachedContext) {
     if (!attachedContext?.length) {
         return [];
@@ -395,13 +336,13 @@ async function restoreSnapshotWithConfirmationByRequestId(accessor, sessionResou
     if (editsToUndo === 1) {
         if (entriesModifiedInRequestsToRemove.length === 1) {
             message = ( localize(
-                5980,
+                6071,
                 "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(
-                5981,
+                6072,
                 "This will remove your last request and undo edits made to {0} files in your working set. Do you want to proceed?",
                 entriesModifiedInRequestsToRemove.length
             ));
@@ -409,24 +350,24 @@ async function restoreSnapshotWithConfirmationByRequestId(accessor, sessionResou
     } else {
         if (entriesModifiedInRequestsToRemove.length === 1) {
             message = ( localize(
-                5982,
+                6073,
                 "This will remove all subsequent requests and undo edits made to {0}. Do you want to proceed?",
                 basename(entriesModifiedInRequestsToRemove[0].modifiedURI)
             ));
         } else {
             message = ( localize(
-                5983,
+                6074,
                 "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(5984, "Do you want to undo your last edit?")) : ( localize(5985, "Do you want to undo {0} edits?", editsToUndo)),
+        title: editsToUndo === 1 ? ( localize(6075, "Do you want to undo your last edit?")) : ( localize(6076, "Do you want to undo {0} edits?", editsToUndo)),
         message: message,
-        primaryButton: ( localize(5986, "Yes")),
+        primaryButton: ( localize(6077, "Yes")),
         checkbox: {
-            label: ( localize(5987, "Don't ask again")),
+            label: ( localize(6078, "Don't ask again")),
             checked: false
         },
         type: "info"
@@ -440,6 +381,7 @@ async function restoreSnapshotWithConfirmationByRequestId(accessor, sessionResou
     if (confirmation.checkboxChecked) {
         await configurationService.updateValue("chat.editing.confirmEditRequestRemoval", false);
     }
+    await chatService.cancelCurrentRequestForSession(sessionResource, "restoreCheckpoint");
     const snapshotRequestId = chatRequests[itemIndex].id;
     await session.restoreSnapshot(snapshotRequestId, undefined);
     return true;
@@ -455,7 +397,7 @@ registerAction2(class RemoveAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.undoEdits",
-            title: ( localize2(5988, "Undo Requests")),
+            title: ( localize2(6079, "Undo Requests")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.discard,
@@ -471,7 +413,7 @@ registerAction2(class RemoveAction extends Action2 {
                 id: MenuId.ChatMessageTitle,
                 group: "navigation",
                 order: 2,
-                when: ( ContextKeyExpr.and(( ( ContextKeyExpr.equals(`config.${ChatConfiguration.EditRequests}`, "input")).negate()), ( ContextKeyExpr.equals(`config.${ChatConfiguration.CheckpointsEnabled}`, false)), ( ChatContextKeys.lockedToCodingAgent.negate())))
+                when: ( ContextKeyExpr.and(( ( ContextKeyExpr.equals(`config.${ChatConfiguration.EditRequests}`, "input")).negate()), ( ContextKeyExpr.equals(`config.${ChatConfiguration.CheckpointsEnabled}`, false)), ( ContextKeyExpr.or(( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeyExprs.isAgentHostSession))))
             }]
         });
     }
@@ -501,8 +443,8 @@ registerAction2(class RestoreCheckpointAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.restoreCheckpoint",
-            title: ( localize2(5989, "Restore Checkpoint")),
-            tooltip: ( localize2(5990, "Restores workspace and chat to this point")),
+            title: ( localize2(6080, "Restore Checkpoint")),
+            tooltip: ( localize2(6081, "Restores workspace and chat to this point")),
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -517,7 +459,7 @@ registerAction2(class RestoreCheckpointAction extends Action2 {
                 id: MenuId.ChatMessageCheckpoint,
                 group: "navigation",
                 order: 2,
-                when: ( ContextKeyExpr.and(ChatContextKeys.isRequest, ( ChatContextKeys.lockedToCodingAgent.negate()), ( ChatContextKeys.isFirstRequest.negate())))
+                when: ( ContextKeyExpr.and(ChatContextKeys.isRequest, ( ContextKeyExpr.or(( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeyExprs.isAgentHostSession)), ( ChatContextKeys.isFirstRequest.negate())))
             }]
         });
     }
@@ -547,15 +489,15 @@ 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")),
+            title: ( localize2(6082, "Start Over")),
+            tooltip: ( localize2(6083, "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))
+                when: ( ContextKeyExpr.and(ChatContextKeys.isRequest, ( ContextKeyExpr.or(( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeyExprs.isAgentHostSession)), ChatContextKeys.isFirstRequest))
             }]
         });
     }
@@ -577,11 +519,11 @@ registerAction2(class RestoreLastCheckpoint extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.restoreLastCheckpoint",
-            title: ( localize2(5993, "Restore to Last Checkpoint")),
+            title: ( localize2(6084, "Restore to Last Checkpoint")),
             f1: true,
             category: CHAT_CATEGORY,
             icon: Codicon.discard,
-            precondition: ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ( ContextKeyExpr.equals(`config.${ChatConfiguration.CheckpointsEnabled}`, true)), ( ChatContextKeys.lockedToCodingAgent.negate())))
+            precondition: ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ( ContextKeyExpr.equals(`config.${ChatConfiguration.CheckpointsEnabled}`, true)), ( ContextKeyExpr.or(( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeyExprs.isAgentHostSession))))
         });
     }
     async run(accessor, ...args) {
@@ -602,7 +544,7 @@ registerAction2(class RestoreLastCheckpoint extends Action2 {
         }
         const checkpointRequest = chatModel.checkpoint;
         if (!checkpointRequest) {
-            alert(( localize(5994, "There is no checkpoint to restore.")));
+            alert(( localize(6085, "There is no checkpoint to restore.")));
             return;
         }
         widget?.viewModel?.model.setCheckpoint(checkpointRequest.id);
@@ -615,7 +557,7 @@ registerAction2(class EditAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.editRequests",
-            title: ( localize2(5995, "Edit Request")),
+            title: ( localize2(6086, "Edit Request")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.edit,
@@ -654,7 +596,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkingSetHistoryAction.id,
-            title: ( localize(5996, "Open File")),
+            title: ( localize(6087, "Open File")),
             menu: [{
                 id: MenuId.ChatEditingCodeBlockContext,
                 group: "navigation",
@@ -680,7 +622,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkingSetHistoryAction.id,
-            title: ( localize(5997, "Open File Snapshot")),
+            title: ( localize(6088, "Open File Snapshot")),
             menu: [{
                 id: MenuId.ChatEditingCodeBlockContext,
                 group: "navigation",
@@ -704,7 +646,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
         if (snapshot) {
             const editor = await editorService.openEditor({
                 resource: snapshot,
-                label: ( localize(5998, "{0} (Snapshot)", basename(context.uri))),
+                label: ( localize(6089, "{0} (Snapshot)", basename(context.uri))),
                 options: {
                     activation: EditorActivation.ACTIVATE
                 }
@@ -721,7 +663,7 @@ registerAction2(class ResolveSymbolsContextAction extends EditingSessionAction {
     constructor() {
         super({
             id: "workbench.action.edits.addFilesFromReferences",
-            title: ( localize2(5999, "Add Files From References")),
+            title: ( localize2(6090, "Add Files From References")),
             f1: false,
             category: CHAT_CATEGORY,
             menu: {
@@ -789,7 +731,7 @@ class ViewPreviousEditsAction extends EditingSessionAction {
         this.Id = "chatEditing.viewPreviousEdits";
     }
     static {
-        this.Label = ( localize(6000, "View Previous Edits"));
+        this.Label = ( localize(6091, "View Previous Edits"));
     }
     constructor() {
         super({
@@ -826,4 +768,4 @@ CommandsRegistry.registerCommand("_chat.editSessions.accept", async (accessor, r
     }
 });
 
-export { ChatEditingAcceptAllAction, ChatEditingDiscardAllAction, ChatEditingShowChangesAction, EditingSessionAction, ToggleExplanationWidgetAction, ViewAllSessionChangesAction, ViewPreviousEditsAction, discardAllEditsWithConfirmation, getEditingSessionContext };
+export { ChatEditingAcceptAllAction, ChatEditingDiscardAllAction, ChatEditingShowChangesAction, EditingSessionAction, ToggleExplanationWidgetAction, ViewPreviousEditsAction, discardAllEditsWithConfirmation, getEditingSessionContext };

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(6002, "Go to Next Chat Edit")) : ( localize2(6003, "Go to Previous Chat Edit")),
+            title: next ? ( localize2(6093, "Go to Next Chat Edit")) : ( localize2(6094, "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(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")),
+            title: _keep ? ( localize2(6095, "Keep Chat Edits")) : ( localize2(6096, "Undo Chat Edits")),
+            shortTitle: _keep ? ( localize2(6097, "Keep")) : ( localize2(6098, "Undo")),
+            tooltip: _keep ? ( localize2(6099, "Keep Chat Edits in this File")) : ( localize2(6100, "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(6010, "Keep this Change")) : ( localize2(6011, "Undo this Change")),
-            shortTitle: _accept ? ( localize2(6012, "Keep")) : ( localize2(6013, "Undo")),
+            title: _accept ? ( localize2(6101, "Keep this Change")) : ( localize2(6102, "Undo this Change")),
+            shortTitle: _accept ? ( localize2(6103, "Keep")) : ( localize2(6104, "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(6014, "Toggle Diff Editor for Chat Edits")),
+            title: ( localize2(6105, "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(6015, "Show Accessible Diff View for Chat Edits")),
+            title: ( localize2(6106, "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(6016, "Review")),
+            title: ( localize2(6107, "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(6017, "Keep All Chat Edits")),
-            tooltip: ( localize2(6018, "Keep All Chat Edits in this Session")),
+            title: ( localize2(6108, "Keep All Chat Edits")),
+            tooltip: ( localize2(6109, "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(6019, "Keep All Edits")) : ( localize(6020, "Undo All Edits")),
+            title: accept ? ( localize(6110, "Keep All Edits")) : ( localize(6111, "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(6021, "Explain")),
+            title: ( localize(6112, "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(6022, "Navigation Status")),
+            title: ( localize(6113, "Navigation Status")),
             precondition: ( ContextKeyExpr.false())
         },
         group: "navigate",

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

@@ -6,6 +6,7 @@ import { IAction, IActionRunner } from "@codingame/monaco-vscode-api/vscode/vs/b
 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";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
+import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 export declare class ChatEditingAcceptRejectActionViewItem extends ActionViewItem {
     private readonly _entry;
     private readonly _editor;
@@ -23,6 +24,6 @@ export declare class ChatEditingAcceptRejectActionViewItem extends ActionViewIte
 export declare class ChatEditingEditorOverlay implements IWorkbenchContribution {
     static readonly ID = "chat.edits.editorOverlay";
     private readonly _store;
-    constructor(editorGroupsService: IEditorGroupsService, instantiationService: IInstantiationService);
+    constructor(editorGroupsService: IEditorGroupsService, instantiationService: IInstantiationService, environmentService: IWorkbenchEnvironmentService);
     dispose(): void;
 }