@codingame/monaco-vscode-chat-service-override 22.1.8 → 23.0.0

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

@@ -5,9 +5,12 @@ import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/netw
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 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 { TextEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/edits/textEdit';
+import { StringText } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/text/abstractText';
 import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
 import { SingleModelEditStackElement } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/editStack';
 import { createTextBufferFactoryFromSnapshot } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
+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 { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -34,6 +37,9 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
     get changesCount() {
         return ( this._textModelChangeService.diffInfo.map(diff => diff.changes.length));
     }
+    get diffInfo() {
+        return this._textModelChangeService.diffInfo;
+    }
     get linesAdded() {
         return ( this._textModelChangeService.diffInfo.map(diff => {
             let added = 0;
@@ -52,16 +58,17 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             return removed;
         }));
     }
-    constructor(resourceRef, _multiDiffEntryDelegate, telemetryInfo, kind, initialContent, markerService, modelService, textModelService, languageService, configService, fileConfigService, chatService, _textFileService, fileService, undoRedoService, instantiationService, aiEditTelemetryService) {
+    constructor(resourceRef, _multiDiffEntryDelegate, telemetryInfo, kind, initialContent, markerService, modelService, textModelService, languageService, configService, fileConfigService, chatService, _textFileService, fileService, undoRedoService, instantiationService, aiEditTelemetryService, _editorWorkerService) {
         super(resourceRef.object.textEditorModel.uri, telemetryInfo, kind, configService, fileConfigService, chatService, fileService, undoRedoService, instantiationService, aiEditTelemetryService);
         this._multiDiffEntryDelegate = _multiDiffEntryDelegate;
         this._textFileService = _textFileService;
+        this._editorWorkerService = _editorWorkerService;
         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));
+        const docSnapshot = this.originalModel = this._register(modelService.createModel(createTextBufferFactoryFromSnapshot(initialContent !== undefined ? 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._isExternalEditInProgress));
         this._register(this._textModelChangeService.onDidAcceptOrRejectAllHunks(action => {
             this._stateObs.set(action, undefined);
             this._notifySessionAction(action === ModifiedFileEntryState.Accepted ? 'accepted' : 'rejected');
@@ -96,7 +103,7 @@ 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(5098, "Chat Edits")));
+                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(5175, "Chat Edits")));
             }
             else {
                 resourceFilter.clear();
@@ -111,17 +118,20 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             this.modifiedModel.getValue() === snapshot.current &&
             this.state.get() === snapshot.state;
     }
-    createSnapshot(requestId, undoStop) {
+    createSnapshot(sessionId, requestId, undoStop) {
         return {
             resource: this.modifiedURI,
             languageId: this.modifiedModel.getLanguageId(),
-            snapshotUri: ChatEditingSnapshotTextModelContentProvider.getSnapshotFileURI(this._telemetryInfo.sessionId, requestId, undoStop, this.modifiedURI.path),
+            snapshotUri: ChatEditingSnapshotTextModelContentProvider.getSnapshotFileURI(sessionId, requestId, undoStop, this.modifiedURI.path),
             original: this.originalModel.getValue(),
             current: this.modifiedModel.getValue(),
             state: this.state.get(),
             telemetryInfo: this._telemetryInfo
         };
     }
+    getCurrentContents() {
+        return this.modifiedModel.getValue();
+    }
     hasModificationAt(location) {
         return ( location.uri.toString()) === ( this.modifiedModel.uri.toString()) && this._textModelChangeService.hasHunkAt(location.range);
     }
@@ -141,7 +151,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(5099, "Chat Edit: '{0}'", request.message.text)) : ( localize(5100, "Chat Edit"));
+        const label = request?.message.text ? ( localize(5176, "Chat Edit: '{0}'", request.message.text)) : ( localize(5177, "Chat Edit"));
         return ( new SingleModelEditStackElement(label, 'chat.edit', this.modifiedModel, null));
     }
     async acceptAgentEdits(resource, textEdits, isLastEdits, responseModel) {
@@ -150,7 +160,6 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             this._waitsForLastEdits.set(!isLastEdits, tx);
             this._stateObs.set(ModifiedFileEntryState.Modified, tx);
             if (!isLastEdits) {
-                this._isCurrentlyBeingModifiedByObs.set(responseModel, tx);
                 this._rewriteRatioObs.set(result.rewriteRatio, tx);
             }
             else {
@@ -185,7 +194,8 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         if (this.createdInRequestId === this._telemetryInfo.requestId) {
             if (isTextFileEditorModel(this._docFileEditorModel)) {
                 await this._docFileEditorModel.revert({ soft: true });
-                await this._fileService.del(this.modifiedURI);
+                await this._fileService.del(this.modifiedURI).catch(err => {
+                });
             }
             this._onDidDelete.fire();
         }
@@ -206,6 +216,31 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
     _shouldAutoSave() {
         return this.modifiedURI.scheme !== Schemas.untitled;
     }
+    async computeEditsFromSnapshots(beforeSnapshot, afterSnapshot) {
+        const stringEdit = await this._editorWorkerService.computeStringEditFromDiff(beforeSnapshot, afterSnapshot, { maxComputationTimeMs: 5000 }, 'advanced');
+        const editorTextEdit = TextEdit.fromStringEdit(stringEdit, ( new StringText(beforeSnapshot)));
+        return editorTextEdit.replacements.slice();
+    }
+    async save() {
+        if (this.modifiedModel.uri.scheme === Schemas.untitled) {
+            return;
+        }
+        if (this._textFileService.isDirty(this.modifiedModel.uri)) {
+            await this._textFileService.save(this.modifiedModel.uri, {
+                reason: SaveReason.EXPLICIT,
+                skipSaveParticipants: true
+            });
+        }
+    }
+    async revertToDisk() {
+        if (this.modifiedModel.uri.scheme === Schemas.untitled) {
+            return;
+        }
+        const fileModel = this._textFileService.files.get(this.modifiedModel.uri);
+        if (fileModel && !fileModel.isDisposed()) {
+            await fileModel.revert({ soft: false });
+        }
+    }
 };
 ChatEditingModifiedDocumentEntry = ( __decorate([
     ( __param(5, IMarkerService)),
@@ -219,7 +254,8 @@ ChatEditingModifiedDocumentEntry = ( __decorate([
     ( __param(13, IFileService)),
     ( __param(14, IUndoRedoService)),
     ( __param(15, IInstantiationService)),
-    ( __param(16, IAiEditTelemetryService))
+    ( __param(16, IAiEditTelemetryService)),
+    ( __param(17, IEditorWorkerService))
 ], ChatEditingModifiedDocumentEntry));
 
 export { ChatEditingModifiedDocumentEntry };

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

@@ -14,7 +14,7 @@ import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/
 import { IAiEditTelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service";
 import { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 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-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatResponseModel } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { ChatUserAction } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 declare class AutoAcceptControl {
@@ -42,8 +42,19 @@ export declare abstract class AbstractChatEditingModifiedFileEntry extends Dispo
     readonly state: IObservable<ModifiedFileEntryState>;
     protected readonly _waitsForLastEdits: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<boolean, void>;
     readonly waitsForLastEdits: IObservable<boolean>;
-    protected readonly _isCurrentlyBeingModifiedByObs: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<IChatResponseModel | undefined, void>;
-    readonly isCurrentlyBeingModifiedBy: IObservable<IChatResponseModel | undefined>;
+    protected readonly _isCurrentlyBeingModifiedByObs: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<{
+        responseModel: IChatResponseModel;
+        undoStopId: string | undefined;
+    } | undefined, void>;
+    readonly isCurrentlyBeingModifiedBy: IObservable<{
+        responseModel: IChatResponseModel;
+        undoStopId: string | undefined;
+    } | undefined>;
+    /**
+     * Flag to track if we're currently in an external edit operation.
+     * When true, file system changes should be treated as agent edits, not user edits.
+     */
+    protected _isExternalEditInProgress: boolean;
     protected readonly _lastModifyingResponseObs: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<IChatResponseModel | undefined, void>;
     readonly lastModifyingResponse: IObservable<IChatResponseModel | undefined>;
     protected readonly _lastModifyingResponseInProgressObs: IObservable<boolean>;
@@ -67,8 +78,12 @@ export declare abstract class AbstractChatEditingModifiedFileEntry extends Dispo
     enableReviewModeUntilSettled(): void;
     updateTelemetryInfo(telemetryInfo: IModifiedEntryTelemetryInfo): void;
     accept(): Promise<void>;
+    /** Accepts and returns a function used to transition the state. This MUST be called by the consumer. */
+    acceptDeferred(): Promise<((tx: ITransaction) => void) | undefined>;
     protected abstract _doAccept(): Promise<void>;
     reject(): Promise<void>;
+    /** Rejects and returns a function used to transition the state. This MUST be called by the consumer. */
+    rejectDeferred(): Promise<((tx: ITransaction) => void) | undefined>;
     protected abstract _doReject(): Promise<void>;
     protected _notifySessionAction(outcome: "accepted" | "rejected" | "userModified"): void;
     protected _notifyAction(action: ChatUserAction): void;
@@ -82,16 +97,40 @@ export declare abstract class AbstractChatEditingModifiedFileEntry extends Dispo
      */
     protected abstract _createEditorIntegration(editor: IEditorPane): IModifiedFileEntryEditorIntegration;
     abstract readonly changesCount: IObservable<number>;
-    acceptStreamingEditsStart(responseModel: IChatResponseModel, tx: ITransaction): void;
+    acceptStreamingEditsStart(responseModel: IChatResponseModel, undoStopId: string | undefined, tx: ITransaction | undefined): void;
     protected abstract _createUndoRedoElement(response: IChatResponseModel): IUndoRedoElement | undefined;
-    abstract acceptAgentEdits(uri: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void>;
+    abstract acceptAgentEdits(uri: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel | undefined): Promise<void>;
     acceptStreamingEditsEnd(): Promise<void>;
     protected abstract _areOriginalAndModifiedIdentical(): Promise<boolean>;
     protected _resetEditsState(tx: ITransaction | undefined): void;
-    abstract createSnapshot(requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
+    abstract createSnapshot(sessionId: string, requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
     abstract equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean;
     abstract restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk?: boolean): Promise<void>;
     abstract resetToInitialContent(): Promise<void>;
     abstract initialContent: string;
+    /**
+     * Computes the edits between two snapshots of the file content.
+     * @param beforeSnapshot The content before the changes
+     * @param afterSnapshot The content after the changes
+     * @returns Array of text edits or cell edit operations
+     */
+    abstract computeEditsFromSnapshots(beforeSnapshot: string, afterSnapshot: string): Promise<(TextEdit | ICellEditOperation)[]>;
+    /**
+     * Marks the start of an external edit operation.
+     * File system changes will be treated as agent edits until stopExternalEdit is called.
+     */
+    startExternalEdit(): void;
+    /**
+     * Marks the end of an external edit operation.
+     */
+    stopExternalEdit(): void;
+    /**
+     * Saves the current model state to disk.
+     */
+    abstract save(): Promise<void>;
+    /**
+     * Reloads the model from disk to ensure it's in sync with file system changes.
+     */
+    abstract revertToDisk(): Promise<void>;
 }
 export {};

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

@@ -28,6 +28,7 @@ import { IAiEditTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/
 import { EditDeltaInfo } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/textModelEditSource';
 import { ModifiedFileEntryState, ChatEditKind } 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 { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValueOpts';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
@@ -42,7 +43,7 @@ class AutoAcceptControl {
         this.cancel = cancel;
     }
 }
-const pendingRewriteMinimap = registerColor('minimap.chatEditHighlight', ( transparent(editorBackground, 0.6)), ( localize(5101, "Color of pending edit regions in the minimap")));
+const pendingRewriteMinimap = registerColor('minimap.chatEditHighlight', ( transparent(editorBackground, 0.6)), ( localize(5178, "Color of pending edit regions in the minimap")));
 let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFileEntry extends Disposable {
     static { AbstractChatEditingModifiedFileEntry_1 = this; }
     static { this.scheme = 'modified-file-entry'; }
@@ -72,6 +73,7 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
         this.waitsForLastEdits = this._waitsForLastEdits;
         this._isCurrentlyBeingModifiedByObs = observableValue(this, undefined);
         this.isCurrentlyBeingModifiedBy = this._isCurrentlyBeingModifiedByObs;
+        this._isExternalEditInProgress = false;
         this._lastModifyingResponseObs = observableValueOpts({ equalsFn: (a, b) => a?.requestId === b?.requestId }, undefined);
         this.lastModifyingResponse = this._lastModifyingResponseObs;
         this._lastModifyingResponseInProgressObs = ( this._lastModifyingResponseObs.map((value, r) => {
@@ -167,26 +169,38 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
         this._telemetryInfo = telemetryInfo;
     }
     async accept() {
+        const callback = await this.acceptDeferred();
+        if (callback) {
+            transaction(callback);
+        }
+    }
+    async acceptDeferred() {
         if (this._stateObs.get() !== ModifiedFileEntryState.Modified) {
             return;
         }
         await this._doAccept();
-        transaction(tx => {
+        return (tx) => {
             this._stateObs.set(ModifiedFileEntryState.Accepted, tx);
             this._autoAcceptCtrl.set(undefined, tx);
-        });
-        this._notifySessionAction('accepted');
+            this._notifySessionAction('accepted');
+        };
     }
     async reject() {
+        const callback = await this.rejectDeferred();
+        if (callback) {
+            transaction(callback);
+        }
+    }
+    async rejectDeferred() {
         if (this._stateObs.get() !== ModifiedFileEntryState.Modified) {
-            return;
+            return undefined;
         }
         this._notifySessionAction('rejected');
         await this._doReject();
-        transaction(tx => {
+        return (tx) => {
             this._stateObs.set(ModifiedFileEntryState.Rejected, tx);
             this._autoAcceptCtrl.set(undefined, tx);
-        });
+        };
     }
     _notifySessionAction(outcome) {
         this._notifyAction({ kind: 'chatEditingSessionAction', uri: this.modifiedURI, hasRemainingEdits: false, outcome });
@@ -212,7 +226,7 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
             modelId: this._telemetryInfo.modelId,
             modeId: this._telemetryInfo.modeId,
             command: this._telemetryInfo.command,
-            sessionId: this._telemetryInfo.sessionId,
+            sessionResource: LocalChatSessionUri.forSession(this._telemetryInfo.sessionId),
             requestId: this._telemetryInfo.requestId,
             result: this._telemetryInfo.result
         });
@@ -225,9 +239,9 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
         }
         return value;
     }
-    acceptStreamingEditsStart(responseModel, tx) {
+    acceptStreamingEditsStart(responseModel, undoStopId, tx) {
         this._resetEditsState(tx);
-        this._isCurrentlyBeingModifiedByObs.set(responseModel, tx);
+        this._isCurrentlyBeingModifiedByObs.set({ responseModel, undoStopId }, tx);
         this._lastModifyingResponseObs.set(responseModel, tx);
         this._autoAcceptCtrl.get()?.cancel();
         const undoRedoElement = this._createUndoRedoElement(responseModel);
@@ -246,6 +260,12 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
         this._rewriteRatioObs.set(0, tx);
         this._waitsForLastEdits.set(false, tx);
     }
+    startExternalEdit() {
+        this._isExternalEditInProgress = true;
+    }
+    stopExternalEdit() {
+        this._isExternalEditInProgress = false;
+    }
 };
 AbstractChatEditingModifiedFileEntry = AbstractChatEditingModifiedFileEntry_1 = ( __decorate([
     ( __param(3, IConfigurationService)),

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

@@ -19,7 +19,7 @@ import { INotebookEditorModelResolverService } from "@codingame/monaco-vscode-ap
 import { INotebookLoggingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service";
 import { INotebookEditorWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/services/notebookWorkerService.service";
 import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntryEditorIntegration, ISnapshotEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatResponseModel } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-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 } from "./chatEditingModifiedFileEntry.js";
 import { ChatEditingNotebookCellEntry } from "./notebook/chatEditingNotebookCellEntry.js";
@@ -59,6 +59,7 @@ export declare class ChatEditingModifiedNotebookEntry extends AbstractChatEditin
     private modifiedToOriginalCell;
     private readonly _cellsDiffInfo;
     get cellsDiffInfo(): IObservable<ICellDiffInfo[]>;
+    get viewType(): string;
     /**
      * List of Cell URIs that are edited,
      * Will be cleared once all edits have been accepted.
@@ -77,6 +78,7 @@ export declare class ChatEditingModifiedNotebookEntry extends AbstractChatEditin
     }, transientOptions: TransientOptions | undefined, telemetryInfo: IModifiedEntryTelemetryInfo, kind: ChatEditKind, initialContent: string, configurationService: IConfigurationService, fileConfigService: IFilesConfigurationService, chatService: IChatService, fileService: IFileService, instantiationService: IInstantiationService, textModelService: ITextModelService, modelService: IModelService, undoRedoService: IUndoRedoService, notebookEditorWorkerService: INotebookEditorWorkerService, loggingService: INotebookLoggingService, notebookResolver: INotebookEditorModelResolverService, aiEditTelemetryService: IAiEditTelemetryService);
     hasModificationAt(location: Location): boolean;
     initializeModelsFromDiffImpl(cellsDiffInfo: CellDiffInfo[]): void;
+    getIndexOfCellHandle(handle: number): number;
     private computeRequestId;
     initializeModelsFromDiff(): Promise<void>;
     updateCellDiffInfo(cellsDiffInfo: ICellDiffInfo[], transcation: ITransaction | undefined): void;
@@ -90,7 +92,7 @@ export declare class ChatEditingModifiedNotebookEntry extends AbstractChatEditin
     protected _areOriginalAndModifiedIdentical(): Promise<boolean>;
     private _areOriginalAndModifiedIdenticalImpl;
     private newNotebookEditGenerator?;
-    acceptAgentEdits(resource: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void>;
+    acceptAgentEdits(resource: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel | undefined): Promise<void>;
     private disposeDeletedCellEntries;
     acceptNotebookEdit(edit: ICellEditOperation): void;
     private computeStateAfterAcceptingRejectingChanges;
@@ -103,12 +105,17 @@ export declare class ChatEditingModifiedNotebookEntry extends AbstractChatEditin
     private keepPreviouslyDeletedCell;
     private _applyEdits;
     private _applyEditsSync;
-    createSnapshot(requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
+    getCurrentSnapshot(): string;
+    createSnapshot(sessionId: string, requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
     equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean;
     restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk?: boolean): Promise<void>;
     resetToInitialContent(): Promise<void>;
+    restoreModifiedModelFromSnapshot(snapshot: string): Promise<void>;
     private restoreSnapshotInModifiedModel;
     private readonly cellTextModelMap;
     private resolveCellModel;
     getOrCreateModifiedTextFileEntryForCell(cell: NotebookCellTextModel, modifiedCellModel: ITextModel, originalCellModel: ITextModel): ChatEditingNotebookCellEntry | undefined;
+    computeEditsFromSnapshots(beforeSnapshot: string, afterSnapshot: string): Promise<(TextEdit | ICellEditOperation)[]>;
+    save(): Promise<void>;
+    revertToDisk(): Promise<void>;
 }

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

@@ -25,9 +25,9 @@ import { UndoRedoElementType } from '@codingame/monaco-vscode-api/vscode/vs/plat
 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';
-import { SnapshotContext } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { SnapshotContext } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
 import { NotebookTextDiffEditor } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CellEditType, NotebookCellsChangeType, NotebookSetting } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { computeDiff } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/common/notebookDiff';
 import { INotebookEditorModelResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service';
@@ -61,6 +61,9 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
     get cellsDiffInfo() {
         return this._cellsDiffInfo;
     }
+    get viewType() {
+        return this.modifiedModel.viewType;
+    }
     static async create(uri, _multiDiffEntryDelegate, telemetryInfo, chatKind, initialContent, instantiationService) {
         return instantiationService.invokeFunction(async (accessor) => {
             const notebookService = accessor.get(INotebookService);
@@ -76,7 +79,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
             const disposables = ( new DisposableStore());
             disposables.add(ChatEditingNotebookFileSystemProvider.registerFile(originalUri, buffer));
             const originalRef = await resolver.resolve(originalUri, notebook.viewType);
-            if (initialContent) {
+            if (initialContent !== undefined) {
                 try {
                     restoreSnapshot(originalRef.object.notebook, initialContent);
                 }
@@ -168,6 +171,9 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
         this._cellsDiffInfo.set(diffs, undefined);
         this._changesCount.set(countChanges(diffs), undefined);
     }
+    getIndexOfCellHandle(handle) {
+        return this.modifiedModel.cells.findIndex(c => c.handle === handle);
+    }
     async initializeModelsFromDiff() {
         const id = ++this.computeRequestId;
         if (this._areOriginalAndModifiedIdenticalImpl()) {
@@ -202,7 +208,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
         this._changesCount.set(countChanges(cellsDiffInfo), transcation);
     }
     mirrorNotebookEdits(e) {
-        if (this._isEditFromUs || ( Array.from(( this.cellEntryMap.values())).some(entry => entry.isEditFromUs))) {
+        if (this._isEditFromUs || this._isExternalEditInProgress || ( Array.from(( this.cellEntryMap.values())).some(entry => entry.isEditFromUs))) {
             return;
         }
         let didResetToOriginalContent = this.initialContentComparer.isEqual(this.modifiedModel);
@@ -400,7 +406,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(5102, "Chat Edit: '{0}'", request.message.text)) : ( localize(5103, "Chat Edit"));
+        const label = request?.message.text ? ( localize(5179, "Chat Edit: '{0}'", request.message.text)) : ( localize(5180, "Chat Edit"));
         const transientOptions = this.transientOptions;
         const outputSizeLimit = this.configurationService.getValue(NotebookSetting.outputBackupSizeLimit) * 1024;
         let initial = createSnapshot(this.modifiedModel, transientOptions, outputSizeLimit);
@@ -507,7 +513,6 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
         }
         transaction((tx) => {
             this._stateObs.set(ModifiedFileEntryState.Modified, tx);
-            this._isCurrentlyBeingModifiedByObs.set(responseModel, tx);
             if (!isLastEdits) {
                 const newRewriteRation = Math.max(this._rewriteRatioObs.get(), calculateNotebookRewriteRatio(this._cellsDiffInfo.get(), this.originalModel, this.modifiedModel));
                 this._rewriteRatioObs.set(Math.min(1, newRewriteRation), tx);
@@ -767,11 +772,14 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
             this._isEditFromUs = false;
         }
     }
-    createSnapshot(requestId, undoStop) {
+    getCurrentSnapshot() {
+        return createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService);
+    }
+    createSnapshot(sessionId, requestId, undoStop) {
         return {
             resource: this.modifiedURI,
             languageId: SnapshotLanguageId,
-            snapshotUri: getNotebookSnapshotFileURI(this._telemetryInfo.sessionId, requestId, undoStop, this.modifiedURI.path, this.modifiedModel.viewType),
+            snapshotUri: getNotebookSnapshotFileURI(sessionId, requestId, undoStop, this.modifiedURI.path, this.modifiedModel.viewType),
             original: createSnapshot(this.originalModel, this.transientOptions, this.configurationService),
             current: createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService),
             state: this.state.get(),
@@ -799,6 +807,10 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
         this.restoreSnapshotInModifiedModel(this.initialContent);
         this.initializeModelsFromDiff();
     }
+    restoreModifiedModelFromSnapshot(snapshot) {
+        this.restoreSnapshotInModifiedModel(snapshot);
+        return this.initializeModelsFromDiff();
+    }
     restoreSnapshotInModifiedModel(snapshot) {
         if (snapshot === createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService)) {
             return;
@@ -835,7 +847,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
             return;
         }
         const disposables = ( new DisposableStore());
-        cellEntry = this._register(this._instantiationService.createInstance(ChatEditingNotebookCellEntry, this.modifiedResourceRef.object.resource, cell, modifiedCellModel, originalCellModel, disposables));
+        cellEntry = this._register(this._instantiationService.createInstance(ChatEditingNotebookCellEntry, this.modifiedResourceRef.object.resource, cell, modifiedCellModel, originalCellModel, () => this._isExternalEditInProgress, disposables));
         this.cellEntryMap.set(cell.uri, cellEntry);
         disposables.add(autorun(r => {
             if (this.modifiedModel.cells.indexOf(cell) === -1) {
@@ -880,6 +892,45 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
         }));
         return cellEntry;
     }
+    async computeEditsFromSnapshots(beforeSnapshot, afterSnapshot) {
+        const beforeData = deserializeSnapshot(beforeSnapshot);
+        const afterData = deserializeSnapshot(afterSnapshot);
+        const edits = [];
+        if (beforeData.data.cells.length > 0) {
+            edits.push({
+                editType: CellEditType.Replace,
+                index: 0,
+                count: beforeData.data.cells.length,
+                cells: afterData.data.cells
+            });
+        }
+        else if (afterData.data.cells.length > 0) {
+            edits.push({
+                editType: CellEditType.Replace,
+                index: 0,
+                count: 0,
+                cells: afterData.data.cells
+            });
+        }
+        return edits;
+    }
+    async save() {
+        if (this.modifiedModel.uri.scheme === Schemas.untitled) {
+            return;
+        }
+        if (this.notebookResolver.isDirty(this.modifiedModel.uri)) {
+            await this.modifiedResourceRef.object.save({
+                reason: SaveReason.EXPLICIT,
+                skipSaveParticipants: true
+            });
+        }
+    }
+    async revertToDisk() {
+        if (this.modifiedModel.uri.scheme === Schemas.untitled) {
+            return;
+        }
+        await this.modifiedResourceRef.object.revert({ soft: false });
+    }
 };
 ChatEditingModifiedNotebookEntry = ChatEditingModifiedNotebookEntry_1 = ( __decorate([
     ( __param(7, IConfigurationService)),