@codingame/monaco-vscode-chat-service-override 11.1.1 → 12.0.0

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

@@ -1,23 +1,25 @@
+
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { localize2, localize } from 'vscode/vscode/vs/nls';
 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 { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { isChatViewTitleActionContext } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatActions';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
-import { CONTEXT_CHAT_ENABLED, CONTEXT_CHAT_LOCATION, CONTEXT_IN_CHAT_SESSION, CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED, CONTEXT_CHAT_EDITING_CAN_UNDO, CONTEXT_CHAT_EDITING_CAN_REDO } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { hasUndecidedChatEditingResourceContextKey, hasAppliedChatEditsContextKey } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+import { ChatContextKeys } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { WorkingSetEntryState, hasUndecidedChatEditingResourceContextKey, hasAppliedChatEditsContextKey } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 import { IChatEditingService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
-import { CHAT_VIEW_ID, EDITS_VIEW_ID } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ChatViewId, EditsViewId } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatEditorInput } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { clearChatEditor } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClear';
-import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
+import { ChatEditorInput } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { clearChatEditor } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClear';
 
 const ACTION_ID_NEW_CHAT = `workbench.action.chat.newChat`;
 const ACTION_ID_NEW_EDIT_SESSION = `workbench.action.chat.newEditSession`;
@@ -26,15 +28,15 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.chatEditor.newChat',
-                title: ( localize2(7504, "New Chat")),
+                title: ( localize2(4177, "New Chat")),
                 icon: Codicon.plus,
                 f1: false,
-                precondition: CONTEXT_CHAT_ENABLED,
+                precondition: ChatContextKeys.enabled,
                 menu: [{
                         id: MenuId.EditorTitle,
                         group: 'navigation',
                         order: 0,
-                        when: ( (ActiveEditorContext.isEqualTo(ChatEditorInput.EditorID))),
+                        when: ( ActiveEditorContext.isEqualTo(ChatEditorInput.EditorID)),
                     }]
             });
         }
@@ -47,21 +49,18 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: ACTION_ID_NEW_CHAT,
-                title: ( localize2(7504, "New Chat")),
+                title: ( localize2(4177, "New Chat")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.plus,
-                precondition: ( (ContextKeyExpr.and(
-                    CONTEXT_CHAT_ENABLED,
-                     (CONTEXT_CHAT_LOCATION.notEqualsTo(ChatAgentLocation.EditingSession))
-                ))),
+                precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.notEqualsTo(ChatAgentLocation.EditingSession)))),
                 f1: true,
                 keybinding: {
-                    weight: 200 ,
-                    primary: 2048  | 42 ,
+                    weight: KeybindingWeight.WorkbenchContrib,
+                    primary: KeyMod.CtrlCmd | KeyCode.KeyL,
                     mac: {
-                        primary: 256  | 42
+                        primary: KeyMod.WinCtrl | KeyCode.KeyL
                     },
-                    when: CONTEXT_IN_CHAT_SESSION
+                    when: ChatContextKeys.inChatSession
                 },
                 menu: [{
                         id: MenuId.ChatContext,
@@ -69,7 +68,7 @@ function registerNewChatActions() {
                     },
                     {
                         id: MenuId.ViewTitle,
-                        when: ( (ContextKeyExpr.equals('view', CHAT_VIEW_ID))),
+                        when: ( ContextKeyExpr.equals('view', ChatViewId)),
                         group: 'navigation',
                         order: -1
                     }]
@@ -94,10 +93,10 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: ACTION_ID_NEW_EDIT_SESSION,
-                title: ( localize2(7505, "New Edit Session")),
+                title: ( localize2(4178, "New Edit Session")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.plus,
-                precondition: ( (ContextKeyExpr.and(CONTEXT_CHAT_ENABLED, CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED))),
+                precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.editingParticipantRegistered)),
                 f1: true,
                 menu: [{
                         id: MenuId.ChatContext,
@@ -105,11 +104,18 @@ function registerNewChatActions() {
                     },
                     {
                         id: MenuId.ViewTitle,
-                        when: ( (ContextKeyExpr.equals('view', EDITS_VIEW_ID))),
+                        when: ( ContextKeyExpr.equals('view', EditsViewId)),
                         group: 'navigation',
                         order: -1
+                    }],
+                keybinding: {
+                    weight: KeybindingWeight.WorkbenchContrib,
+                    primary: KeyMod.CtrlCmd | KeyCode.KeyL,
+                    mac: {
+                        primary: KeyMod.WinCtrl | KeyCode.KeyL
                     },
-                ]
+                    when: ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession))))
+                }
             });
         }
         async _handleCurrentEditingSession(chatEditingService, dialogService) {
@@ -117,29 +123,29 @@ function registerNewChatActions() {
             const currentEdits = currentEditingSession?.entries.get();
             const currentEditCount = currentEdits?.length;
             if (currentEditingSession && currentEditCount) {
-                const undecidedEdits = currentEdits.filter((edit) => edit.state.get() === 0 );
+                const undecidedEdits = currentEdits.filter((edit) => edit.state.get() === WorkingSetEntryState.Modified);
                 if (undecidedEdits.length) {
                     const { result } = await dialogService.prompt({
-                        title: ( localize(7506, "Start new editing session?")),
+                        title: ( localize(4179, "Start new editing session?")),
                         message: ( localize(
-                            7507,
-                            "Starting a new editing session will end your current session. Do you want to discard pending edits to {0} files?",
+                            4180,
+                            "Starting a new editing session will end your current session. Do you want to accept pending edits to {0} files?",
                             undecidedEdits.length
                         )),
                         type: 'info',
                         cancelButton: true,
                         buttons: [
                             {
-                                label: ( localize(7508, "Discard & Continue")),
+                                label: ( localize(4181, "Accept & Continue")),
                                 run: async () => {
-                                    await currentEditingSession.reject();
+                                    await currentEditingSession.accept();
                                     return true;
                                 }
                             },
                             {
-                                label: ( localize(7509, "Accept & Continue")),
+                                label: ( localize(4182, "Discard & Continue")),
                                 run: async () => {
-                                    await currentEditingSession.accept();
+                                    await currentEditingSession.reject();
                                     return true;
                                 }
                             }
@@ -164,17 +170,17 @@ function registerNewChatActions() {
                 announceChatCleared(accessibilitySignalService);
                 const widget = widgetService.getWidgetBySessionId(context.sessionId);
                 if (widget) {
-                    chatEditingService.currentEditingSessionObs.get()?.stop();
+                    chatEditingService.currentEditingSessionObs.get()?.stop(true);
                     widget.clear();
                     widget.attachmentModel.clear();
                     widget.focusInput();
                 }
             }
             else {
-                const chatView = await viewsService.openView(EDITS_VIEW_ID);
+                const chatView = await viewsService.openView(EditsViewId);
                 const widget = chatView.widget;
                 announceChatCleared(accessibilitySignalService);
-                chatEditingService.currentEditingSessionObs.get()?.stop();
+                chatEditingService.currentEditingSessionObs.get()?.stop(true);
                 widget.clear();
                 widget.attachmentModel.clear();
                 widget.focusInput();
@@ -185,18 +191,13 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.done',
-                title: ( localize2(7510, "Done")),
+                title: ( localize2(4183, "Done")),
                 category: CHAT_CATEGORY,
-                precondition: ( (ContextKeyExpr.and(CONTEXT_CHAT_ENABLED, CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED))),
+                precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.editingParticipantRegistered)),
                 f1: false,
                 menu: [{
                         id: MenuId.ChatEditingWidgetToolbar,
-                        when: ( (ContextKeyExpr.and(
-                             (hasUndecidedChatEditingResourceContextKey.negate()),
-                            hasAppliedChatEditsContextKey,
-                            CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED,
-                             (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.EditingSession))
-                        ))),
+                        when: ( ContextKeyExpr.and(( hasUndecidedChatEditingResourceContextKey.negate()), hasAppliedChatEditsContextKey, ChatContextKeys.editingParticipantRegistered, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)))),
                         group: 'navigation',
                         order: 0
                     }]
@@ -217,7 +218,7 @@ function registerNewChatActions() {
             }
             else {
                 const viewsService = accessor.get(IViewsService);
-                const chatView = await viewsService.openView(EDITS_VIEW_ID);
+                const chatView = await viewsService.openView(EditsViewId);
                 const widget = chatView.widget;
                 announceChatCleared(accessibilitySignalService);
                 widget.clear();
@@ -230,18 +231,18 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.undoEdit',
-                title: ( localize2(7511, "Undo Last Edit")),
+                title: ( localize2(4184, "Undo Last Edit")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.discard,
-                precondition: ( (ContextKeyExpr.and(
-                    CONTEXT_CHAT_EDITING_CAN_UNDO,
-                    CONTEXT_CHAT_ENABLED,
-                    CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED
-                ))),
+                precondition: ( ContextKeyExpr.and(
+                    ChatContextKeys.chatEditingCanUndo,
+                    ChatContextKeys.enabled,
+                    ChatContextKeys.editingParticipantRegistered
+                )),
                 f1: true,
                 menu: [{
                         id: MenuId.ViewTitle,
-                        when: ( (ContextKeyExpr.equals('view', EDITS_VIEW_ID))),
+                        when: ( ContextKeyExpr.equals('view', EditsViewId)),
                         group: 'navigation',
                         order: -3
                     }]
@@ -249,32 +250,29 @@ function registerNewChatActions() {
         }
         async run(accessor, ...args) {
             const chatEditingService = accessor.get(IChatEditingService);
-            const chatWidgetService = accessor.get(IChatWidgetService);
             const currentEditingSession = chatEditingService.currentEditingSession;
             if (!currentEditingSession) {
                 return;
             }
-            const widget = chatWidgetService.getWidgetBySessionId(currentEditingSession.chatSessionId);
             await currentEditingSession.undoInteraction();
-            widget?.viewModel?.model.disableRequests(currentEditingSession.hiddenRequestIds.get());
         }
     });
     registerAction2(class RedoChatEditInteractionAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.redoEdit',
-                title: ( localize2(7512, "Redo Last Edit")),
+                title: ( localize2(4185, "Redo Last Edit")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.redo,
-                precondition: ( (ContextKeyExpr.and(
-                    CONTEXT_CHAT_EDITING_CAN_REDO,
-                    CONTEXT_CHAT_ENABLED,
-                    CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED
-                ))),
+                precondition: ( ContextKeyExpr.and(
+                    ChatContextKeys.chatEditingCanRedo,
+                    ChatContextKeys.enabled,
+                    ChatContextKeys.editingParticipantRegistered
+                )),
                 f1: true,
                 menu: [{
                         id: MenuId.ViewTitle,
-                        when: ( (ContextKeyExpr.equals('view', EDITS_VIEW_ID))),
+                        when: ( ContextKeyExpr.equals('view', EditsViewId)),
                         group: 'navigation',
                         order: -2
                     }]
@@ -282,55 +280,49 @@ function registerNewChatActions() {
         }
         async run(accessor, ...args) {
             const chatEditingService = accessor.get(IChatEditingService);
-            const chatWidgetService = accessor.get(IChatWidgetService);
             const currentEditingSession = chatEditingService.currentEditingSession;
             if (!currentEditingSession) {
                 return;
             }
-            const widget = chatWidgetService.getWidgetBySessionId(currentEditingSession.chatSessionId);
             await chatEditingService.currentEditingSession?.redoInteraction();
-            widget?.viewModel?.model.disableRequests(currentEditingSession.hiddenRequestIds.get());
         }
     });
     registerAction2(class GlobalOpenEditsAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.openEditSession',
-                title: ( localize2(7513, "Open {0}", 'Copilot Edits')),
+                title: ( localize2(4186, "Open {0}", 'Copilot Edits')),
                 category: CHAT_CATEGORY,
                 icon: Codicon.goToEditingSession,
-                precondition: ( (ContextKeyExpr.and(CONTEXT_CHAT_ENABLED, CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED))),
+                precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.editingParticipantRegistered)),
                 f1: true,
                 menu: [{
                         id: MenuId.ViewTitle,
-                        when: ( (ContextKeyExpr.and(
-                             (ContextKeyExpr.equals('view', CHAT_VIEW_ID)),
-                            CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED
-                        ))),
+                        when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', ChatViewId)), ChatContextKeys.editingParticipantRegistered, ( ContextKeyExpr.equals(`view.${EditsViewId}.visible`, false)), ( ContextKeyExpr.or(( ContextKeyExpr.and(( ContextKeyExpr.equals(`workbench.panel.chat.defaultViewContainerLocation`, true)), ( ContextKeyExpr.equals(`workbench.panel.chatEditing.defaultViewContainerLocation`, false)))), ( ContextKeyExpr.and(( ContextKeyExpr.equals(`workbench.panel.chat.defaultViewContainerLocation`, false)), ( ContextKeyExpr.equals(`workbench.panel.chatEditing.defaultViewContainerLocation`, true)))))))),
                         group: 'navigation',
                         order: 1
                     }, {
                         id: MenuId.ChatCommandCenter,
-                        when: CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED,
-                        group: 'a_chatEdit',
-                        order: 1
+                        group: 'a_open',
+                        order: 2
+                    }, {
+                        id: MenuId.ChatEditingEditorContent,
+                        group: 'navigate',
+                        order: 4,
                     }],
                 keybinding: {
-                    weight: 200 ,
-                    primary: 2048  | 1024  | 39 ,
+                    weight: KeybindingWeight.WorkbenchContrib,
+                    primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyI,
                     linux: {
-                        primary: 2048  | 512  | 1024  | 39
+                        primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift | KeyCode.KeyI
                     },
-                    when: ( (ContextKeyExpr.and(
-                         (ContextKeyExpr.notEquals('view', EDITS_VIEW_ID)),
-                        CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED
-                    )))
+                    when: ( ContextKeyExpr.and(( ContextKeyExpr.notEquals('view', EditsViewId)), ChatContextKeys.editingParticipantRegistered))
                 }
             });
         }
         async run(accessor, ...args) {
             const viewsService = accessor.get(IViewsService);
-            const chatView = await viewsService.openView(EDITS_VIEW_ID);
+            const chatView = await viewsService.openView(EditsViewId);
             chatView.widget.focusInput();
         }
     });

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

@@ -0,0 +1,9 @@
+import { IChatResponseViewModel } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { ICodeBlockActionContext, ICodeCompareBlockActionContext } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart";
+export interface IChatCodeBlockActionContext extends ICodeBlockActionContext {
+    element: IChatResponseViewModel;
+}
+export declare function isCodeBlockActionContext(thing: unknown): thing is ICodeBlockActionContext;
+export declare function isCodeCompareBlockActionContext(thing: unknown): thing is ICodeCompareBlockActionContext;
+export declare function registerChatCodeBlockActions(): void;
+export declare function registerChatCodeCompareBlockActions(): void;