@codingame/monaco-vscode-chat-service-override 4.5.1 → 5.0.0

package/chat.js

@@ -1,15 +1,12 @@
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import './vscode/src/vs/workbench/contrib/chat/browser/chat.contribution.js';
 import { IChatWidgetService, IQuickChatService, IChatAccessibilityService, IChatCodeBlockContextProviderService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatAccessibilityService } from './vscode/src/vs/workbench/contrib/chat/browser/chatAccessibilityService.js';
-import { ChatContributionService } from './vscode/src/vs/workbench/contrib/chat/browser/chatContributionServiceImpl.js';
 import { QuickChatService } from './vscode/src/vs/workbench/contrib/chat/browser/chatQuick.js';
 import { ChatVariablesService } from './vscode/src/vs/workbench/contrib/chat/browser/chatVariables.js';
 import { ChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 import { ChatCodeBlockContextProviderService } from './vscode/src/vs/workbench/contrib/chat/browser/codeBlockContextProviderService.js';
 import { ChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { IChatContributionService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContributionService.service';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { ChatService } from './vscode/src/vs/workbench/contrib/chat/common/chatServiceImpl.js';
 import { ChatSlashCommandService } from './vscode/src/vs/workbench/contrib/chat/common/chatSlashCommands.js';
@@ -17,20 +14,22 @@ import { IChatSlashCommandService } from 'vscode/vscode/vs/workbench/contrib/cha
 import { IChatVariablesService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
 import { ChatWidgetHistoryService } from './vscode/src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.js';
 import { IChatWidgetHistoryService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatWidgetHistoryService.service';
+import { ILanguageModelStatsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModelStats.service';
 import { LanguageModelsService } from './vscode/src/vs/workbench/contrib/chat/common/languageModels.js';
 import { ILanguageModelsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModels.service';
-import './vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.js';
 import { IInlineChatSavingService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSavingService.service';
 import { InlineChatSavingServiceImpl } from './vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSavingServiceImpl.js';
 import { IInlineChatSessionService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
 import { InlineChatSessionServiceImpl } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
 import { IInlineChatService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat.service';
 import { InlineChatServiceImpl } from './vscode/src/vs/workbench/contrib/inlineChat/common/inlineChatServiceImpl.js';
+import { LanguageModelStatsService } from './vscode/src/vs/workbench/contrib/chat/common/languageModelStats.js';
+import './vscode/src/vs/workbench/contrib/chat/browser/chat.contribution.js';
+import './vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.js';
 
 function getServiceOverride() {
     return {
         [( IChatService.toString())]: new SyncDescriptor(ChatService, [], true),
-        [( IChatContributionService.toString())]: new SyncDescriptor(ChatContributionService, [], true),
         [( IChatWidgetService.toString())]: new SyncDescriptor(ChatWidgetService, [], true),
         [( IQuickChatService.toString())]: new SyncDescriptor(QuickChatService, [], true),
         [( IChatAccessibilityService.toString())]: new SyncDescriptor(ChatAccessibilityService, [], true),
@@ -42,7 +41,8 @@ function getServiceOverride() {
         [( IInlineChatService.toString())]: new SyncDescriptor(InlineChatServiceImpl, [], true),
         [( IInlineChatSessionService.toString())]: new SyncDescriptor(InlineChatSessionServiceImpl, [], true),
         [( IInlineChatSavingService.toString())]: new SyncDescriptor(InlineChatSavingServiceImpl, [], true),
-        [( IChatCodeBlockContextProviderService.toString())]: new SyncDescriptor(ChatCodeBlockContextProviderService, [], true)
+        [( IChatCodeBlockContextProviderService.toString())]: new SyncDescriptor(ChatCodeBlockContextProviderService, [], true),
+        [( ILanguageModelStatsService.toString())]: new SyncDescriptor(LanguageModelStatsService, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-chat-service-override",
-  "version": "4.5.1",
+  "version": "5.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.5.1"
+    "vscode": "npm:@codingame/monaco-vscode-api@5.0.0"
   }
 }

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

@@ -6,10 +6,10 @@ async function clearChatEditor(accessor) {
     const editorService = accessor.get(IEditorService);
     const editorGroupsService = accessor.get(IEditorGroupsService);
     const chatEditorInput = editorService.activeEditor;
-    if (chatEditorInput instanceof ChatEditorInput && chatEditorInput.providerId) {
+    if (chatEditorInput instanceof ChatEditorInput) {
         await editorService.replaceEditors([{
                 editor: chatEditorInput,
-                replacement: { resource: ChatEditorInput.getNewEditorUri(), options: { target: { providerId: chatEditorInput.providerId, pinned: true } } }
+                replacement: { resource: ChatEditorInput.getNewEditorUri(), options: { pinned: true } }
             }], editorGroupsService.activeGroup);
     }
 }

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

@@ -1,36 +1,33 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
-import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { AccessibilitySignal } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
+import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY, isChatViewTitleActionContext } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { clearChatEditor } from './chatClear.js';
+import { CHAT_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatEditorInput } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { CONTEXT_PROVIDER_EXISTS, CONTEXT_IN_CHAT_SESSION } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { CONTEXT_CHAT_ENABLED, CONTEXT_IN_CHAT_SESSION } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 
+const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatClearActions";
 const ACTION_ID_NEW_CHAT = `workbench.action.chat.newChat`;
 function registerNewChatActions() {
     registerAction2(class NewChatEditorAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chatEditor.newChat',
-                title: ( localize2WithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatClearActions',
-                    'chat.newChat.label',
-                    "New Chat"
-                )),
+                title: ( localize2WithPath(_moduleId, 0, "New Chat")),
                 icon: Codicon.plus,
                 f1: false,
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                precondition: CONTEXT_CHAT_ENABLED,
                 menu: [{
                         id: MenuId.EditorTitle,
                         group: 'navigation',
                         order: 0,
-                        when: ( ActiveEditorContext.isEqualTo(ChatEditorInput.EditorID)),
+                        when: ( (ActiveEditorContext.isEqualTo(ChatEditorInput.EditorID))),
                     }]
             });
         }
@@ -43,14 +40,10 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: ACTION_ID_NEW_CHAT,
-                title: ( localize2WithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatClearActions',
-                    'chat.newChat.label',
-                    "New Chat"
-                )),
+                title: ( localize2WithPath(_moduleId, 0, "New Chat")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.plus,
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 keybinding: {
                     weight: 200 ,
@@ -60,57 +53,40 @@ function registerNewChatActions() {
                     },
                     when: CONTEXT_IN_CHAT_SESSION
                 },
-                menu: {
-                    id: MenuId.ChatContext,
-                    group: 'z_clear'
-                }
+                menu: [{
+                        id: MenuId.ChatContext,
+                        group: 'z_clear'
+                    },
+                    {
+                        id: MenuId.ViewTitle,
+                        when: ( (ContextKeyExpr.equals('view', CHAT_VIEW_ID))),
+                        group: 'navigation',
+                        order: -1
+                    }]
             });
         }
         run(accessor, ...args) {
-            const widgetService = accessor.get(IChatWidgetService);
-            const widget = widgetService.lastFocusedWidget;
-            if (!widget) {
-                return;
+            const context = args[0];
+            if (isChatViewTitleActionContext(context)) {
+                announceChatCleared(accessor);
+                context.chatView.clear();
+                context.chatView.widget.focusInput();
+            }
+            else {
+                const widgetService = accessor.get(IChatWidgetService);
+                const widget = widgetService.lastFocusedWidget;
+                if (!widget) {
+                    return;
+                }
+                announceChatCleared(accessor);
+                widget.clear();
+                widget.focusInput();
             }
-            announceChatCleared(accessor);
-            widget.clear();
-            widget.focusInput();
         }
     });
 }
-const getNewChatActionDescriptorForViewTitle = (viewId, providerId) => ({
-    viewId,
-    id: `workbench.action.chat.${providerId}.newChat`,
-    title: ( localize2WithPath(
-        'vs/workbench/contrib/chat/browser/actions/chatClearActions',
-        'chat.newChat.label',
-        "New Chat"
-    )),
-    menu: {
-        id: MenuId.ViewTitle,
-        when: ( ContextKeyExpr.equals('view', viewId)),
-        group: 'navigation',
-        order: -1
-    },
-    precondition: CONTEXT_PROVIDER_EXISTS,
-    category: CHAT_CATEGORY,
-    icon: Codicon.plus,
-    f1: false
-});
-function getNewChatAction(viewId, providerId) {
-    return class NewChatAction extends ViewAction {
-        constructor() {
-            super(getNewChatActionDescriptorForViewTitle(viewId, providerId));
-        }
-        async runInView(accessor, view) {
-            announceChatCleared(accessor);
-            await view.clear();
-            view.widget.focusInput();
-        }
-    };
-}
 function announceChatCleared(accessor) {
     accessor.get(IAccessibilitySignalService).playSignal(AccessibilitySignal.clear);
 }
 
-export { ACTION_ID_NEW_CHAT, getNewChatAction, registerNewChatActions };
+export { ACTION_ID_NEW_CHAT, registerNewChatActions };

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

@@ -12,11 +12,13 @@ import { localize2WithPath } 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 { TerminalLocation } from 'vscode/vscode/vs/platform/terminal/common/terminal';
 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 { CONTEXT_PROVIDER_EXISTS, CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_CHAT_INPUT } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { DefaultChatTextEditor } from 'vscode/vscode/vs/workbench/contrib/chat/browser/codeBlockPart';
+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 { 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';
@@ -26,9 +28,13 @@ import { ITerminalService, ITerminalEditorService, ITerminalGroupService } from
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
 
+const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatCodeblockActions";
 function isCodeBlockActionContext(thing) {
     return typeof thing === 'object' && thing !== null && 'code' in thing && 'element' in thing;
 }
+function isCodeCompareBlockActionContext(thing) {
+    return typeof thing === 'object' && thing !== null && 'element' in thing;
+}
 function isResponseFiltered(context) {
     return isResponseVM(context.element) && context.element.errorDetails?.responseIsFiltered;
 }
@@ -57,11 +63,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyCodeBlock',
-                title: ( localize2WithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions',
-                    'interactive.copyCodeBlock.label',
-                    "Copy"
-                )),
+                title: ( localize2WithPath(_moduleId, 0, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.copy,
@@ -81,7 +83,6 @@ function registerChatCodeBlockActions() {
             if (isResponseVM(context.element)) {
                 const chatService = accessor.get(IChatService);
                 chatService.notifyUserAction({
-                    providerId: context.element.providerId,
                     agentId: context.element.agent?.id,
                     sessionId: context.element.sessionId,
                     requestId: context.element.requestId,
@@ -120,7 +121,6 @@ function registerChatCodeBlockActions() {
         const element = context.element;
         if (element) {
             chatService.notifyUserAction({
-                providerId: element.providerId,
                 agentId: element.agent?.id,
                 sessionId: element.sessionId,
                 requestId: element.requestId,
@@ -145,12 +145,8 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertCodeBlock',
-                title: ( localize2WithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions',
-                    'interactive.insertCodeBlock.label',
-                    "Insert at Cursor"
-                )),
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                title: ( localize2WithPath(_moduleId, 1, "Insert at Cursor")),
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
                 icon: Codicon.insert,
@@ -160,7 +156,10 @@ function registerChatCodeBlockActions() {
                     when: CONTEXT_IN_CHAT_SESSION
                 },
                 keybinding: {
-                    when: ( ContextKeyExpr.or(( ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION, ( CONTEXT_IN_CHAT_INPUT.negate()))), accessibleViewInCodeBlock)),
+                    when: ( (ContextKeyExpr.or(
+                         (ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION,  (CONTEXT_IN_CHAT_INPUT.negate()))),
+                        accessibleViewInCodeBlock
+                    ))),
                     primary: 2048  | 3 ,
                     mac: { primary: 256  | 3  },
                     weight: 400  + 1
@@ -241,28 +240,27 @@ function registerChatCodeBlockActions() {
                 if (usedDocuments) {
                     docRefs.push(usedDocuments);
                 }
-                const cancellationTokenSource = ( new CancellationTokenSource());
+                const cancellationTokenSource = ( (new CancellationTokenSource()));
                 mappedEdits = await mostRelevantProvider.provideMappedEdits(activeModel, [codeBlockActionContext.code], { documents: docRefs }, cancellationTokenSource.token);
             }
             if (mappedEdits) {
                 await bulkEditService.apply(mappedEdits);
             }
             else {
-                const activeSelection = codeEditor.getSelection() ?? ( new Range(activeModel.getLineCount(), 1, activeModel.getLineCount(), 1));
+                const activeSelection = codeEditor.getSelection() ?? ( (new Range(activeModel.getLineCount(), 1, activeModel.getLineCount(), 1)));
                 await bulkEditService.apply([
-                    ( new ResourceTextEdit(activeModel.uri, {
+                    ( (new ResourceTextEdit(activeModel.uri, {
                         range: activeSelection,
                         text: codeBlockActionContext.code,
-                    })),
+                    }))),
                 ]);
             }
-            codeEditorService.listCodeEditors().find(editor => editor.getModel()?.uri.toString() === ( activeModel.uri.toString()))?.focus();
+            codeEditorService.listCodeEditors().find(editor => editor.getModel()?.uri.toString() === ( (activeModel.uri.toString())))?.focus();
         }
         notifyUserAction(accessor, context) {
             if (isResponseVM(context.element)) {
                 const chatService = accessor.get(IChatService);
                 chatService.notifyUserAction({
-                    providerId: context.element.providerId,
                     agentId: context.element.agent?.id,
                     sessionId: context.element.sessionId,
                     requestId: context.element.requestId,
@@ -280,12 +278,8 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertIntoNewFile',
-                title: ( localize2WithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions',
-                    'interactive.insertIntoNewFile.label',
-                    "Insert into New File"
-                )),
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                title: ( localize2WithPath(_moduleId, 2, "Insert into New File")),
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
                 icon: Codicon.newFile,
@@ -305,7 +299,6 @@ function registerChatCodeBlockActions() {
             editorService.openEditor({ contents: context.code, languageId: context.languageId, resource: undefined });
             if (isResponseVM(context.element)) {
                 chatService.notifyUserAction({
-                    providerId: context.element.providerId,
                     agentId: context.element.agent?.id,
                     sessionId: context.element.sessionId,
                     requestId: context.element.requestId,
@@ -333,25 +326,28 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.runInTerminal',
-                title: ( localize2WithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions',
-                    'interactive.runInTerminal.label',
-                    "Insert into Terminal"
-                )),
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                title: ( localize2WithPath(_moduleId, 3, "Insert into Terminal")),
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
                 icon: Codicon.terminal,
                 menu: [{
                         id: MenuId.ChatCodeBlock,
                         group: 'navigation',
-                        when: ( ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION, ( ContextKeyExpr.or(...( shellLangIds.map(e => ( ContextKeyExpr.equals(EditorContextKeys.languageId.key, e)))))))),
+                        when: ( (ContextKeyExpr.and(
+                            CONTEXT_IN_CHAT_SESSION,
+                             (ContextKeyExpr.or(...( (shellLangIds.map(
+                                e => ( (ContextKeyExpr.equals(EditorContextKeys.languageId.key, e)))
+                            )))))
+                        ))),
                     },
                     {
                         id: MenuId.ChatCodeBlock,
                         group: 'navigation',
                         isHiddenByDefault: true,
-                        when: ( ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION, ...( shellLangIds.map(e => ( ContextKeyExpr.notEquals(EditorContextKeys.languageId.key, e))))))
+                        when: ( (ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION, ...( (shellLangIds.map(
+                            e => ( (ContextKeyExpr.notEquals(EditorContextKeys.languageId.key, e)))
+                        ))))))
                     }],
                 keybinding: [{
                         primary: 2048  | 512  | 3 ,
@@ -359,7 +355,7 @@ function registerChatCodeBlockActions() {
                             primary: 256  | 512  | 3
                         },
                         weight: 100 ,
-                        when: ( ContextKeyExpr.or(CONTEXT_IN_CHAT_SESSION, accessibleViewInCodeBlock)),
+                        when: ( (ContextKeyExpr.or(CONTEXT_IN_CHAT_SESSION, accessibleViewInCodeBlock))),
                     }]
             });
         }
@@ -387,7 +383,6 @@ function registerChatCodeBlockActions() {
             terminal.runCommand(context.code, false);
             if (isResponseVM(context.element)) {
                 chatService.notifyUserAction({
-                    providerId: context.element.providerId,
                     agentId: context.element.agent?.id,
                     sessionId: context.element.sessionId,
                     requestId: context.element.requestId,
@@ -430,18 +425,14 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextCodeBlock',
-                title: ( localize2WithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions',
-                    'interactive.nextCodeBlock.label',
-                    "Next Code Block"
-                )),
+                title: ( localize2WithPath(_moduleId, 4, "Next Code Block")),
                 keybinding: {
                     primary: 2048  | 512  | 12 ,
                     mac: { primary: 2048  | 512  | 12 , },
                     weight: 200 ,
                     when: CONTEXT_IN_CHAT_SESSION,
                 },
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
             });
@@ -454,18 +445,14 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousCodeBlock',
-                title: ( localize2WithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions',
-                    'interactive.previousCodeBlock.label',
-                    "Previous Code Block"
-                )),
+                title: ( localize2WithPath(_moduleId, 5, "Previous Code Block")),
                 keybinding: {
                     primary: 2048  | 512  | 11 ,
                     mac: { primary: 2048  | 512  | 11 , },
                     weight: 200 ,
                     when: CONTEXT_IN_CHAT_SESSION,
                 },
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
             });
@@ -500,5 +487,45 @@ function getContextFromEditor(editor, accessor) {
         languageId: editor.getModel().getLanguageId(),
     };
 }
+function registerChatCodeCompareBlockActions() {
+    class ChatCompareCodeBlockAction extends Action2 {
+        run(accessor, ...args) {
+            const context = args[0];
+            if (!isCodeCompareBlockActionContext(context)) {
+                return;
+            }
+            return this.runWithContext(accessor, context);
+        }
+    }
+    registerAction2(class ApplyEditsCompareBlockAction extends ChatCompareCodeBlockAction {
+        constructor() {
+            super({
+                id: 'workbench.action.chat.applyCompareEdits',
+                title: ( localize2WithPath(_moduleId, 6, "Apply Edits")),
+                f1: false,
+                category: CHAT_CATEGORY,
+                icon: Codicon.check,
+                precondition: ( (ContextKeyExpr.and(
+                    EditorContextKeys.hasChanges,
+                     (CONTEXT_CHAT_EDIT_APPLIED.negate())
+                ))),
+                menu: {
+                    id: MenuId.ChatCompareBlock,
+                    group: 'navigation'
+                }
+            });
+        }
+        async runWithContext(accessor, context) {
+            const editorService = accessor.get(IEditorService);
+            const instaService = accessor.get(IInstantiationService);
+            const editor = instaService.createInstance(DefaultChatTextEditor);
+            await editor.apply(context.element, context.edit);
+            await editorService.openEditor({
+                resource: context.edit.uri,
+                options: { revealIfVisible: true },
+            });
+        }
+    });
+}
 
-export { isCodeBlockActionContext, registerChatCodeBlockActions };
+export { isCodeBlockActionContext, isCodeCompareBlockActionContext, registerChatCodeBlockActions, registerChatCodeCompareBlockActions };

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

@@ -6,21 +6,18 @@ import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/brow
 import { CONTEXT_RESPONSE_FILTERED } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { isRequestVM, isResponseVM } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 
+const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatCopyActions";
 function registerChatCopyActions() {
     registerAction2(class CopyAllAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyAll',
-                title: ( localize2WithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatCopyActions',
-                    'interactive.copyAll.label',
-                    "Copy All"
-                )),
+                title: ( localize2WithPath(_moduleId, 0, "Copy All")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
                     id: MenuId.ChatContext,
-                    when: ( CONTEXT_RESPONSE_FILTERED.toNegated()),
+                    when: ( (CONTEXT_RESPONSE_FILTERED.toNegated())),
                     group: 'copy',
                 }
             });
@@ -45,16 +42,12 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyItem',
-                title: ( localize2WithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatCopyActions',
-                    'interactive.copyItem.label',
-                    "Copy"
-                )),
+                title: ( localize2WithPath(_moduleId, 1, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
                     id: MenuId.ChatContext,
-                    when: ( CONTEXT_RESPONSE_FILTERED.toNegated()),
+                    when: ( (CONTEXT_RESPONSE_FILTERED.toNegated())),
                     group: 'copy',
                 }
             });

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

@@ -2,25 +2,22 @@ import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { CONTEXT_IN_CHAT_SESSION, CONTEXT_PROVIDER_EXISTS } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { CONTEXT_IN_CHAT_SESSION, CONTEXT_CHAT_ENABLED } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { isResponseVM } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 
+const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatFileTreeActions";
 function registerChatFileTreeActions() {
     registerAction2(class NextFileTreeAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextFileTree',
-                title: ( localize2WithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatFileTreeActions',
-                    'interactive.nextFileTree.label',
-                    "Next File Tree"
-                )),
+                title: ( localize2WithPath(_moduleId, 0, "Next File Tree")),
                 keybinding: {
                     primary: 2048  | 67 ,
                     weight: 200 ,
                     when: CONTEXT_IN_CHAT_SESSION,
                 },
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
             });
@@ -33,17 +30,13 @@ function registerChatFileTreeActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousFileTree',
-                title: ( localize2WithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatFileTreeActions',
-                    'interactive.previousFileTree.label',
-                    "Previous File Tree"
-                )),
+                title: ( localize2WithPath(_moduleId, 1, "Previous File Tree")),
                 keybinding: {
                     primary: 2048  | 1024  | 67 ,
                     weight: 200 ,
                     when: CONTEXT_IN_CHAT_SESSION,
                 },
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
             });