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

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

@@ -1,4 +1,6 @@
+
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { CopyAction } from 'vscode/vscode/vs/editor/contrib/clipboard/browser/clipboard';
@@ -7,20 +9,20 @@ import { Action2, registerAction2, MenuId } from 'vscode/vscode/vs/platform/acti
 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 { 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 { ITerminalService, ITerminalEditorService, ITerminalGroupService } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminal.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 { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
+import { ChatContextKeys } 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 '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 import { IChatWidgetService, IChatCodeBlockContextProviderService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { DefaultChatTextEditor } from '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart';
-import '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { DefaultChatTextEditor } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ApplyCodeBlockOperation, InsertCodeBlockOperation } from './codeBlockOperations.js';
-import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
 
 const shellLangIds = [
     'fish',
@@ -62,7 +64,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyCodeBlock',
-                title: ( localize2(7550, "Copy")),
+                title: ( localize2(4187, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.copy,
@@ -147,27 +149,28 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.applyInEditor',
-                title: ( localize2(7551, "Apply in Editor")),
-                precondition: CONTEXT_CHAT_ENABLED,
+                title: ( localize2(4188, "Apply in Editor")),
+                precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
                 icon: Codicon.gitPullRequestGoToChanges,
-                menu: {
-                    id: MenuId.ChatCodeBlock,
-                    group: 'navigation',
-                    when: ( (ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION, ...( (shellLangIds.map(
-                        e => ( (ContextKeyExpr.notEquals(EditorContextKeys.languageId.key, e)))
-                    )))))),
-                    order: 10
-                },
+                menu: [
+                    {
+                        id: MenuId.ChatCodeBlock,
+                        group: 'navigation',
+                        when: ( ContextKeyExpr.and(...( shellLangIds.map(e => ( ContextKeyExpr.notEquals(EditorContextKeys.languageId.key, e)))))),
+                        order: 10
+                    },
+                    {
+                        id: MenuId.ChatCodeBlock,
+                        when: ( ContextKeyExpr.or(...( shellLangIds.map(e => ( ContextKeyExpr.equals(EditorContextKeys.languageId.key, e))))))
+                    },
+                ],
                 keybinding: {
-                    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
+                    when: ( ContextKeyExpr.or(( ContextKeyExpr.and(ChatContextKeys.inChatSession, ( ChatContextKeys.inChatInput.negate()))), accessibleViewInCodeBlock)),
+                    primary: KeyMod.CtrlCmd | KeyCode.Enter,
+                    mac: { primary: KeyMod.WinCtrl | KeyCode.Enter },
+                    weight: KeybindingWeight.ExternalExtension + 1
                 },
             });
         }
@@ -178,56 +181,32 @@ function registerChatCodeBlockActions() {
             return this.operation.run(context);
         }
     });
-    registerAction2(class ApplyAllAction extends Action2 {
-        constructor() {
-            super({
-                id: 'workbench.action.chat.applyAll',
-                title: ( localize2(7552, "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 chatEditingService = accessor.get(IChatEditingService);
-            const widget = chatWidgetService.lastFocusedWidget;
-            if (!widget || !widget.viewModel) {
-                return;
-            }
-            const applyEditsId = args[0];
-            const chatModel = widget.viewModel.model;
-            const request = chatModel.getRequests().find(request => request.response?.result?.metadata?.applyEditsId === applyEditsId);
-            if (request && request.response) {
-                await chatEditingService.startOrContinueEditingSession(widget.viewModel.sessionId, { silent: true });
-                await chatEditingService.triggerEditComputation(request.response);
-            }
-        }
-    });
     registerAction2(class SmartApplyInEditorAction extends ChatCodeBlockAction {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertCodeBlock',
-                title: ( localize2(7553, "Insert At Cursor")),
-                precondition: CONTEXT_CHAT_ENABLED,
+                title: ( localize2(4189, "Insert At Cursor")),
+                precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
                 icon: Codicon.insert,
-                menu: {
-                    id: MenuId.ChatCodeBlock,
-                    group: 'navigation',
-                    when: CONTEXT_IN_CHAT_SESSION,
-                    order: 20
-                },
+                menu: [{
+                        id: MenuId.ChatCodeBlock,
+                        group: 'navigation',
+                        when: ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ( ChatContextKeys.location.notEqualsTo(ChatAgentLocation.Terminal)))),
+                        order: 20
+                    }, {
+                        id: MenuId.ChatCodeBlock,
+                        group: 'navigation',
+                        when: ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Terminal)))),
+                        isHiddenByDefault: true,
+                        order: 20
+                    }],
                 keybinding: {
-                    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
+                    when: ( ContextKeyExpr.or(( ContextKeyExpr.and(ChatContextKeys.inChatSession, ( ChatContextKeys.inChatInput.negate()))), accessibleViewInCodeBlock)),
+                    primary: KeyMod.CtrlCmd | KeyCode.Enter,
+                    mac: { primary: KeyMod.WinCtrl | KeyCode.Enter },
+                    weight: KeybindingWeight.ExternalExtension + 1
                 },
             });
         }
@@ -240,8 +219,8 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertIntoNewFile',
-                title: ( localize2(7554, "Insert into New File")),
-                precondition: CONTEXT_CHAT_ENABLED,
+                title: ( localize2(4190, "Insert into New File")),
+                precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
                 icon: Codicon.newFile,
@@ -281,36 +260,29 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.runInTerminal',
-                title: ( localize2(7555, "Insert into Terminal")),
-                precondition: CONTEXT_CHAT_ENABLED,
+                title: ( localize2(4191, "Insert into Terminal")),
+                precondition: ChatContextKeys.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(ChatContextKeys.inChatSession, ( 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(ChatContextKeys.inChatSession, ...( shellLangIds.map(e => ( ContextKeyExpr.notEquals(EditorContextKeys.languageId.key, e))))))
                     }],
                 keybinding: [{
-                        primary: 2048  | 512  | 3 ,
+                        primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Enter,
                         mac: {
-                            primary: 256  | 512  | 3
+                            primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.Enter
                         },
-                        weight: 100 ,
-                        when: ( (ContextKeyExpr.or(CONTEXT_IN_CHAT_SESSION, accessibleViewInCodeBlock))),
+                        weight: KeybindingWeight.EditorContrib,
+                        when: ( ContextKeyExpr.or(ChatContextKeys.inChatSession, accessibleViewInCodeBlock)),
                     }]
             });
         }
@@ -381,14 +353,14 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextCodeBlock',
-                title: ( localize2(7556, "Next Code Block")),
+                title: ( localize2(4192, "Next Code Block")),
                 keybinding: {
-                    primary: 2048  | 512  | 12 ,
-                    mac: { primary: 2048  | 512  | 12 , },
-                    weight: 200 ,
-                    when: CONTEXT_IN_CHAT_SESSION,
+                    primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown,
+                    mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown, },
+                    weight: KeybindingWeight.WorkbenchContrib,
+                    when: ChatContextKeys.inChatSession,
                 },
-                precondition: CONTEXT_CHAT_ENABLED,
+                precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
             });
@@ -401,14 +373,14 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousCodeBlock',
-                title: ( localize2(7557, "Previous Code Block")),
+                title: ( localize2(4193, "Previous Code Block")),
                 keybinding: {
-                    primary: 2048  | 512  | 11 ,
-                    mac: { primary: 2048  | 512  | 11 , },
-                    weight: 200 ,
-                    when: CONTEXT_IN_CHAT_SESSION,
+                    primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
+                    mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp, },
+                    weight: KeybindingWeight.WorkbenchContrib,
+                    when: ChatContextKeys.inChatSession,
                 },
-                precondition: CONTEXT_CHAT_ENABLED,
+                precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
             });
@@ -458,14 +430,11 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.applyCompareEdits',
-                title: ( localize2(7558, "Apply Edits")),
+                title: ( localize2(4194, "Apply Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
-                icon: Codicon.check,
-                precondition: ( (ContextKeyExpr.and(
-                    EditorContextKeys.hasChanges,
-                     (CONTEXT_CHAT_EDIT_APPLIED.negate())
-                ))),
+                icon: Codicon.gitPullRequestGoToChanges,
+                precondition: ( ContextKeyExpr.and(EditorContextKeys.hasChanges, ( ChatContextKeys.editApplied.negate()))),
                 menu: {
                     id: MenuId.ChatCompareBlock,
                     group: 'navigation',
@@ -474,28 +443,20 @@ function registerChatCodeCompareBlockActions() {
             });
         }
         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, context.diffEditor);
-            await editorService.openEditor({
-                resource: context.edit.uri,
-                options: { revealIfVisible: true },
-            });
+            await editor.preview(context.element, context.edit);
         }
     });
     registerAction2(class DiscardEditsCompareBlockAction extends ChatCompareCodeBlockAction {
         constructor() {
             super({
                 id: 'workbench.action.chat.discardCompareEdits',
-                title: ( localize2(7559, "Discard Edits")),
+                title: ( localize2(4195, "Discard Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.trash,
-                precondition: ( (ContextKeyExpr.and(
-                    EditorContextKeys.hasChanges,
-                     (CONTEXT_CHAT_EDIT_APPLIED.negate())
-                ))),
+                precondition: ( ContextKeyExpr.and(EditorContextKeys.hasChanges, ( ChatContextKeys.editApplied.negate()))),
                 menu: {
                     id: MenuId.ChatCompareBlock,
                     group: 'navigation',

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

@@ -0,0 +1,12 @@
+import { ServicesAccessor } from "vscode/vscode/vs/editor/browser/editorExtensions";
+import { Action2, IAction2Options } from "vscode/vscode/vs/platform/actions/common/actions";
+export declare function registerChatContextActions(): void;
+export declare class AttachContextAction extends Action2 {
+    static readonly ID = "workbench.action.chat.attachContext";
+    protected static _cdt: import("vscode/vscode/vs/platform/contextkey/common/contextkey").ContextKeyExpression | undefined;
+    constructor(desc?: Readonly<IAction2Options>);
+    private _getFileContextId;
+    private _attachContext;
+    run(accessor: ServicesAccessor, ...args: any[]): Promise<void>;
+    private _show;
+}