@codingame/monaco-vscode-api 5.3.0 → 6.0.0

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

@@ -1,31 +1,29 @@
 import { Codicon } from '../../../../base/common/codicons.js';
-import { KeyChord } from '../../../../base/common/keyCodes.js';
+import { KeyMod as KeyMod$1, KeyCode, KeyChord } from '../../../../base/common/keyCodes.js';
 import { isCodeEditor, isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
 import { EditorAction2 } from '../../../../editor/browser/editorExtensions.js';
 import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/embeddedDiffEditorWidget.js';
 import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 import { InlineChatController, InlineChatRunOptions } from './inlineChatController.js';
-import { ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_HAS_PROVIDER, MENU_INLINE_CHAT_WIDGET_STATUS, MENU_INLINE_CHAT_WIDGET_DISCARD, CTX_INLINE_CHAT_EDIT_MODE, CTX_INLINE_CHAT_RESPONSE_TYPES, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_DID_EDIT, ACTION_TOGGLE_DIFF, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, CTX_INLINE_CHAT_DOCUMENT_CHANGED, MENU_INLINE_CHAT_WIDGET, ACTION_VIEW_IN_CHAT } from '../common/inlineChat.js';
+import { ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, MENU_INLINE_CHAT_WIDGET_STATUS, CTX_INLINE_CHAT_RESPONSE_TYPES, InlineChatResponseTypes, CTX_INLINE_CHAT_EDIT_MODE, EditMode, CTX_INLINE_CHAT_USER_DID_EDIT, ACTION_TOGGLE_DIFF, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, CTX_INLINE_CHAT_DOCUMENT_CHANGED, MENU_INLINE_CHAT_WIDGET, ACTION_VIEW_IN_CHAT, ACTION_REGENERATE_RESPONSE } from '../common/inlineChat.js';
 import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
-import { MenuRegistry } from '../../../../platform/actions/common/actions.js';
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.service.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
-import { SIDE_GROUP } from '../../../services/editor/common/editorService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { fromNow } from '../../../../base/common/date.js';
 import { IInlineChatSessionService } from './inlineChatSessionService.service.js';
-import { runAccessibilityHelpAction } from '../../chat/browser/actions/chatAccessibilityHelp.js';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../platform/accessibility/common/accessibility.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
-import { AccessibilityHelpAction } from '../../accessibility/browser/accessibleViewActions.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { IPreferencesService } from '../../../services/preferences/common/preferences.service.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
+import { IChatService } from '../../chat/common/chatService.service.js';
+import { CONTEXT_CHAT_REQUEST_IN_PROGRESS } from '../../chat/common/chatContextKeys.js';
 const _moduleId = "vs/workbench/contrib/inlineChat/browser/inlineChatActions";
 CommandsRegistry.registerCommandAlias('interactiveEditor.start', 'inlineChat.start');
 CommandsRegistry.registerCommandAlias('interactive.acceptChanges', ACTION_ACCEPT_CHANGES);
@@ -38,12 +36,12 @@ class StartSessionAction extends EditorAction2 {
             title: LOCALIZED_START_INLINE_CHAT_STRING,
             category: AbstractInlineChatAction.category,
             f1: true,
-            precondition: ( (ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_PROVIDER, EditorContextKeys.writable))),
+            precondition: ( (ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_AGENT, EditorContextKeys.writable))),
             keybinding: {
                 when: EditorContextKeys.focus,
-                weight: 200 ,
-                primary: 2048  | 39 ,
-                secondary: [KeyChord(2048  | 41 , 39 )],
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod$1.CtrlCmd | KeyCode.KeyI,
+                secondary: [KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyCode.KeyI)],
             },
             icon: START_INLINE_CHAT
         });
@@ -69,8 +67,8 @@ class UnstashSessionAction extends EditorAction2 {
             category: AbstractInlineChatAction.category,
             precondition: ( (ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_STASHED_SESSION, EditorContextKeys.writable))),
             keybinding: {
-                weight: 200 ,
-                primary: 2048  | 56 ,
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod$1.CtrlCmd | KeyCode.KeyZ,
             }
         });
     }
@@ -93,7 +91,7 @@ class AbstractInlineChatAction extends EditorAction2 {
         super({
             ...desc,
             category: AbstractInlineChatAction.category,
-            precondition: ( (ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_PROVIDER, desc.precondition)))
+            precondition: ( (ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_AGENT, desc.precondition)))
         });
     }
     runEditorCommand(accessor, editor, ..._args) {
@@ -142,8 +140,8 @@ class ArrowOutUpAction extends AbstractInlineChatAction {
                  (CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
             ))),
             keybinding: {
-                weight: 0 ,
-                primary: 2048  | 16
+                weight: KeybindingWeight.EditorCore,
+                primary: KeyMod$1.CtrlCmd | KeyCode.UpArrow
             }
         });
     }
@@ -163,8 +161,8 @@ class ArrowOutDownAction extends AbstractInlineChatAction {
                  (CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
             ))),
             keybinding: {
-                weight: 0 ,
-                primary: 2048  | 18
+                weight: KeybindingWeight.EditorCore,
+                primary: KeyMod$1.CtrlCmd | KeyCode.DownArrow
             }
         });
     }
@@ -186,19 +184,19 @@ class FocusInlineChat extends EditorAction2 {
                  (CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
             ))),
             keybinding: [{
-                    weight: 0  + 10,
+                    weight: KeybindingWeight.EditorCore + 10,
                     when: ( (ContextKeyExpr.and(
                          (CTX_INLINE_CHAT_OUTER_CURSOR_POSITION.isEqualTo('above')),
                          (EditorContextKeys.isEmbeddedDiffEditor.negate())
                     ))),
-                    primary: 2048  | 18 ,
+                    primary: KeyMod$1.CtrlCmd | KeyCode.DownArrow,
                 }, {
-                    weight: 0  + 10,
+                    weight: KeybindingWeight.EditorCore + 10,
                     when: ( (ContextKeyExpr.and(
                          (CTX_INLINE_CHAT_OUTER_CURSOR_POSITION.isEqualTo('below')),
                          (EditorContextKeys.isEmbeddedDiffEditor.negate())
                     ))),
-                    primary: 2048  | 16 ,
+                    primary: KeyMod$1.CtrlCmd | KeyCode.UpArrow,
                 }]
         });
     }
@@ -216,9 +214,9 @@ class DiscardHunkAction extends AbstractInlineChatAction {
             menu: {
                 id: MENU_INLINE_CHAT_WIDGET_STATUS,
                 when: ( (ContextKeyExpr.and(
-                     (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("onlyMessages" )),
-                     (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("empty" )),
-                     (CTX_INLINE_CHAT_EDIT_MODE.isEqualTo("live" ))
+                     (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo(InlineChatResponseTypes.OnlyMessages)),
+                     (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo(InlineChatResponseTypes.Empty)),
+                     (CTX_INLINE_CHAT_EDIT_MODE.isEqualTo(EditMode.Live))
                 ))),
                 group: '0_main',
                 order: 3
@@ -229,19 +227,6 @@ class DiscardHunkAction extends AbstractInlineChatAction {
         return ctrl.discardHunk();
     }
 }
-MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, {
-    submenu: MENU_INLINE_CHAT_WIDGET_DISCARD,
-    title: ( localizeWithPath(_moduleId, 8, "Discard...")),
-    icon: Codicon.discard,
-    group: '0_main',
-    order: 2,
-    when: ( (ContextKeyExpr.and(
-         (CTX_INLINE_CHAT_EDIT_MODE.notEqualsTo("preview" )),
-         (CTX_INLINE_CHAT_EDIT_MODE.notEqualsTo("live" )),
-         (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("onlyMessages" ))
-    ))),
-    rememberDefaultAction: true
-});
 class DiscardAction extends AbstractInlineChatAction {
     constructor() {
         super({
@@ -250,14 +235,9 @@ class DiscardAction extends AbstractInlineChatAction {
             icon: Codicon.discard,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
-                weight: 100  - 1,
-                primary: 9 ,
+                weight: KeybindingWeight.EditorContrib - 1,
+                primary: KeyCode.Escape,
                 when: ( (CTX_INLINE_CHAT_USER_DID_EDIT.negate()))
-            },
-            menu: {
-                id: MENU_INLINE_CHAT_WIDGET_DISCARD,
-                group: '0_main',
-                order: 0
             }
         });
     }
@@ -265,59 +245,16 @@ class DiscardAction extends AbstractInlineChatAction {
         await ctrl.cancelSession();
     }
 }
-class DiscardToClipboardAction extends AbstractInlineChatAction {
-    constructor() {
-        super({
-            id: 'inlineChat.discardToClipboard',
-            title: ( localizeWithPath(_moduleId, 9, 'Discard to Clipboard')),
-            precondition: ( (ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_DID_EDIT))),
-            menu: {
-                id: MENU_INLINE_CHAT_WIDGET_DISCARD,
-                group: '0_main',
-                order: 1
-            }
-        });
-    }
-    async runInlineChatCommand(accessor, ctrl) {
-        const clipboardService = accessor.get(IClipboardService);
-        const changedText = await ctrl.cancelSession();
-        if (changedText !== undefined) {
-            clipboardService.writeText(changedText);
-        }
-    }
-}
-class DiscardUndoToNewFileAction extends AbstractInlineChatAction {
-    constructor() {
-        super({
-            id: 'inlineChat.discardToFile',
-            title: ( localizeWithPath(_moduleId, 10, 'Discard to New File')),
-            precondition: ( (ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_DID_EDIT))),
-            menu: {
-                id: MENU_INLINE_CHAT_WIDGET_DISCARD,
-                group: '0_main',
-                order: 2
-            }
-        });
-    }
-    async runInlineChatCommand(accessor, ctrl, editor, ..._args) {
-        const editorService = accessor.get(IEditorService);
-        const changedText = await ctrl.cancelSession();
-        if (changedText !== undefined) {
-            const input = { forceUntitled: true, resource: undefined, contents: changedText, languageId: editor.getModel()?.getLanguageId() };
-            editorService.openEditor(input, SIDE_GROUP);
-        }
-    }
-}
 class ToggleDiffForChange extends AbstractInlineChatAction {
     constructor() {
         super({
             id: ACTION_TOGGLE_DIFF,
             precondition: ( (ContextKeyExpr.and(
                 CTX_INLINE_CHAT_VISIBLE,
-                 (CTX_INLINE_CHAT_EDIT_MODE.isEqualTo("live" )),
+                 (CTX_INLINE_CHAT_EDIT_MODE.isEqualTo(EditMode.Live)),
                 CTX_INLINE_CHAT_CHANGE_HAS_DIFF
             ))),
-            title: ( localize2WithPath(_moduleId, 11, 'Toggle Changes')),
+            title: ( localize2WithPath(_moduleId, 8, 'Toggle Changes')),
             icon: Codicon.diffSingle,
             toggled: {
                 condition: CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF,
@@ -327,9 +264,10 @@ class ToggleDiffForChange extends AbstractInlineChatAction {
                     id: MENU_INLINE_CHAT_WIDGET_STATUS,
                     group: '1_main',
                     when: ( (ContextKeyExpr.and(
-                         (CTX_INLINE_CHAT_EDIT_MODE.isEqualTo("live" )),
+                         (CTX_INLINE_CHAT_EDIT_MODE.isEqualTo(EditMode.Live)),
                         CTX_INLINE_CHAT_CHANGE_HAS_DIFF
-                    )))
+                    ))),
+                    order: 10,
                 }
             ]
         });
@@ -342,22 +280,22 @@ class AcceptChanges extends AbstractInlineChatAction {
     constructor() {
         super({
             id: ACTION_ACCEPT_CHANGES,
-            title: ( localize2WithPath(_moduleId, 12, "Accept Changes")),
-            shortTitle: ( localizeWithPath(_moduleId, 13, 'Accept')),
+            title: ( localize2WithPath(_moduleId, 9, "Accept Changes")),
+            shortTitle: ( localizeWithPath(_moduleId, 10, 'Accept')),
             icon: Codicon.check,
             f1: true,
             precondition: ( (ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE,  (ContextKeyExpr.or(
                  (CTX_INLINE_CHAT_DOCUMENT_CHANGED.toNegated()),
-                 (CTX_INLINE_CHAT_EDIT_MODE.notEqualsTo("preview" ))
+                 (CTX_INLINE_CHAT_EDIT_MODE.notEqualsTo(EditMode.Preview))
             ))))),
             keybinding: [{
-                    weight: 200  + 10,
-                    primary: 2048  | 3 ,
+                    weight: KeybindingWeight.WorkbenchContrib + 10,
+                    primary: KeyMod$1.CtrlCmd | KeyCode.Enter,
                 }],
             menu: {
                 when: ( (ContextKeyExpr.and(
-                     (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("onlyMessages" )),
-                     (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("empty" ))
+                     (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo(InlineChatResponseTypes.OnlyMessages)),
+                     (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo(InlineChatResponseTypes.Empty))
                 ))),
                 id: MENU_INLINE_CHAT_WIDGET_STATUS,
                 group: '0_main',
@@ -373,21 +311,21 @@ class CancelSessionAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.cancel',
-            title: ( localizeWithPath(_moduleId, 14, 'Cancel')),
+            title: ( localizeWithPath(_moduleId, 11, 'Cancel')),
             icon: Codicon.clearAll,
             precondition: ( (ContextKeyExpr.and(
                 CTX_INLINE_CHAT_VISIBLE,
-                 (CTX_INLINE_CHAT_EDIT_MODE.isEqualTo("preview" ))
+                 (CTX_INLINE_CHAT_EDIT_MODE.isEqualTo(EditMode.Preview))
             ))),
             keybinding: {
-                weight: 100  - 1,
-                primary: 9
+                weight: KeybindingWeight.EditorContrib - 1,
+                primary: KeyCode.Escape
             },
             menu: {
                 id: MENU_INLINE_CHAT_WIDGET_STATUS,
                 when: ( (ContextKeyExpr.and(
-                     (CTX_INLINE_CHAT_EDIT_MODE.isEqualTo("preview" )),
-                     (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("empty" ))
+                     (CTX_INLINE_CHAT_EDIT_MODE.isEqualTo(EditMode.Preview)),
+                     (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo(InlineChatResponseTypes.Empty))
                 ))),
                 group: '0_main',
                 order: 3
@@ -402,12 +340,12 @@ class CloseAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.close',
-            title: ( localizeWithPath(_moduleId, 15, 'Close')),
+            title: ( localizeWithPath(_moduleId, 12, 'Close')),
             icon: Codicon.close,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
-                weight: 100  - 1,
-                primary: 9 ,
+                weight: KeybindingWeight.EditorContrib - 1,
+                primary: KeyCode.Escape,
                 when: ( (CTX_INLINE_CHAT_USER_DID_EDIT.negate()))
             },
             menu: {
@@ -425,14 +363,10 @@ class ConfigureInlineChatAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.configure',
-            title: ( localizeWithPath(_moduleId, 16, 'Configure ')),
+            title: ( localize2WithPath(_moduleId, 13, 'Configure Inline Chat')),
             icon: Codicon.settingsGear,
             precondition: CTX_INLINE_CHAT_VISIBLE,
-            menu: {
-                id: MENU_INLINE_CHAT_WIDGET,
-                group: 'config',
-                order: 1,
-            }
+            f1: true,
         });
     }
     async runInlineChatCommand(accessor, ctrl, _editor, ..._args) {
@@ -443,12 +377,12 @@ class MoveToNextHunk extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.moveToNextHunk',
-            title: ( localize2WithPath(_moduleId, 17, 'Move to Next Change')),
+            title: ( localize2WithPath(_moduleId, 14, 'Move to Next Change')),
             precondition: CTX_INLINE_CHAT_VISIBLE,
             f1: true,
             keybinding: {
-                weight: 200 ,
-                primary: 65
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyCode.F7
             }
         });
     }
@@ -460,12 +394,12 @@ class MoveToPreviousHunk extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.moveToPreviousHunk',
-            title: ( localize2WithPath(_moduleId, 18, 'Move to Previous Change')),
+            title: ( localize2WithPath(_moduleId, 15, 'Move to Previous Change')),
             f1: true,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
-                weight: 200 ,
-                primary: 1024  | 65
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod$1.Shift | KeyCode.F7
             }
         });
     }
@@ -478,7 +412,7 @@ class CopyRecordings extends AbstractInlineChatAction {
         super({
             id: 'inlineChat.copyRecordings',
             f1: true,
-            title: ( localize2WithPath(_moduleId, 19, "(Developer) Write Exchange to Clipboard"))
+            title: ( localize2WithPath(_moduleId, 16, "(Developer) Write Exchange to Clipboard"))
         });
     }
     async runInlineChatCommand(accessor) {
@@ -494,7 +428,7 @@ class CopyRecordings extends AbstractInlineChatAction {
                 rec,
                 label: ( localizeWithPath(
                     _moduleId,
-                    20,
+                    17,
                     "'{0}' and {1} follow ups ({2})",
                     rec.exchanges[0].prompt,
                     rec.exchanges.length - 1,
@@ -513,31 +447,42 @@ class ViewInChatAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: ACTION_VIEW_IN_CHAT,
-            title: ( localizeWithPath(_moduleId, 21, 'View in Chat')),
+            title: ( localizeWithPath(_moduleId, 18, 'View in Chat')),
             icon: Codicon.commentDiscussion,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             menu: {
-                id: MENU_INLINE_CHAT_WIDGET_STATUS,
-                when: ( (CTX_INLINE_CHAT_RESPONSE_TYPES.isEqualTo("onlyMessages" ))),
-                group: '0_main',
-                order: 1
+                id: MENU_INLINE_CHAT_WIDGET,
+                group: 'navigation',
+                order: 5
             }
         });
     }
     runInlineChatCommand(_accessor, ctrl, _editor, ..._args) {
-        ctrl.viewInChat();
+        return ctrl.viewInChat();
     }
 }
-class InlineAccessibilityHelpContribution extends Disposable {
+class RerunAction extends AbstractInlineChatAction {
     constructor() {
-        super();
-        this._register(AccessibilityHelpAction.addImplementation(106, 'inlineChat', async (accessor) => {
-            const codeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor() || accessor.get(ICodeEditorService).getFocusedCodeEditor();
-            if (!codeEditor) {
-                return;
+        super({
+            id: ACTION_REGENERATE_RESPONSE,
+            title: ( localize2WithPath(_moduleId, 19, "Rerun Request")),
+            f1: false,
+            icon: Codicon.refresh,
+            precondition: ( (CONTEXT_CHAT_REQUEST_IN_PROGRESS.negate())),
+            menu: {
+                id: MENU_INLINE_CHAT_WIDGET_STATUS,
+                group: '0_main',
+                order: 5,
             }
-            runAccessibilityHelpAction(accessor, codeEditor, 'inlineChat');
-        }, ( (ContextKeyExpr.or(CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_FOCUSED)))));
+        });
+    }
+    async runInlineChatCommand(accessor, ctrl, _editor, ..._args) {
+        const chatService = accessor.get(IChatService);
+        const model = ctrl.chatWidget.viewModel?.model;
+        const lastRequest = model?.getRequests().at(-1);
+        if (lastRequest) {
+            await chatService.resendRequest(lastRequest, { noCommandDetection: false, attempt: lastRequest.attempt + 1, location: ctrl.chatWidget.location });
+        }
     }
 }
-export { AbstractInlineChatAction, AcceptChanges, ArrowOutDownAction, ArrowOutUpAction, CancelSessionAction, CloseAction, ConfigureInlineChatAction, CopyRecordings, DiscardAction, DiscardHunkAction, DiscardToClipboardAction, DiscardUndoToNewFileAction, FocusInlineChat, InlineAccessibilityHelpContribution, LOCALIZED_START_INLINE_CHAT_STRING, MoveToNextHunk, MoveToPreviousHunk, START_INLINE_CHAT, StartSessionAction, ToggleDiffForChange, UnstashSessionAction, ViewInChatAction };
+export { AbstractInlineChatAction, AcceptChanges, ArrowOutDownAction, ArrowOutUpAction, CancelSessionAction, CloseAction, ConfigureInlineChatAction, CopyRecordings, DiscardAction, DiscardHunkAction, FocusInlineChat, LOCALIZED_START_INLINE_CHAT_STRING, MoveToNextHunk, MoveToPreviousHunk, RerunAction, START_INLINE_CHAT, StartSessionAction, ToggleDiffForChange, UnstashSessionAction, ViewInChatAction };

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

@@ -1,5 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/inlineChatContentWidget.css.js';
+import { ContentWidgetPositionPreference } from '../../../../editor/browser/editorBrowser.js';
 import { reset, trackFocus } from '../../../../base/browser/dom.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
@@ -24,8 +25,10 @@ import { ChatModel } from '../../chat/common/chatModel.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { ScrollType } from '../../../../editor/common/editorCommon.js';
 let InlineChatContentWidget = class InlineChatContentWidget {
-    constructor(_editor, instaService, contextKeyService) {
+    constructor(location, _editor, instaService, contextKeyService) {
         this._editor = _editor;
         this.suppressMouseDown = false;
         this.allowEditorOverflow = true;
@@ -41,8 +44,8 @@ let InlineChatContentWidget = class InlineChatContentWidget {
         const scopedInstaService = instaService.createChild(( new ServiceCollection([
             IContextKeyService,
             this._store.add(contextKeyService.createScoped(this._domNode))
-        ])));
-        this._widget = scopedInstaService.createInstance(ChatWidget, ChatAgentLocation.Editor, { resource: true }, {
+        ])), this._store);
+        this._widget = scopedInstaService.createInstance(ChatWidget, location, { resource: true }, {
             defaultElementHeight: 32,
             editorOverflowWidgetsDomNode: _editor.getOverflowWidgetsDomNode(),
             renderStyle: 'compact',
@@ -92,11 +95,11 @@ let InlineChatContentWidget = class InlineChatContentWidget {
         }
         return {
             position: this._position,
-            preference: [1 ]
+            preference: [ContentWidgetPositionPreference.ABOVE]
         };
     }
     beforeRender() {
-        const maxHeight = this._widget.input.inputEditor.getOption(67 ) * 5;
+        const maxHeight = this._widget.input.inputEditor.getOption(EditorOption.lineHeight) * 5;
         const inputEditorHeight = this._widget.contentHeight;
         this._widget.layout(Math.min(maxHeight, inputEditorHeight), 360);
         return null;
@@ -120,7 +123,7 @@ let InlineChatContentWidget = class InlineChatContentWidget {
         if (!this._visible) {
             this._visible = true;
             this._focusNext = true;
-            this._editor.revealRangeNearTopIfOutsideViewport(Range.fromPositions(position));
+            this._editor.revealRangeNearTopIfOutsideViewport(Range.fromPositions(position), ScrollType.Immediate);
             this._widget.inputEditor.setValue('');
             const wordInfo = this._editor.getModel()?.getWordAtPosition(position);
             this._position = wordInfo ? ( new Position(position.lineNumber, wordInfo.startColumn)) : position;
@@ -151,7 +154,7 @@ let InlineChatContentWidget = class InlineChatContentWidget {
     }
 };
 InlineChatContentWidget = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IContextKeyService))
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IContextKeyService))
 ], InlineChatContentWidget));
 export { InlineChatContentWidget };