@codingame/monaco-vscode-chat-service-override 25.1.2 → 26.0.0

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.js

@@ -6,8 +6,8 @@ import { EditorAction2 } from '@codingame/monaco-vscode-api/vscode/vs/editor/bro
 import { EmbeddedDiffEditorWidget } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/diffEditor/embeddedDiffEditorWidget';
 import { EmbeddedCodeEditorWidget } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
 import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
-import { InlineChatController, InlineChatRunOptions, InlineChatController1, InlineChatController2 } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_V1_ENABLED, CTX_INLINE_CHAT_V2_ENABLED, CTX_INLINE_CHAT_POSSIBLE, ACTION_START, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, MENU_INLINE_CHAT_WIDGET_STATUS, MENU_INLINE_CHAT_ZONE, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_TYPE, InlineChatResponseType, ACTION_DISCARD_CHANGES, ACTION_REGENERATE_RESPONSE, MENU_INLINE_CHAT_SIDE, ACTION_VIEW_IN_CHAT, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, ACTION_TOGGLE_DIFF } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { InlineChatController, InlineChatRunOptions } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_V1_ENABLED, CTX_INLINE_CHAT_V2_ENABLED, CTX_INLINE_CHAT_POSSIBLE, ACTION_START, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_FOCUSED, CTX_HOVER_MODE } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { ctxHasRequestInProgress, ctxHasEditorModification } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys';
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
@@ -20,22 +20,20 @@ import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/edito
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry';
-import { IPreferencesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
-import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 
-CommandsRegistry.registerCommandAlias('interactiveEditor.start', 'inlineChat.start');
-CommandsRegistry.registerCommandAlias('interactive.acceptChanges', ACTION_ACCEPT_CHANGES);
-const START_INLINE_CHAT = registerIcon('start-inline-chat', Codicon.sparkle, ( localize(8310, 'Icon which spawns the inline chat from the editor toolbar.')));
+CommandsRegistry.registerCommandAlias("interactiveEditor.start", "inlineChat.start");
+CommandsRegistry.registerCommandAlias("interactive.acceptChanges", ACTION_ACCEPT_CHANGES);
+const START_INLINE_CHAT = registerIcon("start-inline-chat", Codicon.sparkle, ( localize(8622, "Icon which spawns the inline chat from the editor toolbar.")));
 const inlineChatContextKey = ( ContextKeyExpr.and(( ContextKeyExpr.or(CTX_INLINE_CHAT_V1_ENABLED, CTX_INLINE_CHAT_V2_ENABLED)), CTX_INLINE_CHAT_POSSIBLE, EditorContextKeys.writable, ( EditorContextKeys.editorSimpleInput.negate())));
 class StartSessionAction extends Action2 {
     constructor() {
         super({
             id: ACTION_START,
-            title: ( localize2(8311, 'Open Inline Chat')),
-            category: AbstractInline1ChatAction.category,
+            title: ( localize2(8623, "Open Inline Chat")),
+            shortTitle: ( localize2(8624, "Inline Chat")),
+            category: AbstractInlineChatAction.category,
             f1: true,
             precondition: inlineChatContextKey,
             keybinding: {
@@ -45,15 +43,24 @@ class StartSessionAction extends Action2 {
             },
             icon: START_INLINE_CHAT,
             menu: [{
-                    id: MenuId.EditorContext,
-                    group: '1_chat',
-                    order: 3,
-                    when: inlineChatContextKey
-                }, {
-                    id: MenuId.ChatTitleBarMenu,
-                    group: 'a_open',
-                    order: 3,
-                }]
+                id: MenuId.EditorContext,
+                group: "1_chat",
+                order: 3,
+                when: inlineChatContextKey
+            }, {
+                id: MenuId.ChatTitleBarMenu,
+                group: "a_open",
+                order: 3
+            }, {
+                id: MenuId.ChatEditorInlineGutter,
+                group: "1_chat",
+                order: 1
+            }, {
+                id: MenuId.InlineChatEditorAffordance,
+                group: "1_chat",
+                order: 1,
+                when: EditorContextKeys.hasNonEmptySelection
+            }]
         });
     }
     run(accessor, ...args) {
@@ -62,12 +69,16 @@ class StartSessionAction extends Action2 {
         if (!editor || editor.isSimpleWidget) {
             return;
         }
-        return editor.invokeWithinContext((editorAccessor) => {
+        return editor.invokeWithinContext(editorAccessor => {
             const kbService = editorAccessor.get(IContextKeyService);
             const logService = editorAccessor.get(ILogService);
             const enabled = kbService.contextMatchesRules(this.desc.precondition ?? undefined);
             if (!enabled) {
-                logService.debug(`[EditorAction2] NOT running command because its precondition is FALSE`, this.desc.id, this.desc.precondition?.serialize());
+                logService.debug(
+                    `[EditorAction2] NOT running command because its precondition is FALSE`,
+                    this.desc.id,
+                    this.desc.precondition?.serialize()
+                );
                 return;
             }
             return this._runEditorCommand(editorAccessor, editor, ...args);
@@ -83,424 +94,80 @@ class StartSessionAction extends Action2 {
         if (arg && InlineChatRunOptions.isInlineChatRunOptions(arg)) {
             options = arg;
         }
-        const task = InlineChatController.get(editor)?.run({ ...options });
-        if (options?.blockOnResponse) {
-            await task;
-        }
+        await InlineChatController.get(editor)?.run({
+            ...options
+        });
     }
 }
 class FocusInlineChat extends EditorAction2 {
     constructor() {
         super({
-            id: 'inlineChat.focus',
-            title: ( localize2(8312, "Focus Input")),
+            id: "inlineChat.focus",
+            title: ( localize2(8625, "Focus Input")),
             f1: true,
-            category: AbstractInline1ChatAction.category,
+            category: AbstractInlineChatAction.category,
             precondition: ( ContextKeyExpr.and(EditorContextKeys.editorTextFocus, CTX_INLINE_CHAT_VISIBLE, ( CTX_INLINE_CHAT_FOCUSED.negate()), ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()))),
             keybinding: [{
-                    weight: KeybindingWeight.EditorCore + 10,
-                    when: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_OUTER_CURSOR_POSITION.isEqualTo('above')), ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
-                    primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
-                }, {
-                    weight: KeybindingWeight.EditorCore + 10,
-                    when: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_OUTER_CURSOR_POSITION.isEqualTo('below')), ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
-                    primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
-                }]
+                weight: KeybindingWeight.EditorCore + 10,
+                when: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_OUTER_CURSOR_POSITION.isEqualTo("above")), ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
+                primary: KeyMod.CtrlCmd | KeyCode.DownArrow
+            }, {
+                weight: KeybindingWeight.EditorCore + 10,
+                when: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_OUTER_CURSOR_POSITION.isEqualTo("below")), ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
+                primary: KeyMod.CtrlCmd | KeyCode.UpArrow
+            }]
         });
     }
     runEditorCommand(_accessor, editor, ..._args) {
         InlineChatController.get(editor)?.focus();
     }
 }
-class UnstashSessionAction extends EditorAction2 {
-    constructor() {
-        super({
-            id: 'inlineChat.unstash',
-            title: ( localize2(8313, "Resume Last Dismissed Inline Chat")),
-            category: AbstractInline1ChatAction.category,
-            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_STASHED_SESSION, EditorContextKeys.writable)),
-            keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyMod.CtrlCmd | KeyCode.KeyZ,
-            }
-        });
-    }
-    async runEditorCommand(_accessor, editor, ..._args) {
-        const ctrl = InlineChatController1.get(editor);
-        if (ctrl) {
-            const session = ctrl.unstashLastSession();
-            if (session) {
-                ctrl.run({
-                    existingSession: session,
-                });
-            }
-        }
-    }
-}
-class AbstractInline1ChatAction extends EditorAction2 {
-    static { this.category = ( localize2(8314, "Inline Chat")); }
-    constructor(desc) {
-        const massageMenu = (menu) => {
-            if (Array.isArray(menu)) {
-                for (const entry of menu) {
-                    entry.when = ( ContextKeyExpr.and(CTX_INLINE_CHAT_V1_ENABLED, entry.when));
-                }
-            }
-            else if (menu) {
-                menu.when = ( ContextKeyExpr.and(CTX_INLINE_CHAT_V1_ENABLED, menu.when));
-            }
-        };
-        if (Array.isArray(desc.menu)) {
-            massageMenu(desc.menu);
-        }
-        else {
-            massageMenu(desc.menu);
-        }
-        super({
-            ...desc,
-            category: AbstractInline1ChatAction.category,
-            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_V1_ENABLED, desc.precondition))
-        });
-    }
-    runEditorCommand(accessor, editor, ..._args) {
-        const editorService = accessor.get(IEditorService);
-        const logService = accessor.get(ILogService);
-        let ctrl = InlineChatController1.get(editor);
-        if (!ctrl) {
-            const { activeTextEditorControl } = editorService;
-            if (isCodeEditor(activeTextEditorControl)) {
-                editor = activeTextEditorControl;
-            }
-            else if (isDiffEditor(activeTextEditorControl)) {
-                editor = activeTextEditorControl.getModifiedEditor();
-            }
-            ctrl = InlineChatController1.get(editor);
-        }
-        if (!ctrl) {
-            logService.warn('[IE] NO controller found for action', this.desc.id, editor.getModel()?.uri);
-            return;
-        }
-        if (editor instanceof EmbeddedCodeEditorWidget) {
-            editor = editor.getParentEditor();
-        }
-        if (!ctrl) {
-            for (const diffEditor of accessor.get(ICodeEditorService).listDiffEditors()) {
-                if (diffEditor.getOriginalEditor() === editor || diffEditor.getModifiedEditor() === editor) {
-                    if (diffEditor instanceof EmbeddedDiffEditorWidget) {
-                        this.runEditorCommand(accessor, diffEditor.getParentEditor(), ..._args);
-                    }
-                }
-            }
-            return;
-        }
-        this.runInlineChatCommand(accessor, ctrl, editor, ..._args);
-    }
-}
-class ArrowOutUpAction extends AbstractInline1ChatAction {
-    constructor() {
-        super({
-            id: 'inlineChat.arrowOutUp',
-            title: ( localize(8315, 'Cursor Up')),
-            precondition: ( ContextKeyExpr.and(
-                CTX_INLINE_CHAT_FOCUSED,
-                CTX_INLINE_CHAT_INNER_CURSOR_FIRST,
-                ( EditorContextKeys.isEmbeddedDiffEditor.negate()),
-                ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
-            )),
-            keybinding: {
-                weight: KeybindingWeight.EditorCore,
-                primary: KeyMod.CtrlCmd | KeyCode.UpArrow
-            }
-        });
-    }
-    runInlineChatCommand(_accessor, ctrl, _editor, ..._args) {
-        ctrl.arrowOut(true);
-    }
-}
-class ArrowOutDownAction extends AbstractInline1ChatAction {
-    constructor() {
-        super({
-            id: 'inlineChat.arrowOutDown',
-            title: ( localize(8316, 'Cursor Down')),
-            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_LAST, ( EditorContextKeys.isEmbeddedDiffEditor.negate()), ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()))),
-            keybinding: {
-                weight: KeybindingWeight.EditorCore,
-                primary: KeyMod.CtrlCmd | KeyCode.DownArrow
-            }
-        });
-    }
-    runInlineChatCommand(_accessor, ctrl, _editor, ..._args) {
-        ctrl.arrowOut(false);
-    }
-}
-class AcceptChanges extends AbstractInline1ChatAction {
-    constructor() {
-        super({
-            id: ACTION_ACCEPT_CHANGES,
-            title: ( localize2(8317, "Accept Changes")),
-            shortTitle: ( localize(8318, 'Accept')),
-            icon: Codicon.check,
-            f1: true,
-            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE)),
-            keybinding: [{
-                    weight: KeybindingWeight.WorkbenchContrib + 10,
-                    primary: KeyMod.CtrlCmd | KeyCode.Enter,
-                }],
-            menu: [{
-                    id: MENU_INLINE_CHAT_WIDGET_STATUS,
-                    group: '0_main',
-                    order: 1,
-                    when: ( ContextKeyExpr.and(( ChatContextKeys.inputHasText.toNegated()), ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), ( CTX_INLINE_CHAT_RESPONSE_TYPE.isEqualTo(InlineChatResponseType.MessagesAndEdits)))),
-                }, {
-                    id: MENU_INLINE_CHAT_ZONE,
-                    group: 'navigation',
-                    order: 1,
-                }]
-        });
-    }
-    async runInlineChatCommand(_accessor, ctrl, _editor, hunk) {
-        ctrl.acceptHunk(hunk);
-    }
-}
-class DiscardHunkAction extends AbstractInline1ChatAction {
-    constructor() {
-        super({
-            id: ACTION_DISCARD_CHANGES,
-            title: ( localize(8319, 'Discard')),
-            icon: Codicon.chromeClose,
-            precondition: CTX_INLINE_CHAT_VISIBLE,
-            menu: [{
-                    id: MENU_INLINE_CHAT_ZONE,
-                    group: 'navigation',
-                    order: 2
-                }],
-            keybinding: {
-                weight: KeybindingWeight.EditorContrib,
-                primary: KeyCode.Escape,
-                when: ( CTX_INLINE_CHAT_RESPONSE_TYPE.isEqualTo(InlineChatResponseType.MessagesAndEdits))
-            }
-        });
-    }
-    async runInlineChatCommand(_accessor, ctrl, _editor, hunk) {
-        return ctrl.discardHunk(hunk);
-    }
-}
-class RerunAction extends AbstractInline1ChatAction {
-    constructor() {
-        super({
-            id: ACTION_REGENERATE_RESPONSE,
-            title: ( localize2(8320, "Rerun Request")),
-            shortTitle: ( localize(8321, 'Rerun')),
-            f1: false,
-            icon: Codicon.refresh,
-            precondition: CTX_INLINE_CHAT_VISIBLE,
-            menu: {
-                id: MENU_INLINE_CHAT_WIDGET_STATUS,
-                group: '0_main',
-                order: 5,
-                when: ( ContextKeyExpr.and(( ChatContextKeys.inputHasText.toNegated()), ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.negate()), ( CTX_INLINE_CHAT_RESPONSE_TYPE.notEqualsTo(InlineChatResponseType.None))))
-            },
-            keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyMod.CtrlCmd | KeyCode.KeyR
-            }
-        });
+class AbstractInlineChatAction extends EditorAction2 {
+    static {
+        this.category = ( localize2(8626, "Inline Chat"));
     }
-    async runInlineChatCommand(accessor, ctrl, _editor, ..._args) {
-        const chatService = accessor.get(IChatService);
-        const chatWidgetService = accessor.get(IChatWidgetService);
-        const model = ctrl.chatWidget.viewModel?.model;
-        if (!model) {
-            return;
-        }
-        const lastRequest = model.getRequests().at(-1);
-        if (lastRequest) {
-            const widget = chatWidgetService.getWidgetBySessionResource(model.sessionResource);
-            await chatService.resendRequest(lastRequest, {
-                noCommandDetection: false,
-                attempt: lastRequest.attempt + 1,
-                location: ctrl.chatWidget.location,
-                userSelectedModelId: widget?.input.currentLanguageModel
-            });
-        }
-    }
-}
-class CloseAction extends AbstractInline1ChatAction {
-    constructor() {
-        super({
-            id: 'inlineChat.close',
-            title: ( localize(8322, 'Close')),
-            icon: Codicon.close,
-            precondition: CTX_INLINE_CHAT_VISIBLE,
-            keybinding: {
-                weight: KeybindingWeight.EditorContrib + 1,
-                primary: KeyCode.Escape,
-            },
-            menu: [{
-                    id: MENU_INLINE_CHAT_WIDGET_STATUS,
-                    group: '0_main',
-                    order: 1,
-                    when: ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.negate())
-                }, {
-                    id: MENU_INLINE_CHAT_SIDE,
-                    group: 'navigation',
-                    when: ( CTX_INLINE_CHAT_RESPONSE_TYPE.isEqualTo(InlineChatResponseType.None))
-                }]
-        });
-    }
-    async runInlineChatCommand(_accessor, ctrl, _editor, ..._args) {
-        ctrl.cancelSession();
-    }
-}
-class ConfigureInlineChatAction extends AbstractInline1ChatAction {
-    constructor() {
-        super({
-            id: 'inlineChat.configure',
-            title: ( localize2(8323, 'Configure Inline Chat')),
-            icon: Codicon.settingsGear,
-            precondition: CTX_INLINE_CHAT_VISIBLE,
-            f1: true,
-            menu: {
-                id: MENU_INLINE_CHAT_WIDGET_STATUS,
-                group: 'zzz',
-                order: 5
-            }
-        });
-    }
-    async runInlineChatCommand(accessor, ctrl, _editor, ..._args) {
-        accessor.get(IPreferencesService).openSettings({ query: 'inlineChat' });
-    }
-}
-class MoveToNextHunk extends AbstractInline1ChatAction {
-    constructor() {
-        super({
-            id: 'inlineChat.moveToNextHunk',
-            title: ( localize2(8324, 'Move to Next Change')),
-            precondition: CTX_INLINE_CHAT_VISIBLE,
-            f1: true,
-            keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyCode.F7
-            }
-        });
-    }
-    runInlineChatCommand(accessor, ctrl, editor, ...args) {
-        ctrl.moveHunk(true);
-    }
-}
-class MoveToPreviousHunk extends AbstractInline1ChatAction {
-    constructor() {
-        super({
-            id: 'inlineChat.moveToPreviousHunk',
-            title: ( localize2(8325, 'Move to Previous Change')),
-            f1: true,
-            precondition: CTX_INLINE_CHAT_VISIBLE,
-            keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyMod.Shift | KeyCode.F7
-            }
-        });
-    }
-    runInlineChatCommand(accessor, ctrl, editor, ...args) {
-        ctrl.moveHunk(false);
-    }
-}
-class ViewInChatAction extends AbstractInline1ChatAction {
-    constructor() {
-        super({
-            id: ACTION_VIEW_IN_CHAT,
-            title: ( localize(8326, 'View in Chat')),
-            icon: Codicon.chatSparkle,
-            precondition: CTX_INLINE_CHAT_VISIBLE,
-            menu: [{
-                    id: MENU_INLINE_CHAT_WIDGET_STATUS,
-                    group: 'more',
-                    order: 1,
-                    when: ( CTX_INLINE_CHAT_RESPONSE_TYPE.notEqualsTo(InlineChatResponseType.Messages))
-                }, {
-                    id: MENU_INLINE_CHAT_WIDGET_STATUS,
-                    group: '0_main',
-                    order: 1,
-                    when: ( ContextKeyExpr.and(( ChatContextKeys.inputHasText.toNegated()), ( CTX_INLINE_CHAT_RESPONSE_TYPE.isEqualTo(InlineChatResponseType.Messages)), ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.negate())))
-                }],
-            keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
-                when: ChatContextKeys.inChatInput
-            }
-        });
-    }
-    runInlineChatCommand(_accessor, ctrl, _editor, ..._args) {
-        return ctrl.viewInChat();
-    }
-}
-class ToggleDiffForChange extends AbstractInline1ChatAction {
-    constructor() {
-        super({
-            id: ACTION_TOGGLE_DIFF,
-            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_CHANGE_HAS_DIFF)),
-            title: ( localize2(8327, 'Toggle Changes')),
-            icon: Codicon.diffSingle,
-            toggled: {
-                condition: CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF,
-            },
-            menu: [{
-                    id: MENU_INLINE_CHAT_WIDGET_STATUS,
-                    group: 'zzz',
-                    order: 1,
-                }, {
-                    id: MENU_INLINE_CHAT_ZONE,
-                    group: 'navigation',
-                    when: CTX_INLINE_CHAT_CHANGE_HAS_DIFF,
-                    order: 2
-                }]
-        });
-    }
-    runInlineChatCommand(_accessor, ctrl, _editor, hunkInfo) {
-        ctrl.toggleDiff(hunkInfo);
-    }
-}
-class AbstractInline2ChatAction extends EditorAction2 {
-    static { this.category = ( localize2(8314, "Inline Chat")); }
     constructor(desc) {
-        const massageMenu = (menu) => {
+        const massageMenu = menu => {
             if (Array.isArray(menu)) {
                 for (const entry of menu) {
                     entry.when = ( ContextKeyExpr.and(CTX_INLINE_CHAT_V2_ENABLED, entry.when));
                 }
-            }
-            else if (menu) {
+            } else if (menu) {
                 menu.when = ( ContextKeyExpr.and(CTX_INLINE_CHAT_V2_ENABLED, menu.when));
             }
         };
         if (Array.isArray(desc.menu)) {
             massageMenu(desc.menu);
-        }
-        else {
+        } else {
             massageMenu(desc.menu);
         }
         super({
             ...desc,
-            category: AbstractInline2ChatAction.category,
+            category: AbstractInlineChatAction.category,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_V2_ENABLED, desc.precondition))
         });
     }
     runEditorCommand(accessor, editor, ..._args) {
         const editorService = accessor.get(IEditorService);
         const logService = accessor.get(ILogService);
-        let ctrl = InlineChatController2.get(editor);
+        let ctrl = InlineChatController.get(editor);
         if (!ctrl) {
-            const { activeTextEditorControl } = editorService;
+            const {
+                activeTextEditorControl
+            } = editorService;
             if (isCodeEditor(activeTextEditorControl)) {
                 editor = activeTextEditorControl;
-            }
-            else if (isDiffEditor(activeTextEditorControl)) {
+            } else if (isDiffEditor(activeTextEditorControl)) {
                 editor = activeTextEditorControl.getModifiedEditor();
             }
-            ctrl = InlineChatController2.get(editor);
+            ctrl = InlineChatController.get(editor);
         }
         if (!ctrl) {
-            logService.warn('[IE] NO controller found for action', this.desc.id, editor.getModel()?.uri);
+            logService.warn(
+                "[IE] NO controller found for action",
+                this.desc.id,
+                editor.getModel()?.uri
+            );
             return;
         }
         if (editor instanceof EmbeddedCodeEditorWidget) {
@@ -519,7 +186,7 @@ class AbstractInline2ChatAction extends EditorAction2 {
         this.runInlineChatCommand(accessor, ctrl, editor, ..._args);
     }
 }
-class KeepOrUndoSessionAction extends AbstractInline2ChatAction {
+class KeepOrUndoSessionAction extends AbstractInlineChatAction {
     constructor(_keep, desc) {
         super(desc);
         this._keep = _keep;
@@ -527,8 +194,7 @@ class KeepOrUndoSessionAction extends AbstractInline2ChatAction {
     async runInlineChatCommand(_accessor, ctrl, editor, ..._args) {
         if (this._keep) {
             await ctrl.acceptSession();
-        }
-        else {
+        } else {
             await ctrl.rejectSession();
         }
         if (editor.hasModel()) {
@@ -539,48 +205,71 @@ class KeepOrUndoSessionAction extends AbstractInline2ChatAction {
 class KeepSessionAction2 extends KeepOrUndoSessionAction {
     constructor() {
         super(true, {
-            id: 'inlineChat2.keep',
-            title: ( localize2(8328, "Keep")),
+            id: "inlineChat2.keep",
+            title: ( localize2(8627, "Keep")),
             f1: true,
             icon: Codicon.check,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( ctxHasRequestInProgress.negate()), ctxHasEditorModification)),
             keybinding: [{
-                    when: ( ContextKeyExpr.and(ChatContextKeys.inputHasFocus, ( ChatContextKeys.inputHasText.negate()))),
-                    weight: KeybindingWeight.WorkbenchContrib,
-                    primary: KeyCode.Enter
-                }, {
-                    weight: KeybindingWeight.WorkbenchContrib + 10,
-                    primary: KeyMod.CtrlCmd | KeyCode.Enter
-                }],
+                when: ( ContextKeyExpr.and(ChatContextKeys.inputHasFocus, ( ChatContextKeys.inputHasText.negate()))),
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyCode.Enter
+            }, {
+                weight: KeybindingWeight.WorkbenchContrib + 10,
+                primary: KeyMod.CtrlCmd | KeyCode.Enter
+            }],
+            menu: [{
+                id: MenuId.ChatEditorInlineExecute,
+                group: "navigation",
+                order: 4,
+                when: ( ContextKeyExpr.and(( ctxHasRequestInProgress.negate()), ctxHasEditorModification, ( ChatContextKeys.inputHasText.toNegated())))
+            }]
+        });
+    }
+}
+class UndoSessionAction2 extends KeepOrUndoSessionAction {
+    constructor() {
+        super(false, {
+            id: "inlineChat2.undo",
+            title: ( localize2(8628, "Undo")),
+            f1: true,
+            icon: Codicon.discard,
+            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_HOVER_MODE)),
+            keybinding: [{
+                when: ( ContextKeyExpr.or(( ContextKeyExpr.and(EditorContextKeys.focus, ( ctxHasEditorModification.negate()))), ChatContextKeys.inputHasFocus)),
+                weight: KeybindingWeight.WorkbenchContrib + 1,
+                primary: KeyCode.Escape
+            }],
             menu: [{
-                    id: MenuId.ChatEditorInlineExecute,
-                    group: 'navigation',
-                    order: 4,
-                    when: ( ContextKeyExpr.and(( ctxHasRequestInProgress.negate()), ctxHasEditorModification, ( ChatContextKeys.inputHasText.toNegated()))),
-                }]
+                id: MenuId.ChatEditorInlineExecute,
+                group: "navigation",
+                order: 100,
+                when: ( ContextKeyExpr.and(CTX_HOVER_MODE, ( ctxHasRequestInProgress.negate()), ctxHasEditorModification))
+            }]
         });
     }
 }
 class UndoAndCloseSessionAction2 extends KeepOrUndoSessionAction {
     constructor() {
         super(false, {
-            id: 'inlineChat2.close',
-            title: ( localize2(8329, "Close")),
+            id: "inlineChat2.close",
+            title: ( localize2(8629, "Close")),
             f1: true,
             icon: Codicon.close,
-            precondition: CTX_INLINE_CHAT_VISIBLE,
+            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( CTX_HOVER_MODE.negate()))),
             keybinding: [{
-                    when: ( ContextKeyExpr.or(( ContextKeyExpr.and(EditorContextKeys.focus, ( ctxHasEditorModification.negate()))), ChatContextKeys.inputHasFocus)),
-                    weight: KeybindingWeight.WorkbenchContrib + 1,
-                    primary: KeyCode.Escape,
-                }],
+                when: ( ContextKeyExpr.or(( ContextKeyExpr.and(EditorContextKeys.focus, ( ctxHasEditorModification.negate()))), ChatContextKeys.inputHasFocus)),
+                weight: KeybindingWeight.WorkbenchContrib + 1,
+                primary: KeyCode.Escape
+            }],
             menu: [{
-                    id: MenuId.ChatEditorInlineExecute,
-                    group: 'navigation',
-                    order: 100
-                }]
+                id: MenuId.ChatEditorInlineExecute,
+                group: "navigation",
+                order: 100,
+                when: ( ContextKeyExpr.or(( CTX_HOVER_MODE.negate()), ( ContextKeyExpr.and(CTX_HOVER_MODE, ( ctxHasEditorModification.negate()), ( ctxHasRequestInProgress.negate())))))
+            }]
         });
     }
 }
 
-export { AbstractInline1ChatAction, AcceptChanges, ArrowOutDownAction, ArrowOutUpAction, CloseAction, ConfigureInlineChatAction, DiscardHunkAction, FocusInlineChat, KeepSessionAction2, MoveToNextHunk, MoveToPreviousHunk, RerunAction, START_INLINE_CHAT, StartSessionAction, ToggleDiffForChange, UndoAndCloseSessionAction2, UnstashSessionAction, ViewInChatAction };
+export { AbstractInlineChatAction, FocusInlineChat, KeepSessionAction2, START_INLINE_CHAT, StartSessionAction, UndoAndCloseSessionAction2, UndoSessionAction2 };