@codingame/monaco-vscode-chat-service-override 18.4.0 → 19.0.1

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.d.ts

@@ -3,11 +3,9 @@ import { ITransaction } from "@codingame/monaco-vscode-api/vscode/vs/base/common
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
-import { IEditorWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service";
 import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { IResolvedTextEditorModel } from "@codingame/monaco-vscode-model-service-override/vscode/vs/editor/common/services/resolverService";
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
-import { IAccessibilitySignalService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.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";
@@ -18,53 +16,32 @@ import { IEditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/co
 import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service";
 import { ITextFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service";
 import { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
-import { ChatEditKind, IModifiedFileEntry, IModifiedFileEntryEditorIntegration } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+import { IChatResponseModel } from "@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { AbstractChatEditingModifiedFileEntry, IModifiedEntryTelemetryInfo, ISnapshotEntry } from "./chatEditingModifiedFileEntry.js";
+import { AbstractChatEditingModifiedFileEntry } from "./chatEditingModifiedFileEntry.js";
 export declare class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifiedFileEntry implements IModifiedFileEntry {
     private readonly _multiDiffEntryDelegate;
-    private readonly _editorWorkerService;
     private readonly _textFileService;
-    private readonly _accessibilitySignalService;
-    private static readonly _lastEditDecorationOptions;
-    private static readonly _pendingEditDecorationOptions;
-    private static readonly _atomicEditDecorationOptions;
     readonly initialContent: string;
     private readonly originalModel;
     private readonly modifiedModel;
     private readonly _docFileEditorModel;
-    private _edit;
-    private _isEditFromUs;
-    private _allEditsAreFromUs;
-    private _diffOperation;
-    private _diffOperationIds;
-    private readonly _diffInfo;
-    readonly changesCount: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservable<number>;
-    private readonly _editDecorationClear;
-    private _editDecorations;
+    get changesCount(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservable<number>;
     readonly originalURI: URI;
+    private readonly _textModelChangeService;
     constructor(resourceRef: IReference<IResolvedTextEditorModel>, _multiDiffEntryDelegate: {
         collapse: (transaction: ITransaction | undefined) => void;
-    }, telemetryInfo: IModifiedEntryTelemetryInfo, kind: ChatEditKind, initialContent: string | undefined, markerService: IMarkerService, modelService: IModelService, textModelService: ITextModelService, languageService: ILanguageService, configService: IConfigurationService, fileConfigService: IFilesConfigurationService, chatService: IChatService, _editorWorkerService: IEditorWorkerService, _textFileService: ITextFileService, fileService: IFileService, undoRedoService: IUndoRedoService, instantiationService: IInstantiationService, _accessibilitySignalService: IAccessibilitySignalService);
-    private _clearCurrentEditLineDecoration;
+    }, telemetryInfo: IModifiedEntryTelemetryInfo, kind: ChatEditKind, initialContent: string | undefined, markerService: IMarkerService, modelService: IModelService, textModelService: ITextModelService, languageService: ILanguageService, configService: IConfigurationService, fileConfigService: IFilesConfigurationService, chatService: IChatService, _textFileService: ITextFileService, fileService: IFileService, undoRedoService: IUndoRedoService, instantiationService: IInstantiationService);
     equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean;
     createSnapshot(requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
-    restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk?: boolean): void;
-    resetToInitialContent(): void;
+    restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk?: boolean): Promise<void>;
+    resetToInitialContent(): Promise<void>;
     protected _areOriginalAndModifiedIdentical(): Promise<boolean>;
     protected _resetEditsState(tx: ITransaction): void;
-    private _mirrorEdits;
     protected _createUndoRedoElement(response: IChatResponseModel): IUndoRedoElement;
     acceptAgentEdits(resource: URI, textEdits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void>;
-    private _acceptHunk;
-    private _rejectHunk;
-    private _applyEdits;
-    private _updateDiffInfoSeq;
-    private _updateDiffInfo;
-    protected _doAccept(tx: ITransaction | undefined): Promise<void>;
-    protected _doReject(tx: ITransaction | undefined): Promise<void>;
-    private _setDocValue;
-    private _collapse;
+    protected _doAccept(): Promise<void>;
+    protected _doReject(): Promise<void>;
     protected _createEditorIntegration(editor: IEditorPane): IModifiedFileEntryEditorIntegration;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.js

@@ -1,46 +1,19 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { addDisposableListener, getWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { assert } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
-import { RunOnceScheduler, DeferredPromise, timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
-import { toDisposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { themeColorFromId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { getCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
-import { EditOperation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/editOperation';
-import { StringEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/edits/stringEdit';
-import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
-import { nullDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
-import { TextEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
-import { OverviewRulerLane, MinimapPosition } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
 import { SingleModelEditStackElement } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/editStack';
-import { ModelDecorationOptions, createTextBufferFactoryFromSnapshot } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
-import { offsetEditFromContentChanges, offsetEditToEditOperations, offsetEditFromLineRangeMapping } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModelStringEdit';
-import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service';
+import { createTextBufferFactoryFromSnapshot } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
-import { TextModelEditReason } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/textModelEditReason';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { AccessibilitySignal } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { IAccessibilitySignalService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.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 { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
-import { editorSelectionBackground } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/editorColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/inputColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/listColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/menuColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/minimapColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 import { IUndoRedoService } from '@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service';
 import { SaveReason } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { IFilesConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
@@ -49,65 +22,30 @@ import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workben
 import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { ChatEditingCodeEditorIntegration } from './chatEditingCodeEditorIntegration.js';
-import { AbstractChatEditingModifiedFileEntry, pendingRewriteMinimap } from './chatEditingModifiedFileEntry.js';
+import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
+import { ChatEditingTextModelChangeService } from './chatEditingTextModelChangeService.js';
 import { ChatEditingTextModelContentProvider, ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
-import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
 
-var ChatEditingModifiedDocumentEntry_1;
 let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifiedFileEntry {
-    static { ChatEditingModifiedDocumentEntry_1 = this; }
-    static { this._lastEditDecorationOptions = ModelDecorationOptions.register({
-        isWholeLine: true,
-        description: 'chat-last-edit',
-        className: 'chat-editing-last-edit-line',
-        marginClassName: 'chat-editing-last-edit',
-        overviewRuler: {
-            position: OverviewRulerLane.Full,
-            color: themeColorFromId(editorSelectionBackground)
-        },
-    }); }
-    static { this._pendingEditDecorationOptions = ModelDecorationOptions.register({
-        isWholeLine: true,
-        description: 'chat-pending-edit',
-        className: 'chat-editing-pending-edit',
-        minimap: {
-            position: MinimapPosition.Inline,
-            color: themeColorFromId(pendingRewriteMinimap)
-        }
-    }); }
-    static { this._atomicEditDecorationOptions = ModelDecorationOptions.register({
-        isWholeLine: true,
-        description: 'chat-atomic-edit',
-        className: 'chat-editing-atomic-edit',
-        minimap: {
-            position: MinimapPosition.Inline,
-            color: themeColorFromId(pendingRewriteMinimap)
-        }
-    }); }
-    constructor(resourceRef, _multiDiffEntryDelegate, telemetryInfo, kind, initialContent, markerService, modelService, textModelService, languageService, configService, fileConfigService, chatService, _editorWorkerService, _textFileService, fileService, undoRedoService, instantiationService, _accessibilitySignalService) {
+    get changesCount() {
+        return ( this._textModelChangeService.diffInfo.map(diff => diff.changes.length));
+    }
+    constructor(resourceRef, _multiDiffEntryDelegate, telemetryInfo, kind, initialContent, markerService, modelService, textModelService, languageService, configService, fileConfigService, chatService, _textFileService, fileService, undoRedoService, instantiationService) {
         super(resourceRef.object.textEditorModel.uri, telemetryInfo, kind, configService, fileConfigService, chatService, fileService, undoRedoService, instantiationService);
         this._multiDiffEntryDelegate = _multiDiffEntryDelegate;
-        this._editorWorkerService = _editorWorkerService;
         this._textFileService = _textFileService;
-        this._accessibilitySignalService = _accessibilitySignalService;
-        this._edit = StringEdit.empty;
-        this._isEditFromUs = false;
-        this._allEditsAreFromUs = true;
-        this._diffOperationIds = 0;
-        this._diffInfo = observableValue(this, nullDocumentDiff);
-        this.changesCount = ( this._diffInfo.map(diff => diff.changes.length));
-        this._editDecorationClear = this._register(( new RunOnceScheduler(
-            () => { this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, []); },
-            500
-        )));
-        this._editDecorations = [];
         this._docFileEditorModel = this._register(resourceRef).object;
         this.modifiedModel = resourceRef.object.textEditorModel;
         this.originalURI = ChatEditingTextModelContentProvider.getFileURI(telemetryInfo.sessionId, this.entryId, this.modifiedURI.path);
         this.initialContent = initialContent ?? this.modifiedModel.getValue();
         const docSnapshot = this.originalModel = this._register(modelService.createModel(createTextBufferFactoryFromSnapshot(initialContent ? stringToSnapshot(initialContent) : this.modifiedModel.createSnapshot()), languageService.createById(this.modifiedModel.getLanguageId()), this.originalURI, false));
+        this._textModelChangeService = this._register(instantiationService.createInstance(ChatEditingTextModelChangeService, this.originalModel, this.modifiedModel, this._stateObs));
+        this._register(this._textModelChangeService.onDidAcceptOrRejectAllHunks(action => {
+            this._stateObs.set(action, undefined);
+            this._notifyAction(action === ModifiedFileEntryState.Accepted ? 'accepted' : 'rejected');
+        }));
         (async () => {
             const reference = await textModelService.createModelReference(docSnapshot.uri);
             if (this._store.isDisposed) {
@@ -116,9 +54,12 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             }
             this._register(reference);
         })();
-        this._register(this.modifiedModel.onDidChangeContent(e => this._mirrorEdits(e)));
-        this._register(toDisposable(() => {
-            this._clearCurrentEditLineDecoration();
+        this._register(this._textModelChangeService.onDidUserEditModel(() => {
+            this._userEditScheduler.schedule();
+            const didResetToOriginalContent = this.modifiedModel.getValue() === this.initialContent;
+            if (this._stateObs.get() === ModifiedFileEntryState.Modified && didResetToOriginalContent) {
+                this._stateObs.set(ModifiedFileEntryState.Rejected, undefined);
+            }
         }));
         const resourceFilter = this._register(( new MutableDisposable()));
         this._register(autorun(r => {
@@ -126,23 +67,19 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             if (inProgress) {
                 const res = this._lastModifyingResponseObs.read(r);
                 const req = res && res.session.getRequests().find(value => value.id === res.requestId);
-                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(4791, "Chat Edits")));
+                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(4873, "Chat Edits")));
             }
             else {
                 resourceFilter.clear();
             }
         }));
     }
-    _clearCurrentEditLineDecoration() {
-        this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, []);
-    }
     equalsSnapshot(snapshot) {
         return !!snapshot &&
             ( this.modifiedURI.toString()) === ( snapshot.resource.toString()) &&
             this.modifiedModel.getLanguageId() === snapshot.languageId &&
             this.originalModel.getValue() === snapshot.original &&
             this.modifiedModel.getValue() === snapshot.current &&
-            this._edit.equals(snapshot.originalToCurrentEdit) &&
             this.state.get() === snapshot.state;
     }
     createSnapshot(requestId, undoStop) {
@@ -152,137 +89,41 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             snapshotUri: ChatEditingSnapshotTextModelContentProvider.getSnapshotFileURI(this._telemetryInfo.sessionId, requestId, undoStop, this.modifiedURI.path),
             original: this.originalModel.getValue(),
             current: this.modifiedModel.getValue(),
-            originalToCurrentEdit: this._edit,
             state: this.state.get(),
             telemetryInfo: this._telemetryInfo
         };
     }
-    restoreFromSnapshot(snapshot, restoreToDisk = true) {
+    async restoreFromSnapshot(snapshot, restoreToDisk = true) {
         this._stateObs.set(snapshot.state, undefined);
-        this.originalModel.setValue(snapshot.original);
-        if (restoreToDisk) {
-            this._setDocValue(snapshot.current);
-        }
-        this._edit = snapshot.originalToCurrentEdit;
-        this._updateDiffInfoSeq();
+        await this._textModelChangeService.resetDocumentValues(snapshot.original, restoreToDisk ? snapshot.current : undefined);
     }
-    resetToInitialContent() {
-        this._setDocValue(this.initialContent);
+    async resetToInitialContent() {
+        await this._textModelChangeService.resetDocumentValues(undefined, this.initialContent);
     }
     async _areOriginalAndModifiedIdentical() {
-        const diff = await this._diffOperation;
-        return diff ? diff.identical : false;
+        return this._textModelChangeService.areOriginalAndModifiedIdentical();
     }
     _resetEditsState(tx) {
         super._resetEditsState(tx);
-        this._clearCurrentEditLineDecoration();
-    }
-    _mirrorEdits(event) {
-        const edit = offsetEditFromContentChanges(event.changes);
-        if (this._isEditFromUs) {
-            const e_sum = this._edit;
-            const e_ai = edit;
-            this._edit = e_sum.compose(e_ai);
-        }
-        else {
-            const e_ai = this._edit;
-            const e_user = edit;
-            const e_user_r = e_user.tryRebase(e_ai.inverse(this.originalModel.getValue()), true);
-            if (e_user_r === undefined) {
-                this._edit = e_ai.compose(e_user);
-            }
-            else {
-                const edits = offsetEditToEditOperations(e_user_r, this.originalModel);
-                this.originalModel.applyEdits(edits);
-                this._edit = e_ai.tryRebase(e_user_r);
-            }
-            this._allEditsAreFromUs = false;
-            this._userEditScheduler.schedule();
-            this._updateDiffInfoSeq();
-            const didResetToOriginalContent = this.modifiedModel.getValue() === this.initialContent;
-            const currentState = this._stateObs.get();
-            switch (currentState) {
-                case ModifiedFileEntryState.Modified:
-                    if (didResetToOriginalContent) {
-                        this._stateObs.set(ModifiedFileEntryState.Rejected, undefined);
-                        break;
-                    }
-            }
-        }
+        this._textModelChangeService.clearCurrentEditLineDecoration();
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(4792, "Chat Edit: '{0}'", request.message.text)) : ( localize(4793, "Chat Edit"));
+        const label = request?.message.text ? ( localize(4874, "Chat Edit: '{0}'", request.message.text)) : ( localize(4875, "Chat Edit"));
         return ( new SingleModelEditStackElement(label, 'chat.edit', this.modifiedModel, null));
     }
     async acceptAgentEdits(resource, textEdits, isLastEdits, responseModel) {
-        assertType(textEdits.every(TextEdit.isTextEdit), 'INVALID args, can only handle text edits');
-        assert(isEqual(resource, this.modifiedURI), ' INVALID args, can only edit THIS document');
-        const isAtomicEdits = textEdits.length > 0 && isLastEdits;
-        let rewriteRatio = 0;
-        if (isAtomicEdits) {
-            const minimalEdits = (await this._editorWorkerService.computeMoreMinimalEdits(this.modifiedModel.uri, textEdits)) ?? textEdits;
-            const ops = ( minimalEdits.map(TextEdit.asEditOperation));
-            const undoEdits = this._applyEdits(ops);
-            if (undoEdits.length > 0) {
-                let range;
-                for (let i = 0; i < undoEdits.length; i++) {
-                    const op = undoEdits[i];
-                    if (!range) {
-                        range = Range.lift(op.range);
-                    }
-                    else {
-                        range = Range.plusRange(range, op.range);
-                    }
-                }
-                if (range) {
-                    const defer = ( new DeferredPromise());
-                    const listener = addDisposableListener(getWindow(undefined), 'animationend', e => {
-                        if (e.animationName === 'kf-chat-editing-atomic-edit') {
-                            defer.complete();
-                            listener.dispose();
-                        }
-                    });
-                    this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, [{
-                            options: ChatEditingModifiedDocumentEntry_1._atomicEditDecorationOptions,
-                            range
-                        }]);
-                    await Promise.any([defer.p, timeout(500)]);
-                    listener.dispose();
-                }
-            }
-        }
-        else {
-            const ops = ( textEdits.map(TextEdit.asEditOperation));
-            const undoEdits = this._applyEdits(ops);
-            const maxLineNumber = undoEdits.reduce((max, op) => Math.max(max, op.range.startLineNumber), 0);
-            rewriteRatio = Math.min(1, maxLineNumber / this.modifiedModel.getLineCount());
-            const newDecorations = [
-                {
-                    options: ChatEditingModifiedDocumentEntry_1._pendingEditDecorationOptions,
-                    range: ( new Range(maxLineNumber + 1, 1, Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER))
-                }
-            ];
-            if (maxLineNumber > 0) {
-                newDecorations.push({
-                    options: ChatEditingModifiedDocumentEntry_1._lastEditDecorationOptions,
-                    range: ( new Range(maxLineNumber, 1, maxLineNumber, Number.MAX_SAFE_INTEGER))
-                });
-            }
-            this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, newDecorations);
-        }
+        const result = await this._textModelChangeService.acceptAgentEdits(resource, textEdits, isLastEdits, responseModel);
         transaction((tx) => {
             this._waitsForLastEdits.set(!isLastEdits, tx);
             this._stateObs.set(ModifiedFileEntryState.Modified, tx);
             if (!isLastEdits) {
                 this._isCurrentlyBeingModifiedByObs.set(responseModel, tx);
-                this._rewriteRatioObs.set(rewriteRatio, tx);
+                this._rewriteRatioObs.set(result.rewriteRatio, tx);
             }
             else {
                 this._resetEditsState(tx);
-                this._updateDiffInfoSeq();
                 this._rewriteRatioObs.set(1, tx);
-                this._editDecorationClear.schedule();
             }
         });
         if (isLastEdits) {
@@ -292,98 +133,9 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             });
         }
     }
-    async _acceptHunk(change) {
-        if (!this._diffInfo.get().changes.includes(change)) {
-            return false;
-        }
-        const edits = [];
-        for (const edit of change.innerChanges ?? []) {
-            const newText = this.modifiedModel.getValueInRange(edit.modifiedRange);
-            edits.push(EditOperation.replace(edit.originalRange, newText));
-        }
-        this.originalModel.pushEditOperations(null, edits, _ => null);
-        await this._updateDiffInfoSeq();
-        if (this._diffInfo.get().identical) {
-            this._stateObs.set(ModifiedFileEntryState.Accepted, undefined);
-            this._notifyAction('accepted');
-        }
-        this._accessibilitySignalService.playSignal(AccessibilitySignal.editsKept, { allowManyInParallel: true });
-        return true;
-    }
-    async _rejectHunk(change) {
-        if (!this._diffInfo.get().changes.includes(change)) {
-            return false;
-        }
-        const edits = [];
-        for (const edit of change.innerChanges ?? []) {
-            const newText = this.originalModel.getValueInRange(edit.originalRange);
-            edits.push(EditOperation.replace(edit.modifiedRange, newText));
-        }
-        this.modifiedModel.pushEditOperations(null, edits, _ => null);
-        await this._updateDiffInfoSeq();
-        if (this._diffInfo.get().identical) {
-            this._stateObs.set(ModifiedFileEntryState.Rejected, undefined);
-            this._notifyAction('rejected');
-        }
-        this._accessibilitySignalService.playSignal(AccessibilitySignal.editsUndone, { allowManyInParallel: true });
-        return true;
-    }
-    _applyEdits(edits) {
-        this._isEditFromUs = true;
-        try {
-            let result = [];
-            TextModelEditReason.editWithReason(( new TextModelEditReason({ source: 'Chat.applyEdits' })), () => {
-                this.modifiedModel.pushEditOperations(null, edits, (undoEdits) => {
-                    result = undoEdits;
-                    return null;
-                });
-            });
-            return result;
-        }
-        finally {
-            this._isEditFromUs = false;
-        }
-    }
-    async _updateDiffInfoSeq() {
-        const myDiffOperationId = ++this._diffOperationIds;
-        await Promise.resolve(this._diffOperation);
-        if (this._diffOperationIds === myDiffOperationId) {
-            const thisDiffOperation = this._updateDiffInfo();
-            this._diffOperation = thisDiffOperation;
-            await thisDiffOperation;
-        }
-    }
-    async _updateDiffInfo() {
-        if (this.originalModel.isDisposed() || this.modifiedModel.isDisposed()) {
-            return undefined;
-        }
-        if (this.state.get() !== ModifiedFileEntryState.Modified) {
-            this._diffInfo.set(nullDocumentDiff, undefined);
-            return nullDocumentDiff;
-        }
-        const docVersionNow = this.modifiedModel.getVersionId();
-        const snapshotVersionNow = this.originalModel.getVersionId();
-        const diff = await this._editorWorkerService.computeDiff(this.originalModel.uri, this.modifiedModel.uri, {
-            ignoreTrimWhitespace: false,
-            computeMoves: false,
-            maxComputationTimeMs: 3000
-        }, 'advanced');
-        if (this.originalModel.isDisposed() || this.modifiedModel.isDisposed()) {
-            return undefined;
-        }
-        if (this.modifiedModel.getVersionId() === docVersionNow && this.originalModel.getVersionId() === snapshotVersionNow) {
-            const diff2 = diff ?? nullDocumentDiff;
-            this._diffInfo.set(diff2, undefined);
-            this._edit = offsetEditFromLineRangeMapping(this.originalModel, this.modifiedModel, diff2.changes);
-            return diff2;
-        }
-        return undefined;
-    }
-    async _doAccept(tx) {
-        this.originalModel.setValue(this.modifiedModel.createSnapshot());
-        this._diffInfo.set(nullDocumentDiff, tx);
-        this._edit = StringEdit.empty;
-        await this._collapse(tx);
+    async _doAccept() {
+        this._textModelChangeService.keep();
+        this._multiDiffEntryDelegate.collapse(undefined);
         const config = this._fileConfigService.getAutoSaveConfiguration(this.modifiedURI);
         if (!config.autoSave || !this._textFileService.isDirty(this.modifiedURI)) {
             try {
@@ -397,7 +149,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             }
         }
     }
-    async _doReject(tx) {
+    async _doReject() {
         if (this.createdInRequestId === this._telemetryInfo.requestId) {
             if (isTextFileEditorModel(this._docFileEditorModel)) {
                 await this._docFileEditorModel.revert({ soft: true });
@@ -406,41 +158,21 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             this._onDidDelete.fire();
         }
         else {
-            this._setDocValue(this.originalModel.getValue());
-            if (this._allEditsAreFromUs && isTextFileEditorModel(this._docFileEditorModel)) {
+            this._textModelChangeService.undo();
+            if (this._textModelChangeService.allEditsAreFromUs && isTextFileEditorModel(this._docFileEditorModel)) {
                 await this._docFileEditorModel.save({ reason: SaveReason.EXPLICIT, skipSaveParticipants: true });
             }
-            await this._collapse(tx);
-        }
-    }
-    _setDocValue(value) {
-        if (this.modifiedModel.getValue() !== value) {
-            this.modifiedModel.pushStackElement();
-            const edit = EditOperation.replace(this.modifiedModel.getFullModelRange(), value);
-            this._applyEdits([edit]);
-            this._updateDiffInfoSeq();
-            this.modifiedModel.pushStackElement();
+            this._multiDiffEntryDelegate.collapse(undefined);
         }
     }
-    async _collapse(transaction) {
-        this._multiDiffEntryDelegate.collapse(transaction);
-    }
     _createEditorIntegration(editor) {
         const codeEditor = getCodeEditor(editor.getControl());
         assertType(codeEditor);
-        const diffInfo = ( this._diffInfo.map(value => {
-            return {
-                ...value,
-                originalModel: this.originalModel,
-                modifiedModel: this.modifiedModel,
-                keep: changes => this._acceptHunk(changes),
-                undo: changes => this._rejectHunk(changes)
-            };
-        }));
+        const diffInfo = this._textModelChangeService.diffInfo;
         return this._instantiationService.createInstance(ChatEditingCodeEditorIntegration, this, codeEditor, diffInfo, false);
     }
 };
-ChatEditingModifiedDocumentEntry = ChatEditingModifiedDocumentEntry_1 = ( __decorate([
+ChatEditingModifiedDocumentEntry = ( __decorate([
     ( __param(5, IMarkerService)),
     ( __param(6, IModelService)),
     ( __param(7, ITextModelService)),
@@ -448,12 +180,10 @@ ChatEditingModifiedDocumentEntry = ChatEditingModifiedDocumentEntry_1 = ( __deco
     ( __param(9, IConfigurationService)),
     ( __param(10, IFilesConfigurationService)),
     ( __param(11, IChatService)),
-    ( __param(12, IEditorWorkerService)),
-    ( __param(13, ITextFileService)),
-    ( __param(14, IFileService)),
-    ( __param(15, IUndoRedoService)),
-    ( __param(16, IInstantiationService)),
-    ( __param(17, IAccessibilitySignalService))
+    ( __param(12, ITextFileService)),
+    ( __param(13, IFileService)),
+    ( __param(14, IUndoRedoService)),
+    ( __param(15, IInstantiationService))
 ], ChatEditingModifiedDocumentEntry));
 
 export { ChatEditingModifiedDocumentEntry };

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.d.ts

@@ -3,7 +3,6 @@ import { Emitter } from "@codingame/monaco-vscode-api/vscode/vs/base/common/even
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable, ITransaction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { StringEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/edits/stringEdit";
 import { TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
@@ -13,9 +12,8 @@ import { IUndoRedoService } from "@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IEditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service";
 import { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
-import { IChatAgentResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents";
-import { ChatEditKind, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ModifiedFileEntryState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry, ModifiedFileEntryState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+import { IChatResponseModel } from "@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 declare class AutoAcceptControl {
     readonly total: number;
@@ -64,10 +62,10 @@ export declare abstract class AbstractChatEditingModifiedFileEntry extends Dispo
     acquire(): this;
     enableReviewModeUntilSettled(): void;
     updateTelemetryInfo(telemetryInfo: IModifiedEntryTelemetryInfo): void;
-    accept(tx: ITransaction | undefined): Promise<void>;
-    protected abstract _doAccept(tx: ITransaction | undefined): Promise<void>;
-    reject(tx: ITransaction | undefined): Promise<void>;
-    protected abstract _doReject(tx: ITransaction | undefined): Promise<void>;
+    accept(): Promise<void>;
+    protected abstract _doAccept(): Promise<void>;
+    reject(): Promise<void>;
+    protected abstract _doReject(): Promise<void>;
     protected _notifyAction(outcome: "accepted" | "rejected" | "userModified"): void;
     private readonly _editorIntegrations;
     getEditorIntegration(pane: IEditorPane): IModifiedFileEntryEditorIntegration;
@@ -76,30 +74,13 @@ export declare abstract class AbstractChatEditingModifiedFileEntry extends Dispo
     acceptStreamingEditsStart(responseModel: IChatResponseModel, tx: ITransaction): void;
     protected abstract _createUndoRedoElement(response: IChatResponseModel): IUndoRedoElement | undefined;
     abstract acceptAgentEdits(uri: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void>;
-    acceptStreamingEditsEnd(tx: ITransaction): Promise<void>;
+    acceptStreamingEditsEnd(): Promise<void>;
     protected abstract _areOriginalAndModifiedIdentical(): Promise<boolean>;
-    protected _resetEditsState(tx: ITransaction): void;
+    protected _resetEditsState(tx: ITransaction | undefined): void;
     abstract createSnapshot(requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
     abstract equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean;
-    abstract restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk?: boolean): void;
-    abstract resetToInitialContent(): void;
+    abstract restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk?: boolean): Promise<void>;
+    abstract resetToInitialContent(): Promise<void>;
     abstract initialContent: string;
 }
-export interface IModifiedEntryTelemetryInfo {
-    readonly agentId: string | undefined;
-    readonly command: string | undefined;
-    readonly sessionId: string;
-    readonly requestId: string;
-    readonly result: IChatAgentResult | undefined;
-}
-export interface ISnapshotEntry {
-    readonly resource: URI;
-    readonly languageId: string;
-    readonly snapshotUri: URI;
-    readonly original: string;
-    readonly current: string;
-    readonly originalToCurrentEdit: StringEdit;
-    readonly state: ModifiedFileEntryState;
-    telemetryInfo: IModifiedEntryTelemetryInfo;
-}
 export {};