@codingame/monaco-vscode-katex-common 26.2.1 → 27.0.0

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

@@ -32,6 +32,7 @@ import { SIDE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/ser
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IChatAttachmentResolveService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatAttachmentResolveService.service';
 import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
+import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service';
 import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { IDiagnosticVariableEntryFilterData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
@@ -43,15 +44,15 @@ import { isNotebookContainingCellEditor } from '@codingame/monaco-vscode-api/vsc
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
-import { CTX_INLINE_CHAT_VISIBLE, InlineChatConfigKeys } from '../common/inlineChat.js';
+import { CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_INLINE_CHAT_PENDING_CONFIRMATION, InlineChatConfigKeys } from '../common/inlineChat.js';
 import { InlineChatAffordance } from './inlineChatAffordance.js';
 import { InlineChatInputWidget, InlineChatSessionOverlayWidget } from './inlineChatOverlayWidget.js';
 import { IInlineChatSessionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
 import { InlineChatZoneWidget } from './inlineChatZoneWidget.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
-import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { waitForState } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/utilsCancellation';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 
@@ -69,9 +70,10 @@ class InlineChatRunOptions {
             position,
             attachments,
             modelSelector,
-            resolveOnResponse
+            resolveOnResponse,
+            attachDiagnostics
         } = options;
-        if (typeof message !== "undefined" && typeof message !== "string" || typeof autoSend !== "undefined" && typeof autoSend !== "boolean" || typeof initialRange !== "undefined" && !Range.isIRange(initialRange) || typeof initialSelection !== "undefined" && !Selection.isISelection(initialSelection) || typeof position !== "undefined" && !Position.isIPosition(position) || typeof attachments !== "undefined" && (!Array.isArray(attachments) || !attachments.every(item => item instanceof URI)) || typeof modelSelector !== "undefined" && !isILanguageModelChatSelector(modelSelector) || typeof resolveOnResponse !== "undefined" && typeof resolveOnResponse !== "boolean") {
+        if (typeof message !== "undefined" && typeof message !== "string" || typeof autoSend !== "undefined" && typeof autoSend !== "boolean" || typeof initialRange !== "undefined" && !Range.isIRange(initialRange) || typeof initialSelection !== "undefined" && !Selection.isISelection(initialSelection) || typeof position !== "undefined" && !Position.isIPosition(position) || typeof attachments !== "undefined" && (!Array.isArray(attachments) || !attachments.every(item => item instanceof URI)) || typeof modelSelector !== "undefined" && !isILanguageModelChatSelector(modelSelector) || typeof resolveOnResponse !== "undefined" && typeof resolveOnResponse !== "boolean" || typeof attachDiagnostics !== "undefined" && typeof attachDiagnostics !== "boolean") {
             return false;
         }
         return true;
@@ -96,6 +98,9 @@ let InlineChatController = class InlineChatController {
     get isActive() {
         return Boolean(this._currentSession.get());
     }
+    get inputWidget() {
+        return this._inputWidget;
+    }
     constructor(
         _editor,
         _instaService,
@@ -110,7 +115,9 @@ let InlineChatController = class InlineChatController {
         _editorService,
         _markerDecorationsService,
         _languageModelService,
-        _logService
+        _logService,
+        _chatEditingService,
+        _chatService
     ) {
         this._editor = _editor;
         this._instaService = _instaService;
@@ -124,17 +131,43 @@ let InlineChatController = class InlineChatController {
         this._markerDecorationsService = _markerDecorationsService;
         this._languageModelService = _languageModelService;
         this._logService = _logService;
+        this._chatEditingService = _chatEditingService;
+        this._chatService = _chatService;
         this._store = ( new DisposableStore());
         this._isActiveController = observableValue(this, false);
         const editorObs = observableCodeEditor(_editor);
         const ctxInlineChatVisible = CTX_INLINE_CHAT_VISIBLE.bindTo(contextKeyService);
+        const ctxFileBelongsToChat = CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.bindTo(contextKeyService);
+        const ctxPendingConfirmation = CTX_INLINE_CHAT_PENDING_CONFIRMATION.bindTo(contextKeyService);
         const notebookAgentConfig = observableConfigValue(InlineChatConfigKeys.notebookAgent, false, this._configurationService);
         this._renderMode = observableConfigValue(InlineChatConfigKeys.RenderMode, "zone", this._configurationService);
-        const overlayWidget = this._store.add(this._instaService.createInstance(InlineChatInputWidget, editorObs));
+        this._store.add(autorun(r => {
+            const model = editorObs.model.read(r);
+            if (!model) {
+                ctxFileBelongsToChat.set(false);
+                return;
+            }
+            const sessions = this._chatEditingService.editingSessionsObs.read(r);
+            let hasEdits = false;
+            for (const session of sessions) {
+                const entries = session.entries.read(r);
+                for (const entry of entries) {
+                    if (isEqual(entry.modifiedURI, model.uri)) {
+                        hasEdits = true;
+                        break;
+                    }
+                }
+                if (hasEdits) {
+                    break;
+                }
+            }
+            ctxFileBelongsToChat.set(hasEdits);
+        }));
+        const overlayWidget = this._inputWidget = this._store.add(this._instaService.createInstance(InlineChatInputWidget, editorObs));
         const sessionOverlayWidget = this._store.add(
             this._instaService.createInstance(InlineChatSessionOverlayWidget, editorObs)
         );
-        this._gutterIndicator = this._store.add(
+        this.inputOverlayWidget = this._store.add(
             this._instaService.createInstance(InlineChatAffordance, this._editor, overlayWidget)
         );
         this._zone = ( new Lazy(() => {
@@ -240,7 +273,7 @@ let InlineChatController = class InlineChatController {
             }
         }));
         const defaultPlaceholderObs = ( visibleSessionObs.map((session, r) => {
-            return session?.initialSelection.isEmpty() ? ( localize(8819, "Generate code")) : ( localize(8820, "Modify selected code"));
+            return session?.initialSelection.isEmpty() ? ( localize(9472, "Generate code")) : ( localize(9473, "Modify selected code"));
         }));
         this._store.add(autorun(r => {
             const session = visibleSessionObs.read(r);
@@ -270,14 +303,18 @@ let InlineChatController = class InlineChatController {
             const session = visibleSessionObs.read(r);
             const renderMode = this._renderMode.read(r);
             if (!session || renderMode !== "hover") {
+                ctxPendingConfirmation.set(false);
                 sessionOverlayWidget.hide();
                 return;
             }
             const lastRequest = session.chatModel.lastRequestObs.read(r);
             const isInProgress = lastRequest?.response?.isInProgress.read(r);
+            const isPendingConfirmation = !!lastRequest?.response?.isPendingConfirmation.read(r);
+            const isError = !!lastRequest?.response?.result?.errorDetails;
+            ctxPendingConfirmation.set(isPendingConfirmation);
             const entry = session.editingSession.readEntry(session.uri, r);
             const isNotSettled = entry ? entry.state.read(r) === ModifiedFileEntryState.Modified : false;
-            if (isInProgress || isNotSettled) {
+            if (isInProgress || isNotSettled || isPendingConfirmation || isError) {
                 sessionOverlayWidget.show(session);
             } else {
                 sessionOverlayWidget.hide();
@@ -342,7 +379,7 @@ let InlineChatController = class InlineChatController {
                 if (lastProgress) {
                     placeholder = renderAsPlaintext(lastProgress.content);
                 }
-                this._zone.rawValue?.widget.chatWidget.setInputPlaceholder(placeholder || ( localize(8821, "Working...")));
+                this._zone.rawValue?.widget.chatWidget.setInputPlaceholder(placeholder || ( localize(9474, "Working...")));
             }
         }));
         this._store.add(autorun(r => {
@@ -395,26 +432,29 @@ let InlineChatController = class InlineChatController {
             await existingSession.editingSession.accept();
             existingSession.dispose();
         }
-        if (!arg?.message && this._configurationService.getValue(InlineChatConfigKeys.RenderMode) === "hover") {
-            await this._gutterIndicator.showMenuAtSelection();
-            return true;
-        }
         this._isActiveController.set(true, undefined);
         const session = this._inlineChatSessionService.createSession(this._editor);
         const sessionStore = ( new DisposableStore());
         try {
             await this._applyModelDefaults(session, sessionStore);
-            const entries = [];
-            for (const [range, marker] of this._markerDecorationsService.getLiveMarkers(uri)) {
-                if (range.intersectRanges(this._editor.getSelection())) {
-                    const filter = IDiagnosticVariableEntryFilterData.fromMarker(marker);
-                    entries.push(IDiagnosticVariableEntryFilterData.toEntry(filter));
-                }
+            if (arg) {
+                arg.attachDiagnostics ??= this._configurationService.getValue(InlineChatConfigKeys.RenderMode) === "zone";
             }
-            if (entries.length > 0) {
-                this._zone.value.widget.chatWidget.attachmentModel.addContext(...entries);
-                this._zone.value.widget.chatWidget.input.setValue(entries.length > 1 ? ( localize(8822, "Fix the attached problems")) : ( localize(8823, "Fix the attached problem")), true);
-                this._zone.value.widget.chatWidget.inputEditor.setSelection(( new Selection(1, 1, Number.MAX_SAFE_INTEGER, 1)));
+            if (arg?.attachDiagnostics) {
+                const entries = [];
+                for (const [range, marker] of this._markerDecorationsService.getLiveMarkers(uri)) {
+                    if (range.intersectRanges(this._editor.getSelection())) {
+                        const filter = IDiagnosticVariableEntryFilterData.fromMarker(marker);
+                        entries.push(IDiagnosticVariableEntryFilterData.toEntry(filter));
+                    }
+                }
+                if (entries.length > 0) {
+                    this._zone.value.widget.chatWidget.attachmentModel.addContext(...entries);
+                    const msg = entries.length > 1 ? ( localize(9475, "Fix the attached problems")) : ( localize(9476, "Fix the attached problem"));
+                    this._zone.value.widget.chatWidget.input.setValue(msg, true);
+                    arg.message = msg;
+                    this._zone.value.widget.chatWidget.inputEditor.setSelection(( new Selection(1, 1, Number.MAX_SAFE_INTEGER, 1)));
+                }
             }
             if (arg && InlineChatRunOptions.isInlineChatRunOptions(arg)) {
                 if (arg.initialRange) {
@@ -481,6 +521,7 @@ let InlineChatController = class InlineChatController {
         if (!session) {
             return;
         }
+        this._chatService.cancelCurrentRequestForSession(session.chatModel.sessionResource, "inlineChatReject");
         await session.editingSession.reject();
         session.dispose();
     }
@@ -557,14 +598,14 @@ let InlineChatController = class InlineChatController {
         return undefined;
     }
 };
-InlineChatController = InlineChatController_1 = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, INotebookEditorService)), ( __param(3, IInlineChatSessionService)), ( __param(4, ICodeEditorService)), ( __param(5, IContextKeyService)), ( __param(6, IConfigurationService)), ( __param(7, ISharedWebContentExtractorService)), ( __param(8, IFileService)), ( __param(9, IChatAttachmentResolveService)), ( __param(10, IEditorService)), ( __param(11, IMarkerDecorationsService)), ( __param(12, ILanguageModelsService)), ( __param(13, ILogService))], InlineChatController));
+InlineChatController = InlineChatController_1 = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, INotebookEditorService)), ( __param(3, IInlineChatSessionService)), ( __param(4, ICodeEditorService)), ( __param(5, IContextKeyService)), ( __param(6, IConfigurationService)), ( __param(7, ISharedWebContentExtractorService)), ( __param(8, IFileService)), ( __param(9, IChatAttachmentResolveService)), ( __param(10, IEditorService)), ( __param(11, IMarkerDecorationsService)), ( __param(12, ILanguageModelsService)), ( __param(13, ILogService)), ( __param(14, IChatEditingService)), ( __param(15, IChatService))], InlineChatController));
 async function reviewEdits(accessor, editor, stream, token, applyCodeBlockSuggestionId) {
     if (!editor.hasModel()) {
         return false;
     }
     const chatService = accessor.get(IChatService);
     const uri = editor.getModel().uri;
-    const chatModelRef = chatService.startSession(ChatAgentLocation.EditorInline);
+    const chatModelRef = chatService.startNewLocalSession(ChatAgentLocation.EditorInline);
     const chatModel = chatModelRef.object;
     chatModel.startEditingSession(true);
     const store = ( new DisposableStore());
@@ -626,7 +667,7 @@ async function reviewNotebookEdits(accessor, uri, stream, token) {
     const chatService = accessor.get(IChatService);
     const notebookService = accessor.get(INotebookService);
     const isNotebook = notebookService.hasSupportedNotebooks(uri);
-    const chatModelRef = chatService.startSession(ChatAgentLocation.EditorInline);
+    const chatModelRef = chatService.startNewLocalSession(ChatAgentLocation.EditorInline);
     const chatModel = chatModelRef.object;
     chatModel.startEditingSession(true);
     const store = ( new DisposableStore());

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatEditorAffordance.d.ts

@@ -1,5 +1,6 @@
 import { IDimension } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/dom";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { ICodeEditor, IContentWidget, IContentWidgetPosition } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
 import { Selection } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/selection";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
@@ -15,10 +16,14 @@ export declare class InlineChatEditorAffordance extends Disposable implements IC
     private readonly _domNode;
     private _position;
     private _isVisible;
+    private readonly _onDidRunAction;
+    readonly onDidRunAction: Event<string>;
     readonly allowEditorOverflow = true;
     readonly suppressMouseDown = false;
     constructor(_editor: ICodeEditor, selection: IObservable<Selection | undefined>, instantiationService: IInstantiationService);
     private _show;
+    private _showAtSelection;
+    private _showAtLineStart;
     private _hide;
     getId(): string;
     getDomNode(): HTMLElement;

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

@@ -2,13 +2,15 @@
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import * as inlineChatEditorAffordance from './media/inlineChatEditorAffordance.css';
-import { $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { reset, $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { MutableDisposable, DisposableStore, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { ContentWidgetPositionPreference } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
 import { EditorOption } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorOptions';
 import { SelectionDirection } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/selection';
+import { computeIndentLevel } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/utils';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { MenuId, MenuItemAction } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { MenuItemAction, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { MenuWorkbenchToolBar, HiddenItemStrategy } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { quickFixCommandId } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/codeAction/browser/codeAction';
@@ -22,6 +24,8 @@ import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/t
 import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
 import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { ACTION_START, ACTION_ASK_IN_CHAT } from '../common/inlineChat.js';
+import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var InlineChatEditorAffordance_1;
@@ -35,13 +39,44 @@ let QuickFixActionViewItem = class QuickFixActionViewItem extends MenuEntryActio
         contextKeyService,
         themeService,
         contextMenuService,
-        accessibilityService
+        accessibilityService,
+        commandService
     ) {
-        super(action, {
+        const wrappedAction = new (class extends MenuItemAction {
+            constructor() {
+                super(
+                    action.item,
+                    action.alt?.item,
+                    {},
+                    action.hideActions,
+                    action.menuKeybinding,
+                    contextKeyService,
+                    commandService
+                );
+                this.elementGetter = () => undefined;
+            }
+            async run(...args) {
+                const controller = CodeActionController.get(_editor);
+                const info = controller?.lightBulbState.get();
+                const element = this.elementGetter();
+                if (controller && info && element) {
+                    const {
+                        bottom,
+                        left
+                    } = element.getBoundingClientRect();
+                    await controller.showCodeActions(info.trigger, info.actions, {
+                        x: left,
+                        y: bottom
+                    });
+                }
+            }
+        })();
+        super(wrappedAction, {
             draggable: false
         }, keybindingService, notificationService, contextKeyService, themeService, contextMenuService, accessibilityService);
         this._editor = _editor;
         this._lightBulbStore = this._store.add(( new MutableDisposable()));
+        wrappedAction.elementGetter = () => this.element;
     }
     render(container) {
         super.render(container);
@@ -63,14 +98,42 @@ let QuickFixActionViewItem = class QuickFixActionViewItem extends MenuEntryActio
                 const icon = info?.icon ?? Codicon.lightBulb;
                 const iconClasses = ThemeIcon.asClassNameArray(icon);
                 this.label.className = "";
-                this.label.classList.add("codicon", ...iconClasses);
+                this.label.classList.add("codicon", "action-label", ...iconClasses);
             }
             this._currentTitle = info?.title;
             this.updateTooltip();
         }));
     }
 };
-QuickFixActionViewItem = ( __decorate([( __param(2, IKeybindingService)), ( __param(3, INotificationService)), ( __param(4, IContextKeyService)), ( __param(5, IThemeService)), ( __param(6, IContextMenuService)), ( __param(7, IAccessibilityService))], QuickFixActionViewItem));
+QuickFixActionViewItem = ( __decorate([( __param(2, IKeybindingService)), ( __param(3, INotificationService)), ( __param(4, IContextKeyService)), ( __param(5, IThemeService)), ( __param(6, IContextMenuService)), ( __param(7, IAccessibilityService)), ( __param(8, ICommandService))], QuickFixActionViewItem));
+let LabelWithKeybindingActionViewItem = class LabelWithKeybindingActionViewItem extends MenuEntryActionViewItem {
+    constructor(
+        action,
+        keybindingService,
+        notificationService,
+        contextKeyService,
+        themeService,
+        contextMenuService,
+        accessibilityService
+    ) {
+        super(action, {
+            draggable: false
+        }, keybindingService, notificationService, contextKeyService, themeService, contextMenuService, accessibilityService);
+        this.options.label = true;
+        this.options.icon = false;
+        this._kbLabel = keybindingService.lookupKeybinding(action.id)?.getLabel() ?? undefined;
+    }
+    updateLabel() {
+        if (this.label) {
+            reset(
+                this.label,
+                this.action.label,
+                ...(this._kbLabel ? [$("span.inline-chat-keybinding", undefined, this._kbLabel)] : [])
+            );
+        }
+    }
+};
+LabelWithKeybindingActionViewItem = ( __decorate([( __param(1, IKeybindingService)), ( __param(2, INotificationService)), ( __param(3, IContextKeyService)), ( __param(4, IThemeService)), ( __param(5, IContextMenuService)), ( __param(6, IAccessibilityService))], LabelWithKeybindingActionViewItem));
 let InlineChatEditorAffordance = class InlineChatEditorAffordance extends Disposable {
     static {
         InlineChatEditorAffordance_1 = this;
@@ -84,10 +147,12 @@ let InlineChatEditorAffordance = class InlineChatEditorAffordance extends Dispos
         this._id = `inline-chat-content-widget-${InlineChatEditorAffordance_1._idPool++}`;
         this._position = null;
         this._isVisible = false;
+        this._onDidRunAction = this._store.add(( new Emitter()));
+        this.onDidRunAction = this._onDidRunAction.event;
         this.allowEditorOverflow = true;
         this.suppressMouseDown = false;
         this._domNode = $(".inline-chat-content-widget");
-        this._store.add(
+        const toolbar = this._store.add(
             instantiationService.createInstance(MenuWorkbenchToolBar, this._domNode, MenuId.InlineChatEditorAffordance, {
                 telemetrySource: "inlineChatEditorAffordance",
                 hiddenItemStrategy: HiddenItemStrategy.Ignore,
@@ -95,16 +160,24 @@ let InlineChatEditorAffordance = class InlineChatEditorAffordance extends Dispos
                     renderShortTitle: true
                 },
                 toolbarOptions: {
-                    primaryGroup: () => true
+                    primaryGroup: () => true,
+                    useSeparatorsInPrimaryActions: true
                 },
                 actionViewItemProvider: action => {
                     if (action instanceof MenuItemAction && action.id === quickFixCommandId) {
                         return instantiationService.createInstance(QuickFixActionViewItem, action, this._editor);
                     }
+                    if (action instanceof MenuItemAction && (action.id === ACTION_START || action.id === ACTION_ASK_IN_CHAT || action.id === "inlineChat.fixDiagnostics")) {
+                        return instantiationService.createInstance(LabelWithKeybindingActionViewItem, action);
+                    }
                     return undefined;
                 }
             })
         );
+        this._store.add(toolbar.actionRunner.onDidRun(e => {
+            this._onDidRunAction.fire(e.action.id);
+            this._hide();
+        }));
         this._store.add(autorun(r => {
             const sel = selection.read(r);
             if (sel) {
@@ -115,6 +188,19 @@ let InlineChatEditorAffordance = class InlineChatEditorAffordance extends Dispos
         }));
     }
     _show(selection) {
+        if (selection.isEmpty()) {
+            this._showAtLineStart(selection.getPosition().lineNumber);
+        } else {
+            this._showAtSelection(selection);
+        }
+        if (this._isVisible) {
+            this._editor.layoutContentWidget(this);
+        } else {
+            this._editor.addContentWidget(this);
+            this._isVisible = true;
+        }
+    }
+    _showAtSelection(selection) {
         const cursorPosition = selection.getPosition();
         const direction = selection.getDirection();
         const preference = direction === SelectionDirection.RTL ? ContentWidgetPositionPreference.ABOVE : ContentWidgetPositionPreference.BELOW;
@@ -122,12 +208,38 @@ let InlineChatEditorAffordance = class InlineChatEditorAffordance extends Dispos
             position: cursorPosition,
             preference: [preference]
         };
-        if (this._isVisible) {
-            this._editor.layoutContentWidget(this);
-        } else {
-            this._editor.addContentWidget(this);
-            this._isVisible = true;
+    }
+    _showAtLineStart(lineNumber) {
+        const model = this._editor.getModel();
+        if (!model) {
+            return;
+        }
+        const tabSize = model.getOptions().tabSize;
+        const fontInfo = this._editor.getOptions().get(EditorOption.fontInfo);
+        const lineContent = model.getLineContent(lineNumber);
+        const indent = computeIndentLevel(lineContent, tabSize);
+        const lineHasSpace = indent < 0 ? true : fontInfo.spaceWidth * indent > 22;
+        let effectiveLineNumber = lineNumber;
+        if (!lineHasSpace) {
+            const isLineEmptyOrIndented = ln => {
+                const content = model.getLineContent(ln);
+                return /^\s*$|^\s+/.test(content);
+            };
+            const lineCount = model.getLineCount();
+            if (lineNumber > 1 && isLineEmptyOrIndented(lineNumber - 1)) {
+                effectiveLineNumber = lineNumber - 1;
+            } else if (lineNumber < lineCount && isLineEmptyOrIndented(lineNumber + 1)) {
+                effectiveLineNumber = lineNumber + 1;
+            }
         }
+        const effectiveColumnNumber = /^\S\s*$/.test(model.getLineContent(effectiveLineNumber)) ? 2 : 1;
+        this._position = {
+            position: {
+                lineNumber: effectiveLineNumber,
+                column: effectiveColumnNumber
+            },
+            preference: [ContentWidgetPositionPreference.EXACT]
+        };
     }
     _hide() {
         if (this._isVisible) {

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatGutterAffordance.d.ts

@@ -1,21 +1,18 @@
-import { IObservable, ISettableObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { ObservableCodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/observableCodeEditor";
 import { Selection } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/selection";
 import { InlineEditsGutterIndicator } from "@codingame/monaco-vscode-api/vscode/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView";
 import { IAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service";
+import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service";
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { HoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hoverService";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
+import { IUserInteractionService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userInteraction/browser/userInteractionService.service";
 export declare class InlineChatGutterAffordance extends InlineEditsGutterIndicator {
-    private readonly _myEditorObs;
-    private readonly _hover;
-    private readonly _keybindingService;
-    constructor(_myEditorObs: ObservableCodeEditor, selection: IObservable<Selection | undefined>, _hover: ISettableObservable<{
-        rect: DOMRect;
-        above: boolean;
-        lineNumber: number;
-    } | undefined>, _keybindingService: IKeybindingService, hoverService: HoverService, instantiationService: IInstantiationService, accessibilityService: IAccessibilityService, themeService: IThemeService);
-    protected _showHover(): void;
-    private _doShowHover;
+    private readonly _onDidRunAction;
+    readonly onDidRunAction: Event<string>;
+    constructor(myEditorObs: ObservableCodeEditor, selection: IObservable<Selection | undefined>, _keybindingService: IKeybindingService, hoverService: HoverService, instantiationService: IInstantiationService, accessibilityService: IAccessibilityService, themeService: IThemeService, userInteractionService: IUserInteractionService, menuService: IMenuService, contextKeyService: IContextKeyService);
 }