@codingame/monaco-vscode-chat-service-override 16.1.0 → 17.0.0

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

@@ -1,7 +1,8 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { Disposable, DisposableMap, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableMap, toDisposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { clamp } from '@codingame/monaco-vscode-api/vscode/vs/base/common/numbers';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
@@ -23,9 +24,11 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quic
 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 { IFilesConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
-import { WorkingSetEntryState, ChatEditKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+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 { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
+import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/api';
+import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
 
@@ -37,7 +40,7 @@ class AutoAcceptControl {
         this.cancel = cancel;
     }
 }
-const pendingRewriteMinimap = registerColor('minimap.chatEditHighlight', ( transparent(editorBackground, 0.6)), ( localize(4687, "Color of pending edit regions in the minimap")));
+const pendingRewriteMinimap = registerColor('minimap.chatEditHighlight', ( transparent(editorBackground, 0.6)), ( localize(4751, "Color of pending edit regions in the minimap")));
 let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFileEntry extends Disposable {
     static { AbstractChatEditingModifiedFileEntry_1 = this; }
     static { this.scheme = 'modified-file-entry'; }
@@ -60,16 +63,22 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
         this.entryId = `${AbstractChatEditingModifiedFileEntry_1.scheme}::${++AbstractChatEditingModifiedFileEntry_1.lastEntryId}`;
         this._onDidDelete = this._register(( new Emitter()));
         this.onDidDelete = this._onDidDelete.event;
-        this._stateObs = observableValue(this, WorkingSetEntryState.Attached);
+        this._stateObs = observableValue(this, ModifiedFileEntryState.Modified);
         this.state = this._stateObs;
         this._isCurrentlyBeingModifiedByObs = observableValue(this, undefined);
         this.isCurrentlyBeingModifiedBy = this._isCurrentlyBeingModifiedByObs;
+        this._lastModifyingResponseObs = observableValueOpts({ equalsFn: (a, b) => a?.requestId === b?.requestId }, undefined);
+        this.lastModifyingResponse = this._lastModifyingResponseObs;
+        this._lastModifyingResponseInProgressObs = ( this._lastModifyingResponseObs.map((value, r) => {
+            return value && observableFromEvent(this, value.onDidChange, () => !value.isComplete && !value.isPendingConfirmation).read(r);
+        }));
         this._rewriteRatioObs = observableValue(this, 0);
         this.rewriteRatio = this._rewriteRatioObs;
         this._reviewModeTempObs = observableValue(this, undefined);
         this._autoAcceptCtrl = observableValue(this, undefined);
         this.autoAcceptController = this._autoAcceptCtrl;
         this._refCounter = 1;
+        this._userEditScheduler = this._register(( new RunOnceScheduler(() => this._notifyAction('userModified'), 1000)));
         this._editorIntegrations = this._register(( new DisposableMap()));
         if (kind === ChatEditKind.Created) {
             this.createdInRequestId = this._telemetryInfo.requestId;
@@ -92,15 +101,42 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
             const tempValue = this._reviewModeTempObs.read(r);
             return tempValue ?? configuredValue === 0;
         });
+        this._store.add(toDisposable(() => this._lastModifyingResponseObs.set(undefined, undefined)));
         const autoSaveOff = this._store.add(( new MutableDisposable()));
         this._store.add(autorun(r => {
-            if (this.isCurrentlyBeingModifiedBy.read(r)) {
+            if (this._lastModifyingResponseInProgressObs.read(r)) {
                 autoSaveOff.value = _fileConfigService.disableAutoSave(this.modifiedURI);
             }
             else {
                 autoSaveOff.clear();
             }
         }));
+        this._store.add(autorun(r => {
+            const inProgress = this._lastModifyingResponseInProgressObs.read(r);
+            if (inProgress === false && !this.reviewMode.read(r)) {
+                const acceptTimeout = this._autoAcceptTimeout.get() * 1000;
+                const future = Date.now() + acceptTimeout;
+                const update = () => {
+                    const reviewMode = this.reviewMode.get();
+                    if (reviewMode) {
+                        this._autoAcceptCtrl.set(undefined, undefined);
+                        return;
+                    }
+                    const remain = Math.round(future - Date.now());
+                    if (remain <= 0) {
+                        this.accept(undefined);
+                    }
+                    else {
+                        const handle = setTimeout(update, 100);
+                        this._autoAcceptCtrl.set(( new AutoAcceptControl(acceptTimeout, remain, () => {
+                            clearTimeout(handle);
+                            this._autoAcceptCtrl.set(undefined, undefined);
+                        })), undefined);
+                    }
+                };
+                update();
+            }
+        }));
     }
     dispose() {
         if (--this._refCounter === 0) {
@@ -114,7 +150,7 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
     enableReviewModeUntilSettled() {
         this._reviewModeTempObs.set(true, undefined);
         const cleanup = autorun(r => {
-            const resetConfig = this.state.read(r) !== WorkingSetEntryState.Modified;
+            const resetConfig = this.state.read(r) !== ModifiedFileEntryState.Modified;
             if (resetConfig) {
                 this._store.delete(cleanup);
                 this._reviewModeTempObs.set(undefined, undefined);
@@ -126,22 +162,22 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
         this._telemetryInfo = telemetryInfo;
     }
     async accept(tx) {
-        if (this._stateObs.get() !== WorkingSetEntryState.Modified) {
+        if (this._stateObs.get() !== ModifiedFileEntryState.Modified) {
             return;
         }
         await this._doAccept(tx);
-        this._stateObs.set(WorkingSetEntryState.Accepted, tx);
+        this._stateObs.set(ModifiedFileEntryState.Accepted, tx);
         this._autoAcceptCtrl.set(undefined, tx);
         this._notifyAction('accepted');
     }
     async reject(tx) {
-        if (this._stateObs.get() !== WorkingSetEntryState.Modified) {
+        if (this._stateObs.get() !== ModifiedFileEntryState.Modified) {
             return;
         }
+        this._notifyAction('rejected');
         await this._doReject(tx);
-        this._stateObs.set(WorkingSetEntryState.Rejected, tx);
+        this._stateObs.set(ModifiedFileEntryState.Rejected, tx);
         this._autoAcceptCtrl.set(undefined, tx);
-        this._notifyAction('rejected');
     }
     _notifyAction(outcome) {
         this._chatService.notifyUserAction({
@@ -164,6 +200,7 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
     acceptStreamingEditsStart(responseModel, tx) {
         this._resetEditsState(tx);
         this._isCurrentlyBeingModifiedByObs.set(responseModel, tx);
+        this._lastModifyingResponseObs.set(responseModel, tx);
         this._autoAcceptCtrl.get()?.cancel();
         const undoRedoElement = this._createUndoRedoElement(responseModel);
         if (undoRedoElement) {
@@ -175,29 +212,6 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
         if (await this._areOriginalAndModifiedIdentical()) {
             this.accept(tx);
         }
-        else if (!this.reviewMode.get() && !this._autoAcceptCtrl.get()) {
-            const acceptTimeout = this._autoAcceptTimeout.get() * 1000;
-            const future = Date.now() + acceptTimeout;
-            const update = () => {
-                const reviewMode = this.reviewMode.get();
-                if (reviewMode) {
-                    this._autoAcceptCtrl.set(undefined, undefined);
-                    return;
-                }
-                const remain = Math.round(future - Date.now());
-                if (remain <= 0) {
-                    this.accept(undefined);
-                }
-                else {
-                    const handle = setTimeout(update, 100);
-                    this._autoAcceptCtrl.set(( new AutoAcceptControl(acceptTimeout, remain, () => {
-                        clearTimeout(handle);
-                        this._autoAcceptCtrl.set(undefined, undefined);
-                    })), undefined);
-                }
-            };
-            update();
-        }
     }
     _resetEditsState(tx) {
         this._isCurrentlyBeingModifiedByObs.set(undefined, tx);

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

@@ -12,14 +12,14 @@ import { IUndoRedoElement } from "@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IUndoRedoService } from "@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service";
 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 { CellDiffInfo } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel";
-import { NotebookCellTextModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
+import { CellDiffInfo } from "@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel";
+import { NotebookCellTextModel } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
 import { ICellEditOperation, IResolvedNotebookEditorModel, NotebookTextModelChangedEvent, TransientOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { INotebookEditorModelResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service";
 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, IModifiedFileEntryEditorIntegration } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatResponseModel } from "@codingame/monaco-vscode-api/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 { ChatEditingNotebookCellEntry } from "./notebook/chatEditingNotebookCellEntry.js";

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

@@ -27,15 +27,15 @@ import { IUndoRedoService } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 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 { NotebookTextDiffEditor } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+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-324f9a6e-6231-5bfc-af17-e147abd2dfd2-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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/notebookDiff';
+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';
 import { INotebookLoggingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { INotebookEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/services/notebookWorkerService.service';
-import { WorkingSetEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+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 { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { getNotebookSnapshotFileURI, restoreSnapshot, createSnapshot, deserializeSnapshot, SnapshotComparer } from './notebook/chatEditingModifiedNotebookSnapshot.js';
@@ -45,7 +45,7 @@ import { ChatEditingNotebookFileSystemProvider } from './notebook/chatEditingNot
 import { isTransientIPyNbExtensionEvent, adjustCellDiffAndOriginalModelBasedOnCellMovements, getCorrespondingOriginalCellIndex, adjustCellDiffAndOriginalModelBasedOnCellAddDelete, calculateNotebookRewriteRatio, adjustCellDiffForRevertingAnInsertedCell, adjustCellDiffForKeepingAnInsertedCell, adjustCellDiffForRevertingADeletedCell } from './notebook/helpers.js';
 import { countChanges, sortCellChanges } from './notebook/notebookCellChanges.js';
 import { observableValue, transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
-import { ObservablePromise } from '@codingame/monaco-vscode-ae8a8ca1-f243-508b-9c37-c88ebbd295fa-common/vscode/vs/base/common/observableInternal/promise';
+import { ObservablePromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/promise';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
 
 var ChatEditingModifiedNotebookEntry_1;
@@ -75,7 +75,13 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
             disposables.add(ChatEditingNotebookFileSystemProvider.registerFile(originalUri, buffer));
             const originalRef = await resolver.resolve(originalUri, notebook.viewType);
             if (initialContent) {
-                restoreSnapshot(originalRef.object.notebook, initialContent);
+                try {
+                    restoreSnapshot(originalRef.object.notebook, initialContent);
+                }
+                catch (ex) {
+                    console.error(`Error restoring snapshot: ${initialContent}`, ex);
+                    initialContent = createSnapshot(notebook, options.serializer.options, configurationServie);
+                }
             }
             else {
                 initialContent = createSnapshot(notebook, options.serializer.options, configurationServie);
@@ -196,22 +202,24 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
         }
         let didResetToOriginalContent = this.initialContentComparer.isEqual(this.modifiedModel);
         const currentState = this._stateObs.get();
-        if (currentState === WorkingSetEntryState.Rejected) {
-            return;
-        }
-        if (currentState === WorkingSetEntryState.Modified && didResetToOriginalContent) {
-            this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
+        if (currentState === ModifiedFileEntryState.Modified && didResetToOriginalContent) {
+            this._stateObs.set(ModifiedFileEntryState.Rejected, undefined);
             this.updateCellDiffInfo([], undefined);
             this.initializeModelsFromDiff();
+            this._notifyAction('rejected');
             return;
         }
         if (!e.rawEvents.length) {
             return;
         }
+        if (currentState === ModifiedFileEntryState.Rejected) {
+            return;
+        }
         if (isTransientIPyNbExtensionEvent(this.modifiedModel.notebookType, e)) {
             return;
         }
         this._allEditsAreFromUs = false;
+        this._userEditScheduler.schedule();
         for (const event of e.rawEvents.filter(event => event.kind !== NotebookCellsChangeType.ChangeCellContent)) {
             switch (event.kind) {
                 case NotebookCellsChangeType.ChangeDocumentMetadata: {
@@ -321,8 +329,8 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
             }
         }
         didResetToOriginalContent = this.initialContentComparer.isEqual(this.modifiedModel);
-        if (currentState === WorkingSetEntryState.Modified && didResetToOriginalContent) {
-            this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
+        if (currentState === ModifiedFileEntryState.Modified && didResetToOriginalContent) {
+            this._stateObs.set(ModifiedFileEntryState.Rejected, undefined);
             this.updateCellDiffInfo([], undefined);
             this.initializeModelsFromDiff();
             return;
@@ -387,11 +395,12 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(4688, "Chat Edit: '{0}'", request.message.text)) : ( localize(4689, "Chat Edit"));
+        const label = request?.message.text ? ( localize(4752, "Chat Edit: '{0}'", request.message.text)) : ( localize(4753, "Chat Edit"));
         const transientOptions = this.transientOptions;
         const outputSizeLimit = this.configurationService.getValue(NotebookSetting.outputBackupSizeLimit) * 1024;
         let initial = createSnapshot(this.modifiedModel, transientOptions, outputSizeLimit);
         let last = '';
+        let redoState = ModifiedFileEntryState.Rejected;
         return {
             type: UndoRedoElementType.Resource,
             resource: this.modifiedURI,
@@ -400,11 +409,34 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
             confirmBeforeUndo: false,
             undo: async () => {
                 last = createSnapshot(this.modifiedModel, transientOptions, outputSizeLimit);
-                restoreSnapshot(this.modifiedModel, initial);
+                this._isEditFromUs = true;
+                try {
+                    restoreSnapshot(this.modifiedModel, initial);
+                    restoreSnapshot(this.originalModel, initial);
+                }
+                finally {
+                    this._isEditFromUs = false;
+                }
+                redoState = this._stateObs.get() === ModifiedFileEntryState.Accepted ? ModifiedFileEntryState.Accepted : ModifiedFileEntryState.Rejected;
+                this._stateObs.set(ModifiedFileEntryState.Rejected, undefined);
+                this.updateCellDiffInfo([], undefined);
+                this.initializeModelsFromDiff();
+                this._notifyAction('userModified');
             },
             redo: async () => {
                 initial = createSnapshot(this.modifiedModel, transientOptions, outputSizeLimit);
-                restoreSnapshot(this.modifiedModel, last);
+                this._isEditFromUs = true;
+                try {
+                    restoreSnapshot(this.modifiedModel, last);
+                    restoreSnapshot(this.originalModel, last);
+                }
+                finally {
+                    this._isEditFromUs = false;
+                }
+                this._stateObs.set(redoState, undefined);
+                this.updateCellDiffInfo([], undefined);
+                this.initializeModelsFromDiff();
+                this._notifyAction('userModified');
             }
         };
     }
@@ -448,7 +480,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
         }
         transaction((tx) => {
             if (!isLastEdits) {
-                this._stateObs.set(WorkingSetEntryState.Modified, tx);
+                this._stateObs.set(ModifiedFileEntryState.Modified, tx);
                 this._isCurrentlyBeingModifiedByObs.set(responseModel, tx);
                 const newRewriteRation = Math.max(this._rewriteRatioObs.get(), calculateNotebookRewriteRatio(this._cellsDiffInfo.get(), this.originalModel, this.modifiedModel));
                 this._rewriteRatioObs.set(Math.min(1, newRewriteRation), tx);
@@ -515,8 +547,9 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
     computeStateAfterAcceptingRejectingChanges(accepted) {
         const currentSnapshot = createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService);
         if (( new SnapshotComparer(currentSnapshot)).isEqual(this.originalModel)) {
-            const state = accepted ? WorkingSetEntryState.Accepted : WorkingSetEntryState.Rejected;
+            const state = accepted ? ModifiedFileEntryState.Accepted : ModifiedFileEntryState.Rejected;
             this._stateObs.set(state, undefined);
+            this._notifyAction(accepted ? 'accepted' : 'rejected');
         }
     }
     createModifiedCellDiffInfo(modifiedCellIndex, originalCellIndex) {
@@ -799,10 +832,10 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
                 return;
             }
             const cellState = cellEntry.state.read(r);
-            if (cellState === WorkingSetEntryState.Accepted) {
+            if (cellState === ModifiedFileEntryState.Accepted) {
                 this.computeStateAfterAcceptingRejectingChanges(true);
             }
-            else if (cellState === WorkingSetEntryState.Rejected) {
+            else if (cellState === ModifiedFileEntryState.Rejected) {
                 this.computeStateAfterAcceptingRejectingChanges(false);
             }
         }));

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

@@ -13,12 +13,12 @@ import { IDecorationsService } from "@codingame/monaco-vscode-api/vscode/vs/work
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
-import { IMultiDiffSourceResolver, IResolvedMultiDiffSource } from "@codingame/monaco-vscode-ae8a8ca1-f243-508b-9c37-c88ebbd295fa-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
+import { IMultiDiffSourceResolver, IResolvedMultiDiffSource } from "@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
 import { IMultiDiffSourceResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service";
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
 import { IChatEditingSession, IChatRelatedFile, IChatRelatedFilesProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
 import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service";
-import { ChatModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { ChatModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 export declare class ChatEditingService extends Disposable implements IChatEditingService {
     private readonly _instantiationService;

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { coalesce, delta, compareBy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { ErrorNoTelemetry } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
-import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Event, Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { Disposable, dispose, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { LinkedList } from '@codingame/monaco-vscode-api/vscode/vs/base/common/linkedList';
@@ -26,16 +26,16 @@ import { IDecorationsService } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
-import { MultiDiffEditorItem } from '@codingame/monaco-vscode-ae8a8ca1-f243-508b-9c37-c88ebbd295fa-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
+import { MultiDiffEditorItem } from '@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
 import { IMultiDiffSourceResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service';
 import { CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { chatEditingSnapshotScheme, chatEditingAgentSupportsReadonlyReferencesContextKey, ChatEditingSessionState, WorkingSetEntryState, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, chatEditingResourceContextKey, inChatEditingSessionContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
-import { isCellTextEditOperation } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { chatEditingSnapshotScheme, chatEditingAgentSupportsReadonlyReferencesContextKey, ChatEditingSessionState, ModifiedFileEntryState, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, parseChatMultiDiffUri, chatEditingResourceContextKey, inChatEditingSessionContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+import { isCellTextEditOperation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ChatEditorInput } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { ChatEditingSession } from './chatEditingSession.js';
 import { ChatEditingTextModelContentProvider, ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
@@ -94,7 +94,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
             }
             e.join(storageTask, {
                 id: 'join.chatEditingSession',
-                label: ( localize(4690, "Saving chat edits history"))
+                label: ( localize(4754, "Saving chat edits history"))
             });
         }));
     }
@@ -165,6 +165,10 @@ let ChatEditingService = class ChatEditingService extends Disposable {
     }
     observerEditsInResponse(requestId, responseModel, session, observerDisposables) {
         const editsSeen = [];
+        let editorDidChange = false;
+        const editorListener = Event.once(this._editorService.onDidActiveEditorChange)(() => {
+            editorDidChange = true;
+        });
         const editedFilesExist = ( new ResourceMap());
         const ensureEditorOpen = (partUri) => {
             const uri = CellUri.parse(partUri)?.notebook ?? partUri;
@@ -177,8 +181,9 @@ let ChatEditingService = class ChatEditingService extends Disposable {
                     return;
                 }
                 const activeUri = this._editorService.activeEditorPane?.input.resource;
-                const inactive = this._editorService.activeEditorPane?.input instanceof ChatEditorInput && this._editorService.activeEditorPane.input.sessionId === session.chatSessionId ||
-                    Boolean(activeUri && session.entries.get().find(entry => isEqual(activeUri, entry.modifiedURI)));
+                const inactive = editorDidChange
+                    || this._editorService.activeEditorPane?.input instanceof ChatEditorInput && this._editorService.activeEditorPane.input.sessionId === session.chatSessionId
+                    || Boolean(activeUri && session.entries.get().find(entry => isEqual(activeUri, entry.modifiedURI)));
                 this._editorService.openEditor({ resource: uri, options: { inactive, preserveFocus: true, pinned: true } });
             }));
         };
@@ -191,6 +196,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
             }
             editsSeen.length = 0;
             editedFilesExist.clear();
+            editorListener.dispose();
         };
         const handleResponseParts = async () => {
             if (responseModel.isCanceled) {
@@ -315,7 +321,7 @@ let ChatDecorationsProvider = class ChatDecorationsProvider extends Disposable {
         super();
         this._sessions = _sessions;
         this._chatAgentService = _chatAgentService;
-        this.label = ( localize(4691, "Chat Editing"));
+        this.label = ( localize(4755, "Chat Editing"));
         this._currentEntries = derived(this, (r) => {
             const sessions = this._sessions.read(r);
             if (!sessions) {
@@ -336,7 +342,7 @@ let ChatDecorationsProvider = class ChatDecorationsProvider extends Disposable {
         });
         this._modifiedUris = derived(this, (r) => {
             const uri = this._currentEntries.read(r);
-            return ( uri.filter(entry => !entry.isCurrentlyBeingModifiedBy.read(r) && entry.state.read(r) === WorkingSetEntryState.Modified).map(entry => entry.modifiedURI));
+            return ( uri.filter(entry => !entry.isCurrentlyBeingModifiedBy.read(r) && entry.state.read(r) === ModifiedFileEntryState.Modified).map(entry => entry.modifiedURI));
         });
         this.onDidChange = Event.any(observeArrayChanges(this._currentlyEditingUris, compareBy(uri => ( uri.toString()), compare), this._store), observeArrayChanges(this._modifiedUris, compareBy(uri => ( uri.toString()), compare), this._store));
     }
@@ -351,11 +357,11 @@ let ChatDecorationsProvider = class ChatDecorationsProvider extends Disposable {
         }
         const isModified = ( this._modifiedUris.get().some(e => ( e.toString()) === ( uri.toString())));
         if (isModified) {
-            const defaultAgentName = this._chatAgentService.getDefaultAgent(ChatAgentLocation.EditingSession)?.fullName;
+            const defaultAgentName = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Panel)?.fullName;
             return {
                 weight: 1000,
                 letter: Codicon.diffModified,
-                tooltip: defaultAgentName ? ( localize(4692, "Pending changes from {0}", defaultAgentName)) : ( localize(4693, "Pending changes from chat")),
+                tooltip: defaultAgentName ? ( localize(4756, "Pending changes from {0}", defaultAgentName)) : ( localize(4757, "Pending changes from chat")),
                 bubble: true
             };
         }
@@ -374,18 +380,20 @@ let ChatEditingMultiDiffSourceResolver = class ChatEditingMultiDiffSourceResolve
         return uri.scheme === CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME;
     }
     async resolveDiffSource(uri) {
+        const parsed = parseChatMultiDiffUri(uri);
         const thisSession = derived(this, r => {
-            return this._editingSessionsObs.read(r).find(candidate => candidate.chatSessionId === uri.authority);
+            return this._editingSessionsObs.read(r).find(candidate => candidate.chatSessionId === parsed.chatSessionId);
         });
-        return this._instantiationService.createInstance(ChatEditingMultiDiffSource, thisSession);
+        return this._instantiationService.createInstance(ChatEditingMultiDiffSource, thisSession, parsed.showPreviousChanges);
     }
 };
 ChatEditingMultiDiffSourceResolver = ( __decorate([
     ( __param(1, IInstantiationService))
 ], ChatEditingMultiDiffSourceResolver));
 class ChatEditingMultiDiffSource {
-    constructor(_currentSession) {
+    constructor(_currentSession, _showPreviousChanges) {
         this._currentSession = _currentSession;
+        this._showPreviousChanges = _showPreviousChanges;
         this._resources = derived(this, (reader) => {
             const currentSession = this._currentSession.read(reader);
             if (!currentSession) {
@@ -393,6 +401,15 @@ class ChatEditingMultiDiffSource {
             }
             const entries = currentSession.entries.read(reader);
             return ( entries.map((entry) => {
+                if (this._showPreviousChanges) {
+                    const entryDiffObs = currentSession.getEntryDiffBetweenStops(entry.modifiedURI, undefined, undefined);
+                    const entryDiff = entryDiffObs?.read(reader);
+                    if (entryDiff) {
+                        return ( new MultiDiffEditorItem(entryDiff.originalURI, entryDiff.modifiedURI, undefined, {
+                            [chatEditingResourceContextKey.key]: entry.entryId,
+                        }));
+                    }
+                }
                 return ( new MultiDiffEditorItem(entry.originalURI, entry.modifiedURI, undefined, {
                     [chatEditingResourceContextKey.key]: entry.entryId,
                 }));

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

@@ -1,5 +1,4 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ResourceMap } from "@codingame/monaco-vscode-api/vscode/vs/base/common/map";
 import { IObservable, IReader } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IBulkEditService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService.service";
@@ -8,16 +7,16 @@ import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common
 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 { 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 { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
-import { ChatEditingSessionChangeType, ChatEditingSessionState, IChatEditingSession, IEditSessionEntryDiff, IModifiedFileEntry, IStreamingEdits, WorkingSetDisplayMetadata, WorkingSetEntryRemovalReason } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { ChatEditingSessionState, IChatEditingSession, IEditSessionEntryDiff, IModifiedFileEntry, IStreamingEdits } 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 { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 import { AbstractChatEditingModifiedFileEntry, ISnapshotEntry } from "./chatEditingModifiedFileEntry.js";
-import { IAccessibilitySignalService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
 export declare class ChatEditingSession extends Disposable implements IChatEditingSession {
     readonly chatSessionId: string;
     readonly isGlobalEditingSession: boolean;
@@ -40,13 +39,10 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     private readonly _initialFileContents;
     private readonly _entriesObs;
     get entries(): IObservable<readonly IModifiedFileEntry[]>;
-    private _workingSet;
     private _editorPane;
     get state(): IObservable<ChatEditingSessionState>;
     readonly canUndo: IObservable<boolean>;
     readonly canRedo: IObservable<boolean>;
-    private readonly _onDidChange;
-    get onDidChange(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<ChatEditingSessionChangeType>;
     private readonly _onDidDispose;
     get onDidDispose(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     constructor(chatSessionId: string, isGlobalEditingSession: boolean, _lookupExternalEntry: (uri: URI) => AbstractChatEditingModifiedFileEntry | undefined, _instantiationService: IInstantiationService, _modelService: IModelService, _languageService: ILanguageService, _textModelService: ITextModelService, _bulkEditService: IBulkEditService, _editorGroupsService: IEditorGroupsService, _editorService: IEditorService, _chatService: IChatService, _notebookService: INotebookService, _editorWorkerService: IEditorWorkerService, _configurationService: IConfigurationService, _accessibilitySignalService: IAccessibilitySignalService);
@@ -59,11 +55,13 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     private _findEditStop;
     private _ensurePendingSnapshot;
     private _diffsBetweenStops;
+    private _fullDiffs;
     private readonly _ignoreTrimWhitespaceObservable;
     private _entryDiffBetweenTextStops;
     private _createDiffBetweenStopsObservable;
-    getEntryDiffBetweenStops(uri: URI, requestId: string, stopId: string | undefined): IObservable<IEditSessionEntryDiff | undefined>;
-    createSnapshot(requestId: string, undoStop: string | undefined): void;
+    getEntryDiffBetweenStops(uri: URI, requestId: string | undefined, stopId: string | undefined): IObservable<IEditSessionEntryDiff | undefined>;
+    createSnapshot(requestId: string, undoStop: string | undefined, makeEmpty?: boolean): void;
+    private _createEmptySnapshot;
     private _createSnapshot;
     getSnapshot(requestId: string, undoStop: string | undefined, snapshotUri: URI): ISnapshotEntry | undefined;
     getSnapshotModel(requestId: string, undoStop: string | undefined, snapshotUri: URI): Promise<ITextModel | null>;
@@ -71,11 +69,11 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     private _pendingSnapshot;
     restoreSnapshot(requestId: string | undefined, stopId: string | undefined): Promise<void>;
     private _restoreSnapshot;
-    remove(reason: WorkingSetEntryRemovalReason, ...uris: URI[]): void;
+    remove(...uris: URI[]): void;
     private _assertNotDisposed;
     accept(...uris: URI[]): Promise<void>;
     reject(...uris: URI[]): Promise<void>;
-    show(): Promise<void>;
+    show(previousChanges?: boolean): Promise<void>;
     private _stopPromise;
     stop(clearState?: boolean): Promise<void>;
     private _performStop;
@@ -96,15 +94,3 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     private _createModifiedFileEntry;
     private _collapse;
 }
-export interface IChatEditingSessionSnapshot {
-    readonly startIndex: number;
-    readonly requestId: string | undefined;
-    readonly stops: IChatEditingSessionStop[];
-    readonly postEdit: ResourceMap<ISnapshotEntry> | undefined;
-}
-interface IChatEditingSessionStop {
-    stopId: string | undefined;
-    readonly workingSet: ResourceMap<WorkingSetDisplayMetadata>;
-    readonly entries: ResourceMap<ISnapshotEntry>;
-}
-export {};