@codingame/monaco-vscode-katex-common 31.0.1 → 32.0.0

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

@@ -1,4 +1,3 @@
-import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 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";
@@ -6,26 +5,18 @@ import { IPosition, Position } from "@codingame/monaco-vscode-api/vscode/vs/edit
 import { IRange } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
 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 { 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 { 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 { IInstantiationService } 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 { 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 {
@@ -47,8 +38,7 @@ export declare class InlineChatController implements IEditorContribution {
     readonly inputOverlayWidget: InlineChatAffordance;
     get widget(): EditorBasedInlineChatWidget;
     get isActive(): boolean;
-    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);
+    constructor(editor: ICodeEditor, instaService: IInstantiationService, notebookEditorService: INotebookEditorService, inlineChatSessionService: IInlineChatSessionService, codeEditorService: ICodeEditorService, contextKeyService: IContextKeyService, configurationService: IConfigurationService, editorService: IEditorService, markerDecorationsService: IMarkerDecorationsService, languageModelService: ILanguageModelsService, logService: ILogService, chatEditingService: IChatEditingService, chatService: IChatService);
     dispose(): void;
     getWidgetPosition(): Position | undefined;
     focus(): void;
@@ -57,10 +47,4 @@ export declare class InlineChatController implements IEditorContribution {
     rejectSession(): Promise<void>;
     continueSessionInChat(): Promise<void>;
     rephraseSession(): Promise<void>;
-    createImageAttachment(attachment: URI): Promise<IChatRequestVariableEntry | undefined>;
 }
-export declare function reviewEdits(accessor: ServicesAccessor, editor: ICodeEditor, stream: AsyncIterable<TextEdit[]>, token: CancellationToken, applyCodeBlockSuggestionId: EditSuggestionId | undefined): Promise<boolean>;
-export declare function reviewNotebookEdits(accessor: ServicesAccessor, uri: URI, stream: AsyncIterable<[
-    URI,
-    TextEdit[]
-] | ICellEditOperation[]>, token: CancellationToken): Promise<boolean>;

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

@@ -2,13 +2,10 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
 import { alert } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
-import { raceCancellation } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
-import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
@@ -23,14 +20,11 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 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 { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } 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 { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
-import { ISharedWebContentExtractorService } from '@codingame/monaco-vscode-api/vscode/vs/platform/webContentExtractor/common/webContentExtractor.service';
 import { SIDE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 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';
@@ -38,16 +32,14 @@ import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-a
 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';
 import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
-import { ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { isILanguageModelChatSelector, ILanguageModelChatMetadata } 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 { isNotebookContainingCellEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookEditor';
 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, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_INLINE_CHAT_PENDING_CONFIRMATION, CTX_INLINE_CHAT_TERMINATED, InlineChatConfigKeys } from '../common/inlineChat.js';
+import { INLINE_CHAT_ID, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_INLINE_CHAT_TERMINATED, InlineChatConfigKeys } from '../common/inlineChat.js';
 import { InlineChatAffordance } from './inlineChatAffordance.js';
-import { InlineChatInputWidget, InlineChatSessionOverlayWidget } from './inlineChatOverlayWidget.js';
 import { continueInPanelChat, rephraseInlineChat } from './inlineChatSessionService.js';
 import { IInlineChatSessionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
 import { InlineChatZoneWidget } from './inlineChatZoneWidget.js';
@@ -89,7 +81,7 @@ let InlineChatController = class InlineChatController {
         InlineChatController_1 = this;
     }
     static {
-        this.ID = "editor.contrib.inlineChatController";
+        this.ID = INLINE_CHAT_ID;
     }
     static get(editor) {
         return editor.getContribution(InlineChatController_1.ID) ?? undefined;
@@ -97,18 +89,13 @@ let InlineChatController = class InlineChatController {
     static #userSelectedModel;
     #store = ( new DisposableStore());
     #isActiveController = observableValue(this, false);
-    #renderMode;
     #zone;
-    #inputWidget;
     #currentSession;
     #editor;
     #instaService;
     #notebookEditorService;
     #inlineChatSessionService;
     #configurationService;
-    #webContentExtractorService;
-    #fileService;
-    #chatAttachmentResolveService;
     #editorService;
     #markerDecorationsService;
     #languageModelService;
@@ -121,9 +108,6 @@ let InlineChatController = class InlineChatController {
     get isActive() {
         return Boolean(this.#currentSession.get());
     }
-    get inputWidget() {
-        return this.#inputWidget;
-    }
     constructor(
         editor,
         instaService,
@@ -132,9 +116,6 @@ let InlineChatController = class InlineChatController {
         codeEditorService,
         contextKeyService,
         configurationService,
-        webContentExtractorService,
-        fileService,
-        chatAttachmentResolveService,
         editorService,
         markerDecorationsService,
         languageModelService,
@@ -147,9 +128,6 @@ let InlineChatController = class InlineChatController {
         this.#notebookEditorService = notebookEditorService;
         this.#inlineChatSessionService = inlineChatSessionService;
         this.#configurationService = configurationService;
-        this.#webContentExtractorService = webContentExtractorService;
-        this.#fileService = fileService;
-        this.#chatAttachmentResolveService = chatAttachmentResolveService;
         this.#editorService = editorService;
         this.#markerDecorationsService = markerDecorationsService;
         this.#languageModelService = languageModelService;
@@ -159,10 +137,8 @@ let InlineChatController = class InlineChatController {
         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 ctxTerminated = CTX_INLINE_CHAT_TERMINATED.bindTo(contextKeyService);
-        const notebookAgentConfig = observableConfigValue(InlineChatConfigKeys.notebookAgent, false, this.#configurationService);
-        this.#renderMode = observableConfigValue(InlineChatConfigKeys.RenderMode, "zone", this.#configurationService);
+        const notebookAgentConfig = observableConfigValue(InlineChatConfigKeys.NotebookAgent, false, this.#configurationService);
         this.#store.add(autorun(r => {
             const model = editorObs.model.read(r);
             if (!model) {
@@ -185,13 +161,7 @@ let InlineChatController = class InlineChatController {
             }
             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.inputOverlayWidget = this.#store.add(
-            this.#instaService.createInstance(InlineChatAffordance, this.#editor, overlayWidget)
-        );
+        this.inputOverlayWidget = this.#store.add(this.#instaService.createInstance(InlineChatAffordance, this.#editor));
         this.#zone = ( new Lazy(() => {
             assertType(
                 this.#editor.hasModel(),
@@ -296,7 +266,7 @@ let InlineChatController = class InlineChatController {
             }
         }));
         const defaultPlaceholderObs = ( visibleSessionObs.map((session, r) => {
-            return session?.initialSelection.isEmpty() ? ( localize(10089, "Generate code")) : ( localize(10090, "Modify selected code"));
+            return session?.initialSelection.isEmpty() ? ( localize(10418, "Generate code")) : ( localize(10419, "Modify selected code"));
         }));
         this.#store.add(autorun(r => {
             const session = visibleSessionObs.read(r);
@@ -304,14 +274,11 @@ let InlineChatController = class InlineChatController {
         }));
         this.#store.add(autorun(r => {
             const session = visibleSessionObs.read(r);
-            const renderMode = this.#renderMode.read(r);
             if (!session) {
                 this.#zone.rawValue?.hide();
                 this.#zone.rawValue?.widget.chatWidget.setModel(undefined);
                 editor.focus();
                 ctxInlineChatVisible.reset();
-            } else if (renderMode === "hover") {
-                ctxInlineChatVisible.set(true);
             } else {
                 ctxInlineChatVisible.set(true);
                 this.#zone.value.widget.chatWidget.setModel(session.chatModel);
@@ -324,28 +291,6 @@ let InlineChatController = class InlineChatController {
                 this.#zone.value.widget.focus();
             }
         }));
-        this.#store.add(autorun(r => {
-            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;
-            const isTerminated = !!session.terminationState.read(r);
-            ctxPendingConfirmation.set(isPendingConfirmation);
-            const entry = session.editingSession.readEntry(session.uri, r);
-            const isNotSettled = entry ? entry.state.read(r) === ModifiedFileEntryState.Modified : false;
-            if (isInProgress || isNotSettled || isPendingConfirmation || isError || isTerminated) {
-                sessionOverlayWidget.show(session);
-            } else {
-                sessionOverlayWidget.hide();
-            }
-        }));
         this.#store.add(autorun(r => {
             const session = this.#currentSession.read(r);
             if (!session) {
@@ -412,30 +357,29 @@ let InlineChatController = class InlineChatController {
             const session = visibleSessionObs.read(r);
             const response = lastResponseObs.read(r);
             const terminationState = session?.terminationState.read(r);
-            const renderMode = this.#renderMode.read(r);
             this.#zone.rawValue?.widget.updateInfo("");
             if (!response?.isInProgress.read(r)) {
+                this.#zone.rawValue?.status.set(response?.result?.details ?? "", undefined);
                 if (response?.result?.errorDetails) {
                     this.#zone.rawValue?.widget.updateInfo(`$(error) ${response.result.errorDetails.message}`);
                     alert(response.result.errorDetails.message);
-                } else if (terminationState && renderMode === "zone") {
-                    this.#zone.rawValue?.showTerminationCard(terminationState, this.#instaService);
                 } else if (terminationState) {
-                    this.#zone.rawValue?.widget.updateInfo(`$(info) ${renderAsPlaintext(terminationState)}`);
+                    this.#zone.rawValue?.showTerminationCard(terminationState, this.#instaService);
                 }
-                if (!terminationState || renderMode !== "zone") {
+                if (!terminationState) {
                     this.#zone.rawValue?.hideTerminationCard();
                 }
                 this.#zone.rawValue?.widget.domNode.classList.toggle("request-in-progress", false);
                 this.#zone.rawValue?.widget.chatWidget.setInputPlaceholder(defaultPlaceholderObs.read(r));
             } else {
                 this.#zone.rawValue?.widget.domNode.classList.toggle("request-in-progress", true);
+                this.#zone.rawValue?.status.set("", undefined);
                 let placeholder = response.request?.message.text;
                 const lastProgress = lastResponseProgressObs.read(r);
                 if (lastProgress) {
                     placeholder = renderAsPlaintext(lastProgress.content);
                 }
-                this.#zone.rawValue?.widget.chatWidget.setInputPlaceholder(placeholder || ( localize(10091, "Working...")));
+                this.#zone.rawValue?.widget.chatWidget.setInputPlaceholder(placeholder || ( localize(10420, "Working...")));
             }
         }));
         this.#store.add(autorun(r => {
@@ -490,85 +434,7 @@ let InlineChatController = class InlineChatController {
         }
         this.#isActiveController.set(true, undefined);
         const session = this.#inlineChatSessionService.createSession(this.#editor);
-        if (this.#renderMode.get() === "hover") {
-            return this.#runHover(session, arg);
-        } else {
-            return this.#runZone(session, arg);
-        }
-    }
-    async #runHover(session, arg) {
-        assertType(this.#editor.hasModel());
-        const uri = this.#editor.getModel().uri;
-        if (arg && InlineChatRunOptions.isInlineChatRunOptions(arg)) {
-            if (arg.initialRange) {
-                this.#editor.revealRange(arg.initialRange);
-            }
-            if (arg.initialSelection) {
-                this.#editor.setSelection(arg.initialSelection);
-            }
-        }
-        const {
-            location,
-            locationData
-        } = this.#buildLocationData();
-        let userSelectedModelId;
-        if (arg?.modelSelector) {
-            userSelectedModelId = (await this.#languageModelService.selectLanguageModels(arg.modelSelector)).sort().at(0);
-            if (!userSelectedModelId) {
-                throw ( new Error(
-                    `No language models found matching selector: ${JSON.stringify(arg.modelSelector)}.`
-                ));
-            }
-        } else {
-            userSelectedModelId = await this.#resolveModelId(location);
-        }
-        const attachedContext = [];
-        if (arg?.attachments) {
-            for (const attachment of arg.attachments) {
-                const resolved = await this.#chatAttachmentResolveService.resolveImageEditorAttachContext(attachment);
-                if (resolved) {
-                    attachedContext.push(resolved);
-                }
-            }
-        }
-        if (arg?.attachDiagnostics) {
-            for (const [range, marker] of this.#markerDecorationsService.getLiveMarkers(uri)) {
-                if (range.intersectRanges(this.#editor.getSelection())) {
-                    const filter = IDiagnosticVariableEntryFilterData.fromMarker(marker);
-                    attachedContext.push(IDiagnosticVariableEntryFilterData.toEntry(filter));
-                }
-            }
-            if (attachedContext.length > 0 && !arg.message) {
-                arg.message = attachedContext.length > 1 ? ( localize(10092, "Fix the attached problems")) : ( localize(10093, "Fix the attached problem"));
-            }
-        }
-        if (arg?.message && arg.autoSend) {
-            await this.#chatService.sendRequest(session.chatModel.sessionResource, arg.message, {
-                userSelectedModelId,
-                location,
-                locationData,
-                attachedContext: attachedContext.length > 0 ? attachedContext : undefined,
-                modeInfo: {
-                    kind: ChatModeKind.Ask,
-                    isBuiltin: true,
-                    modeInstructions: undefined,
-                    modeId: "ask",
-                    applyCodeBlockSuggestionId: undefined
-                }
-            });
-        }
-        if (!arg?.resolveOnResponse) {
-            await Event.toPromise(session.editingSession.onDidDispose);
-            const rejected = session.editingSession.getEntry(uri)?.state.get() === ModifiedFileEntryState.Rejected;
-            return !rejected;
-        } else {
-            const modifiedObs = derived(r => {
-                const entry = session.editingSession.readEntry(uri, r);
-                return entry?.state.read(r) === ModifiedFileEntryState.Modified && !entry?.isCurrentlyBeingModifiedBy.read(r);
-            });
-            await waitForState(modifiedObs, state => state === true);
-            return true;
-        }
+        return this.#runZone(session, arg);
     }
     async #runZone(session, arg) {
         assertType(this.#editor.hasModel());
@@ -589,7 +455,7 @@ let InlineChatController = class InlineChatController {
                 }
                 if (entries.length > 0) {
                     this.#zone.value.widget.chatWidget.attachmentModel.addContext(...entries);
-                    const msg = entries.length > 1 ? ( localize(10092, "Fix the attached problems")) : ( localize(10093, "Fix the attached problem"));
+                    const msg = entries.length > 1 ? ( localize(10421, "Fix the attached problems")) : ( localize(10422, "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)));
@@ -676,22 +542,11 @@ let InlineChatController = class InlineChatController {
         if (!session) {
             return;
         }
-        if (this.#renderMode.get() === "zone") {
-            const requestText = this.#instaService.invokeFunction(rephraseInlineChat, session);
-            if (requestText) {
-                this.#zone.rawValue?.widget.chatWidget.setInput(requestText);
-            }
-            this.#zone.rawValue?.widget.focus();
-            return;
-        }
-        const requestText = session.chatModel.getRequests().at(-1)?.message.text;
-        session.dispose();
-        if (!requestText) {
-            return;
+        const requestText = this.#instaService.invokeFunction(rephraseInlineChat, session);
+        if (requestText) {
+            this.#zone.rawValue?.widget.chatWidget.setInput(requestText);
         }
-        const selection = this.#editor.getSelection();
-        const placeholder = selection && !selection.isEmpty() ? ( localize(10094, "Describe how to change this")) : ( localize(10095, "Describe what to generate"));
-        await this.inputOverlayWidget.showMenuAtSelection(placeholder, requestText);
+        this.#zone.rawValue?.widget.focus();
     }
     async #selectVendorDefaultModel(session) {
         const model = this.#zone.value.widget.chatWidget.input.selectedLanguageModel.get();
@@ -711,69 +566,6 @@ let InlineChatController = class InlineChatController {
             }
         }
     }
-    async #resolveModelId(location) {
-        const userSelectedModel = InlineChatController_1.#userSelectedModel;
-        const defaultModelSetting = this.#configurationService.getValue(InlineChatConfigKeys.DefaultModel);
-        if (userSelectedModel) {
-            const match = this.#languageModelService.lookupLanguageModelByQualifiedName(userSelectedModel);
-            if (match) {
-                return match.identifier;
-            }
-            InlineChatController_1.#userSelectedModel = undefined;
-        }
-        if (defaultModelSetting) {
-            const match = this.#languageModelService.lookupLanguageModelByQualifiedName(defaultModelSetting);
-            if (match) {
-                return match.identifier;
-            }
-            this.#logService.warn(
-                `inlineChat.defaultModel setting value '${defaultModelSetting}' did not match any available model. Falling back to vendor default.`
-            );
-        }
-        for (const id of this.#languageModelService.getLanguageModelIds()) {
-            const metadata = this.#languageModelService.lookupLanguageModel(id);
-            if (metadata?.isDefaultForLocation[location]) {
-                return id;
-            }
-        }
-        return undefined;
-    }
-    #buildLocationData() {
-        assertType(this.#editor.hasModel());
-        const notebookEditor = this.#notebookEditorService.getNotebookForPossibleCell(this.#editor);
-        if (notebookEditor) {
-            const useNotebookAgent = this.#configurationService.getValue(InlineChatConfigKeys.notebookAgent);
-            if (useNotebookAgent) {
-                return {
-                    location: ChatAgentLocation.Notebook,
-                    locationData: {
-                        type: ChatAgentLocation.Notebook,
-                        sessionInputUri: this.#editor.getModel().uri
-                    }
-                };
-            }
-            return {
-                location: ChatAgentLocation.Notebook,
-                locationData: {
-                    type: ChatAgentLocation.EditorInline,
-                    id: getEditorId(this.#editor, this.#editor.getModel()),
-                    selection: this.#editor.getSelection(),
-                    document: this.#editor.getModel().uri,
-                    wholeRange: this.#editor.getSelection()
-                }
-            };
-        }
-        return {
-            location: ChatAgentLocation.EditorInline,
-            locationData: {
-                type: ChatAgentLocation.EditorInline,
-                id: getEditorId(this.#editor, this.#editor.getModel()),
-                selection: this.#editor.getSelection(),
-                document: this.#editor.getModel().uri,
-                wholeRange: this.#editor.getSelection()
-            }
-        };
-    }
     async #applyModelDefaults(session, sessionStore) {
         const userSelectedModel = InlineChatController_1.#userSelectedModel;
         const defaultModelSetting = this.#configurationService.getValue(InlineChatConfigKeys.DefaultModel);
@@ -811,180 +603,7 @@ let InlineChatController = class InlineChatController {
             }
         }));
     }
-    async createImageAttachment(attachment) {
-        const value = this.#currentSession.get();
-        if (!value) {
-            return undefined;
-        }
-        if (attachment.scheme === Schemas.file) {
-            if (await this.#fileService.canHandleResource(attachment)) {
-                return await this.#chatAttachmentResolveService.resolveImageEditorAttachContext(attachment);
-            }
-        } else if (attachment.scheme === Schemas.http || attachment.scheme === Schemas.https) {
-            const extractedImages = await this.#webContentExtractorService.readImage(attachment, CancellationToken.None);
-            if (extractedImages) {
-                return await this.#chatAttachmentResolveService.resolveImageEditorAttachContext(attachment, extractedImages);
-            }
-        }
-        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)), ( __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.startNewLocalSession(ChatAgentLocation.EditorInline);
-    const chatModel = chatModelRef.object;
-    chatModel.startEditingSession(true);
-    const store = ( new DisposableStore());
-    store.add(chatModelRef);
-    const chatRequest = chatModel?.addRequest({
-        text: "",
-        parts: []
-    }, {
-        variables: []
-    }, 0, {
-        kind: undefined,
-        modeId: "applyCodeBlock",
-        modeInstructions: undefined,
-        isBuiltin: true,
-        applyCodeBlockSuggestionId
-    });
-    assertType(chatRequest.response);
-    chatRequest.response.updateContent({
-        kind: "textEdit",
-        uri,
-        edits: [],
-        done: false
-    });
-    for await (const chunk of stream) {
-        if (token.isCancellationRequested) {
-            chatRequest.response.cancel();
-            break;
-        }
-        chatRequest.response.updateContent({
-            kind: "textEdit",
-            uri,
-            edits: chunk,
-            done: false
-        });
-    }
-    chatRequest.response.updateContent({
-        kind: "textEdit",
-        uri,
-        edits: [],
-        done: true
-    });
-    if (!token.isCancellationRequested) {
-        chatRequest.response.complete();
-    }
-    const isSettled = derived(r => {
-        const entry = chatModel.editingSession?.readEntry(uri, r);
-        if (!entry) {
-            return false;
-        }
-        const state = entry.state.read(r);
-        return state === ModifiedFileEntryState.Accepted || state === ModifiedFileEntryState.Rejected;
-    });
-    const whenDecided = waitForState(isSettled, Boolean);
-    await raceCancellation(whenDecided, token);
-    store.dispose();
-    return true;
-}
-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.startNewLocalSession(ChatAgentLocation.EditorInline);
-    const chatModel = chatModelRef.object;
-    chatModel.startEditingSession(true);
-    const store = ( new DisposableStore());
-    store.add(chatModelRef);
-    const chatRequest = chatModel?.addRequest({
-        text: "",
-        parts: []
-    }, {
-        variables: []
-    }, 0);
-    assertType(chatRequest.response);
-    if (isNotebook) {
-        chatRequest.response.updateContent({
-            kind: "notebookEdit",
-            uri,
-            edits: [],
-            done: false
-        });
-    } else {
-        chatRequest.response.updateContent({
-            kind: "textEdit",
-            uri,
-            edits: [],
-            done: false
-        });
-    }
-    for await (const chunk of stream) {
-        if (token.isCancellationRequested) {
-            chatRequest.response.cancel();
-            break;
-        }
-        if (chunk.every(isCellEditOperation)) {
-            chatRequest.response.updateContent({
-                kind: "notebookEdit",
-                uri,
-                edits: chunk,
-                done: false
-            });
-        } else {
-            chatRequest.response.updateContent({
-                kind: "textEdit",
-                uri: chunk[0],
-                edits: chunk[1],
-                done: false
-            });
-        }
-    }
-    if (isNotebook) {
-        chatRequest.response.updateContent({
-            kind: "notebookEdit",
-            uri,
-            edits: [],
-            done: true
-        });
-    } else {
-        chatRequest.response.updateContent({
-            kind: "textEdit",
-            uri,
-            edits: [],
-            done: true
-        });
-    }
-    if (!token.isCancellationRequested) {
-        chatRequest.response.complete();
-    }
-    const isSettled = derived(r => {
-        const entry = chatModel.editingSession?.readEntry(uri, r);
-        if (!entry) {
-            return false;
-        }
-        const state = entry.state.read(r);
-        return state === ModifiedFileEntryState.Accepted || state === ModifiedFileEntryState.Rejected;
-    });
-    const whenDecided = waitForState(isSettled, Boolean);
-    await raceCancellation(whenDecided, token);
-    store.dispose();
-    return true;
-}
-function isCellEditOperation(edit) {
-    if (URI.isUri(edit)) {
-        return false;
-    }
-    if (Array.isArray(edit)) {
-        return false;
-    }
-    return true;
-}
+InlineChatController = InlineChatController_1 = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, INotebookEditorService)), ( __param(3, IInlineChatSessionService)), ( __param(4, ICodeEditorService)), ( __param(5, IContextKeyService)), ( __param(6, IConfigurationService)), ( __param(7, IEditorService)), ( __param(8, IMarkerDecorationsService)), ( __param(9, ILanguageModelsService)), ( __param(10, ILogService)), ( __param(11, IChatEditingService)), ( __param(12, IChatService))], InlineChatController));
 
-export { InlineChatController, InlineChatRunOptions, reviewEdits, reviewNotebookEdits };
+export { InlineChatController, InlineChatRunOptions };