@codingame/monaco-vscode-chat-service-override 9.0.3 → 10.0.1

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.js

@@ -1,46 +1,37 @@
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
-import { isEqual } from 'vscode/vscode/vs/base/common/resources';
-import { isDiffEditor, isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
-import { ResourceTextEdit, IBulkEditService } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
-import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
-import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
-import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { CopyAction } from 'vscode/vscode/vs/editor/contrib/clipboard/browser/clipboard';
-import { localize2, localize } from 'vscode/vscode/vs/nls';
+import { localize2 } from 'vscode/vscode/vs/nls';
 import { Action2, registerAction2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import 'vscode/vscode/vs/platform/notification/common/notification';
-import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
-import { ProgressLocation } from 'vscode/vscode/vs/platform/progress/common/progress';
-import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import { TerminalLocation } from 'vscode/vscode/vs/platform/terminal/common/terminal';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { accessibleViewInCodeBlock } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { IChatWidgetService, IChatCodeBlockContextProviderService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { DefaultChatTextEditor } from 'vscode/vscode/vs/workbench/contrib/chat/browser/codeBlockPart';
+import { ITerminalService, ITerminalEditorService, ITerminalGroupService } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
+import { ICodeMapperService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService.service';
 import { CONTEXT_CHAT_ENABLED, CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_CHAT_INPUT, CONTEXT_CHAT_EDIT_APPLIED } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { IChatEditingService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
 import { ChatCopyKind } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { isResponseVM } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatViewModel';
-import { insertCell } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
-import { NOTEBOOK_EDITOR_ID, CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { ITerminalService, ITerminalEditorService, ITerminalGroupService } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
-import { splitLines } from 'vscode/vscode/vs/base/common/strings';
-import { CharCode } from 'vscode/vscode/vs/base/common/charCode';
-import { InlineChatController } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
-import { AsyncIterableObject } from 'vscode/vscode/vs/base/common/async';
-import Severity$1 from 'vscode/vscode/vs/base/common/severity';
+import { IChatWidgetService, IChatCodeBlockContextProviderService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { DefaultChatTextEditor } from 'vscode/vscode/vs/workbench/contrib/chat/browser/codeBlockPart';
+import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { ApplyCodeBlockOperation, InsertCodeBlockOperation } from './codeBlockOperations.js';
 
+const shellLangIds = [
+    'fish',
+    'ps1',
+    'pwsh',
+    'powershell',
+    'sh',
+    'shellscript',
+    'zsh'
+];
 function isCodeBlockActionContext(thing) {
     return typeof thing === 'object' && thing !== null && 'code' in thing && 'element' in thing;
 }
@@ -50,9 +41,6 @@ function isCodeCompareBlockActionContext(thing) {
 function isResponseFiltered(context) {
     return isResponseVM(context.element) && context.element.errorDetails?.responseIsFiltered;
 }
-function getUsedDocuments(context) {
-    return isResponseVM(context.element) ? context.element.usedContext?.documents : undefined;
-}
 class ChatCodeBlockAction extends Action2 {
     run(accessor, ...args) {
         let context = args[0];
@@ -70,188 +58,12 @@ class ChatCodeBlockAction extends Action2 {
         return this.runWithContext(accessor, context);
     }
 }
-class InsertCodeBlockAction extends ChatCodeBlockAction {
-    async runWithContext(accessor, context) {
-        const editorService = accessor.get(IEditorService);
-        const textFileService = accessor.get(ITextFileService);
-        if (isResponseFiltered(context)) {
-            return;
-        }
-        if (editorService.activeEditorPane?.getId() === NOTEBOOK_EDITOR_ID) {
-            return this.handleNotebookEditor(accessor, editorService.activeEditorPane.getControl(), context);
-        }
-        let activeEditorControl = editorService.activeTextEditorControl;
-        if (isDiffEditor(activeEditorControl)) {
-            activeEditorControl = activeEditorControl.getOriginalEditor().hasTextFocus() ? activeEditorControl.getOriginalEditor() : activeEditorControl.getModifiedEditor();
-        }
-        if (!isCodeEditor(activeEditorControl)) {
-            return;
-        }
-        if (!activeEditorControl.hasModel()) {
-            return;
-        }
-        const activeModelUri = activeEditorControl.getModel().uri;
-        const activeTextModel = textFileService.files.get(activeModelUri) ?? textFileService.untitled.get(activeModelUri);
-        if (!activeTextModel || activeTextModel.isReadonly()) {
-            return;
-        }
-        await this.handleTextEditor(accessor, activeEditorControl, context);
-    }
-    async handleNotebookEditor(accessor, notebookEditor, context) {
-        if (!notebookEditor.hasModel()) {
-            return;
-        }
-        if (notebookEditor.isReadOnly) {
-            return;
-        }
-        if (notebookEditor.activeCodeEditor?.hasTextFocus()) {
-            const codeEditor = notebookEditor.activeCodeEditor;
-            if (codeEditor.hasModel()) {
-                return this.handleTextEditor(accessor, codeEditor, context);
-            }
-        }
-        const languageService = accessor.get(ILanguageService);
-        const chatService = accessor.get(IChatService);
-        const focusRange = notebookEditor.getFocus();
-        const next = Math.max(focusRange.end - 1, 0);
-        insertCell(languageService, notebookEditor, next, CellKind.Code, 'below', context.code, true);
-        this.notifyUserAction(chatService, context);
-    }
-    async computeEdits(accessor, codeEditor, codeBlockActionContext) {
-        const activeModel = codeEditor.getModel();
-        const range = codeEditor.getSelection() ?? ( (new Range(activeModel.getLineCount(), 1, activeModel.getLineCount(), 1)));
-        const text = reindent(codeBlockActionContext.code, activeModel, range.startLineNumber);
-        return { edits: [( (new ResourceTextEdit(activeModel.uri, { range, text })))] };
-    }
-    get showPreview() {
-        return false;
-    }
-    async handleTextEditor(accessor, codeEditor, codeBlockActionContext) {
-        const bulkEditService = accessor.get(IBulkEditService);
-        const codeEditorService = accessor.get(ICodeEditorService);
-        const chatService = accessor.get(IChatService);
-        const result = await this.computeEdits(accessor, codeEditor, codeBlockActionContext);
-        this.notifyUserAction(chatService, codeBlockActionContext, result);
-        if (this.showPreview) {
-            const showWithPreview = await this.applyWithInlinePreview(codeEditorService, result.edits, codeEditor);
-            if (!showWithPreview) {
-                await bulkEditService.apply(result.edits, { showPreview: true });
-                const activeModel = codeEditor.getModel();
-                codeEditorService.listCodeEditors().find(editor => editor.getModel()?.uri.toString() === ( (activeModel.uri.toString())))?.focus();
-            }
-        }
-        else {
-            await bulkEditService.apply(result.edits);
-            const activeModel = codeEditor.getModel();
-            codeEditorService.listCodeEditors().find(editor => editor.getModel()?.uri.toString() === ( (activeModel.uri.toString())))?.focus();
-        }
-    }
-    async applyWithInlinePreview(codeEditorService, edits, codeEditor) {
-        const firstEdit = edits[0];
-        if (!ResourceTextEdit.is(firstEdit)) {
-            return false;
-        }
-        const resource = firstEdit.resource;
-        const textEdits = coalesce(( (edits.map(
-            edit => ResourceTextEdit.is(edit) && isEqual(resource, edit.resource) ? edit.textEdit : undefined
-        ))));
-        if (textEdits.length !== edits.length) {
-            return false;
-        }
-        const editorToApply = await codeEditorService.openCodeEditor({ resource }, codeEditor);
-        if (editorToApply) {
-            const inlineChatController = InlineChatController.get(editorToApply);
-            if (inlineChatController) {
-                const cancellationTokenSource = ( (new CancellationTokenSource()));
-                try {
-                    return await inlineChatController.reviewEdits(textEdits[0].range, AsyncIterableObject.fromArray(textEdits), cancellationTokenSource.token);
-                }
-                finally {
-                    cancellationTokenSource.dispose();
-                }
-            }
-        }
-        return false;
-    }
-    notifyUserAction(chatService, context, result) {
-        if (isResponseVM(context.element)) {
-            chatService.notifyUserAction({
-                agentId: context.element.agent?.id,
-                command: context.element.slashCommand?.name,
-                sessionId: context.element.sessionId,
-                requestId: context.element.requestId,
-                result: context.element.result,
-                action: {
-                    kind: 'insert',
-                    codeBlockIndex: context.codeBlockIndex,
-                    totalCharacters: context.code.length,
-                    userAction: this.desc.id,
-                    codeMapper: result?.codeMapper,
-                }
-            });
-        }
-    }
-}
-function reindent(codeBlockContent, model, seletionStartLine) {
-    const newContent = splitLines(codeBlockContent);
-    if (newContent.length === 0) {
-        return codeBlockContent;
-    }
-    const formattingOptions = model.getFormattingOptions();
-    const codeIndentLevel = computeIndentation(model.getLineContent(seletionStartLine), formattingOptions.tabSize).level;
-    const indents = ( (newContent.map(line => computeIndentation(line, formattingOptions.tabSize))));
-    const newContentIndentLevel = indents.reduce((min, indent, index) => {
-        if (indent.length !== newContent[index].length) {
-            return Math.min(indent.level, min);
-        }
-        return min;
-    }, Number.MAX_VALUE);
-    if (newContentIndentLevel === Number.MAX_VALUE || newContentIndentLevel === codeIndentLevel) {
-        return codeBlockContent;
-    }
-    const newLines = [];
-    for (let i = 0; i < newContent.length; i++) {
-        const { level, length } = indents[i];
-        const newLevel = Math.max(0, codeIndentLevel + level - newContentIndentLevel);
-        const newIndentation = formattingOptions.insertSpaces ? ' '.repeat(formattingOptions.tabSize * newLevel) : '\t'.repeat(newLevel);
-        newLines.push(newIndentation + newContent[i].substring(length));
-    }
-    return newLines.join('\n');
-}
-function computeIndentation(line, tabSize) {
-    let nSpaces = 0;
-    let level = 0;
-    let i = 0;
-    let length = 0;
-    const len = line.length;
-    while (i < len) {
-        const chCode = line.charCodeAt(i);
-        if (chCode === CharCode.Space) {
-            nSpaces++;
-            if (nSpaces === tabSize) {
-                level++;
-                nSpaces = 0;
-                length = i + 1;
-            }
-        }
-        else if (chCode === CharCode.Tab) {
-            level++;
-            nSpaces = 0;
-            length = i + 1;
-        }
-        else {
-            break;
-        }
-        i++;
-    }
-    return { level, length };
-}
 function registerChatCodeBlockActions() {
     registerAction2(class CopyCodeBlockAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyCodeBlock',
-                title: ( localize2(7098, "Copy")),
+                title: ( localize2(7310, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.copy,
@@ -332,19 +144,21 @@ function registerChatCodeBlockActions() {
         }
         return false;
     });
-    registerAction2(class SmartApplyInEditorAction extends InsertCodeBlockAction {
+    registerAction2(class SmartApplyInEditorAction extends ChatCodeBlockAction {
         constructor() {
             super({
                 id: 'workbench.action.chat.applyInEditor',
-                title: ( localize2(7099, "Apply in Editor")),
+                title: ( localize2(7311, "Apply in Editor")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
-                icon: Codicon.sparkle,
+                icon: Codicon.gitPullRequestGoToChanges,
                 menu: {
                     id: MenuId.ChatCodeBlock,
                     group: 'navigation',
-                    when: CONTEXT_IN_CHAT_SESSION,
+                    when: ( (ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION, ...( (shellLangIds.map(
+                        e => ( (ContextKeyExpr.notEquals(EditorContextKeys.languageId.key, e)))
+                    )))))),
                     order: 10
                 },
                 keybinding: {
@@ -352,69 +166,67 @@ function registerChatCodeBlockActions() {
                          (ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION,  (CONTEXT_IN_CHAT_INPUT.negate()))),
                         accessibleViewInCodeBlock
                     ))),
-                    primary: KeyMod.CtrlCmd | KeyCode.Enter,
-                    mac: { primary: KeyMod.WinCtrl | KeyCode.Enter },
-                    weight: KeybindingWeight.ExternalExtension + 1
+                    primary: 2048  | 3 ,
+                    mac: { primary: 256  | 3  },
+                    weight: 400  + 1
                 },
             });
         }
-        async computeEdits(accessor, codeEditor, codeBlockActionContext) {
-            const progressService = accessor.get(IProgressService);
-            const notificationService = accessor.get(INotificationService);
-            const activeModel = codeEditor.getModel();
-            const mappedEditsProviders = accessor.get(ILanguageFeaturesService).mappedEditsProvider.ordered(activeModel);
-            if (mappedEditsProviders.length > 0) {
-                const docRefs = [];
-                const currentDocUri = activeModel.uri;
-                const currentDocVersion = activeModel.getVersionId();
-                const selections = codeEditor.getSelections();
-                if (selections.length > 0) {
-                    docRefs.push([
-                        {
-                            uri: currentDocUri,
-                            version: currentDocVersion,
-                            ranges: selections,
-                        }
-                    ]);
-                }
-                const usedDocuments = getUsedDocuments(codeBlockActionContext);
-                if (usedDocuments) {
-                    docRefs.push(usedDocuments);
-                }
-                const cancellationTokenSource = ( (new CancellationTokenSource()));
-                try {
-                    const edits = await progressService.withProgress({ location: ProgressLocation.Notification, delay: 500, sticky: true, cancellable: true }, async (progress) => {
-                        for (const provider of mappedEditsProviders) {
-                            progress.report({ message: ( localize(7100, "Applying code block using {0}...", provider.displayName)) });
-                            const mappedEdits = await provider.provideMappedEdits(activeModel, [codeBlockActionContext.code], { documents: docRefs }, cancellationTokenSource.token);
-                            if (mappedEdits) {
-                                return { edits: mappedEdits.edits, codeMapper: provider.displayName };
-                            }
-                        }
-                        return undefined;
-                    }, () => cancellationTokenSource.cancel());
-                    if (edits) {
-                        return edits;
-                    }
-                }
-                catch (e) {
-                    notificationService.notify({ severity: Severity$1.Error, message: ( localize(7101, "Failed to apply code block: {0}", e.message)) });
-                }
-                finally {
-                    cancellationTokenSource.dispose();
-                }
+        runWithContext(accessor, context) {
+            if (!this.operation) {
+                this.operation = accessor.get(IInstantiationService).createInstance(ApplyCodeBlockOperation);
             }
-            return super.computeEdits(accessor, codeEditor, codeBlockActionContext);
+            return this.operation.run(context);
         }
-        get showPreview() {
-            return true;
+    });
+    registerAction2(class ApplyAllAction extends Action2 {
+        constructor() {
+            super({
+                id: 'workbench.action.chat.applyAll',
+                title: ( localize2(7312, "Apply All Edits")),
+                precondition: CONTEXT_CHAT_ENABLED,
+                f1: true,
+                category: CHAT_CATEGORY,
+                icon: Codicon.edit
+            });
+        }
+        async run(accessor, ...args) {
+            const chatWidgetService = accessor.get(IChatWidgetService);
+            const codemapperService = accessor.get(ICodeMapperService);
+            const chatEditingService = accessor.get(IChatEditingService);
+            const widget = chatWidgetService.lastFocusedWidget;
+            if (!widget) {
+                return;
+            }
+            const items = widget.viewModel?.getItems() ?? [];
+            const item = widget.getFocus() ?? items[items.length - 1];
+            if (!isResponseVM(item)) {
+                return;
+            }
+            const codeblocks = widget.getCodeBlockInfosForResponse(item);
+            const request = [];
+            for (const codeblock of codeblocks) {
+                if (codeblock.codemapperUri && codeblock.uri) {
+                    const code = codeblock.getContent();
+                    request.push({ resource: codeblock.codemapperUri, code });
+                }
+            }
+            await chatEditingService.startOrContinueEditingSession(item.sessionId, async (stream) => {
+                const response = {
+                    textEdit: (resource, textEdits) => {
+                        stream.textEdits(resource, textEdits);
+                    }
+                };
+                const tokenSource = ( (new CancellationTokenSource()));
+                await codemapperService.mapCode({ codeBlocks: request, conversation: [] }, response, tokenSource.token);
+            }, { silent: true });
         }
     });
-    registerAction2(class SmartApplyInEditorAction extends InsertCodeBlockAction {
+    registerAction2(class SmartApplyInEditorAction extends ChatCodeBlockAction {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertCodeBlock',
-                title: ( localize2(7102, "Insert At Cursor")),
+                title: ( localize2(7313, "Insert At Cursor")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -430,18 +242,22 @@ function registerChatCodeBlockActions() {
                          (ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION,  (CONTEXT_IN_CHAT_INPUT.negate()))),
                         accessibleViewInCodeBlock
                     ))),
-                    primary: KeyMod.CtrlCmd | KeyCode.Enter,
-                    mac: { primary: KeyMod.WinCtrl | KeyCode.Enter },
-                    weight: KeybindingWeight.ExternalExtension + 1
+                    primary: 2048  | 3 ,
+                    mac: { primary: 256  | 3  },
+                    weight: 400  + 1
                 },
             });
         }
+        runWithContext(accessor, context) {
+            const operation = accessor.get(IInstantiationService).createInstance(InsertCodeBlockOperation);
+            return operation.run(context);
+        }
     });
     registerAction2(class InsertIntoNewFileAction extends ChatCodeBlockAction {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertIntoNewFile',
-                title: ( localize2(7103, "Insert into New File")),
+                title: ( localize2(7314, "Insert into New File")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -472,27 +288,17 @@ function registerChatCodeBlockActions() {
                         kind: 'insert',
                         codeBlockIndex: context.codeBlockIndex,
                         totalCharacters: context.code.length,
-                        newFile: true,
-                        userAction: this.desc.id,
+                        newFile: true
                     }
                 });
             }
         }
     });
-    const shellLangIds = [
-        'fish',
-        'ps1',
-        'pwsh',
-        'powershell',
-        'sh',
-        'shellscript',
-        'zsh'
-    ];
     registerAction2(class RunInTerminalAction extends ChatCodeBlockAction {
         constructor() {
             super({
                 id: 'workbench.action.chat.runInTerminal',
-                title: ( localize2(7104, "Insert into Terminal")),
+                title: ( localize2(7315, "Insert into Terminal")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -516,11 +322,11 @@ function registerChatCodeBlockActions() {
                         ))))))
                     }],
                 keybinding: [{
-                        primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Enter,
+                        primary: 2048  | 512  | 3 ,
                         mac: {
-                            primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.Enter
+                            primary: 256  | 512  | 3
                         },
-                        weight: KeybindingWeight.EditorContrib,
+                        weight: 100 ,
                         when: ( (ContextKeyExpr.or(CONTEXT_IN_CHAT_SESSION, accessibleViewInCodeBlock))),
                     }]
             });
@@ -592,11 +398,11 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextCodeBlock',
-                title: ( localize2(7105, "Next Code Block")),
+                title: ( localize2(7316, "Next Code Block")),
                 keybinding: {
-                    primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown,
-                    mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown, },
-                    weight: KeybindingWeight.WorkbenchContrib,
+                    primary: 2048  | 512  | 12 ,
+                    mac: { primary: 2048  | 512  | 12 , },
+                    weight: 200 ,
                     when: CONTEXT_IN_CHAT_SESSION,
                 },
                 precondition: CONTEXT_CHAT_ENABLED,
@@ -612,11 +418,11 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousCodeBlock',
-                title: ( localize2(7106, "Previous Code Block")),
+                title: ( localize2(7317, "Previous Code Block")),
                 keybinding: {
-                    primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
-                    mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp, },
-                    weight: KeybindingWeight.WorkbenchContrib,
+                    primary: 2048  | 512  | 11 ,
+                    mac: { primary: 2048  | 512  | 11 , },
+                    weight: 200 ,
                     when: CONTEXT_IN_CHAT_SESSION,
                 },
                 precondition: CONTEXT_CHAT_ENABLED,
@@ -652,6 +458,7 @@ function getContextFromEditor(editor, accessor) {
         codeBlockIndex: codeBlockInfo.codeBlockIndex,
         code: editor.getValue(),
         languageId: editor.getModel().getLanguageId(),
+        codemapperUri: codeBlockInfo.codemapperUri
     };
 }
 function registerChatCodeCompareBlockActions() {
@@ -668,7 +475,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.applyCompareEdits',
-                title: ( localize2(7107, "Apply Edits")),
+                title: ( localize2(7318, "Apply Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.check,
@@ -698,7 +505,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.discardCompareEdits',
-                title: ( localize2(7108, "Discard Edits")),
+                title: ( localize2(7319, "Discard Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.trash,