@codingame/monaco-vscode-chat-service-override 17.2.0 → 18.0.0

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

@@ -3,7 +3,7 @@ import { Emitter } from "@codingame/monaco-vscode-api/vscode/vs/base/common/even
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable, ITransaction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { OffsetEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/offsetEdit";
+import { StringEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/edits/stringEdit";
 import { TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
@@ -39,11 +39,13 @@ export declare abstract class AbstractChatEditingModifiedFileEntry extends Dispo
     readonly onDidDelete: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     protected readonly _stateObs: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<ModifiedFileEntryState, void>;
     readonly state: IObservable<ModifiedFileEntryState>;
+    protected readonly _waitsForLastEdits: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<boolean, void>;
+    readonly waitsForLastEdits: IObservable<boolean>;
     protected readonly _isCurrentlyBeingModifiedByObs: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<IChatResponseModel | undefined, void>;
     readonly isCurrentlyBeingModifiedBy: IObservable<IChatResponseModel | undefined>;
     protected readonly _lastModifyingResponseObs: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<IChatResponseModel | undefined, void>;
     readonly lastModifyingResponse: IObservable<IChatResponseModel | undefined>;
-    protected readonly _lastModifyingResponseInProgressObs: IObservable<boolean | undefined>;
+    protected readonly _lastModifyingResponseInProgressObs: IObservable<boolean>;
     protected readonly _rewriteRatioObs: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<number, void>;
     readonly rewriteRatio: IObservable<number>;
     private readonly _reviewModeTempObs;
@@ -96,7 +98,7 @@ export interface ISnapshotEntry {
     readonly snapshotUri: URI;
     readonly original: string;
     readonly current: string;
-    readonly originalToCurrentEdit: OffsetEdit;
+    readonly originalToCurrentEdit: StringEdit;
     readonly state: ModifiedFileEntryState;
     telemetryInfo: IModifiedEntryTelemetryInfo;
 }

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

@@ -26,11 +26,10 @@ import { IUndoRedoService } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IFilesConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
 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';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValueOpts';
+import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var AbstractChatEditingModifiedFileEntry_1;
 class AutoAcceptControl {
@@ -40,7 +39,7 @@ class AutoAcceptControl {
         this.cancel = cancel;
     }
 }
-const pendingRewriteMinimap = registerColor('minimap.chatEditHighlight', ( transparent(editorBackground, 0.6)), ( localize(4751, "Color of pending edit regions in the minimap")));
+const pendingRewriteMinimap = registerColor('minimap.chatEditHighlight', ( transparent(editorBackground, 0.6)), ( localize(4794, "Color of pending edit regions in the minimap")));
 let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFileEntry extends Disposable {
     static { AbstractChatEditingModifiedFileEntry_1 = this; }
     static { this.scheme = 'modified-file-entry'; }
@@ -65,12 +64,14 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
         this.onDidDelete = this._onDidDelete.event;
         this._stateObs = observableValue(this, ModifiedFileEntryState.Modified);
         this.state = this._stateObs;
+        this._waitsForLastEdits = observableValue(this, false);
+        this.waitsForLastEdits = this._waitsForLastEdits;
         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);
+            return value?.isInProgress.read(r) ?? false;
         }));
         this._rewriteRatioObs = observableValue(this, 0);
         this.rewriteRatio = this._rewriteRatioObs;
@@ -104,7 +105,7 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
         this._store.add(toDisposable(() => this._lastModifyingResponseObs.set(undefined, undefined)));
         const autoSaveOff = this._store.add(( new MutableDisposable()));
         this._store.add(autorun(r => {
-            if (this._lastModifyingResponseInProgressObs.read(r)) {
+            if (this._waitsForLastEdits.read(r)) {
                 autoSaveOff.value = _fileConfigService.disableAutoSave(this.modifiedURI);
             }
             else {
@@ -210,12 +211,13 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
     async acceptStreamingEditsEnd(tx) {
         this._resetEditsState(tx);
         if (await this._areOriginalAndModifiedIdentical()) {
-            this.accept(tx);
+            await this.accept(tx);
         }
     }
     _resetEditsState(tx) {
         this._isCurrentlyBeingModifiedByObs.set(undefined, tx);
         this._rewriteRatioObs.set(0, tx);
+        this._waitsForLastEdits.set(false, tx);
     }
 };
 AbstractChatEditingModifiedFileEntry = AbstractChatEditingModifiedFileEntry_1 = ( __decorate([

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

@@ -10,8 +10,8 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/in
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
-import { LineRange } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/lineRange';
-import { OffsetEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/offsetEdit';
+import { LineRange } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/ranges/lineRange';
+import { StringEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/edits/stringEdit';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { nullDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
 import { RangeMapping, DetailedLineRangeMapping } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/rangeMapping';
@@ -28,7 +28,7 @@ import { SaveReason } from '@codingame/monaco-vscode-api/vscode/vs/workbench/com
 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-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 { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CellEditType, NotebookCellsChangeType, NotebookSetting } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { computeDiff } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/common/notebookDiff';
 import { INotebookEditorModelResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service';
@@ -44,9 +44,10 @@ import { ChatEditingNotebookDiffEditorIntegration, ChatEditingNotebookEditorInte
 import { ChatEditingNotebookFileSystemProvider } from './notebook/chatEditingNotebookFileSystemProvider.js';
 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-api/vscode/vs/base/common/observableInternal/promise';
-import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+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 { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var ChatEditingModifiedNotebookEntry_1;
 const SnapshotLanguageId = 'VSCodeChatNotebookSnapshotLanguage';
@@ -391,11 +392,11 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
     }
     _resetEditsState(tx) {
         super._resetEditsState(tx);
-        this.cellEntryMap.forEach(entry => !entry.disposed && entry.clearCurrentEditLineDecoration());
+        this.cellEntryMap.forEach(entry => !entry.isDisposed && entry.clearCurrentEditLineDecoration());
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(4752, "Chat Edit: '{0}'", request.message.text)) : ( localize(4753, "Chat Edit"));
+        const label = request?.message.text ? ( localize(4795, "Chat Edit: '{0}'", request.message.text)) : ( localize(4796, "Chat Edit"));
         const transientOptions = this.transientOptions;
         const outputSizeLimit = this.configurationService.getValue(NotebookSetting.outputBackupSizeLimit) * 1024;
         let initial = createSnapshot(this.modifiedModel, transientOptions, outputSizeLimit);
@@ -479,9 +480,9 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
             notebookEdits.forEach(edit => this.acceptNotebookEdit(edit));
         }
         transaction((tx) => {
+            this._stateObs.set(ModifiedFileEntryState.Modified, tx);
+            this._isCurrentlyBeingModifiedByObs.set(responseModel, tx);
             if (!isLastEdits) {
-                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);
             }
@@ -745,7 +746,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
             snapshotUri: getNotebookSnapshotFileURI(this._telemetryInfo.sessionId, requestId, undoStop, this.modifiedURI.path, this.modifiedModel.viewType),
             original: createSnapshot(this.originalModel, this.transientOptions, this.configurationService),
             current: createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService),
-            originalToCurrentEdit: OffsetEdit.empty,
+            originalToCurrentEdit: StringEdit.empty,
             state: this.state.get(),
             telemetryInfo: this.telemetryInfo,
         };

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

@@ -35,13 +35,14 @@ import { chatEditingSnapshotScheme, chatEditingAgentSupportsReadonlyReferencesCo
 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-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { ChatEditingSession } from './chatEditingSession.js';
 import { ChatEditingTextModelContentProvider, ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
-import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/api';
-import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
-import { runOnChange, ValueWithChangeEventFromObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
+import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValueOpts';
+import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
+import { runOnChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/runOnChange';
+import { ValueWithChangeEventFromObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/valueWithChangeEvent';
 
 let ChatEditingService = class ChatEditingService extends Disposable {
     constructor(_instantiationService, multiDiffSourceResolverService, textModelService, contextKeyService, _chatService, _editorService, decorationsService, _fileService, lifecycleService, storageService, logService, extensionService, productService, notebookService) {
@@ -94,7 +95,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
             }
             e.join(storageTask, {
                 id: 'join.chatEditingSession',
-                label: ( localize(4754, "Saving chat edits history"))
+                label: ( localize(4797, "Saving chat edits history"))
             });
         }));
     }
@@ -223,20 +224,21 @@ let ChatEditingService = class ChatEditingService extends Disposable {
                 entry.seen = part.edits.length;
                 if (newEdits.length > 0 || isFirst) {
                     if (part.kind === 'notebookEditGroup') {
-                        newEdits.forEach(edit => {
+                        newEdits.forEach((edit, idx) => {
+                            const done = part.done ? idx === newEdits.length - 1 : false;
                             if (TextEdit.isTextEdit(edit)) {
                                 return;
                             }
                             else if (isCellTextEditOperation(edit)) {
-                                entry.streaming.pushNotebookCellText(edit.uri, [edit.edit]);
+                                entry.streaming.pushNotebookCellText(edit.uri, [edit.edit], done);
                             }
                             else {
-                                entry.streaming.pushNotebook([edit]);
+                                entry.streaming.pushNotebook([edit], done);
                             }
                         });
                     }
                     else if (part.kind === 'textEditGroup') {
-                        entry.streaming.pushText(newEdits);
+                        entry.streaming.pushText(newEdits, part.done ?? false);
                     }
                 }
                 if (part.done) {
@@ -321,7 +323,7 @@ let ChatDecorationsProvider = class ChatDecorationsProvider extends Disposable {
         super();
         this._sessions = _sessions;
         this._chatAgentService = _chatAgentService;
-        this.label = ( localize(4755, "Chat Editing"));
+        this.label = ( localize(4798, "Chat Editing"));
         this._currentEntries = derived(this, (r) => {
             const sessions = this._sessions.read(r);
             if (!sessions) {
@@ -361,7 +363,7 @@ let ChatDecorationsProvider = class ChatDecorationsProvider extends Disposable {
             return {
                 weight: 1000,
                 letter: Codicon.diffModified,
-                tooltip: defaultAgentName ? ( localize(4756, "Pending changes from {0}", defaultAgentName)) : ( localize(4757, "Pending changes from chat")),
+                tooltip: defaultAgentName ? ( localize(4799, "Pending changes from {0}", defaultAgentName)) : ( localize(4800, "Pending changes from chat")),
                 bubble: true
             };
         }

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

@@ -41,8 +41,8 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     get entries(): IObservable<readonly IModifiedFileEntry[]>;
     private _editorPane;
     get state(): IObservable<ChatEditingSessionState>;
-    readonly canUndo: IObservable<boolean>;
-    readonly canRedo: IObservable<boolean>;
+    readonly canUndo: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservableWithChange<boolean, void>;
+    readonly canRedo: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservableWithChange<boolean, void>;
     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);

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

@@ -7,7 +7,7 @@ import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/c
 import { BugIndicatingError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { 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 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableStore, dispose } 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';
@@ -37,10 +37,11 @@ import { ChatEditingModifiedNotebookEntry } from './chatEditingModifiedNotebookE
 import { ChatEditingSessionStorage } from './chatEditingSessionStorage.js';
 import { ChatEditingTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
 import { ChatEditingModifiedNotebookDiff } from './notebook/chatEditingModifiedNotebookDiff.js';
-import { observableValue, asyncTransaction, transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
-import { derived, derivedWithStore, derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
-import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
-import { ObservablePromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/promise';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { derived, derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
+import { asyncTransaction, transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { ObservablePromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/promise';
 
 const POST_EDIT_STOP_ID = 'd19944f6-f46c-4e17-911b-79a8e843c7c0';
 class ThrottledSequencer extends Sequencer {
@@ -239,11 +240,12 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         this._pendingSnapshot ??= this._createSnapshot(undefined, undefined);
     }
     _entryDiffBetweenTextStops(entriesContent, modelUrisObservable) {
-        const modelRefsPromise = derivedWithStore(this, (reader, store) => {
+        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());
@@ -496,7 +498,7 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         }
         const input = MultiDiffEditorInput.fromResourceMultiDiffEditorInput({
             multiDiffSource: getMultiDiffSourceUri(this, previousChanges),
-            label: ( localize(4758, "Suggested Edits"))
+            label: ( localize(4801, "Suggested Edits"))
         }, this._instantiationService);
         this._editorPane = await this._editorGroupsService.activeGroup.openEditor(input, { pinned: true, activation: EditorActivation.ACTIVATE });
     }
@@ -544,24 +546,24 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         });
         let didComplete = false;
         return {
-            pushText: (edits) => {
+            pushText: (edits, isLastEdits) => {
                 sequencer.queue(async () => {
                     if (!this.isDisposed) {
-                        await this._acceptEdits(resource, edits, false, responseModel);
+                        await this._acceptEdits(resource, edits, isLastEdits, responseModel);
                     }
                 });
             },
-            pushNotebookCellText: (cell, edits) => {
+            pushNotebookCellText: (cell, edits, isLastEdits) => {
                 sequencer.queue(async () => {
                     if (!this.isDisposed) {
-                        await this._acceptEdits(cell, edits, false, responseModel);
+                        await this._acceptEdits(cell, edits, isLastEdits, responseModel);
                     }
                 });
             },
-            pushNotebook: edits => {
+            pushNotebook: (edits, isLastEdits) => {
                 sequencer.queue(async () => {
                     if (!this.isDisposed) {
-                        await this._acceptEdits(resource, edits, false, responseModel);
+                        await this._acceptEdits(resource, edits, isLastEdits, responseModel);
                     }
                 });
             },

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

@@ -5,7 +5,7 @@ import { StringSHA1 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/h
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { OffsetEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/offsetEdit';
+import { StringEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/edits/stringEdit';
 import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
@@ -64,7 +64,7 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
                 languageId: entry.languageId,
                 original: await getFileContent(entry.originalHash),
                 current: await getFileContent(entry.currentHash),
-                originalToCurrentEdit: OffsetEdit.fromJson(entry.originalToCurrentEdit),
+                originalToCurrentEdit: StringEdit.fromJson(entry.originalToCurrentEdit),
                 state: entry.state,
                 snapshotUri: ( URI.parse(entry.snapshotUri)),
                 telemetryInfo: { requestId: entry.telemetryInfo.requestId, agentId: entry.telemetryInfo.agentId, command: entry.telemetryInfo.command, sessionId: this.chatSessionId, result: undefined }
@@ -159,9 +159,7 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
                 languageId: entry.languageId,
                 originalHash: addFileContent(entry.original),
                 currentHash: addFileContent(entry.current),
-                originalToCurrentEdit: ( entry.originalToCurrentEdit.edits.map(
-                    edit => ({ pos: edit.replaceRange.start, len: edit.replaceRange.length, txt: edit.newText })
-                )),
+                originalToCurrentEdit: entry.originalToCurrentEdit.toJson(),
                 state: entry.state,
                 snapshotUri: ( entry.snapshotUri.toString()),
                 telemetryInfo: { requestId: entry.telemetryInfo.requestId, agentId: entry.telemetryInfo.agentId, command: entry.telemetryInfo.command }

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

@@ -6,13 +6,13 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/in
 import { ObservableDisposable } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/base/common/observableDisposable';
 import { themeColorFromId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { EditOperation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/editOperation';
-import { OffsetEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/offsetEdit';
+import { StringEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/edits/stringEdit';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { nullDocumentDiff } from '../../../../../../editor/common/diff/documentDiffProvider.js';
 import { TextEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 import { OverviewRulerLane, MinimapPosition } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
 import { ModelDecorationOptions } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
-import { OffsetEdits } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModelOffsetEdit';
+import { offsetEditFromContentChanges, offsetEditToEditOperations, offsetEditFromLineRangeMapping } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModelStringEdit';
 import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
@@ -27,13 +27,14 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/mini
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
-import { CellEditState } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-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';
 import { pendingRewriteMinimap } from '../chatEditingModifiedFileEntry.js';
-import { observableValue, transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
-import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
 
 var ChatEditingNotebookCellEntry_1;
 let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends ObservableDisposable {
@@ -74,7 +75,7 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Ob
         this.originalModel = originalModel;
         this._editorWorkerService = _editorWorkerService;
         this.notebookEditorService = notebookEditorService;
-        this._edit = OffsetEdit.empty;
+        this._edit = StringEdit.empty;
         this._isEditFromUs = false;
         this._allEditsAreFromUs = true;
         this._diffOperationIds = 0;
@@ -111,7 +112,7 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Ob
         this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, []);
     }
     _mirrorEdits(event) {
-        const edit = OffsetEdits.fromContentChanges(event.changes);
+        const edit = offsetEditFromContentChanges(event.changes);
         if (this._isEditFromUs) {
             const e_sum = this._edit;
             const e_ai = edit;
@@ -125,7 +126,7 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Ob
                 this._edit = e_ai.compose(e_user);
             }
             else {
-                const edits = OffsetEdits.asEditOperations(e_user_r, this.originalModel);
+                const edits = offsetEditToEditOperations(e_user_r, this.originalModel);
                 this.originalModel.applyEdits(edits);
                 this._edit = e_ai.tryRebase(e_user_r);
             }
@@ -287,7 +288,7 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Ob
         if (this.modifiedModel.getVersionId() === docVersionNow && this.originalModel.getVersionId() === snapshotVersionNow) {
             const diff2 = diff ?? nullDocumentDiff;
             this._diffInfo.set(diff2, undefined);
-            this._edit = OffsetEdits.fromLineRangeMapping(this.originalModel, this.modifiedModel, diff2.changes);
+            this._edit = offsetEditFromLineRangeMapping(this.originalModel, this.modifiedModel, diff2.changes);
         }
     }
 };

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

@@ -4,7 +4,7 @@ import { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
-import { LineRange } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/lineRange';
+import { LineRange } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/ranges/lineRange';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { nullDocumentDiff } from '../../../../../../editor/common/diff/documentDiffProvider.js';
 import { PrefixSumComputer } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/prefixSumComputer';
@@ -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-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane, CellEditState } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-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';
@@ -26,9 +26,10 @@ import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { ChatEditingCodeEditorIntegration } from '../chatEditingCodeEditorIntegration.js';
 import { sortCellChanges, countChanges } from './notebookCellChanges.js';
 import { OverlayToolbarDecorator } from './overlayToolbarDecorator.js';
-import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
-import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
-import { debouncedObservable, observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { debouncedObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/utils';
+import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 
 let ChatEditingNotebookEditorIntegration = class ChatEditingNotebookEditorIntegration extends Disposable {
     constructor(_entry, editor, notebookModel, originalModel, cellChanges, instantiationService) {
@@ -132,7 +133,16 @@ let ChatEditingNotebookEditorWidgetIntegration = class ChatEditingNotebookEditor
                 && lastModifyingRequestId !== _entry.lastModifyingRequestId
                 && ( cellChanges.read(r).some(c => c.type !== 'unchanged' && !c.diff.read(r).identical))) {
                 lastModifyingRequestId = _entry.lastModifyingRequestId;
-                this.reveal(true);
+                const visibleChange = this.sortedCellChanges.find(c => {
+                    if (c.type === 'unchanged') {
+                        return false;
+                    }
+                    const index = c.modifiedCellIndex ?? c.originalCellIndex;
+                    return ( this.notebookEditor.visibleRanges.some(range => index >= range.start && index < range.end));
+                });
+                if (!visibleChange) {
+                    this.reveal(true);
+                }
             }
         }));
         this._register(autorun(r => {
@@ -543,12 +553,12 @@ let ChatEditingNotebookEditorWidgetIntegration = class ChatEditingNotebookEditor
             modified: { resource: this._entry.modifiedURI },
             label: defaultAgentName
                 ? ( localize(
-                4759,
+                4802,
                 '{0} (changes from {1})',
                 basename(this._entry.modifiedURI),
                 defaultAgentName
             ))
-                : ( localize(4760, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
+                : ( localize(4803, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
         };
         await this._editorService.openEditor(diffInput);
     }

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-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor } from "@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-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

@@ -8,7 +8,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-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-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 {