@codingame/monaco-vscode-chat-service-override 19.1.4 → 20.0.0

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

@@ -0,0 +1,380 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { equals, binarySearch2 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
+import { equals as equals$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
+import { findLast } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arraysFind';
+import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
+import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service';
+import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.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 { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
+import { ChatEditingModifiedNotebookEntry } from './chatEditingModifiedNotebookEntry.js';
+import { ChatEditingModifiedNotebookDiff } from './notebook/chatEditingModifiedNotebookDiff.js';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { derivedOpts, derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
+import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
+import { ObservablePromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/promise';
+
+var ChatEditingTimeline_1;
+let ChatEditingTimeline = class ChatEditingTimeline {
+    static { ChatEditingTimeline_1 = this; }
+    static { this.POST_EDIT_STOP_ID = 'd19944f6-f46c-4e17-911b-79a8e843c7c0'; }
+    static createEmptySnapshot(undoStop) {
+        return {
+            stopId: undoStop,
+            entries: ( new ResourceMap()),
+        };
+    }
+    constructor(_editorWorkerService, _instantiationService, configurationService, _textModelService) {
+        this._editorWorkerService = _editorWorkerService;
+        this._instantiationService = _instantiationService;
+        this._textModelService = _textModelService;
+        this._linearHistory = observableValue(this, []);
+        this._linearHistoryIndex = observableValue(this, 0);
+        this._diffsBetweenStops = ( new Map());
+        this._fullDiffs = ( new Map());
+        this.requestDisablement = derivedOpts({ equalsFn: (a, b) => equals(a, b, equals$1) }, reader => {
+            const history = this._linearHistory.read(reader);
+            const index = this._linearHistoryIndex.read(reader);
+            const undoRequests = [];
+            for (const entry of history) {
+                if (!entry.requestId) ;
+                else if (entry.startIndex >= index) {
+                    undoRequests.push({ requestId: entry.requestId });
+                }
+                else if (entry.startIndex + entry.stops.length > index) {
+                    undoRequests.push({ requestId: entry.requestId, afterUndoStop: entry.stops[(index - 1) - entry.startIndex].stopId });
+                }
+            }
+            return undoRequests;
+        });
+        this._ignoreTrimWhitespaceObservable = observableConfigValue('diffEditor.ignoreTrimWhitespace', true, configurationService);
+        this.canUndo = derived(r => {
+            const linearHistoryIndex = this._linearHistoryIndex.read(r);
+            return linearHistoryIndex > 1;
+        });
+        this.canRedo = derived(r => {
+            const linearHistoryIndex = this._linearHistoryIndex.read(r);
+            return linearHistoryIndex < getMaxHistoryIndex(this._linearHistory.read(r));
+        });
+    }
+    restoreFromState(state, tx) {
+        this._linearHistory.set(state.history, tx);
+        this._linearHistoryIndex.set(state.index, tx);
+    }
+    getSnapshotForRestore(requestId, stopId) {
+        if (requestId === undefined) {
+            return undefined;
+        }
+        const stopRef = this.findEditStop(requestId, stopId);
+        if (!stopRef) {
+            return undefined;
+        }
+        const toIndex = stopRef.stop.stopId === undefined ? stopRef.historyIndex : stopRef.historyIndex + 1;
+        return {
+            stop: stopRef.stop,
+            apply: () => this._linearHistoryIndex.set(toIndex, undefined)
+        };
+    }
+    ensureEditInUndoStopMatches(requestId, undoStop, entry, next, tx) {
+        const history = this._linearHistory.get();
+        const snapIndex = history.findIndex((s) => s.requestId === requestId);
+        if (snapIndex === -1) {
+            return;
+        }
+        const snap = { ...history[snapIndex] };
+        let stopIndex = snap.stops.findIndex((s) => s.stopId === undoStop);
+        if (stopIndex === -1) {
+            return;
+        }
+        let linearHistoryIndexIncr = 0;
+        if (next) {
+            if (stopIndex === snap.stops.length - 1) {
+                if (snap.stops[stopIndex].stopId === ChatEditingTimeline_1.POST_EDIT_STOP_ID) {
+                    throw ( new Error('cannot duplicate post-edit stop'));
+                }
+                snap.stops = snap.stops.concat(ChatEditingTimeline_1.createEmptySnapshot(ChatEditingTimeline_1.POST_EDIT_STOP_ID));
+                linearHistoryIndexIncr++;
+            }
+            stopIndex++;
+        }
+        const stop = snap.stops[stopIndex];
+        if (entry.equalsSnapshot(stop.entries.get(entry.modifiedURI))) {
+            return;
+        }
+        const newMap = ( new ResourceMap(stop.entries));
+        newMap.set(entry.modifiedURI, entry.createSnapshot(requestId, stop.stopId));
+        const newStop = snap.stops.slice();
+        newStop[stopIndex] = { ...stop, entries: newMap };
+        snap.stops = newStop;
+        const newHistory = history.slice();
+        newHistory[snapIndex] = snap;
+        this._linearHistory.set(newHistory, tx);
+        if (linearHistoryIndexIncr) {
+            this._linearHistoryIndex.set(this._linearHistoryIndex.get() + linearHistoryIndexIncr, tx);
+        }
+    }
+    getUndoSnapshot() {
+        return this.getUndoRedoSnapshot(-1);
+    }
+    getRedoSnapshot() {
+        return this.getUndoRedoSnapshot(1);
+    }
+    getUndoRedoSnapshot(direction) {
+        let idx = this._linearHistoryIndex.get() - 1;
+        const max = getMaxHistoryIndex(this._linearHistory.get());
+        const startEntry = this.getHistoryEntryByLinearIndex(idx);
+        let entry = startEntry;
+        if (!startEntry) {
+            return undefined;
+        }
+        do {
+            idx += direction;
+            entry = this.getHistoryEntryByLinearIndex(idx);
+        } while (idx + direction < max &&
+            idx + direction >= 0 &&
+            entry &&
+            !(direction === -1 && entry.entry.requestId !== startEntry.entry.requestId) &&
+            !stopProvidesNewData(startEntry.stop, entry.stop));
+        if (entry) {
+            return { stop: entry.stop, apply: () => this._linearHistoryIndex.set(idx + 1, undefined) };
+        }
+        return undefined;
+    }
+    getStateForPersistence() {
+        return { history: this._linearHistory.get(), index: this._linearHistoryIndex.get() };
+    }
+    findSnapshot(requestId) {
+        return this._linearHistory.get().find((s) => s.requestId === requestId);
+    }
+    findEditStop(requestId, undoStop) {
+        const snapshot = this.findSnapshot(requestId);
+        if (!snapshot) {
+            return undefined;
+        }
+        const idx = snapshot.stops.findIndex((s) => s.stopId === undoStop);
+        return idx === -1 ? undefined : { stop: snapshot.stops[idx], snapshot, historyIndex: snapshot.startIndex + idx };
+    }
+    getHistoryEntryByLinearIndex(index) {
+        const history = this._linearHistory.get();
+        const searchedIndex = binarySearch2(history.length, (e) => history[e].startIndex - index);
+        const entry = history[searchedIndex < 0 ? (~searchedIndex) - 1 : searchedIndex];
+        if (!entry || index - entry.startIndex >= entry.stops.length) {
+            return undefined;
+        }
+        return {
+            entry,
+            stop: entry.stops[index - entry.startIndex]
+        };
+    }
+    pushSnapshot(requestId, undoStop, snapshot) {
+        const linearHistoryPtr = this._linearHistoryIndex.get();
+        const newLinearHistory = [];
+        for (const entry of this._linearHistory.get()) {
+            if (entry.startIndex >= linearHistoryPtr) {
+                break;
+            }
+            else if (linearHistoryPtr - entry.startIndex < entry.stops.length) {
+                newLinearHistory.push({ requestId: entry.requestId, stops: entry.stops.slice(0, linearHistoryPtr - entry.startIndex), startIndex: entry.startIndex });
+            }
+            else {
+                newLinearHistory.push(entry);
+            }
+        }
+        const lastEntry = newLinearHistory.at(-1);
+        if (requestId && lastEntry?.requestId === requestId) {
+            const hadPostEditStop = lastEntry.stops.at(-1)?.stopId === ChatEditingTimeline_1.POST_EDIT_STOP_ID && undoStop;
+            if (hadPostEditStop) {
+                const rebaseUri = (uri) => uri.with({ query: uri.query.replace(ChatEditingTimeline_1.POST_EDIT_STOP_ID, undoStop) });
+                for (const [uri, prev] of lastEntry.stops.at(-1).entries) {
+                    snapshot.entries.set(uri, { ...prev, snapshotUri: rebaseUri(prev.snapshotUri), resource: rebaseUri(prev.resource) });
+                }
+            }
+            newLinearHistory[newLinearHistory.length - 1] = {
+                ...lastEntry,
+                stops: [...(hadPostEditStop ? lastEntry.stops.slice(0, -1) : lastEntry.stops), snapshot]
+            };
+        }
+        else {
+            newLinearHistory.push({ requestId, startIndex: lastEntry ? lastEntry.startIndex + lastEntry.stops.length : 0, stops: [snapshot] });
+        }
+        transaction((tx) => {
+            const last = newLinearHistory[newLinearHistory.length - 1];
+            this._linearHistory.set(newLinearHistory, tx);
+            this._linearHistoryIndex.set(last.startIndex + last.stops.length, tx);
+        });
+    }
+    _entryDiffBetweenTextStops(entriesContent, modelUrisObservable) {
+        const modelRefsPromise = derived(this, (reader) => {
+            const modelUris = modelUrisObservable.read(reader);
+            if (!modelUris) {
+                return undefined;
+            }
+            const store = reader.store.add(( new DisposableStore()));
+            const promise = Promise.all(( modelUris.map(u => this._textModelService.createModelReference(u)))).then(refs => {
+                if (store.isDisposed) {
+                    refs.forEach(r => r.dispose());
+                }
+                else {
+                    refs.forEach(r => store.add(r));
+                }
+                return refs;
+            });
+            return ( new ObservablePromise(promise));
+        });
+        return derived((reader) => {
+            const refs2 = modelRefsPromise.read(reader)?.promiseResult.read(reader);
+            const refs = refs2?.data;
+            if (!refs) {
+                return;
+            }
+            const entries = entriesContent.read(reader);
+            if (entries?.before && ChatEditingModifiedNotebookEntry.canHandleSnapshot(entries.before)) {
+                const diffService = this._instantiationService.createInstance(ChatEditingModifiedNotebookDiff, entries.before, entries.after);
+                return ( new ObservablePromise(diffService.computeDiff()));
+            }
+            const ignoreTrimWhitespace = this._ignoreTrimWhitespaceObservable.read(reader);
+            const promise = this._editorWorkerService.computeDiff(refs[0].object.textEditorModel.uri, refs[1].object.textEditorModel.uri, { ignoreTrimWhitespace, computeMoves: false, maxComputationTimeMs: 3000 }, 'advanced').then((diff) => {
+                const entryDiff = {
+                    originalURI: refs[0].object.textEditorModel.uri,
+                    modifiedURI: refs[1].object.textEditorModel.uri,
+                    identical: !!diff?.identical,
+                    quitEarly: !diff || diff.quitEarly,
+                    added: 0,
+                    removed: 0,
+                };
+                if (diff) {
+                    for (const change of diff.changes) {
+                        entryDiff.removed += change.original.endLineNumberExclusive - change.original.startLineNumber;
+                        entryDiff.added += change.modified.endLineNumberExclusive - change.modified.startLineNumber;
+                    }
+                }
+                return entryDiff;
+            });
+            return ( new ObservablePromise(promise));
+        });
+    }
+    _createDiffBetweenStopsObservable(uri, requestId, stopId) {
+        const entries = derivedOpts({
+            equalsFn: (a, b) => snapshotsEqualForDiff(a?.before, b?.before) && snapshotsEqualForDiff(a?.after, b?.after),
+        }, reader => {
+            const stops = requestId ?
+                getCurrentAndNextStop(requestId, stopId, this._linearHistory.read(reader)) :
+                getFirstAndLastStop(uri, this._linearHistory.read(reader));
+            if (!stops) {
+                return undefined;
+            }
+            const before = stops.current.get(uri);
+            const after = stops.next.get(uri);
+            if (!before || !after) {
+                return undefined;
+            }
+            return { before, after };
+        });
+        const modelUrisObservable = derivedOpts({ equalsFn: (a, b) => equals(a, b, isEqual) }, reader => {
+            const entriesValue = entries.read(reader);
+            if (!entriesValue) {
+                return undefined;
+            }
+            return [entriesValue.before.snapshotUri, entriesValue.after.snapshotUri];
+        });
+        const diff = this._entryDiffBetweenTextStops(entries, modelUrisObservable);
+        return derived(reader => {
+            return diff.read(reader)?.promiseResult.read(reader)?.data || undefined;
+        });
+    }
+    getEntryDiffBetweenStops(uri, requestId, stopId) {
+        if (requestId) {
+            const key = `${uri}\0${requestId}\0${stopId}`;
+            let observable = this._diffsBetweenStops.get(key);
+            if (!observable) {
+                observable = this._createDiffBetweenStopsObservable(uri, requestId, stopId);
+                this._diffsBetweenStops.set(key, observable);
+            }
+            return observable;
+        }
+        else {
+            const key = ( uri.toString());
+            let observable = this._fullDiffs.get(key);
+            if (!observable) {
+                observable = this._createDiffBetweenStopsObservable(uri, requestId, stopId);
+                this._fullDiffs.set(key, observable);
+            }
+            return observable;
+        }
+    }
+};
+ChatEditingTimeline = ChatEditingTimeline_1 = ( __decorate([
+    ( __param(0, IEditorWorkerService)),
+    ( __param(1, IInstantiationService)),
+    ( __param(2, IConfigurationService)),
+    ( __param(3, ITextModelService))
+], ChatEditingTimeline));
+function stopProvidesNewData(origin, target) {
+    return ( Iterable.some(
+        target.entries,
+        ([uri, e]) => origin.entries.get(uri)?.current !== e.current
+    ));
+}
+function getMaxHistoryIndex(history) {
+    const lastHistory = history.at(-1);
+    return lastHistory ? lastHistory.startIndex + lastHistory.stops.length : 0;
+}
+function snapshotsEqualForDiff(a, b) {
+    if (!a || !b) {
+        return a === b;
+    }
+    return isEqual(a.snapshotUri, b.snapshotUri) && a.current === b.current;
+}
+function getCurrentAndNextStop(requestId, stopId, history) {
+    const snapshotIndex = history.findIndex(s => s.requestId === requestId);
+    if (snapshotIndex === -1) {
+        return undefined;
+    }
+    const snapshot = history[snapshotIndex];
+    const stopIndex = snapshot.stops.findIndex(s => s.stopId === stopId);
+    if (stopIndex === -1) {
+        return undefined;
+    }
+    const currentStop = snapshot.stops[stopIndex];
+    const current = currentStop.entries;
+    const nextStop = stopIndex < snapshot.stops.length - 1
+        ? snapshot.stops[stopIndex + 1]
+        : undefined;
+    if (!nextStop) {
+        return undefined;
+    }
+    return { current, currentStopId: currentStop.stopId, next: nextStop.entries, nextStopId: nextStop.stopId };
+}
+function getFirstAndLastStop(uri, history) {
+    let firstStopWithUri;
+    for (const snapshot of history) {
+        const stop = snapshot.stops.find(s => ( s.entries.has(uri)));
+        if (stop) {
+            firstStopWithUri = stop;
+            break;
+        }
+    }
+    let lastStopWithUri;
+    let lastStopWithUriId;
+    for (let i = history.length - 1; i >= 0; i--) {
+        const snapshot = history[i];
+        const stop = findLast(snapshot.stops, s => ( s.entries.has(uri)));
+        if (stop) {
+            lastStopWithUri = stop.entries;
+            lastStopWithUriId = stop.stopId;
+            break;
+        }
+    }
+    if (!firstStopWithUri || !lastStopWithUri) {
+        return undefined;
+    }
+    return { current: firstStopWithUri.entries, currentStopId: firstStopWithUri.stopId, next: lastStopWithUri, nextStopId: lastStopWithUriId };
+}
+
+export { ChatEditingTimeline };

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

@@ -38,8 +38,9 @@ function restoreSnapshot(notebook, snapshot) {
 }
 class SnapshotComparer {
     constructor(initialCotent) {
-        this.transientOptions = deserializeSnapshot(initialCotent).transientOptions;
-        this.data = deserializeSnapshot(initialCotent).data;
+        const { transientOptions, data } = deserializeSnapshot(initialCotent);
+        this.transientOptions = transientOptions;
+        this.data = data;
     }
     isEqual(notebook) {
         if (notebook.cells.length !== this.data.cells.length) {

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

@@ -9,7 +9,7 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { INotebookEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service";
 import { NotebookCellTextModel } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
 import { 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 { IChatResponseModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 export declare class ChatEditingNotebookCellEntry extends Disposable {
     readonly notebookUri: URI;
     readonly cell: NotebookCellTextModel;

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { CellEditState } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';

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

@@ -18,7 +18,7 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { NotebookDeletedCellDecorator } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator';
 import { NotebookInsertedCellDecorator } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookInsertedCellDecorator';
 import { NotebookModifiedCellDecorator } from '../../../../notebook/browser/diff/inlineDiff/notebookModifiedCellDecorator.js';
-import { getNotebookEditorFromEditorPane, CellEditState } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane, CellEditState } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
@@ -111,8 +111,8 @@ let ChatEditingNotebookEditorWidgetIntegration = class ChatEditingNotebookEditor
             if (!notebookEditor) {
                 return;
             }
-            originalReadonly ??= notebookEditor.isReadOnly;
             if (isReadOnly) {
+                originalReadonly ??= notebookEditor.isReadOnly;
                 notebookEditor.setOptions({ isReadOnly: true });
             }
             else if (originalReadonly === false) {
@@ -123,7 +123,7 @@ let ChatEditingNotebookEditorWidgetIntegration = class ChatEditingNotebookEditor
                     disposable.dispose();
                 }, 100);
                 const disposable = toDisposable(() => clearTimeout(timeout));
-                this._register(disposable);
+                r.store.add(disposable);
             }
         }));
         let lastModifyingRequestId;
@@ -553,12 +553,12 @@ let ChatEditingNotebookEditorWidgetIntegration = class ChatEditingNotebookEditor
             modified: { resource: this._entry.modifiedURI },
             label: defaultAgentName
                 ? ( localize(
-                4884,
+                4963,
                 '{0} (changes from {1})',
                 basename(this._entry.modifiedURI),
                 defaultAgentName
             ))
-                : ( localize(4885, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
+                : ( localize(4964, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
         };
         await this._editorService.openEditor(diffInput);
     }

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

@@ -19,6 +19,8 @@ function countChanges(changes) {
     }, 0);
 }
 function sortCellChanges(changes) {
+    const indexes = ( new Map());
+    changes.forEach((c, i) => indexes.set(c, i));
     return [...changes].sort((a, b) => {
         if ((a.type === 'unchanged' || a.type === 'modified') &&
             (b.type === 'unchanged' || b.type === 'modified')) {
@@ -31,10 +33,10 @@ function sortCellChanges(changes) {
             return a.modifiedCellIndex - b.modifiedCellIndex;
         }
         if (a.type === 'delete' && b.type === 'insert') {
-            return -1;
+            return indexes.get(a) - indexes.get(b);
         }
         if (a.type === 'insert' && b.type === 'delete') {
-            return 1;
+            return indexes.get(a) - indexes.get(b);
         }
         if ((a.type === 'delete' && b.type !== 'insert') || (a.type !== 'insert' && b.type === 'delete')) {
             return a.originalCellIndex - b.originalCellIndex;

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

@@ -1,7 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IAccessibilitySignalService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { INotebookEditor } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { NotebookTextModel } from "@codingame/monaco-vscode-notebook-service-override/vscode/vs/workbench/contrib/notebook/common/model/notebookTextModel";
 import { ICellDiffInfo } from "./notebookCellChanges.js";
 export declare class OverlayToolbarDecorator extends Disposable {

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

@@ -9,7 +9,7 @@ import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
-import { CellEditState } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 
 let OverlayToolbarDecorator = class OverlayToolbarDecorator extends Disposable {

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

@@ -9,7 +9,7 @@ import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/th
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
-import { EditorGroupView } from '@codingame/monaco-vscode-33de3d75-8b1a-53f0-9e27-0c71c327e1a1-common/vscode/vs/workbench/browser/parts/editor/editorGroupView';
+import { EditorGroupView } from '@codingame/monaco-vscode-615ce609-8555-545a-a549-47bd9f80e9f8-common/vscode/vs/workbench/browser/parts/editor/editorGroupView';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -17,14 +17,14 @@ import { EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vsco
 import { joinPath, isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
-import { showChatView } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { showChatView } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { ButtonWithDropdown, Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
 import { defaultButtonStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import { createElement, addDisposableListener } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { cleanupOldImages, createFileForMedia } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { cleanupOldImages, createFileForMedia } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
@@ -71,27 +71,27 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         this._domNode = createElement('div');
         this._domNode.className = 'element-selection-message';
         const message = createElement('span');
-        const startSelectionMessage = ( localize(4886, 'Add element to chat'));
+        const startSelectionMessage = ( localize(4965, 'Add element to chat'));
         message.textContent = startSelectionMessage;
         this._domNode.appendChild(message);
         let cts;
         const actions = [];
         actions.push(toAction({
             id: 'singleSelection',
-            label: ( localize(4887, 'Select an Element')),
+            label: ( localize(4966, 'Select an Element')),
             enabled: true,
             run: async () => { await startElementSelection(); }
         }), toAction({
             id: 'continuousSelection',
-            label: ( localize(4888, 'Continuous Selection')),
+            label: ( localize(4967, 'Continuous Selection')),
             enabled: true,
             run: async () => {
                 this._editor.focus();
                 cts = ( new CancellationTokenSource());
-                message.textContent = ( localize(4889, 'Selecting element...'));
+                message.textContent = ( localize(4968, 'Selecting element...'));
                 this.hideElement(startButton.element);
                 this.showElement(cancelButton.element);
-                cancelButton.label = ( localize(4890, 'Done'));
+                cancelButton.label = ( localize(4969, 'Done'));
                 while (!cts.token.isCancellationRequested) {
                     try {
                         await this.addElementToChat(cts);
@@ -102,7 +102,7 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
                         break;
                     }
                 }
-                message.textContent = ( localize(4891, 'Element added to chat'));
+                message.textContent = ( localize(4970, 'Element added to chat'));
                 finishedSelecting();
             }
         }));
@@ -111,27 +111,27 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
             addPrimaryActionToDropdown: false,
             contextMenuProvider: this.contextMenuService,
             supportShortLabel: true,
-            title: ( localize(4892, 'Click to select an element.')),
+            title: ( localize(4971, 'Click to select an element.')),
             supportIcons: true,
             ...defaultButtonStyles
         })));
-        startButton.primaryButton.label = ( localize(4893, 'Start'));
+        startButton.primaryButton.label = ( localize(4972, 'Start'));
         startButton.element.classList.add('element-selection-start');
         const cancelButton = this._showStore.add(( new Button(
             this._domNode,
-            { ...defaultButtonStyles, supportIcons: true, title: ( localize(4894, 'Click to cancel selection.')) }
+            { ...defaultButtonStyles, supportIcons: true, title: ( localize(4973, 'Click to cancel selection.')) }
         )));
         cancelButton.element.className = 'element-selection-cancel hidden';
-        const cancelButtonLabel = ( localize(4895, 'Cancel'));
+        const cancelButtonLabel = ( localize(4974, 'Cancel'));
         cancelButton.label = cancelButtonLabel;
-        const configure = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4896, "Configure Attachments Sent")) })));
+        const configure = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4975, "Configure Attachments Sent")) })));
         configure.icon = Codicon.gear;
-        const collapseOverlay = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4897, "Collapse Overlay")) })));
+        const collapseOverlay = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4976, "Collapse Overlay")) })));
         collapseOverlay.icon = Codicon.chevronRight;
-        const nextSelection = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4898, "Select Again")) })));
+        const nextSelection = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4977, "Select Again")) })));
         nextSelection.icon = Codicon.close;
         nextSelection.element.classList.add('hidden');
-        const expandOverlay = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4899, "Expand Overlay")) })));
+        const expandOverlay = this._showStore.add(( new Button(this._domNode, { supportIcons: true, title: ( localize(4978, "Expand Overlay")) })));
         expandOverlay.icon = Codicon.layout;
         const expandContainer = createElement('div');
         expandContainer.className = 'element-expand-container hidden';
@@ -155,11 +155,11 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         const startElementSelection = async () => {
             cts = ( new CancellationTokenSource());
             this._editor.focus();
-            message.textContent = ( localize(4889, 'Selecting element...'));
+            message.textContent = ( localize(4968, 'Selecting element...'));
             this.hideElement(startButton.element);
             this.showElement(cancelButton.element);
             await this.addElementToChat(cts);
-            message.textContent = ( localize(4891, 'Element added to chat'));
+            message.textContent = ( localize(4970, 'Element added to chat'));
             finishedSelecting();
         };
         this._showStore.add(addDisposableListener(startButton.primaryButton.element, 'click', async () => {
@@ -167,7 +167,7 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         }));
         this._showStore.add(addDisposableListener(cancelButton.element, 'click', () => {
             cts.cancel();
-            message.textContent = ( localize(4900, 'Selection canceled'));
+            message.textContent = ( localize(4979, 'Selection canceled'));
             finishedSelecting();
         }));
         this._showStore.add(addDisposableListener(collapseOverlay.element, 'click', () => {
@@ -303,7 +303,7 @@ let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
         };
         let cts = ( new CancellationTokenSource());
         const show = async () => {
-            connectingWebviewElement.textContent = ( localize(4901, 'Connecting to webview...'));
+            connectingWebviewElement.textContent = ( localize(4980, 'Connecting to webview...'));
             if (!container.contains(connectingWebviewElement)) {
                 container.appendChild(connectingWebviewElement);
             }
@@ -314,7 +314,7 @@ let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
                     await this._browserElementsService.startDebugSession(cts.token, activeBrowserType);
                 }
                 catch (error) {
-                    connectingWebviewElement.textContent = ( localize(4902, 'Please reopen the preview.'));
+                    connectingWebviewElement.textContent = ( localize(4981, 'Please reopen the preview.'));
                     return;
                 }
             }