@codingame/monaco-vscode-api 5.3.0 → 6.0.1

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.js

@@ -1,17 +1,16 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
 import { getWindow, scheduleAtNextAnimationFrame, trackFocus, Dimension, WindowIntervalTimer } from '../../../../../../base/browser/dom.js';
-import { disposableTimeout, createCancelablePromise, raceCancellationError, Queue } from '../../../../../../base/common/async.js';
+import { disposableTimeout, createCancelablePromise, Queue, DeferredPromise } from '../../../../../../base/common/async.js';
 import { CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
-import { Emitter, Event } from '../../../../../../base/common/event.js';
-import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
-import { Disposable, DisposableStore, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { Emitter } from '../../../../../../base/common/event.js';
+import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
 import { LRUCache } from '../../../../../../base/common/map.js';
 import { Schemas } from '../../../../../../base/common/network.js';
 import { MovingAverage } from '../../../../../../base/common/numbers.js';
+import { isEqual } from '../../../../../../base/common/resources.js';
 import { StopWatch } from '../../../../../../base/common/stopwatch.js';
 import { assertType } from '../../../../../../base/common/types.js';
 import { URI } from '../../../../../../base/common/uri.js';
-import { generateUuid } from '../../../../../../base/common/uuid.js';
 import { CodeEditorWidget } from '../../../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
 import { Selection } from '../../../../../../editor/common/core/selection.js';
 import { TextEdit } from '../../../../../../editor/common/languages.js';
@@ -19,22 +18,19 @@ import { ILanguageService } from '../../../../../../editor/common/languages/lang
 import { IEditorWorkerService } from '../../../../../../editor/common/services/editorWorker.js';
 import { IModelService } from '../../../../../../editor/common/services/model.js';
 import { localizeWithPath } from '../../../../../../nls.js';
-import { ICommandService } from '../../../../../../platform/commands/common/commands.service.js';
+import { MenuId } from '../../../../../../platform/actions/common/actions.js';
 import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { AsyncProgress } from '../../../../../../platform/progress/common/progress.js';
+import { StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../../../platform/storage/common/storage.service.js';
-import { GeneratingPhrase } from '../../../../chat/browser/chat.js';
 import { ChatAgentLocation } from '../../../../chat/common/chatAgents.js';
+import { IChatService } from '../../../../chat/common/chatService.service.js';
 import { countWords } from '../../../../chat/common/chatWordCounter.js';
-import { IInlineChatSavingService } from '../../../../inlineChat/browser/inlineChatSavingService.service.js';
-import { SessionPrompt, ReplyResponse, SessionExchange, EmptyResponse, ErrorResponse } from '../../../../inlineChat/browser/inlineChatSession.js';
-import { IInlineChatSessionService } from '../../../../inlineChat/browser/inlineChatSessionService.service.js';
 import { InlineChatWidget } from '../../../../inlineChat/browser/inlineChatWidget.js';
 import { performAsyncTextEdit, asProgressiveEdit } from '../../../../inlineChat/browser/utils.js';
-import { CTX_INLINE_CHAT_LAST_RESPONSE_TYPE } from '../../../../inlineChat/common/inlineChat.js';
+import { MENU_INLINE_CHAT_WIDGET } from '../../../../inlineChat/common/inlineChat.js';
 import { insertCell, runDeleteAction } from '../cellOperations.js';
-import { CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_NOTEBOOK_CHAT_USER_DID_EDIT, CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION, MENU_CELL_CHAT_INPUT, MENU_CELL_CHAT_WIDGET, MENU_CELL_CHAT_WIDGET_STATUS, MENU_CELL_CHAT_WIDGET_FEEDBACK } from './notebookChatContext.js';
+import { CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_NOTEBOOK_CHAT_USER_DID_EDIT, CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION, MENU_CELL_CHAT_WIDGET_STATUS } from './notebookChatContext.js';
 import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
 import { CellKind } from '../../../common/notebookCommon.js';
 import { NotebookExecutionType } from '../../../common/notebookExecutionStateService.js';
@@ -68,15 +64,28 @@ class NotebookChatWidget extends Disposable {
         this.parentEditor = parentEditor;
         this._languageService = _languageService;
         this._editingCell = null;
-        this._register(inlineChatWidget.onDidChangeHeight(() => {
+        const updateHeight = () => {
+            if (this.heightInPx === inlineChatWidget.contentHeight) {
+                return;
+            }
             this.heightInPx = inlineChatWidget.contentHeight;
             this._notebookEditor.changeViewZones(accessor => {
                 accessor.layoutZone(id);
             });
             this._layoutWidget(inlineChatWidget, widgetContainer);
+        };
+        this._register(inlineChatWidget.onDidChangeHeight(() => {
+            updateHeight();
         }));
+        this._register(inlineChatWidget.chatWidget.onDidChangeHeight(() => {
+            updateHeight();
+        }));
+        this.heightInPx = inlineChatWidget.contentHeight;
         this._layoutWidget(inlineChatWidget, widgetContainer);
     }
+    layout() {
+        this._layoutWidget(this.inlineChatWidget, this.widgetContainer);
+    }
     restoreEditingCell(initEditingCell) {
         this._editingCell = initEditingCell;
         const decorationIds = this._notebookEditor.deltaCellDecorations([], [{
@@ -190,19 +199,17 @@ let NotebookChatController = class NotebookChatController extends Disposable {
     }
     static { this._storageKey = 'inline-chat-history'; }
     static { this._promptHistory = []; }
-    constructor(_notebookEditor, _instantiationService, _inlineChatSessionService, _contextKeyService, _commandService, _editorWorkerService, _inlineChatSavingService, _modelService, _languageService, _executionStateService, _storageService) {
+    constructor(_notebookEditor, _instantiationService, _contextKeyService, _editorWorkerService, _modelService, _languageService, _executionStateService, _storageService, _chatService) {
         super();
         this._notebookEditor = _notebookEditor;
         this._instantiationService = _instantiationService;
-        this._inlineChatSessionService = _inlineChatSessionService;
         this._contextKeyService = _contextKeyService;
-        this._commandService = _commandService;
         this._editorWorkerService = _editorWorkerService;
-        this._inlineChatSavingService = _inlineChatSavingService;
         this._modelService = _modelService;
         this._languageService = _languageService;
         this._executionStateService = _executionStateService;
         this._storageService = _storageService;
+        this._chatService = _chatService;
         this._historyOffset = -1;
         this._historyCandidate = '';
         this._promptCache = ( (new LRUCache(1000, 0.7)));
@@ -210,13 +217,13 @@ let NotebookChatController = class NotebookChatController extends Disposable {
         this.onDidChangePromptCache = this._onDidChangePromptCache.event;
         this._userEditingDisposables = this._register(( (new DisposableStore())));
         this._widgetDisposableStore = this._register(( (new DisposableStore())));
+        this._model = this._register(( (new MutableDisposable())));
         this._ctxHasActiveRequest = CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST.bindTo(this._contextKeyService);
         this._ctxCellWidgetFocused = CTX_NOTEBOOK_CELL_CHAT_FOCUSED.bindTo(this._contextKeyService);
-        this._ctxLastResponseType = CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.bindTo(this._contextKeyService);
         this._ctxUserDidEdit = CTX_NOTEBOOK_CHAT_USER_DID_EDIT.bindTo(this._contextKeyService);
         this._ctxOuterFocusPosition = CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.bindTo(this._contextKeyService);
         this._registerFocusTracker();
-        NotebookChatController_1._promptHistory = JSON.parse(this._storageService.get(NotebookChatController_1._storageKey, 0 , '[]'));
+        NotebookChatController_1._promptHistory = JSON.parse(this._storageService.get(NotebookChatController_1._storageKey, StorageScope.PROFILE, '[]'));
         this._historyUpdate = (prompt) => {
             const idx = NotebookChatController_1._promptHistory.indexOf(prompt);
             if (idx >= 0) {
@@ -225,7 +232,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
             NotebookChatController_1._promptHistory.unshift(prompt);
             this._historyOffset = -1;
             this._historyCandidate = '';
-            this._storageService.store(NotebookChatController_1._storageKey, JSON.stringify(NotebookChatController_1._promptHistory), 0 , 0 );
+            this._storageService.store(NotebookChatController_1._storageKey, JSON.stringify(NotebookChatController_1._promptHistory), StorageScope.PROFILE, StorageTarget.USER);
         };
     }
     _registerFocusTracker() {
@@ -310,10 +317,15 @@ let NotebookChatController = class NotebookChatController extends Disposable {
         fakeParentEditor.setModel(result);
         const inlineChatWidget = this._widgetDisposableStore.add(this._instantiationService.createInstance(InlineChatWidget, ChatAgentLocation.Notebook, {
             telemetrySource: 'notebook-generate-cell',
-            inputMenuId: MENU_CELL_CHAT_INPUT,
-            widgetMenuId: MENU_CELL_CHAT_WIDGET,
+            inputMenuId: MenuId.ChatExecute,
+            widgetMenuId: MENU_INLINE_CHAT_WIDGET,
             statusMenuId: MENU_CELL_CHAT_WIDGET_STATUS,
-            feedbackMenuId: MENU_CELL_CHAT_WIDGET_FEEDBACK
+            rendererOptions: {
+                renderTextEditsAsSummary: (uri) => {
+                    return isEqual(uri, this._widget?.parentEditor.getModel()?.uri)
+                        || isEqual(uri, this._notebookEditor.textModel?.uri);
+                }
+            }
         }));
         inlineChatWidget.placeholder = ( localizeWithPath(_moduleId, 0, "Ask a question"));
         inlineChatWidget.updateInfo(( localizeWithPath(_moduleId, 1, "AI-generated code may be incorrect")));
@@ -349,14 +361,9 @@ let NotebookChatController = class NotebookChatController extends Disposable {
                 this._focusWidget();
             }, 0, this._store);
             this._sessionCtor = createCancelablePromise(async (token) => {
+                await this._startSession(token);
                 if (fakeParentEditor.hasModel()) {
-                    await this._startSession(fakeParentEditor, token);
-                    this._warmupRequestCts = ( (new CancellationTokenSource()));
-                    this._startInitialFolowups(fakeParentEditor, this._warmupRequestCts.token);
                     if (this._widget) {
-                        this._widget.inlineChatWidget.placeholder = this._activeSession?.session.placeholder ?? ( localizeWithPath(_moduleId, 0, "Ask a question"));
-                        this._widget.inlineChatWidget.updateInfo(this._activeSession?.session.message ?? ( localizeWithPath(_moduleId, 1, "AI-generated code may be incorrect")));
-                        this._widget.inlineChatWidget.updateSlashCommands(this._activeSession?.session.slashCommands ?? []);
                         this._focusWidget();
                     }
                     if (this._widget && input) {
@@ -369,6 +376,15 @@ let NotebookChatController = class NotebookChatController extends Disposable {
             });
         });
     }
+    async _startSession(token) {
+        if (!this._model.value) {
+            this._model.value = this._chatService.startSession(ChatAgentLocation.Editor, token);
+            if (!this._model.value) {
+                throw ( (new Error('Failed to start chat session')));
+            }
+        }
+        this._strategy = ( (new EditStrategy()));
+    }
     _scrollWidgetIntoView(index) {
         if (index === 0 || this._notebookEditor.getLength() === 0) {
             this._notebookEditor.revealOffsetInCenterIfOutsideViewport(0);
@@ -395,19 +411,24 @@ let NotebookChatController = class NotebookChatController extends Disposable {
         }
         this._widget.updateNotebookEditorFocusNSelections();
     }
+    hasSession(chatModel) {
+        return this._model.value === chatModel;
+    }
+    getSessionInputUri() {
+        return this._widget?.parentEditor.getModel()?.uri;
+    }
     async acceptInput() {
         assertType(this._widget);
         await this._sessionCtor;
-        assertType(this._activeSession);
-        this._warmupRequestCts?.dispose(true);
-        this._warmupRequestCts = undefined;
-        this._activeSession.addInput(( (new SessionPrompt(this._widget.inlineChatWidget.value))));
-        assertType(this._activeSession.lastInput);
-        const value = this._activeSession.lastInput.value;
-        this._historyUpdate(value);
+        assertType(this._model.value);
+        assertType(this._strategy);
+        const model = this._model.value;
+        this._widget.inlineChatWidget.setChatModel(model);
+        const lastInput = this._widget.inlineChatWidget.value;
+        this._historyUpdate(lastInput);
         const editor = this._widget.parentEditor;
-        const model = editor.getModel();
-        if (!editor.hasModel() || !model) {
+        const textModel = editor.getModel();
+        if (!editor.hasModel() || !textModel) {
             return;
         }
         if (this._widget.editingCell && this._widget.editingCell.textBuffer.getLength() > 0) {
@@ -428,187 +449,83 @@ let NotebookChatController = class NotebookChatController extends Disposable {
                 }]);
         }
         this._ctxHasActiveRequest.set(true);
-        this._widget.inlineChatWidget.updateSlashCommands(this._activeSession.session.slashCommands ?? []);
-        this._widget?.inlineChatWidget.updateProgress(true);
-        const request = {
-            requestId: generateUuid(),
-            prompt: value,
-            attempt: 0,
-            selection: { selectionStartLineNumber: 1, selectionStartColumn: 1, positionLineNumber: 1, positionColumn: 1 },
-            wholeRange: { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 },
-            live: true,
-            previewDocument: model.uri,
-            withIntentDetection: true,
-        };
         this._activeRequestCts?.cancel();
         this._activeRequestCts = ( (new CancellationTokenSource()));
-        const progressEdits = [];
-        const progressiveEditsQueue = ( (new Queue()));
-        const progressiveEditsClock = StopWatch.create();
-        const progressiveEditsAvgDuration = ( (new MovingAverage()));
-        const progressiveEditsCts = ( (new CancellationTokenSource(this._activeRequestCts.token)));
-        let progressiveChatResponse;
-        const progress = ( (new AsyncProgress(async (data) => {
-            if (this._activeRequestCts?.token.isCancellationRequested) {
-                return;
-            }
-            if (data.message) {
-                this._widget?.inlineChatWidget.updateToolbar(false);
-                this._widget?.inlineChatWidget.updateInfo(data.message);
-            }
-            if (data.edits?.length) {
-                if (!request.live) {
-                    throw ( (new Error('Progress in NOT supported in non-live mode')));
-                }
-                progressEdits.push(data.edits);
-                progressiveEditsAvgDuration.update(progressiveEditsClock.elapsed());
-                progressiveEditsClock.reset();
-                progressiveEditsQueue.queue(async () => {
-                    await this._makeChanges(data.edits, data.editsShouldBeInstant
-                        ? undefined
-                        : { duration: progressiveEditsAvgDuration.value, token: progressiveEditsCts.token });
-                });
-            }
-            if (data.markdownFragment) {
-                if (!progressiveChatResponse) {
-                    const message = {
-                        message: ( (new MarkdownString(
-                            data.markdownFragment,
-                            { supportThemeIcons: true, supportHtml: true, isTrusted: false }
-                        ))),
-                        requestId: request.requestId,
-                    };
-                    progressiveChatResponse = this._widget?.inlineChatWidget.updateChatMessage(message, true);
-                }
-                else {
-                    progressiveChatResponse.appendContent(data.markdownFragment);
-                }
-            }
-        })));
-        const task = this._activeSession.provider.provideResponse(this._activeSession.session, request, progress, this._activeRequestCts.token);
-        let response;
+        const store = ( (new DisposableStore()));
         try {
-            this._widget?.inlineChatWidget.updateChatMessage(undefined);
-            this._widget?.inlineChatWidget.updateFollowUps(undefined);
-            this._widget?.inlineChatWidget.updateProgress(true);
-            this._widget?.inlineChatWidget.updateInfo(!this._activeSession.lastExchange ? GeneratingPhrase + '\u2026' : '');
             this._ctxHasActiveRequest.set(true);
-            const reply = await raceCancellationError(Promise.resolve(task), this._activeRequestCts.token);
-            if (progressiveEditsQueue.size > 0) {
-                await Event.toPromise(progressiveEditsQueue.onDrained);
-            }
-            await progress.drain();
-            if (!reply) {
-                response = ( (new EmptyResponse()));
-            }
-            else {
-                const markdownContents = ( (new MarkdownString('', { supportThemeIcons: true, supportHtml: true, isTrusted: false })));
-                const replyResponse = response = this._instantiationService.createInstance(ReplyResponse, reply, markdownContents, this._activeSession.textModelN.uri, this._activeSession.textModelN.getAlternativeVersionId(), progressEdits, request.requestId, undefined);
-                for (let i = progressEdits.length; i < replyResponse.allLocalEdits.length; i++) {
-                    await this._makeChanges(replyResponse.allLocalEdits[i], undefined);
-                }
-                if (this._activeSession?.provider.provideFollowups) {
-                    const followupCts = ( (new CancellationTokenSource()));
-                    const followups = await this._activeSession.provider.provideFollowups(this._activeSession.session, replyResponse.raw, followupCts.token);
-                    if (followups && this._widget) {
-                        const widget = this._widget;
-                        widget.inlineChatWidget.updateFollowUps(followups, async (followup) => {
-                            if (followup.kind === 'reply') {
-                                widget.inlineChatWidget.value = followup.message;
-                                this.acceptInput();
-                            }
-                            else {
-                                await this.acceptSession();
-                                this._commandService.executeCommand(followup.commandId, ...(followup.args ?? []));
-                            }
-                        });
+            const progressiveEditsQueue = ( (new Queue()));
+            const progressiveEditsClock = StopWatch.create();
+            const progressiveEditsAvgDuration = ( (new MovingAverage()));
+            const progressiveEditsCts = ( (new CancellationTokenSource(this._activeRequestCts.token)));
+            const responsePromise = ( (new DeferredPromise()));
+            const response = await this._widget.inlineChatWidget.chatWidget.acceptInput();
+            if (response) {
+                let lastLength = 0;
+                store.add(response.onDidChange(e => {
+                    if (response.isCanceled) {
+                        progressiveEditsCts.cancel();
+                        responsePromise.complete();
+                        return;
                     }
-                }
-                this._userEditingDisposables.clear();
-                const editingCell = this._widget.getEditingCell();
-                if (editingCell) {
-                    this._userEditingDisposables.add(editingCell.model.onDidChangeContent(() => this._updateUserEditingState()));
-                    this._userEditingDisposables.add(editingCell.model.onDidChangeLanguage(() => this._updateUserEditingState()));
-                    this._userEditingDisposables.add(editingCell.model.onDidChangeMetadata(() => this._updateUserEditingState()));
-                    this._userEditingDisposables.add(editingCell.model.onDidChangeInternalMetadata(() => this._updateUserEditingState()));
-                    this._userEditingDisposables.add(editingCell.model.onDidChangeOutputs(() => this._updateUserEditingState()));
-                    this._userEditingDisposables.add(this._executionStateService.onDidChangeExecution(e => {
-                        if (e.type === NotebookExecutionType.cell && e.affectsCell(editingCell.uri)) {
-                            this._updateUserEditingState();
+                    if (response.isComplete) {
+                        responsePromise.complete();
+                        return;
+                    }
+                    const edits = ( (response.response.value.map(part => {
+                        if (part.kind === 'textEditGroup'
+                        ) {
+                            return part.edits;
                         }
-                    }));
-                }
+                        else {
+                            return [];
+                        }
+                    }))).flat();
+                    const newEdits = edits.slice(lastLength);
+                    if (newEdits.length === 0) {
+                        return;
+                    }
+                    lastLength = edits.length;
+                    progressiveEditsAvgDuration.update(progressiveEditsClock.elapsed());
+                    progressiveEditsClock.reset();
+                    progressiveEditsQueue.queue(async () => {
+                        for (const edits of newEdits) {
+                            await this._makeChanges(edits, {
+                                duration: progressiveEditsAvgDuration.value,
+                                token: progressiveEditsCts.token
+                            });
+                        }
+                    });
+                }));
+            }
+            await responsePromise.p;
+            await progressiveEditsQueue.whenIdle();
+            this._userEditingDisposables.clear();
+            const editingCell = this._widget.getEditingCell();
+            if (editingCell) {
+                this._userEditingDisposables.add(editingCell.model.onDidChangeContent(() => this._updateUserEditingState()));
+                this._userEditingDisposables.add(editingCell.model.onDidChangeLanguage(() => this._updateUserEditingState()));
+                this._userEditingDisposables.add(editingCell.model.onDidChangeMetadata(() => this._updateUserEditingState()));
+                this._userEditingDisposables.add(editingCell.model.onDidChangeInternalMetadata(() => this._updateUserEditingState()));
+                this._userEditingDisposables.add(editingCell.model.onDidChangeOutputs(() => this._updateUserEditingState()));
+                this._userEditingDisposables.add(this._executionStateService.onDidChangeExecution(e => {
+                    if (e.type === NotebookExecutionType.cell && e.affectsCell(editingCell.uri)) {
+                        this._updateUserEditingState();
+                    }
+                }));
             }
         }
         catch (e) {
-            response = ( (new ErrorResponse(e)));
         }
         finally {
+            store.dispose();
             this._ctxHasActiveRequest.set(false);
-            this._widget?.inlineChatWidget.updateProgress(false);
-            this._widget?.inlineChatWidget.updateInfo('');
-            this._widget?.inlineChatWidget.updateToolbar(true);
-        }
-        this._ctxHasActiveRequest.set(false);
-        this._widget?.inlineChatWidget.updateProgress(false);
-        this._widget?.inlineChatWidget.updateInfo('');
-        this._widget?.inlineChatWidget.updateToolbar(true);
-        this._activeSession?.addExchange(( (new SessionExchange(this._activeSession.lastInput, response))));
-        this._ctxLastResponseType.set(response instanceof ReplyResponse ? response.raw.type : undefined);
-    }
-    async _startSession(editor, token) {
-        if (this._activeSession) {
-            this._inlineChatSessionService.releaseSession(this._activeSession);
-        }
-        const session = await this._inlineChatSessionService.createSession(editor, { editMode: "live"  }, token);
-        if (!session) {
-            return;
-        }
-        this._activeSession = session;
-        this._strategy = ( (new EditStrategy(session)));
-    }
-    async _startInitialFolowups(editor, token) {
-        if (!this._activeSession || !this._activeSession.provider.provideFollowups) {
-            return;
-        }
-        const request = {
-            requestId: generateUuid(),
-            prompt: '',
-            attempt: 0,
-            selection: { selectionStartLineNumber: 1, selectionStartColumn: 1, positionLineNumber: 1, positionColumn: 1 },
-            wholeRange: { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 },
-            live: true,
-            previewDocument: editor.getModel().uri,
-            withIntentDetection: true
-        };
-        const progress = ( (new AsyncProgress(async (data) => { })));
-        const task = this._activeSession.provider.provideResponse(this._activeSession.session, request, progress, token);
-        const reply = await raceCancellationError(Promise.resolve(task), token);
-        if (token.isCancellationRequested) {
-            return;
-        }
-        if (!reply) {
-            return;
-        }
-        const markdownContents = ( (new MarkdownString('', { supportThemeIcons: true, supportHtml: true, isTrusted: false })));
-        const response = this._instantiationService.createInstance(ReplyResponse, reply, markdownContents, this._activeSession.textModelN.uri, this._activeSession.textModelN.getAlternativeVersionId(), [], request.requestId, undefined);
-        const followups = await this._activeSession.provider.provideFollowups(this._activeSession.session, response.raw, token);
-        if (followups && this._widget) {
-            const widget = this._widget;
-            widget.inlineChatWidget.updateFollowUps(followups, async (followup) => {
-                if (followup.kind === 'reply') {
-                    widget.inlineChatWidget.value = followup.message;
-                    this.acceptInput();
-                }
-                else {
-                    await this.acceptSession();
-                    this._commandService.executeCommand(followup.commandId, ...(followup.args ?? []));
-                }
-            });
+            this._widget.inlineChatWidget.updateProgress(false);
+            this._widget.inlineChatWidget.updateInfo('');
+            this._widget.inlineChatWidget.updateToolbar(true);
         }
     }
     async _makeChanges(edits, opts) {
-        assertType(this._activeSession);
         assertType(this._strategy);
         assertType(this._widget);
         const editingCell = await this._widget.getOrCreateEditingCell();
@@ -622,9 +539,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
         }
         const actualEdits = !opts && moreMinimalEdits ? moreMinimalEdits : edits;
         const editOperations = ( (actualEdits.map(TextEdit.asEditOperation)));
-        this._inlineChatSavingService.markChanged(this._activeSession);
         try {
-            this._activeSession.wholeRange.trackEdits(editOperations);
             if (opts) {
                 await this._strategy.makeProgressiveChanges(editor, editOperations, opts);
             }
@@ -639,22 +554,22 @@ let NotebookChatController = class NotebookChatController extends Disposable {
         this._ctxUserDidEdit.set(true);
     }
     async acceptSession() {
-        assertType(this._activeSession);
+        assertType(this._model);
         assertType(this._strategy);
         const editor = this._widget?.parentEditor;
         if (!editor?.hasModel()) {
             return;
         }
         const editingCell = this._widget?.getEditingCell();
-        if (editingCell && this._notebookEditor.hasModel() && this._activeSession.lastInput) {
+        if (editingCell && this._notebookEditor.hasModel()) {
             const cellId = NotebookCellTextModelLikeId.str({ uri: editingCell.uri, viewType: this._notebookEditor.textModel.viewType });
-            const prompt = this._activeSession.lastInput.value;
-            this._promptCache.set(cellId, prompt);
+            if (this._widget?.inlineChatWidget.value) {
+                this._promptCache.set(cellId, this._widget.inlineChatWidget.value);
+            }
             this._onDidChangePromptCache.fire({ cell: editingCell.uri });
         }
         try {
-            await this._strategy.apply(editor);
-            this._inlineChatSessionService.releaseSession(this._activeSession);
+            this._model.clear();
         }
         catch (_err) { }
         this.dismiss(false);
@@ -733,26 +648,16 @@ let NotebookChatController = class NotebookChatController extends Disposable {
         this._widget.inlineChatWidget.selectAll();
     }
     async cancelCurrentRequest(discard) {
-        if (discard) {
-            this._strategy?.cancel();
-        }
         this._activeRequestCts?.cancel();
     }
     getEditingCell() {
         return this._widget?.getEditingCell();
     }
     discard() {
-        this._strategy?.cancel();
         this._activeRequestCts?.cancel();
         this._widget?.discardChange();
         this.dismiss(true);
     }
-    async feedbackLast(kind) {
-        if (this._activeSession?.lastExchange && this._activeSession.lastExchange.response instanceof ReplyResponse) {
-            this._activeSession.provider.handleInlineChatResponseFeedback?.(this._activeSession.session, this._activeSession.lastExchange.response.raw, kind);
-            this._widget?.inlineChatWidget.updateStatus('Thank you for your feedback!', { resetAfter: 1250 });
-        }
-    }
     dismiss(discard) {
         const widget = this._widget;
         const widgetIndex = widget?.afterModelPosition;
@@ -777,6 +682,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
         this._ctxUserDidEdit.set(false);
         this._sessionCtor?.cancel();
         this._sessionCtor = undefined;
+        this._model.clear();
         this._widget?.dispose();
         this._widget = undefined;
         this._widgetDisposableStore.clear();
@@ -804,19 +710,16 @@ let NotebookChatController = class NotebookChatController extends Disposable {
 };
 NotebookChatController = NotebookChatController_1 = ( (__decorate([
     ( (__param(1, IInstantiationService))),
-    ( (__param(2, IInlineChatSessionService))),
-    ( (__param(3, IContextKeyService))),
-    ( (__param(4, ICommandService))),
-    ( (__param(5, IEditorWorkerService))),
-    ( (__param(6, IInlineChatSavingService))),
-    ( (__param(7, IModelService))),
-    ( (__param(8, ILanguageService))),
-    ( (__param(9, INotebookExecutionStateService))),
-    ( (__param(10, IStorageService)))
+    ( (__param(2, IContextKeyService))),
+    ( (__param(3, IEditorWorkerService))),
+    ( (__param(4, IModelService))),
+    ( (__param(5, ILanguageService))),
+    ( (__param(6, INotebookExecutionStateService))),
+    ( (__param(7, IStorageService))),
+    ( (__param(8, IChatService)))
 ], NotebookChatController)));
 class EditStrategy {
-    constructor(_session) {
-        this._session = _session;
+    constructor() {
         this._editCount = 0;
     }
     async makeProgressiveChanges(editor, edits, opts) {
@@ -843,33 +746,6 @@ class EditStrategy {
         }
         editor.executeEdits('inline-chat-live', edits, cursorStateComputerAndInlineDiffCollection);
     }
-    async apply(editor) {
-        if (this._editCount > 0) {
-            editor.pushUndoStop();
-        }
-        if (!(this._session.lastExchange?.response instanceof ReplyResponse)) {
-            return;
-        }
-        const { untitledTextModel } = this._session.lastExchange.response;
-        if (untitledTextModel && !untitledTextModel.isDisposed() && untitledTextModel.isDirty()) {
-            await untitledTextModel.save({ reason: 1  });
-        }
-    }
-    async cancel() {
-        const { textModelN: modelN, textModelNAltVersion, textModelNSnapshotAltVersion } = this._session;
-        if (modelN.isDisposed()) {
-            return;
-        }
-        const targetAltVersion = textModelNSnapshotAltVersion ?? textModelNAltVersion;
-        while (targetAltVersion < modelN.getAlternativeVersionId() && modelN.canUndo()) {
-            modelN.undo();
-        }
-    }
-    createSnapshot() {
-        if (this._session && !this._session.textModel0.equalsTextBuffer(this._session.textModelN.getTextBuffer())) {
-            this._session.createSnapshot();
-        }
-    }
 }
 registerNotebookContribution(NotebookChatController.id, NotebookChatController);
 export { EditStrategy, NotebookChatController };