@codingame/monaco-vscode-katex-common 25.1.2 → 26.0.0

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

@@ -0,0 +1,122 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+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 { 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';
+import { InlineChatEditorAffordance } from './inlineChatEditorAffordance.js';
+import { InlineChatGutterAffordance } from './inlineChatGutterAffordance.js';
+import { SelectionDirection } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/selection';
+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 { 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';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
+import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
+import { waitForState } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/utilsCancellation';
+
+let InlineChatAffordance = class InlineChatAffordance extends Disposable {
+    constructor(
+        _editor,
+        _inputWidget,
+        _instantiationService,
+        configurationService,
+        chatEntiteldService,
+        inlineChatSessionService
+    ) {
+        super();
+        this._editor = _editor;
+        this._inputWidget = _inputWidget;
+        this._instantiationService = _instantiationService;
+        this._menuData = observableValue(this, undefined);
+        const editorObs = observableCodeEditor(this._editor);
+        const affordance = observableConfigValue(InlineChatConfigKeys.Affordance, "off", configurationService);
+        const debouncedSelection = debouncedObservable(editorObs.cursorSelection, 500);
+        const selectionData = observableValue(this, undefined);
+        let explicitSelection = false;
+        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) {
+                selectionData.set(undefined, undefined);
+            }
+        }));
+        this._store.add(autorun(r => {
+            const value = debouncedSelection.read(r);
+            if (!value || value.isEmpty() || !explicitSelection || _editor.getModel()?.getValueInRange(value).match(/^\s+$/)) {
+                selectionData.set(undefined, undefined);
+                return;
+            }
+            selectionData.set(value, undefined);
+        }));
+        this._store.add(autorun(r => {
+            if (chatEntiteldService.sentimentObs.read(r).hidden) {
+                selectionData.set(undefined, undefined);
+            }
+        }));
+        const hasSessionObs = derived(r => {
+            observableSignalFromEvent(this, inlineChatSessionService.onDidChangeSessions).read(r);
+            const model = editorObs.model.read(r);
+            return model ? inlineChatSessionService.getSessionByTextModel(model.uri) !== undefined : false;
+        });
+        this._store.add(autorun(r => {
+            if (hasSessionObs.read(r)) {
+                selectionData.set(undefined, undefined);
+            }
+        }));
+        this._store.add(this._instantiationService.createInstance(
+            InlineChatGutterAffordance,
+            editorObs,
+            derived(r => affordance.read(r) === "gutter" ? selectionData.read(r) : undefined),
+            this._menuData
+        ));
+        this._store.add(this._instantiationService.createInstance(
+            InlineChatEditorAffordance,
+            this._editor,
+            derived(r => affordance.read(r) === "editor" ? selectionData.read(r) : undefined)
+        ));
+        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();
+            const editorRect = editorDomNode.getBoundingClientRect();
+            const left = data.rect.left - editorRect.left;
+            this._inputWidget.show(data.lineNumber, left, data.above);
+        }));
+        this._store.add(autorun(r => {
+            const pos = this._inputWidget.position.read(r);
+            if (pos === null) {
+                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);
+        const editorRect = editorDomNode.getBoundingClientRect();
+        const x = editorRect.left + scrolledPosition.left;
+        const y = editorRect.top + scrolledPosition.top;
+        this._menuData.set({
+            rect: ( new DOMRect(x, y, 0, scrolledPosition.height)),
+            above: direction === SelectionDirection.RTL,
+            lineNumber: position.lineNumber
+        }, undefined);
+        await waitForState(this._inputWidget.position, pos => pos === null);
+    }
+};
+InlineChatAffordance = ( __decorate([( __param(2, IInstantiationService)), ( __param(3, IConfigurationService)), ( __param(4, IChatEntitlementService)), ( __param(5, IInlineChatSessionService))], InlineChatAffordance));
+
+export { InlineChatAffordance };

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

@@ -1,5 +1,4 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
-import { Emitter } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ICodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
 import { ICodeEditorService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service";
@@ -8,159 +7,75 @@ import { IRange } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/cor
 import { ISelection } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/selection";
 import { IEditorContribution } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon";
 import { TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
-import { IEditorWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service";
 import { IMarkerDecorationsService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/markerDecorations.service";
 import { EditSuggestionId } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/textModelEditSource";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
-import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IInstantiationService, ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 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 { 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 { HunkInformation, Session } from "./inlineChatSession.js";
 import { IInlineChatSessionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service";
 import { EditorBasedInlineChatWidget } from "./inlineChatWidget.js";
-export declare enum State {
-    CREATE_SESSION = "CREATE_SESSION",
-    INIT_UI = "INIT_UI",
-    WAIT_FOR_INPUT = "WAIT_FOR_INPUT",
-    SHOW_REQUEST = "SHOW_REQUEST",
-    PAUSE = "PAUSE",
-    CANCEL = "CANCEL",
-    ACCEPT = "DONE"
-}
 export declare abstract class InlineChatRunOptions {
     initialSelection?: ISelection;
     initialRange?: IRange;
     message?: string;
     attachments?: URI[];
     autoSend?: boolean;
-    existingSession?: Session;
     position?: IPosition;
     modelSelector?: ILanguageModelChatSelector;
-    blockOnResponse?: boolean;
+    resolveOnResponse?: boolean;
     static isInlineChatRunOptions(options: unknown): options is InlineChatRunOptions;
 }
 export declare class InlineChatController implements IEditorContribution {
-    static ID: string;
-    static get(editor: ICodeEditor): InlineChatController | null;
-    private readonly _delegate;
-    constructor(editor: ICodeEditor);
-    dispose(): void;
-    get isActive(): boolean;
-    run(arg?: InlineChatRunOptions): Promise<boolean>;
-    focus(): void;
-    get widget(): EditorBasedInlineChatWidget;
-    getWidgetPosition(): Position | undefined;
-    acceptSession(): Promise<void>;
-}
-/**
- * @deprecated
- */
-export declare class InlineChatController1 implements IEditorContribution {
-    private readonly _editor;
-    private readonly _instaService;
-    private readonly _inlineChatSessionService;
-    private readonly _editorWorkerService;
-    private readonly _logService;
-    private readonly _configurationService;
-    private readonly _dialogService;
-    private readonly _chatService;
-    private readonly _editorService;
-    private readonly _webContentExtractorService;
-    private readonly _fileService;
-    private readonly _chatAttachmentResolveService;
-    static get(editor: ICodeEditor): InlineChatController1 | null;
-    private _isDisposed;
-    private readonly _store;
-    private readonly _ui;
-    private readonly _ctxVisible;
-    private readonly _ctxEditing;
-    private readonly _ctxResponseType;
-    private readonly _ctxRequestInProgress;
-    private readonly _ctxResponse;
-    private readonly _messages;
-    protected readonly _onDidEnterState: Emitter<State>;
-    get chatWidget(): import("../../chat/browser/widget/chatWidget.js").ChatWidget;
-    private readonly _sessionStore;
-    private readonly _stashedSession;
-    private _delegateSession?;
-    private _session?;
-    private _strategy?;
-    constructor(_editor: ICodeEditor, _instaService: IInstantiationService, _inlineChatSessionService: IInlineChatSessionService, _editorWorkerService: IEditorWorkerService, _logService: ILogService, _configurationService: IConfigurationService, _dialogService: IDialogService, contextKeyService: IContextKeyService, _chatService: IChatService, _editorService: IEditorService, notebookEditorService: INotebookEditorService, _webContentExtractorService: ISharedWebContentExtractorService, _fileService: IFileService, _chatAttachmentResolveService: IChatAttachmentResolveService);
-    dispose(): void;
-    private _log;
-    get widget(): EditorBasedInlineChatWidget;
-    getId(): string;
-    getWidgetPosition(): Position | undefined;
-    private _currentRun?;
-    run(options?: InlineChatRunOptions | undefined): Promise<boolean>;
-    protected _nextState(state: State, options: InlineChatRunOptions): Promise<void>;
-    private [State.CREATE_SESSION];
-    private [State.INIT_UI];
-    private [State.WAIT_FOR_INPUT];
-    private [State.SHOW_REQUEST];
-    private [State.PAUSE];
-    private [State.ACCEPT];
-    private [State.CANCEL];
-    private _showWidget;
-    private _resetWidget;
-    private _updateCtxResponseType;
-    private _createChatTextEditGroupState;
-    private _makeChanges;
-    private _getMetadata;
-    private _updatePlaceholder;
-    private _updateInput;
-    arrowOut(up: boolean): void;
-    focus(): void;
-    viewInChat(): Promise<void>;
-    acceptSession(): void;
-    acceptHunk(hunkInfo?: HunkInformation): void | undefined;
-    discardHunk(hunkInfo?: HunkInformation): void | undefined;
-    toggleDiff(hunkInfo?: HunkInformation): void | undefined;
-    moveHunk(next: boolean): void;
-    cancelSession(): Promise<void>;
-    reportIssue(): void;
-    unstashLastSession(): Session | undefined;
-    joinCurrentRun(): Promise<void> | undefined;
-    get isActive(): boolean;
-    createImageAttachment(attachment: URI): Promise<IChatRequestVariableEntry | undefined>;
-}
-export declare class InlineChatController2 implements IEditorContribution {
     private readonly _editor;
     private readonly _instaService;
     private readonly _notebookEditorService;
     private readonly _inlineChatSessionService;
+    private readonly _configurationService;
     private readonly _webContentExtractorService;
     private readonly _fileService;
     private readonly _chatAttachmentResolveService;
     private readonly _editorService;
     private readonly _markerDecorationsService;
     private readonly _languageModelService;
-    static readonly ID = "editor.contrib.inlineChatController2";
-    static get(editor: ICodeEditor): InlineChatController2 | undefined;
+    private readonly _logService;
+    static readonly ID = "editor.contrib.inlineChatController";
+    static get(editor: ICodeEditor): InlineChatController | undefined;
+    /**
+     * Stores the user's explicitly chosen model (qualified name) from a previous inline chat request in the same session.
+     * When set, this takes priority over the inlineChat.defaultModel setting.
+     */
+    private static _userSelectedModel;
     private readonly _store;
     private readonly _isActiveController;
+    private readonly _renderMode;
     private readonly _zone;
+    private readonly _gutterIndicator;
     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, chatService: IChatService);
+    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);
     dispose(): void;
     getWidgetPosition(): Position | undefined;
     focus(): void;
     run(arg?: InlineChatRunOptions): Promise<boolean>;
     acceptSession(): Promise<void>;
     rejectSession(): Promise<void>;
+    private _selectVendorDefaultModel;
+    /**
+     * Applies model defaults based on settings and tracks user model changes.
+     * Prioritization: user session choice > inlineChat.defaultModel setting > vendor default
+     */
+    private _applyModelDefaults;
     createImageAttachment(attachment: URI): Promise<IChatRequestVariableEntry | undefined>;
 }
 export declare function reviewEdits(accessor: ServicesAccessor, editor: ICodeEditor, stream: AsyncIterable<TextEdit[]>, token: CancellationToken, applyCodeBlockSuggestionId: EditSuggestionId | undefined): Promise<boolean>;