@codingame/monaco-vscode-chat-service-override 23.2.2 → 24.1.0

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

@@ -6,10 +6,11 @@ import { assertNever } from '@codingame/monaco-vscode-api/vscode/vs/base/common/
 import { ThrottledDelayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
+import { ResourceSet, mapsStrictEqualIgnoreOrder, ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { equals as equals$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { isDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { TextModel } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
@@ -21,6 +22,7 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { CellUri, CellEditType } 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 { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
+import { emptySessionEntryDiff } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 import { FileOperationType } from './chatEditingOperations.js';
 import { ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
 import { restoreSnapshot, createSnapshot } from './notebook/chatEditingModifiedNotebookSnapshot.js';
@@ -28,14 +30,15 @@ import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValueOpts';
 import { derived, derivedOpts } 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';
 import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
+import { ObservablePromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/promise';
+import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
 
 const START_REQUEST_EPOCH = '$$start';
 const STOP_ID_EPOCH_PREFIX = '__epoch_';
 let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl {
-    constructor(chatSessionId, _delegate, _notebookEditorModelResolverService, _notebookService, _instantiationService, _modelService, _textModelService, _editorWorkerService, _configurationService) {
-        this.chatSessionId = chatSessionId;
+    constructor(chatSessionResource, _delegate, _notebookEditorModelResolverService, _notebookService, _instantiationService, _modelService, _textModelService, _editorWorkerService, _configurationService) {
+        this.chatSessionResource = chatSessionResource;
         this._delegate = _delegate;
         this._notebookEditorModelResolverService = _notebookEditorModelResolverService;
         this._notebookService = _notebookService;
@@ -49,6 +52,7 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         this._currentEpoch = observableValue(this, 0);
         this._operations = observableValueOpts({ equalsFn: () => false }, []);
         this._fileBaselines = ( new Map());
+        this._refCountedDiffs = ( new Map());
         this._willUndoToCheckpoint = derived(reader => {
             const currentEpoch = this._currentEpoch.read(reader);
             const checkpoints = this._checkpoints.read(reader);
@@ -172,7 +176,7 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         }
     }
     getContentURIAtStop(requestId, fileURI, stopId) {
-        return ChatEditingSnapshotTextModelContentProvider.getSnapshotFileURI(this.chatSessionId, requestId, stopId, fileURI.path);
+        return ChatEditingSnapshotTextModelContentProvider.getSnapshotFileURI(this.chatSessionResource, requestId, stopId, fileURI.path);
     }
     async _navigateToEpoch(restoreToEpoch, navigateToEpoch = restoreToEpoch) {
         const currentEpoch = this._currentEpoch.get();
@@ -222,7 +226,9 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
     }
     hasFileBaseline(uri, requestId) {
         const key = this._getBaselineKey(uri, requestId);
-        return ( this._fileBaselines.has(key));
+        return ( this._fileBaselines.has(key)) || ( this._operations.get().some(
+            op => op.type === FileOperationType.Create && op.requestId === requestId && isEqual(uri, op.uri)
+        ));
     }
     async getContentAtStop(requestId, contentURI, stopId) {
         let toEpoch;
@@ -555,28 +561,49 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
             const startIndex = checkpoints.findIndex(c => c.requestId === requestId && c.undoStopId === stopId);
             return { start: checkpoints[startIndex], end: checkpoints[startIndex + 1] };
         });
-        return this._getEntryDiffBetweenEpochs(uri, epochs);
+        return this._getEntryDiffBetweenEpochs(uri, `s\0${requestId}\0${stopId}`, epochs);
     }
-    getEntryDiffBetweenRequests(uri, startRequestId, stopRequestId) {
-        const epochs = derivedOpts({ equalsFn: (a, b) => a.start === b.start && a.end === b.end }, reader => {
+    _getRequestEpochBounds(startRequestId, stopRequestId) {
+        return derivedOpts({ equalsFn: (a, b) => a.start === b.start && a.end === b.end }, reader => {
             const checkpoints = this._checkpoints.read(reader);
             const startIndex = checkpoints.findIndex(c => c.requestId === startRequestId);
             const start = startIndex === -1 ? checkpoints[0] : checkpoints[startIndex];
-            const end = checkpoints.find(c => c.requestId === stopRequestId) || findFirst(checkpoints, c => c.requestId !== startRequestId, startIndex) || checkpoints[checkpoints.length - 1];
+            let end;
+            if (stopRequestId === undefined) {
+                end = findFirst(checkpoints, c => c.requestId !== startRequestId, startIndex + 1);
+            }
+            else {
+                end = checkpoints.find(c => c.requestId === stopRequestId)
+                    || findFirst(checkpoints, c => c.requestId !== startRequestId, startIndex)
+                    || checkpoints[checkpoints.length - 1];
+            }
             return { start, end };
         });
-        return this._getEntryDiffBetweenEpochs(uri, epochs);
     }
-    _getEntryDiffBetweenEpochs(uri, epochs) {
+    getEntryDiffBetweenRequests(uri, startRequestId, stopRequestId) {
+        return this._getEntryDiffBetweenEpochs(uri, `r\0${startRequestId}\0${stopRequestId}`, this._getRequestEpochBounds(startRequestId, stopRequestId));
+    }
+    _getEntryDiffBetweenEpochs(uri, cacheKey, epochs) {
+        const key = `${( uri.toString())}\0${cacheKey}`;
+        let obs = this._refCountedDiffs.get(key);
+        if (!obs) {
+            obs = this._getEntryDiffBetweenEpochsInner(uri, epochs, () => this._refCountedDiffs.delete(key));
+            this._refCountedDiffs.set(key, obs);
+        }
+        return obs;
+    }
+    _getEntryDiffBetweenEpochsInner(uri, epochs, onLastObserverRemoved) {
         const modelRefsPromise = derived(this, (reader) => {
             const { start, end } = epochs.read(reader);
             if (!start) {
                 return undefined;
             }
             const store = reader.store.add(( new DisposableStore()));
+            const originalURI = this.getContentURIAtStop(start.requestId || START_REQUEST_EPOCH, uri, STOP_ID_EPOCH_PREFIX + start.epoch);
+            const modifiedURI = this.getContentURIAtStop(end?.requestId || start.requestId || START_REQUEST_EPOCH, uri, STOP_ID_EPOCH_PREFIX + (end?.epoch || Number.MAX_SAFE_INTEGER));
             const promise = Promise.all([
-                this._textModelService.createModelReference(this.getContentURIAtStop(start.requestId || START_REQUEST_EPOCH, uri, STOP_ID_EPOCH_PREFIX + start.epoch)),
-                this._textModelService.createModelReference(this.getContentURIAtStop(end?.requestId || start.requestId || START_REQUEST_EPOCH, uri, STOP_ID_EPOCH_PREFIX + (end?.epoch || Number.MAX_SAFE_INTEGER))),
+                this._textModelService.createModelReference(originalURI),
+                this._textModelService.createModelReference(modifiedURI),
             ]).then(refs => {
                 if (store.isDisposed) {
                     refs.forEach(r => r.dispose());
@@ -584,32 +611,52 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
                 else {
                     refs.forEach(r => store.add(r));
                 }
-                return { refs, isFinal: !!end };
+                return {
+                    refs: ( refs.map(r => ({
+                        model: r.object.textEditorModel,
+                        onChange: observableSignalFromEvent(this, r.object.textEditorModel.onDidChangeContent.bind(r.object.textEditorModel)),
+                    }))),
+                    isFinal: !!end,
+                };
+            }).catch((error) => {
+                return { refs: [], isFinal: true, error };
             });
-            return ( new ObservablePromise(promise));
-        });
-        const resolvedModels = derived(reader => {
-            const refs2 = modelRefsPromise.read(reader)?.promiseResult.read(reader);
-            return refs2?.data && {
-                isFinal: refs2.data.isFinal,
-                refs: ( refs2.data.refs.map(r => ({
-                    model: r.object.textEditorModel,
-                    onChange: observableSignalFromEvent(this, r.object.textEditorModel.onDidChangeContent.bind(r.object.textEditorModel)),
-                }))),
+            return {
+                originalURI,
+                modifiedURI,
+                promise: ( new ObservablePromise(promise)),
             };
         });
-        const diff = derived((reader) => {
-            const modelsData = resolvedModels.read(reader);
+        const diff = derived(reader => {
+            const modelsData = modelRefsPromise.read(reader);
             if (!modelsData) {
                 return;
             }
-            const { refs, isFinal } = modelsData;
+            const { originalURI, modifiedURI, promise } = modelsData;
+            const promiseData = promise?.promiseResult.read(reader);
+            if (!promiseData?.data) {
+                return { originalURI, modifiedURI, promise: undefined };
+            }
+            const { refs, isFinal, error } = promiseData.data;
+            if (error) {
+                return { originalURI, modifiedURI, promise: ( new ObservablePromise(Promise.resolve(emptySessionEntryDiff(originalURI, modifiedURI)))) };
+            }
             refs.forEach(m => m.onChange.read(reader));
-            const promise = this._computeDiff(refs[0].model.uri, refs[1].model.uri, isFinal);
-            return ( new ObservablePromise(promise));
+            return { originalURI, modifiedURI, promise: ( new ObservablePromise(this._computeDiff(originalURI, modifiedURI, !!isFinal))) };
         });
-        return derived(reader => {
-            return diff.read(reader)?.promiseResult.read(reader)?.data || undefined;
+        return derivedOpts({ onLastObserverRemoved }, reader => {
+            const result = diff.read(reader);
+            if (!result) {
+                return undefined;
+            }
+            const promised = result.promise?.promiseResult.read(reader);
+            if (promised?.data) {
+                return promised.data;
+            }
+            if (promised?.error) {
+                return emptySessionEntryDiff(result.originalURI, result.modifiedURI);
+            }
+            return { ...emptySessionEntryDiff(result.originalURI, result.modifiedURI), isBusy: true };
         });
     }
     _computeDiff(originalUri, modifiedUri, isFinal) {
@@ -622,6 +669,7 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
                 quitEarly: !diff || diff.quitEarly,
                 added: 0,
                 removed: 0,
+                isBusy: false,
             };
             if (diff) {
                 for (const change of diff.changes) {
@@ -632,6 +680,99 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
             return entryDiff;
         });
     }
+    hasEditsInRequest(requestId, reader) {
+        for (const value of ( this._fileBaselines.values())) {
+            if (value.requestId === requestId) {
+                return true;
+            }
+        }
+        for (const operation of this._operations.read(reader)) {
+            if (operation.requestId === requestId) {
+                return true;
+            }
+        }
+        return false;
+    }
+    getDiffsForFilesInRequest(requestId) {
+        const boundsObservable = this._getRequestEpochBounds(requestId);
+        const startEpochs = derivedOpts({ equalsFn: mapsStrictEqualIgnoreOrder }, reader => {
+            const uris = ( new ResourceMap());
+            for (const value of ( this._fileBaselines.values())) {
+                if (value.requestId === requestId) {
+                    uris.set(value.uri, value.epoch);
+                }
+            }
+            const bounds = boundsObservable.read(reader);
+            for (const operation of this._operations.read(reader)) {
+                if (operation.epoch < bounds.start.epoch) {
+                    continue;
+                }
+                if (bounds.end && operation.epoch >= bounds.end.epoch) {
+                    break;
+                }
+                if (operation.type === FileOperationType.Create) {
+                    uris.set(operation.uri, 0);
+                }
+            }
+            return uris;
+        });
+        return this._getDiffsForFilesAtEpochs(startEpochs, ( boundsObservable.map(b => b.end)));
+    }
+    _getDiffsForFilesAtEpochs(startEpochs, endCheckpointObs) {
+        const prevDiffs = ( new ResourceMap());
+        let prevEndCheckpoint = undefined;
+        const perFileDiffs = derived(this, reader => {
+            const checkpoints = this._checkpoints.read(reader);
+            const firstCheckpoint = checkpoints[0];
+            if (!firstCheckpoint) {
+                return [];
+            }
+            const endCheckpoint = endCheckpointObs.read(reader);
+            if (endCheckpoint !== prevEndCheckpoint) {
+                prevDiffs.clear();
+                prevEndCheckpoint = endCheckpoint;
+            }
+            const uris = startEpochs.read(reader);
+            const diffs = [];
+            for (const [uri, epoch] of uris) {
+                const obs = prevDiffs.get(uri) ?? this._getEntryDiffBetweenEpochs(uri, `e\0${epoch}\0${endCheckpoint?.epoch}`, constObservable({ start: checkpoints.findLast(cp => cp.epoch <= epoch) || firstCheckpoint, end: endCheckpoint }));
+                prevDiffs.set(uri, obs);
+                diffs.push(obs);
+            }
+            return diffs;
+        });
+        return ( perFileDiffs.map((diffs, reader) => {
+            return diffs.flatMap(d => d.read(reader)).filter(isDefined);
+        }));
+    }
+    getDiffsForFilesInSession() {
+        const startEpochs = derivedOpts({ equalsFn: mapsStrictEqualIgnoreOrder }, reader => {
+            const uris = ( new ResourceMap());
+            for (const baseline of ( this._fileBaselines.values())) {
+                uris.set(baseline.uri, Math.min(baseline.epoch, uris.get(baseline.uri) ?? Number.MAX_SAFE_INTEGER));
+            }
+            for (const operation of this._operations.read(reader)) {
+                if (operation.type === FileOperationType.Create) {
+                    uris.set(operation.uri, 0);
+                }
+            }
+            return uris;
+        });
+        return this._getDiffsForFilesAtEpochs(startEpochs, constObservable(undefined));
+    }
+    getDiffForSession() {
+        const fileDiffs = this.getDiffsForFilesInSession();
+        return derived(reader => {
+            const diffs = fileDiffs.read(reader);
+            let added = 0;
+            let removed = 0;
+            for (const diff of diffs) {
+                added += diff.added;
+                removed += diff.removed;
+            }
+            return { added, removed };
+        });
+    }
 };
 ChatEditingCheckpointTimelineImpl = ( __decorate([
     ( __param(2, INotebookEditorModelResolverService)),

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

@@ -26,6 +26,7 @@ export declare class ChatEditingCodeEditorIntegration implements IModifiedFileEn
     private readonly _diffLineDecorations;
     private readonly _diffVisualDecorations;
     private readonly _diffHunksRenderStore;
+    private readonly _diffHunkWidgetPool;
     private readonly _diffHunkWidgets;
     private _viewZones;
     private readonly _accessibleDiffViewVisible;

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

@@ -4,7 +4,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import * as chatEditorController from '../media/chatEditorController.css';
 import { createElement, getTotalWidth } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { DisposableStore, toDisposable, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { dispose, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { isEqual, basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { themeColorFromId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
@@ -30,13 +30,13 @@ import { TextEditorSelectionRevealType } from '@codingame/monaco-vscode-api/vsco
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { EditorsOrder, isDiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { overviewRulerModifiedForeground, minimapGutterModifiedBackground, overviewRulerAddedForeground, minimapGutterAddedBackground, overviewRulerDeletedForeground, minimapGutterDeletedBackground } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
+import { overviewRulerModifiedForeground, minimapGutterModifiedBackground, overviewRulerAddedForeground, minimapGutterAddedBackground, overviewRulerDeletedForeground, minimapGutterDeletedBackground } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff';
 import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 import { isTextDiffEditorForEntry } from './chatEditing.js';
 import { ActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems';
-import { AcceptHunkAction, RejectHunkAction } from './chatEditingEditorActions.js';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { ctxCursorInChangeRange } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys';
+import { LinkedList } from '@codingame/monaco-vscode-api/vscode/vs/base/common/linkedList';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -45,6 +45,23 @@ import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base
 
 var ChatEditingCodeEditorIntegration_1, DiffHunkWidget_1;
 registerCss(chatEditorController);
+class ObjectPool {
+    constructor() {
+        this._free = ( new LinkedList());
+    }
+    dispose() {
+        dispose(this._free);
+    }
+    get() {
+        return this._free.shift();
+    }
+    putBack(obj) {
+        this._free.push(obj);
+    }
+    get free() {
+        return this._free;
+    }
+}
 let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
     static { ChatEditingCodeEditorIntegration_1 = this; }
     static { this._diffLineDecorationData = ModelDecorationOptions.register({ description: 'diff-line-decoration' }); }
@@ -57,6 +74,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
         this.currentIndex = this._currentIndex;
         this._store = ( new DisposableStore());
         this._diffHunksRenderStore = this._store.add(( new DisposableStore()));
+        this._diffHunkWidgetPool = this._store.add(( new ObjectPool()));
         this._diffHunkWidgets = [];
         this._viewZones = [];
         this._accessibleDiffViewVisible = observableValue(this, false);
@@ -213,6 +231,9 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
         });
         this._viewZones = [];
         this._diffHunksRenderStore.clear();
+        for (const widget of this._diffHunkWidgetPool.free) {
+            widget.remove();
+        }
         this._diffVisualDecorations.clear();
     }
     _updateDiffRendering(diff, reviewMode, diffMode) {
@@ -318,10 +339,19 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                     }
                 }
                 if (reviewMode || diffMode) {
-                    const widget = this._editor.invokeWithinContext(accessor => {
-                        const instaService = accessor.get(IInstantiationService);
-                        return instaService.createInstance(DiffHunkWidget, diff, diffEntry, this._editor.getModel().getVersionId(), this._editor, isCreatedContent ? 0 : extraLines);
-                    });
+                    let widget = this._diffHunkWidgetPool.get();
+                    if (!widget) {
+                        widget = this._editor.invokeWithinContext(accessor => {
+                            const instaService = accessor.get(IInstantiationService);
+                            return instaService.createInstance(DiffHunkWidget, this._editor, diff, diffEntry, this._editor.getModel().getVersionId(), isCreatedContent ? 0 : extraLines);
+                        });
+                    }
+                    else {
+                        widget.update(diff, diffEntry, this._editor.getModel().getVersionId(), isCreatedContent ? 0 : extraLines);
+                    }
+                    this._diffHunksRenderStore.add(toDisposable(() => {
+                        this._diffHunkWidgetPool.putBack(widget);
+                    }));
                     widget.layout(diffEntry.modified.startLineNumber);
                     this._diffHunkWidgets.push(widget);
                     diffHunkDecorations.push({
@@ -342,10 +372,11 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
         });
         const diffHunkDecoCollection = this._editor.createDecorationsCollection(diffHunkDecorations);
         this._diffHunksRenderStore.add(toDisposable(() => {
-            dispose(this._diffHunkWidgets);
-            this._diffHunkWidgets.length = 0;
             diffHunkDecoCollection.clear();
         }));
+        for (const extraWidget of this._diffHunkWidgetPool.free) {
+            extraWidget.remove();
+        }
         const positionObs = observableFromEvent(this._editor.onDidChangeCursorPosition, _ => this._editor.getPosition());
         const activeWidgetIdx = derived(r => {
             const position = positionObs.read(r);
@@ -522,7 +553,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                 original: { resource: this._entry.originalURI },
                 modified: { resource: this._entry.modifiedURI },
                 options: { selection },
-                label: ( localize(5158, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
+                label: ( localize(5218, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
             });
             if (diffEditor && diffEditor.input) {
                 diffEditor.getControl()?.setSelection(selection);
@@ -563,14 +594,15 @@ ChatEditingCodeEditorIntegration = ChatEditingCodeEditorIntegration_1 = ( __deco
 let DiffHunkWidget = class DiffHunkWidget {
     static { DiffHunkWidget_1 = this; }
     static { this._idPool = 0; }
-    constructor(_diffInfo, _change, _versionId, _editor, _lineDelta, instaService) {
+    constructor(_editor, _diffInfo, _change, _versionId, _lineDelta, instaService) {
+        this._editor = _editor;
         this._diffInfo = _diffInfo;
         this._change = _change;
         this._versionId = _versionId;
-        this._editor = _editor;
         this._lineDelta = _lineDelta;
         this._id = `diff-change-widget-${DiffHunkWidget_1._idPool++}`;
         this._store = ( new DisposableStore());
+        this._removed = false;
         this._domNode = createElement('div');
         this._domNode.className = 'chat-diff-change-content-widget';
         const toolbar = instaService.createInstance(MenuWorkbenchToolBar, this._domNode, MenuId.ChatEditingEditorHunk, {
@@ -582,10 +614,10 @@ let DiffHunkWidget = class DiffHunkWidget {
                 arg: this,
             },
             actionViewItemProvider: (action, options) => {
-                if (action.id === AcceptHunkAction.ID || action.id === RejectHunkAction.ID) {
+                if (!action.class) {
                     return new (class extends ActionViewItem {
                         constructor() {
-                            super(undefined, action, { ...options, keybindingNotRenderedWithLabel: true, icon: false, label: true });
+                            super(undefined, action, { ...options, keybindingNotRenderedWithLabel: true , icon: false, label: true });
                         }
                     });
                 }
@@ -596,9 +628,16 @@ let DiffHunkWidget = class DiffHunkWidget {
         this._store.add(toolbar.actionRunner.onWillRun(_ => _editor.focus()));
         this._editor.addOverlayWidget(this);
     }
+    update(diffInfo, change, versionId, lineDelta) {
+        this._diffInfo = diffInfo;
+        this._change = change;
+        this._versionId = versionId;
+        this._lineDelta = lineDelta;
+    }
     dispose() {
         this._store.dispose();
         this._editor.removeOverlayWidget(this);
+        this._removed = true;
     }
     getId() {
         return this._id;
@@ -608,15 +647,25 @@ let DiffHunkWidget = class DiffHunkWidget {
         const { contentLeft, contentWidth, verticalScrollbarWidth } = this._editor.getLayoutInfo();
         const scrollTop = this._editor.getScrollTop();
         this._position = {
-            stackOridinal: 1,
+            stackOrdinal: 1,
             preference: {
                 top: this._editor.getTopForLineNumber(startLineNumber) - scrollTop - (lineHeight * this._lineDelta),
                 left: contentLeft + contentWidth - (2 * verticalScrollbarWidth + getTotalWidth(this._domNode))
             }
         };
-        this._editor.layoutOverlayWidget(this);
+        if (this._removed) {
+            this._removed = false;
+            this._editor.addOverlayWidget(this);
+        }
+        else {
+            this._editor.layoutOverlayWidget(this);
+        }
         this._lastStartLineNumber = startLineNumber;
     }
+    remove() {
+        this._editor.removeOverlayWidget(this);
+        this._removed = true;
+    }
     toggle(show) {
         this._domNode.classList.toggle('hover', show);
         if (this._lastStartLineNumber) {
@@ -664,7 +713,7 @@ class AccessibleDiffViewContainer {
     getPosition() {
         return {
             preference: { top: 0, left: 0 },
-            stackOridinal: 1
+            stackOrdinal: 1
         };
     }
 }