@codingame/monaco-vscode-api 6.0.3 → 7.0.1

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

@@ -30,7 +30,7 @@ import { SessionPrompt, EmptyResponse, ErrorResponse, ReplyResponse, Session } f
 import { IInlineChatSessionService } from './inlineChatSessionService.service.js';
 import { LiveStrategy, PreviewStrategy } from './inlineChatStrategies.js';
 import { InlineChatZoneWidget } from './inlineChatZoneWidget.js';
-import { INLINE_CHAT_ID, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_RESPONSE_TYPES, InlineChatConfigKeys, EditMode, InlineChatResponseTypes } from '../common/inlineChat.js';
+import { INLINE_CHAT_ID, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_RESPONSE_TYPE, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, InlineChatConfigKeys, EditMode, InlineChatResponseType } from '../common/inlineChat.js';
 import { InlineChatContentWidget } from './inlineChatContentWidget.js';
 import { MessageController } from '../../../../editor/contrib/message/browser/messageController.js';
 import { ChatRequestRemovalReason } from '../../chat/common/chatModel.js';
@@ -43,6 +43,7 @@ import { generateUuid } from '../../../../base/common/uuid.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { ChatAgentLocation } from '../../chat/common/chatAgents.js';
 import { INotebookEditorService } from '../../notebook/browser/services/notebookEditorService.service.js';
+import { escapeRegExpCharacters } from '../../../../base/common/strings.js';
 const _moduleId = "vs/workbench/contrib/inlineChat/browser/inlineChatController";
 var State;
 ( ((function(State) {
@@ -66,7 +67,7 @@ var Message;
     Message[Message["ACCEPT_INPUT"] = 32] = "ACCEPT_INPUT";
 })(Message || (Message = {}))));
 class InlineChatRunOptions {
-    static isInteractiveEditorOptions(options) {
+    static isInlineChatRunOptions(options) {
         const { initialSelection, initialRange, message, autoSend, position, existingSession } = options;
         if (typeof message !== 'undefined' && typeof message !== 'string'
             || typeof autoSend !== 'undefined' && typeof autoSend !== 'boolean'
@@ -113,7 +114,8 @@ let InlineChatController = class InlineChatController {
         this._forcedPlaceholder = undefined;
         this._ctxVisible = CTX_INLINE_CHAT_VISIBLE.bindTo(contextKeyService);
         this._ctxUserDidEdit = CTX_INLINE_CHAT_USER_DID_EDIT.bindTo(contextKeyService);
-        this._ctxResponseTypes = CTX_INLINE_CHAT_RESPONSE_TYPES.bindTo(contextKeyService);
+        this._ctxResponseType = CTX_INLINE_CHAT_RESPONSE_TYPE.bindTo(contextKeyService);
+        this._ctxRequestInProgress = CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.bindTo(contextKeyService);
         this._ui = ( (new Lazy(() => {
             let location = ChatAgentLocation.Editor;
             for (const notebookEditor of notebookEditorService.listNotebookEditors()) {
@@ -235,7 +237,6 @@ let InlineChatController = class InlineChatController {
                 this._log('state=_createSession) message received', m);
                 if (m === Message.ACCEPT_INPUT) {
                     options.autoSend = true;
-                    this._ui.value.zone.widget.updateProgress(true);
                     this._ui.value.zone.widget.updateInfo(( localizeWithPath(_moduleId, 1, "Getting ready...")));
                 }
                 else {
@@ -295,9 +296,8 @@ let InlineChatController = class InlineChatController {
         this._sessionStore.add(this._ui.value.content.onDidBlur(() => this.cancelSession()));
         this._ui.value.content.setSession(this._session);
         this._updatePlaceholder();
-        const message = this._session.session.message ?? ( localizeWithPath(_moduleId, 2, "AI-generated code may be incorrect"));
-        this._ui.value.zone.widget.updateInfo(message);
         this._showWidget(!this._session.chatModel.hasRequests);
+        this._ui.value.zone.widget.updateToolbar(true);
         this._sessionStore.add(this._editor.onDidChangeModel((e) => {
             const msg = this._session?.chatModel.hasRequests
                 ? Message.PAUSE_SESSION
@@ -327,30 +327,8 @@ let InlineChatController = class InlineChatController {
             }
         }));
         this._sessionStore.add(this._session.chatModel.onDidChange(async (e) => {
-            if (e.kind === 'addRequest' && e.request.response) {
-                this._ui.value.zone.widget.updateProgress(true);
-                const listener = e.request.response.onDidChange(() => {
-                    if (e.request.response?.isCanceled || e.request.response?.isComplete) {
-                        this._ui.value.zone.widget.updateProgress(false);
-                        listener.dispose();
-                    }
-                });
-            }
-            else if (e.kind === 'removeRequest') {
-                const exchange = this._session.exchanges.find(candidate => candidate.prompt.request.id === e.requestId);
-                if (exchange && this._editor.hasModel()) {
-                    this._session.hunkData.ignoreTextModelNChanges = true;
-                    try {
-                        const model = this._editor.getModel();
-                        const targetAltVersion = exchange.prompt.modelAltVersionId;
-                        while (targetAltVersion < model.getAlternativeVersionId() && model.canUndo()) {
-                            await model.undo();
-                        }
-                    }
-                    finally {
-                        this._session.hunkData.ignoreTextModelNChanges = false;
-                    }
-                }
+            if (e.kind === 'removeRequest') {
+                await this._session.undoChangesUntil(e.requestId);
             }
         }));
         this._sessionStore.add(this._languageFeatureService.completionProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, hasAccessToAllModels: true }, {
@@ -360,7 +338,7 @@ let InlineChatController = class InlineChatController {
                 if (position.lineNumber !== 1) {
                     return undefined;
                 }
-                if (!this._session || !this._session.session.slashCommands) {
+                if (!this._session || !this._session.agent.slashCommands) {
                     return undefined;
                 }
                 const widget = this._chatWidgetService.getWidgetByInputUri(model.uri);
@@ -368,12 +346,12 @@ let InlineChatController = class InlineChatController {
                     return undefined;
                 }
                 const result = { suggestions: [], incomplete: false };
-                for (const command of this._session.session.slashCommands) {
+                for (const command of this._session.agent.slashCommands) {
                     const withSlash = `/${command.name}`;
                     result.suggestions.push({
                         label: { label: withSlash, description: command.description ?? '' },
                         kind: CompletionItemKind.Text,
-                        insertText: withSlash,
+                        insertText: `${withSlash} `,
                         range: Range.fromPositions(( (new Position(1, 1))), position),
                     });
                 }
@@ -382,18 +360,15 @@ let InlineChatController = class InlineChatController {
         }));
         const updateSlashDecorations = (collection, model) => {
             const newDecorations = [];
-            for (const command of (this._session?.session.slashCommands ?? []).sort((a, b) => b.name.length - a.name.length)) {
+            for (const command of (this._session?.agent.slashCommands ?? []).sort((a, b) => b.name.length - a.name.length)) {
                 const withSlash = `/${command.name}`;
                 const firstLine = model.getLineContent(1);
-                if (firstLine.startsWith(withSlash)) {
+                if (firstLine.match(( (new RegExp(`^${escapeRegExpCharacters(withSlash)}(\\s|$)`))))) {
                     newDecorations.push({
                         range: ( (new Range(1, 1, 1, withSlash.length + 1))),
                         options: {
                             description: 'inline-chat-slash-command',
                             inlineClassName: 'inline-chat-slash-command',
-                            after: {
-                                content: ' '
-                            }
                         }
                     });
                     if (firstLine.trim() === `/${command.name}`) {
@@ -482,20 +457,18 @@ let InlineChatController = class InlineChatController {
         if (!request?.message.text) {
             return State.WAIT_FOR_INPUT;
         }
-        const input = request.message.text;
-        this._ui.value.zone.widget.value = input;
         this._session.addInput(( (new SessionPrompt(request, this._editor.getModel().getAlternativeVersionId()))));
         return State.SHOW_REQUEST;
     }
     async [State.SHOW_REQUEST]() {
         assertType(this._session);
         assertType(this._session.chatModel.requestInProgress);
+        this._ctxRequestInProgress.set(true);
         const { chatModel } = this._session;
         const request = chatModel.getRequests().at(-1);
         assertType(request);
         assertType(request.response);
         this._showWidget(false);
-        this._ui.value.zone.widget.value = request.message.text;
         this._ui.value.zone.widget.selectAll(false);
         this._ui.value.zone.widget.updateInfo('');
         const { response } = request;
@@ -543,6 +516,7 @@ let InlineChatController = class InlineChatController {
         const editState = { sha1: textModel0Sha1, applied: 0 };
         let localEditGroup;
         const handleResponse = () => {
+            this._updateCtxResponseType();
             if (!localEditGroup) {
                 localEditGroup = response.response.value.find(part => part.kind === 'textEditGroup' && isEqual(part.uri, this._session?.textModelN.uri));
             }
@@ -582,36 +556,23 @@ let InlineChatController = class InlineChatController {
         handleResponse();
         await responsePromise.p;
         await progressiveEditsQueue.whenIdle();
+        if (response.isCanceled) {
+            await this._session.undoChangesUntil(response.requestId);
+        }
         store.dispose();
         const diff = await this._editorWorkerService.computeDiff(this._session.textModel0.uri, this._session.textModelN.uri, { computeMoves: false, maxComputationTimeMs: Number.MAX_SAFE_INTEGER, ignoreTrimWhitespace: false }, 'advanced');
         this._session.wholeRange.fixup(diff?.changes ?? []);
-        await this._session.hunkData.recompute(editState);
-        this._ui.value.zone.widget.updateToolbar(true);
-        this._ui.value.zone.widget.updateProgress(false);
+        await this._session.hunkData.recompute(editState, diff);
+        this._ctxRequestInProgress.set(false);
         return next;
     }
     async [State.SHOW_RESPONSE]() {
         assertType(this._session);
         assertType(this._strategy);
         const { response } = this._session.lastExchange;
-        let responseTypes;
-        for (const request of this._session.chatModel.getRequests()) {
-            if (!request.response) {
-                continue;
-            }
-            const thisType = asInlineChatResponseType(request.response.response);
-            if (responseTypes === undefined) {
-                responseTypes = thisType;
-            }
-            else if (responseTypes !== thisType) {
-                responseTypes = InlineChatResponseTypes.Mixed;
-                break;
-            }
-        }
-        this._ctxResponseTypes.set(responseTypes);
         let newPosition;
         if (response instanceof EmptyResponse) {
-            const status = ( localizeWithPath(_moduleId, 3, "No results, please refine your input and try again"));
+            const status = ( localizeWithPath(_moduleId, 2, "No results, please refine your input and try again"));
             this._ui.value.zone.widget.updateStatus(status, { classes: ['warn'] });
             return State.WAIT_FOR_INPUT;
         }
@@ -623,8 +584,18 @@ let InlineChatController = class InlineChatController {
         }
         else if (response instanceof ReplyResponse) {
             this._ui.value.zone.widget.updateStatus('');
-            this._ui.value.zone.widget.updateToolbar(true);
-            newPosition = await this._strategy.renderChanges(response);
+            const position = await this._strategy.renderChanges();
+            if (position) {
+                const selection = this._editor.getSelection();
+                if (selection?.containsPosition(position)) {
+                    if (position.lineNumber - selection.startLineNumber > 8) {
+                        newPosition = position;
+                    }
+                }
+                else {
+                    newPosition = position;
+                }
+            }
         }
         this._showWidget(false, newPosition);
         return State.WAIT_FOR_INPUT;
@@ -642,7 +613,7 @@ let InlineChatController = class InlineChatController {
             await this._strategy.apply();
         }
         catch (err) {
-            this._dialogService.error(( localizeWithPath(_moduleId, 4, "Failed to apply changes.", toErrorMessage(err))));
+            this._dialogService.error(( localizeWithPath(_moduleId, 3, "Failed to apply changes.", toErrorMessage(err))));
             this._log('FAILED to apply changes');
             this._log(err);
         }
@@ -656,13 +627,13 @@ let InlineChatController = class InlineChatController {
         if (this._session) {
             assertType(this._strategy);
             this._sessionStore.clear();
-            const shouldStash = !this._session.isUnstashed && !!this._session.lastExchange && this._session.hunkData.size === this._session.hunkData.pending;
+            const shouldStash = !this._session.isUnstashed && this._session.chatModel.hasRequests && this._session.hunkData.size === this._session.hunkData.pending;
             let undoCancelEdits = [];
             try {
                 undoCancelEdits = this._strategy.cancel();
             }
             catch (err) {
-                this._dialogService.error(( localizeWithPath(_moduleId, 5, "Failed to discard changes.", toErrorMessage(err))));
+                this._dialogService.error(( localizeWithPath(_moduleId, 4, "Failed to discard changes.", toErrorMessage(err))));
                 this._log('FAILED to discard changes');
                 this._log(err);
             }
@@ -681,6 +652,7 @@ let InlineChatController = class InlineChatController {
     }
     _showWidget(initialRender = false, position) {
         assertType(this._editor.hasModel());
+        this._ctxVisible.set(true);
         let widgetPosition;
         if (position) {
             widgetPosition = position;
@@ -696,7 +668,7 @@ let InlineChatController = class InlineChatController {
         else {
             widgetPosition = this._editor.getSelection().getStartPosition().delta(-1);
         }
-        if (this._session && !position && (this._session.hasChangedText || this._session.lastExchange)) {
+        if (this._session && !position && (this._session.hasChangedText || this._session.chatModel.hasRequests)) {
             widgetPosition = this._session.wholeRange.value.getStartPosition().delta(-1);
         }
         if (this._ui.rawValue?.zone?.position) {
@@ -714,10 +686,6 @@ let InlineChatController = class InlineChatController {
                 this._ui.value.zone.widget.setChatModel(this._session.chatModel);
             }
         }
-        if (this._session && this._ui.rawValue?.zone) {
-            this._ui.rawValue?.zone.updateBackgroundColor(widgetPosition, this._session.wholeRange.value);
-        }
-        this._ctxVisible.set(true);
         return widgetPosition;
     }
     _resetWidget() {
@@ -730,6 +698,31 @@ let InlineChatController = class InlineChatController {
             this._editor.focus();
         }
     }
+    _updateCtxResponseType() {
+        if (!this._session) {
+            this._ctxResponseType.set(InlineChatResponseType.None);
+            return;
+        }
+        const hasLocalEdit = (response) => {
+            return (
+                 (response.value.some(
+                    part => part.kind === 'textEditGroup' && isEqual(part.uri, this._session?.textModelN.uri)
+                ))
+            );
+        };
+        let responseType = InlineChatResponseType.None;
+        for (const request of this._session.chatModel.getRequests()) {
+            if (!request.response) {
+                continue;
+            }
+            responseType = InlineChatResponseType.Messages;
+            if (hasLocalEdit(request.response.response)) {
+                responseType = InlineChatResponseType.MessagesAndEdits;
+                break;
+            }
+        }
+        this._ctxResponseType.set(responseType);
+    }
     async _makeChanges(edits, opts, undoStopBefore) {
         assertType(this._session);
         assertType(this._strategy);
@@ -745,7 +738,6 @@ let InlineChatController = class InlineChatController {
             stop: () => this._session.hunkData.ignoreTextModelNChanges = false,
         };
         this._inlineChatSavingService.markChanged(this._session);
-        this._session.wholeRange.trackEdits(editOperations);
         if (opts) {
             await this._strategy.makeProgressiveChanges(editOperations, editsObserver, opts, undoStopBefore);
         }
@@ -757,10 +749,10 @@ let InlineChatController = class InlineChatController {
         this._ui.value.zone.widget.placeholder = this._getPlaceholderText();
     }
     _getPlaceholderText() {
-        return this._forcedPlaceholder ?? this._session?.session.placeholder ?? '';
+        return this._forcedPlaceholder ?? this._session?.agent.description ?? '';
     }
     showSaveHint() {
-        const status = ( localizeWithPath(_moduleId, 6, "Accept or discard changes to continue saving"));
+        const status = ( localizeWithPath(_moduleId, 5, "Accept or discard changes to continue saving"));
         this._ui.value.zone.widget.updateStatus(status, { classes: ['warn'] });
     }
     acceptInput() {
@@ -828,10 +820,10 @@ let InlineChatController = class InlineChatController {
         this._strategy?.toggleDiff?.();
     }
     acceptSession() {
-        if (this._session?.lastExchange?.response instanceof ReplyResponse && this._session?.lastExchange?.response.chatResponse) {
-            const response = this._session?.lastExchange?.response.chatResponse;
+        const response = this._session?.chatModel.getRequests().at(-1)?.response;
+        if (response) {
             this._chatService.notifyUserAction({
-                sessionId: this._session.chatModel.sessionId,
+                sessionId: response.session.sessionId,
                 requestId: response.requestId,
                 agentId: response.agent?.id,
                 result: response.result,
@@ -850,10 +842,10 @@ let InlineChatController = class InlineChatController {
         return this._strategy?.discardHunk();
     }
     async cancelSession() {
-        if (this._session?.lastExchange?.response instanceof ReplyResponse && this._session?.lastExchange?.response.chatResponse) {
-            const response = this._session?.lastExchange?.response.chatResponse;
+        const response = this._session?.chatModel.getRequests().at(-1)?.response;
+        if (response) {
             this._chatService.notifyUserAction({
-                sessionId: this._session.chatModel.sessionId,
+                sessionId: response.session.sessionId,
                 requestId: response.requestId,
                 agentId: response.agent?.id,
                 result: response.result,
@@ -913,26 +905,4 @@ async function moveToPanelChat(accessor, model) {
         widget.focusLastMessage();
     }
 }
-function asInlineChatResponseType(response) {
-    let result;
-    for (const item of response.value) {
-        let thisType;
-        switch (item.kind) {
-            case 'textEditGroup':
-                thisType = InlineChatResponseTypes.OnlyEdits;
-                break;
-            case 'markdownContent':
-            default:
-                thisType = InlineChatResponseTypes.OnlyMessages;
-                break;
-        }
-        if (result === undefined) {
-            result = thisType;
-        }
-        else if (result !== thisType) {
-            return InlineChatResponseTypes.Mixed;
-        }
-    }
-    return result ?? InlineChatResponseTypes.Empty;
-}
 export { InlineChatController, InlineChatRunOptions, State };

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

@@ -1,6 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
-import { ResourceFileEdit, ResourceTextEdit, ResourceEdit } from '../../../../editor/browser/services/bulkEditService.js';
 import { TrackedRangeStickiness } from '../../../../editor/common/model.js';
 import { CTX_INLINE_CHAT_HAS_STASHED_SESSION } from '../common/inlineChat.js';
 import { Range } from '../../../../editor/common/core/range.js';
@@ -38,14 +37,6 @@ class SessionWholeRange {
             this._textModel.deltaDecorations(this._decorationIds, []);
         }
     }
-    trackEdits(edits) {
-        const newDeco = [];
-        for (const edit of edits) {
-            newDeco.push({ range: edit.range, options: SessionWholeRange._options });
-        }
-        this._decorationIds.push(...this._textModel.deltaDecorations([], newDeco));
-        this._onDidChange.fire(this);
-    }
     fixup(changes) {
         const newDeco = [];
         for (const { modified } of changes) {
@@ -93,18 +84,17 @@ class Session {
     constructor(editMode,
     targetUri,
     textModel0,
-    textModelN, agent, session, wholeRange, hunkData, chatModel) {
+    textModelN, agent, wholeRange, hunkData, chatModel) {
         this.editMode = editMode;
         this.targetUri = targetUri;
         this.textModel0 = textModel0;
         this.textModelN = textModelN;
         this.agent = agent;
-        this.session = session;
         this.wholeRange = wholeRange;
         this.hunkData = hunkData;
         this.chatModel = chatModel;
         this._isUnstashed = false;
-        this._exchange = [];
+        this._exchanges = [];
         this._startTime = ( new Date());
         this.textModelNAltVersion = textModelN.getAlternativeVersionId();
         this._teldata = {
@@ -137,14 +127,28 @@ class Session {
     }
     addExchange(exchange) {
         this._isUnstashed = false;
-        const newLen = this._exchange.push(exchange);
+        const newLen = this._exchanges.push(exchange);
         this._teldata.rounds += `${newLen}|`;
     }
-    get exchanges() {
-        return this._exchange;
-    }
     get lastExchange() {
-        return this._exchange[this._exchange.length - 1];
+        return this._exchanges[this._exchanges.length - 1];
+    }
+    async undoChangesUntil(requestId) {
+        const idx = this._exchanges.findIndex(candidate => candidate.prompt.request.id === requestId);
+        if (idx < 0) {
+            return false;
+        }
+        this.hunkData.ignoreTextModelNChanges = true;
+        try {
+            const targetAltVersion = this._exchanges[idx].prompt.modelAltVersionId;
+            while (targetAltVersion < this.textModelN.getAlternativeVersionId() && this.textModelN.canUndo()) {
+                await this.textModelN.undo();
+            }
+        }
+        finally {
+            this.hunkData.ignoreTextModelNChanges = false;
+        }
+        return true;
     }
     get hasChangedText() {
         return !this.textModel0.equalsTextBuffer(this.textModelN.getTextBuffer());
@@ -181,14 +185,14 @@ class Session {
     }
     asRecording() {
         const result = {
-            session: this.session,
+            session: this.chatModel.sessionId,
             when: this._startTime,
             exchanges: []
         };
-        for (const exchange of this._exchange) {
+        for (const exchange of this._exchanges) {
             const response = exchange.response;
             if (response instanceof ReplyResponse) {
-                result.exchanges.push({ prompt: exchange.prompt.value, res: response.raw });
+                result.exchanges.push({ prompt: exchange.prompt.value, res: response.chatResponse });
             }
         }
         return result;
@@ -217,31 +221,22 @@ class ErrorResponse {
     }
 }
 let ReplyResponse = class ReplyResponse {
-    constructor(raw, localUri, modelAltVersionId, chatRequest, chatResponse, _textFileService, _languageService) {
-        this.raw = raw;
-        this.modelAltVersionId = modelAltVersionId;
+    constructor(localUri, chatRequest, chatResponse, _textFileService, _languageService) {
         this.chatRequest = chatRequest;
         this.chatResponse = chatResponse;
         this._textFileService = _textFileService;
         this._languageService = _languageService;
         const editsMap = ( new ResourceMap());
-        const edits = ResourceEdit.convert(raw.edits);
-        for (const edit of edits) {
-            if (edit instanceof ResourceFileEdit) {
-                if (edit.newResource && !edit.oldResource) {
-                    editsMap.set(edit.newResource, []);
-                    if (edit.options.contents) {
-                        console.warn('CONTENT not supported');
+        for (const item of chatResponse.response.value) {
+            if (item.kind === 'textEditGroup') {
+                const array = editsMap.get(item.uri);
+                for (const group of item.edits) {
+                    if (array) {
+                        array.push(group);
+                    }
+                    else {
+                        editsMap.set(item.uri, [group]);
                     }
-                }
-            }
-            else if (edit instanceof ResourceTextEdit) {
-                const array = editsMap.get(edit.resource);
-                if (array) {
-                    array.push([edit.textEdit]);
-                }
-                else {
-                    editsMap.set(edit.resource, [[edit.textEdit]]);
                 }
             }
         }
@@ -265,8 +260,8 @@ let ReplyResponse = class ReplyResponse {
     }
 };
 ReplyResponse = ( __decorate([
-    ( __param(5, ITextFileService)),
-    ( __param(6, ILanguageService))
+    ( __param(3, ITextFileService)),
+    ( __param(4, ILanguageService))
 ], ReplyResponse));
 let StashedSession = class StashedSession {
     constructor(editor, session, _undoCancelEdits, contextKeyService, _sessionService, _logService) {
@@ -426,8 +421,8 @@ let HunkData = class HunkData {
         }
         this._textModel0.pushEditOperations(null, edits, () => null);
     }
-    async recompute(editState) {
-        const diff = await this._editorWorkerService.computeDiff(this._textModel0.uri, this._textModelN.uri, { ignoreTrimWhitespace: false, maxComputationTimeMs: Number.MAX_SAFE_INTEGER, computeMoves: false }, 'advanced');
+    async recompute(editState, diff) {
+        diff ??= await this._editorWorkerService.computeDiff(this._textModel0.uri, this._textModelN.uri, { ignoreTrimWhitespace: false, maxComputationTimeMs: Number.MAX_SAFE_INTEGER, computeMoves: false }, 'advanced');
         if (!diff || diff.changes.length === 0) {
             return;
         }

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

@@ -97,17 +97,6 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
         this._onWillStartSession.fire(editor);
         const textModel = editor.getModel();
         const selection = editor.getSelection();
-        const rawSession = {
-            id: Math.random(),
-            wholeRange: ( new Range(
-                selection.selectionStartLineNumber,
-                selection.selectionStartColumn,
-                selection.positionLineNumber,
-                selection.positionColumn
-            )),
-            placeholder: agent.description,
-            slashCommands: agent.slashCommands
-        };
         const store = ( new DisposableStore());
         this._logService.trace(`[IE] creating NEW session for ${editor.getId()}, ${agent.extensionId}`);
         const chatModel = this._chatService.startSession(ChatAgentLocation.Editor, token);
@@ -124,7 +113,6 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
             if (e.kind !== 'addRequest' || !e.request.response) {
                 return;
             }
-            const modelAltVersionIdNow = textModel.getAlternativeVersionId();
             const { response } = e.request;
             lastResponseListener.value = response.onDidChange(() => {
                 if (!response.isComplete) {
@@ -142,23 +130,7 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
                     inlineResponse = ( new EmptyResponse());
                 }
                 else {
-                    const raw = {
-                        edits: { edits: [] },
-                    };
-                    for (const item of response.response.value) {
-                        if (item.kind === 'textEditGroup') {
-                            for (const group of item.edits) {
-                                for (const edit of group) {
-                                    raw.edits.edits.push({
-                                        resource: item.uri,
-                                        textEdit: edit,
-                                        versionId: undefined
-                                    });
-                                }
-                            }
-                        }
-                    }
-                    inlineResponse = this._instaService.createInstance(ReplyResponse, raw, session.textModelN.uri, modelAltVersionIdNow, e.request, response);
+                    inlineResponse = this._instaService.createInstance(ReplyResponse, session.textModelN.uri, e.request, response);
                 }
                 session.addExchange(( new SessionExchange(session.lastInput, inlineResponse)));
                 if (inlineResponse instanceof ReplyResponse && inlineResponse.untitledTextModel) {
@@ -188,7 +160,12 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
         }
         let wholeRange = options.wholeRange;
         if (!wholeRange) {
-            wholeRange = rawSession.wholeRange ? Range.lift(rawSession.wholeRange) : editor.getSelection();
+            wholeRange = ( new Range(
+                selection.selectionStartLineNumber,
+                selection.selectionStartColumn,
+                selection.positionLineNumber,
+                selection.positionColumn
+            ));
         }
         if (token.isCancellationRequested) {
             store.dispose();
@@ -200,7 +177,6 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
             textModel0,
             textModelN,
             agent,
-            rawSession,
             store.add(( new SessionWholeRange(textModelN, wholeRange))),
             store.add(( new HunkData(this._editorWorkerService, textModel0, textModelN))),
             chatModel
@@ -315,14 +291,16 @@ InlineChatSessionServiceImpl = ( __decorate([
 let InlineChatEnabler = class InlineChatEnabler {
     static { this.Id = 'inlineChat.enabler'; }
     constructor(contextKeyService, chatAgentService) {
+        this._store = ( new DisposableStore());
         this._ctxHasProvider = CTX_INLINE_CHAT_HAS_AGENT.bindTo(contextKeyService);
-        chatAgentService.onDidChangeAgents(() => {
+        this._store.add(chatAgentService.onDidChangeAgents(() => {
             const hasEditorAgent = Boolean(chatAgentService.getDefaultAgent(ChatAgentLocation.Editor));
             this._ctxHasProvider.set(hasEditorAgent);
-        });
+        }));
     }
     dispose() {
         this._ctxHasProvider.reset();
+        this._store.dispose();
     }
 };
 InlineChatEnabler = ( __decorate([

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

@@ -128,7 +128,7 @@ let PreviewStrategy = class PreviewStrategy extends EditModeStrategy {
     }
     async makeProgressiveChanges() {
     }
-    async renderChanges(response) { }
+    async renderChanges() { }
     hasFocus() {
         return this._zone.widget.hasFocus();
     }
@@ -239,7 +239,7 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
             obs.stop();
         }
     }
-    async renderChanges(response) {
+    async renderChanges() {
         this._progressiveEditingDecorations.clear();
         const renderHunks = () => {
             let widgetData;
@@ -387,7 +387,6 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
             });
             if (widgetData) {
                 this._zone.updatePositionAndHeight(widgetData.position);
-                this._editor.revealPositionInCenterIfOutsideViewport(widgetData.position);
                 const remainingHunks = this._session.hunkData.pending;
                 this._updateSummaryMessage(remainingHunks, this._session.hunkData.size);
                 const mode = this._configService.getValue(InlineChatConfigKeys.AccessibleDiffView);
@@ -427,7 +426,7 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
         }
         else if (remaining === 1) {
             message = needsReview
-                ? ( localizeWithPath(_moduleId, 1, "$(info) Accept or discard 1 change"))
+                ? ( localizeWithPath(_moduleId, 1, "$(info) Accept or Discard change"))
                 : ( localizeWithPath(_moduleId, 2, "1 change"));
         }
         else {