@codingame/monaco-vscode-katex-common 26.2.2 → 28.0.0

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

@@ -5,7 +5,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/in
 import { observableCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/observableCodeEditor';
 import { ScrollType } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { InlineChatConfigKeys } from '../common/inlineChat.js';
+import { InlineChatConfigKeys, CTX_INLINE_CHAT_AFFORDANCE_VISIBLE } from '../common/inlineChat.js';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
@@ -15,6 +15,11 @@ import { SelectionDirection } from '@codingame/monaco-vscode-api/vscode/vs/edito
 import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { CursorChangeReason } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/cursorEvents';
 import { IInlineChatSessionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
+import { CodeActionController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/codeAction/browser/codeActionController';
+import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
+import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
+import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { debouncedObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/utils';
 import { runOnChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/runOnChange';
@@ -24,24 +29,35 @@ import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/v
 import { waitForState } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/utilsCancellation';
 
 let InlineChatAffordance = class InlineChatAffordance extends Disposable {
+    #editor;
+    #inputWidget;
+    #instantiationService;
+    #menuData = observableValue(this, undefined);
+    #selectionData = observableValue(this, undefined);
     constructor(
-        _editor,
-        _inputWidget,
-        _instantiationService,
+        editor,
+        inputWidget,
+        instantiationService,
         configurationService,
         chatEntiteldService,
-        inlineChatSessionService
+        inlineChatSessionService,
+        telemetryService,
+        contextKeyService
     ) {
         super();
-        this._editor = _editor;
-        this._inputWidget = _inputWidget;
-        this._instantiationService = _instantiationService;
-        this._menuData = observableValue(this, undefined);
-        const editorObs = observableCodeEditor(this._editor);
+        this.#editor = editor;
+        this.#inputWidget = inputWidget;
+        this.#instantiationService = instantiationService;
+        const editorObs = observableCodeEditor(this.#editor);
         const affordance = observableConfigValue(InlineChatConfigKeys.Affordance, "off", configurationService);
         const debouncedSelection = debouncedObservable(editorObs.cursorSelection, 500);
-        const selectionData = observableValue(this, undefined);
+        const selectionData = this.#selectionData;
+        const ctxAffordanceVisible = CTX_INLINE_CHAT_AFFORDANCE_VISIBLE.bindTo(contextKeyService);
+        this._store.add({
+            dispose: () => ctxAffordanceVisible.reset()
+        });
         let explicitSelection = false;
+        let affordanceId;
         this._store.add(runOnChange(editorObs.selections, (value, _prev, events) => {
             explicitSelection = events.every(e => e.reason === CursorChangeReason.Explicit);
             if (!value || value.length !== 1 || value[0].isEmpty() || !explicitSelection) {
@@ -50,10 +66,20 @@ let InlineChatAffordance = class InlineChatAffordance extends Disposable {
         }));
         this._store.add(autorun(r => {
             const value = debouncedSelection.read(r);
-            if (!value || value.isEmpty() || !explicitSelection || _editor.getModel()?.getValueInRange(value).match(/^\s+$/)) {
+            if (!value || value.isEmpty() || !explicitSelection || this.#editor.getModel()?.getValueInRange(value).match(/^\s+$/)) {
                 selectionData.set(undefined, undefined);
+                affordanceId = undefined;
                 return;
             }
+            affordanceId = generateUuid();
+            const mode = affordance.read(undefined);
+            if (mode === "gutter" || mode === "editor") {
+                telemetryService.publicLog2("inlineChatAffordance/shown", {
+                    mode,
+                    id: affordanceId,
+                    commandId: ""
+                });
+            }
             selectionData.set(value, undefined);
         }));
         this._store.add(autorun(r => {
@@ -71,52 +97,88 @@ let InlineChatAffordance = class InlineChatAffordance extends Disposable {
                 selectionData.set(undefined, undefined);
             }
         }));
-        this._store.add(this._instantiationService.createInstance(
+        this._store.add(this.#editor.onContextMenu(() => {
+            selectionData.set(undefined, undefined);
+        }));
+        this._store.add(autorun(r => {
+            if (!editorObs.isFocused.read(r)) {
+                selectionData.set(undefined, undefined);
+            }
+        }));
+        this._store.add(autorun(r => {
+            const sel = selectionData.read(r);
+            const mode = affordance.read(r);
+            ctxAffordanceVisible.set(sel !== undefined && (mode === "editor" || mode === "gutter"));
+        }));
+        const gutterAffordance = this._store.add(this.#instantiationService.createInstance(
             InlineChatGutterAffordance,
             editorObs,
-            derived(r => affordance.read(r) === "gutter" ? selectionData.read(r) : undefined),
-            this._menuData
+            derived(r => affordance.read(r) === "gutter" ? selectionData.read(r) : undefined)
         ));
-        this._store.add(this._instantiationService.createInstance(
+        const editorAffordance = this.#instantiationService.createInstance(
             InlineChatEditorAffordance,
-            this._editor,
+            this.#editor,
             derived(r => affordance.read(r) === "editor" ? selectionData.read(r) : undefined)
-        ));
+        );
+        this._store.add(editorAffordance);
+        this._store.add(
+            Event.any(editorAffordance.onDidRunAction, gutterAffordance.onDidRunAction)(commandId => {
+                if (affordanceId) {
+                    telemetryService.publicLog2("inlineChatAffordance/selected", {
+                        mode: affordance.get(),
+                        id: affordanceId,
+                        commandId
+                    });
+                }
+            })
+        );
         this._store.add(autorun(r => {
-            const data = this._menuData.read(r);
+            const mode = affordance.read(r);
+            const hideWithSelection = mode === "editor" || mode === "gutter";
+            const controller = CodeActionController.get(this.#editor);
+            if (controller) {
+                controller.onlyLightBulbWithEmptySelection = hideWithSelection;
+            }
+        }));
+        this._store.add(autorun(r => {
+            const data = this.#menuData.read(r);
             if (!data) {
                 return;
             }
-            this._editor.revealLineInCenterIfOutsideViewport(data.lineNumber, ScrollType.Immediate);
-            const editorDomNode = this._editor.getDomNode();
+            this.#editor.revealLineInCenterIfOutsideViewport(data.lineNumber, ScrollType.Immediate);
+            const editorDomNode = this.#editor.getDomNode();
             const editorRect = editorDomNode.getBoundingClientRect();
             const left = data.rect.left - editorRect.left;
-            this._inputWidget.show(data.lineNumber, left, data.above);
+            this.#inputWidget.show(data.lineNumber, left, data.above, data.placeholder);
         }));
         this._store.add(autorun(r => {
-            const pos = this._inputWidget.position.read(r);
+            const pos = this.#inputWidget.position.read(r);
             if (pos === null) {
-                this._menuData.set(undefined, undefined);
+                this.#menuData.set(undefined, undefined);
             }
         }));
     }
-    async showMenuAtSelection() {
-        assertType(this._editor.hasModel());
-        const direction = this._editor.getSelection().getDirection();
-        const position = this._editor.getPosition();
-        const editorDomNode = this._editor.getDomNode();
-        const scrolledPosition = this._editor.getScrolledVisiblePosition(position);
+    dismiss() {
+        this.#selectionData.set(undefined, undefined);
+    }
+    async showMenuAtSelection(placeholder) {
+        assertType(this.#editor.hasModel());
+        const direction = this.#editor.getSelection().getDirection();
+        const position = this.#editor.getPosition();
+        const editorDomNode = this.#editor.getDomNode();
+        const scrolledPosition = this.#editor.getScrolledVisiblePosition(position);
         const editorRect = editorDomNode.getBoundingClientRect();
         const x = editorRect.left + scrolledPosition.left;
         const y = editorRect.top + scrolledPosition.top;
-        this._menuData.set({
+        this.#menuData.set({
             rect: ( new DOMRect(x, y, 0, scrolledPosition.height)),
             above: direction === SelectionDirection.RTL,
-            lineNumber: position.lineNumber
+            lineNumber: position.lineNumber,
+            placeholder
         }, undefined);
-        await waitForState(this._inputWidget.position, pos => pos === null);
+        await waitForState(this.#inputWidget.position, pos => pos === null);
     }
 };
-InlineChatAffordance = ( __decorate([( __param(2, IInstantiationService)), ( __param(3, IConfigurationService)), ( __param(4, IChatEntitlementService)), ( __param(5, IInlineChatSessionService))], InlineChatAffordance));
+InlineChatAffordance = ( __decorate([( __param(2, IInstantiationService)), ( __param(3, IConfigurationService)), ( __param(4, IChatEntitlementService)), ( __param(5, IInlineChatSessionService)), ( __param(6, ITelemetryService)), ( __param(7, IContextKeyService))], InlineChatAffordance));
 
 export { InlineChatAffordance };

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

@@ -17,11 +17,15 @@ import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { ISharedWebContentExtractorService } from "@codingame/monaco-vscode-api/vscode/vs/platform/webContentExtractor/common/webContentExtractor.service";
 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 { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { IChatRequestVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries";
 import { ILanguageModelChatSelector } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels";
 import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service";
 import { INotebookEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service";
 import { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
+import { InlineChatAffordance } from "./inlineChatAffordance.js";
+import { InlineChatInputWidget } from "./inlineChatOverlayWidget.js";
 import { IInlineChatSessionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service";
 import { EditorBasedInlineChatWidget } from "./inlineChatWidget.js";
 export declare abstract class InlineChatRunOptions {
@@ -33,6 +37,7 @@ export declare abstract class InlineChatRunOptions {
     position?: IPosition;
     modelSelector?: ILanguageModelChatSelector;
     resolveOnResponse?: boolean;
+    attachDiagnostics?: boolean;
     static isInlineChatRunOptions(options: unknown): options is InlineChatRunOptions;
 }
 export declare class InlineChatController implements IEditorContribution {
@@ -48,6 +53,8 @@ export declare class InlineChatController implements IEditorContribution {
     private readonly _markerDecorationsService;
     private readonly _languageModelService;
     private readonly _logService;
+    private readonly _chatEditingService;
+    private readonly _chatService;
     static readonly ID = "editor.contrib.inlineChatController";
     static get(editor: ICodeEditor): InlineChatController | undefined;
     /**
@@ -59,11 +66,13 @@ export declare class InlineChatController implements IEditorContribution {
     private readonly _isActiveController;
     private readonly _renderMode;
     private readonly _zone;
-    private readonly _gutterIndicator;
+    readonly inputOverlayWidget: InlineChatAffordance;
+    private readonly _inputWidget;
     private readonly _currentSession;
     get widget(): EditorBasedInlineChatWidget;
     get isActive(): boolean;
-    constructor(_editor: ICodeEditor, _instaService: IInstantiationService, _notebookEditorService: INotebookEditorService, _inlineChatSessionService: IInlineChatSessionService, codeEditorService: ICodeEditorService, contextKeyService: IContextKeyService, _configurationService: IConfigurationService, _webContentExtractorService: ISharedWebContentExtractorService, _fileService: IFileService, _chatAttachmentResolveService: IChatAttachmentResolveService, _editorService: IEditorService, _markerDecorationsService: IMarkerDecorationsService, _languageModelService: ILanguageModelsService, _logService: ILogService);
+    get inputWidget(): InlineChatInputWidget;
+    constructor(_editor: ICodeEditor, _instaService: IInstantiationService, _notebookEditorService: INotebookEditorService, _inlineChatSessionService: IInlineChatSessionService, codeEditorService: ICodeEditorService, contextKeyService: IContextKeyService, _configurationService: IConfigurationService, _webContentExtractorService: ISharedWebContentExtractorService, _fileService: IFileService, _chatAttachmentResolveService: IChatAttachmentResolveService, _editorService: IEditorService, _markerDecorationsService: IMarkerDecorationsService, _languageModelService: ILanguageModelsService, _logService: ILogService, _chatEditingService: IChatEditingService, _chatService: IChatService);
     dispose(): void;
     getWidgetPosition(): Position | undefined;
     focus(): void;

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(9658, "Generate code")) : ( localize(9659, "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(9660, "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(9661, "Fix the attached problems")) : ( localize(9662, "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;