@codingame/monaco-vscode-chat-service-override 25.1.2 → 26.0.0

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

@@ -34,10 +34,20 @@ import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/v
 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_';
+const START_REQUEST_EPOCH = "$$start";
+const STOP_ID_EPOCH_PREFIX = "__epoch_";
 let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl {
-    constructor(chatSessionResource, _delegate, _notebookEditorModelResolverService, _notebookService, _instantiationService, _modelService, _textModelService, _editorWorkerService, _configurationService) {
+    constructor(
+        chatSessionResource,
+        _delegate,
+        _notebookEditorModelResolverService,
+        _notebookService,
+        _instantiationService,
+        _modelService,
+        _textModelService,
+        _editorWorkerService,
+        _configurationService
+    ) {
         this.chatSessionResource = chatSessionResource;
         this._delegate = _delegate;
         this._notebookEditorModelResolverService = _notebookEditorModelResolverService;
@@ -50,7 +60,9 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         this._epochCounter = 0;
         this._checkpoints = observableValue(this, []);
         this._currentEpoch = observableValue(this, 0);
-        this._operations = observableValueOpts({ equalsFn: () => false }, []);
+        this._operations = observableValueOpts({
+            equalsFn: () => false
+        }, []);
         this._fileBaselines = ( new Map());
         this._refCountedDiffs = ( new Map());
         this._willUndoToCheckpoint = derived(reader => {
@@ -90,7 +102,10 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
             const nextCheckpoint = nextOperation && checkpoints.find(op => op.epoch > nextOperation.epoch);
             const currentCheckpoint = findLast(checkpoints, cp => cp.epoch < currentEpoch);
             if (currentCheckpoint && nextOperation && currentCheckpoint.requestId !== nextOperation.requestId) {
-                const startOfNextRequestIdx = findLastIdx(checkpoints, (cp, i) => cp.undoStopId === undefined && (checkpoints[i - 1]?.requestId === currentCheckpoint.requestId));
+                const startOfNextRequestIdx = findLastIdx(
+                    checkpoints,
+                    (cp, i) => cp.undoStopId === undefined && (checkpoints[i - 1]?.requestId === currentCheckpoint.requestId)
+                );
                 const startOfNextRequest = startOfNextRequestIdx === -1 ? undefined : checkpoints[startOfNextRequestIdx];
                 if (startOfNextRequest && nextOperation.requestId !== startOfNextRequest.requestId) {
                     const requestAfterTheNext = findFirst(checkpoints, op => op.undoStopId === undefined, startOfNextRequestIdx + 1);
@@ -102,7 +117,9 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
             return Math.min(nextCheckpoint?.epoch || Infinity, (maxEncounteredEpoch + 1));
         });
         this.canRedo = ( this._willRedoToEpoch.map(e => !!e));
-        this.requestDisablement = derivedOpts({ equalsFn: (a, b) => equals(a, b, equals$1) }, reader => {
+        this.requestDisablement = derivedOpts({
+            equalsFn: (a, b) => equals(a, b, equals$1)
+        }, reader => {
             const currentEpoch = this._currentEpoch.read(reader);
             const operations = this._operations.read(reader);
             const checkpoints = this._checkpoints.read(reader);
@@ -115,7 +132,11 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
             const stopDisablingAtEpoch = Math.max(lastAppliedOperation, lastAppliedRequest);
             const disablement = ( new Map());
             for (let i = checkpoints.length - 1; i >= 0; i--) {
-                const { undoStopId, requestId, epoch } = checkpoints[i];
+                const {
+                    undoStopId,
+                    requestId,
+                    epoch
+                } = checkpoints[i];
                 if (epoch <= stopDisablingAtEpoch) {
                     break;
                 }
@@ -123,9 +144,12 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
                     disablement.set(requestId, undoStopId);
                 }
             }
-            return ( [...disablement].map(([requestId, afterUndoStop]) => ({ requestId, afterUndoStop })));
+            return ( [...disablement].map(([requestId, afterUndoStop]) => ({
+                requestId,
+                afterUndoStop
+            })));
         });
-        this.createCheckpoint(undefined, undefined, 'Initial State', 'Starting point before any edits');
+        this.createCheckpoint(undefined, undefined, "Initial State", "Starting point before any edits");
     }
     createCheckpoint(requestId, undoStopId, label, description) {
         const existingCheckpoints = this._checkpoints.get();
@@ -133,7 +157,10 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         if (existing) {
             return existing.checkpointId;
         }
-        const { checkpoints, operations } = this._getVisibleOperationsAndCheckpoints();
+        const {
+            checkpoints,
+            operations
+        } = this._getVisibleOperationsAndCheckpoints();
         const checkpointId = generateUuid();
         const epoch = this.incrementEpoch();
         checkpoints.push({
@@ -170,8 +197,7 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         }
         if (targetCheckpoint.undoStopId === undefined) {
             return this._navigateToEpoch(targetCheckpoint.epoch + 1, targetCheckpoint.epoch);
-        }
-        else {
+        } else {
             return this._navigateToEpoch(targetCheckpoint.epoch + 1);
         }
     }
@@ -193,7 +219,11 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         return this._epochCounter++;
     }
     recordFileOperation(operation) {
-        const { currentEpoch, checkpoints, operations } = this._getVisibleOperationsAndCheckpoints();
+        const {
+            currentEpoch,
+            checkpoints,
+            operations
+        } = this._getVisibleOperationsAndCheckpoints();
         if (operation.epoch < currentEpoch) {
             throw ( new Error(
                 `Cannot record operation at epoch ${operation.epoch} when current epoch is ${currentEpoch}`
@@ -234,17 +264,16 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         let toEpoch;
         if (stopId?.startsWith(STOP_ID_EPOCH_PREFIX)) {
             toEpoch = Number(stopId.slice(STOP_ID_EPOCH_PREFIX.length));
-        }
-        else {
+        } else {
             toEpoch = this._checkpoints.get().find(c => c.requestId === requestId && c.undoStopId === stopId)?.epoch;
         }
         const fileURI = this._getTimelineCanonicalUriForPath(contentURI);
         if (!toEpoch || !fileURI) {
-            return '';
+            return "";
         }
         const baseline = await this._findBestBaselineForFile(fileURI, toEpoch, requestId);
         if (!baseline) {
-            return '';
+            return "";
         }
         const operations = this._getFileOperationsInRange(fileURI, baseline.epoch, toEpoch);
         const replayed = await this._replayOperations(baseline, operations);
@@ -291,11 +320,11 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         if (!targetCheckpoint) {
             throw ( new Error(`Checkpoint for epoch ${targetEpoch} not found`));
         }
-        const baseline = await this._findBestBaselineForFile(uri, targetEpoch, targetCheckpoint.requestId || '');
+        const baseline = await this._findBestBaselineForFile(uri, targetEpoch, targetCheckpoint.requestId || "");
         if (!baseline) {
             return {
                 exists: false,
-                uri,
+                uri
             };
         }
         const operations = this._getFileOperationsInRange(uri, baseline.epoch, targetEpoch);
@@ -307,7 +336,7 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
             currentEpoch: this._currentEpoch.get(),
             fileBaselines: [...this._fileBaselines],
             operations: this._operations.get(),
-            epochCounter: this._epochCounter,
+            epochCounter: this._epochCounter
         };
     }
     restoreFromState(state, tx) {
@@ -325,10 +354,14 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         return checkpoints.find(c => c.requestId === requestId && c.undoStopId === undoStopId)?.checkpointId;
     }
     async _reconstructAllFileContents(targetEpoch, filesToReconstruct) {
-        await Promise.all(( Array.from(filesToReconstruct).map(async (uri) => {
+        await Promise.all(( Array.from(filesToReconstruct).map(async uri => {
             const reconstructedState = await this._reconstructFileState(uri, targetEpoch);
             if (reconstructedState.exists) {
-                await this._delegate.setContents(reconstructedState.uri, reconstructedState.content, reconstructedState.telemetryInfo);
+                await this._delegate.setContents(
+                    reconstructedState.uri,
+                    reconstructedState.content,
+                    reconstructedState.telemetryInfo
+                );
             }
         })));
     }
@@ -349,7 +382,7 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
                     requestId: operation.requestId,
                     content: operation.initialContent,
                     epoch: operation.epoch,
-                    telemetryInfo: operation.telemetryInfo,
+                    telemetryInfo: operation.telemetryInfo
                 };
             }
             if (operation.type === FileOperationType.Rename && isEqual(operation.newUri, uri)) {
@@ -362,10 +395,10 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
                 return {
                     uri: uri,
                     epoch: operation.epoch,
-                    content: replayed.exists ? replayed.content : '',
+                    content: replayed.exists ? replayed.content : "",
                     requestId: operation.requestId,
                     telemetryInfo: prev.telemetryInfo,
-                    notebookViewType: replayed.exists ? replayed.notebookViewType : undefined,
+                    notebookViewType: replayed.exists ? replayed.notebookViewType : undefined
                 };
             }
             if (currentRequestId && operation.requestId !== currentRequestId) {
@@ -381,9 +414,7 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
     _getFileOperationsInRange(uri, fromEpoch, toEpoch) {
         return this._operations.get().filter(op => {
             const cellUri = CellUri.parse(op.uri);
-            return op.epoch >= fromEpoch &&
-                op.epoch < toEpoch &&
-                (isEqual(op.uri, uri) || (cellUri && isEqual(cellUri.notebook, uri)));
+            return op.epoch >= fromEpoch && op.epoch < toEpoch && (isEqual(op.uri, uri) || (cellUri && isEqual(cellUri.notebook, uri)));
         }).sort((a, b) => a.epoch - b.epoch);
     }
     async _replayOperations(baseline, operations) {
@@ -391,7 +422,7 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
             exists: true,
             content: baseline.content,
             uri: baseline.uri,
-            telemetryInfo: baseline.telemetryInfo,
+            telemetryInfo: baseline.telemetryInfo
         };
         if (baseline.notebookViewType) {
             currentState.notebook = await this._notebookEditorModelResolverService.createUntitledNotebookTextModel(baseline.notebookViewType);
@@ -411,7 +442,8 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
     }
     async _applyOperationToState(state, operation, telemetryInfo) {
         switch (operation.type) {
-            case FileOperationType.Create: {
+        case FileOperationType.Create:
+            {
                 if (state.exists && state.notebook) {
                     state.notebook.dispose();
                 }
@@ -428,35 +460,42 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
                     uri: operation.uri,
                     telemetryInfo,
                     notebookViewType: operation.notebookViewType,
-                    notebook,
+                    notebook
                 };
             }
-            case FileOperationType.Delete:
-                if (state.exists && state.notebook) {
-                    state.notebook.dispose();
-                }
-                return {
-                    exists: false,
-                    uri: operation.uri
-                };
-            case FileOperationType.Rename:
-                return {
-                    ...state,
-                    uri: operation.newUri
-                };
-            case FileOperationType.TextEdit: {
+        case FileOperationType.Delete:
+            if (state.exists && state.notebook) {
+                state.notebook.dispose();
+            }
+            return {
+                exists: false,
+                uri: operation.uri
+            };
+        case FileOperationType.Rename:
+            return {
+                ...state,
+                uri: operation.newUri
+            };
+        case FileOperationType.TextEdit:
+            {
                 if (!state.exists) {
-                    throw ( new Error('Cannot apply text edits to non-existent file'));
+                    throw ( new Error("Cannot apply text edits to non-existent file"));
                 }
                 const nbCell = operation.cellIndex !== undefined && state.notebook?.cells.at(operation.cellIndex);
                 if (nbCell) {
                     const newContent = this._applyTextEditsToContent(nbCell.getValue(), operation.edits);
                     state.notebook.applyEdits([{
-                            editType: CellEditType.Replace,
-                            index: operation.cellIndex,
-                            count: 1,
-                            cells: [{ cellKind: nbCell.cellKind, language: nbCell.language, mime: nbCell.language, source: newContent, outputs: nbCell.outputs }]
-                        }], true, undefined, () => undefined, undefined);
+                        editType: CellEditType.Replace,
+                        index: operation.cellIndex,
+                        count: 1,
+                        cells: [{
+                            cellKind: nbCell.cellKind,
+                            language: nbCell.language,
+                            mime: nbCell.language,
+                            source: newContent,
+                            outputs: nbCell.outputs
+                        }]
+                    }], true, undefined, () => undefined, undefined);
                     return state;
                 }
                 return {
@@ -464,17 +503,17 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
                     content: this._applyTextEditsToContent(state.content, operation.edits)
                 };
             }
-            case FileOperationType.NotebookEdit:
-                if (!state.exists) {
-                    throw ( new Error('Cannot apply notebook edits to non-existent file'));
-                }
-                if (!state.notebook) {
-                    throw ( new Error('Cannot apply notebook edits to non-notebook file'));
-                }
-                state.notebook.applyEdits(operation.cellEdits.slice(), true, undefined, () => undefined, undefined);
-                return state;
-            default:
-                assertNever();
+        case FileOperationType.NotebookEdit:
+            if (!state.exists) {
+                throw ( new Error("Cannot apply notebook edits to non-existent file"));
+            }
+            if (!state.notebook) {
+                throw ( new Error("Cannot apply notebook edits to non-notebook file"));
+            }
+            state.notebook.applyEdits(operation.cellEdits.slice(), true, undefined, () => undefined, undefined);
+            return state;
+        default:
+            assertNever();
         }
     }
     async _applyFileSystemOperations(fromEpoch, toEpoch) {
@@ -482,8 +521,7 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         const operations = this._operations.get().filter(op => {
             if (isMovingForward) {
                 return op.epoch >= fromEpoch && op.epoch < toEpoch;
-            }
-            else {
+            } else {
                 return op.epoch < fromEpoch && op.epoch >= toEpoch;
             }
         }).sort((a, b) => isMovingForward ? a.epoch - b.epoch : b.epoch - a.epoch);
@@ -495,49 +533,55 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
     }
     async _applyFileSystemOperation(operation, isMovingForward, urisToRestore) {
         switch (operation.type) {
-            case FileOperationType.Create:
-                if (isMovingForward) {
-                    await this._delegate.createFile(operation.uri, operation.initialContent);
-                    urisToRestore.add(operation.uri);
-                }
-                else {
-                    await this._delegate.deleteFile(operation.uri);
-                    urisToRestore.delete(operation.uri);
-                }
-                break;
-            case FileOperationType.Delete:
-                if (isMovingForward) {
-                    await this._delegate.deleteFile(operation.uri);
-                    urisToRestore.delete(operation.uri);
-                }
-                else {
-                    await this._delegate.createFile(operation.uri, operation.finalContent);
-                    urisToRestore.add(operation.uri);
-                }
-                break;
-            case FileOperationType.Rename:
-                if (isMovingForward) {
-                    await this._delegate.renameFile(operation.oldUri, operation.newUri);
-                    urisToRestore.delete(operation.oldUri);
-                    urisToRestore.add(operation.newUri);
-                }
-                else {
-                    await this._delegate.renameFile(operation.newUri, operation.oldUri);
-                    urisToRestore.delete(operation.newUri);
-                    urisToRestore.add(operation.oldUri);
-                }
-                break;
-            case FileOperationType.TextEdit:
-            case FileOperationType.NotebookEdit:
-                urisToRestore.add(CellUri.parse(operation.uri)?.notebook ?? operation.uri);
-                break;
-            default:
-                assertNever();
+        case FileOperationType.Create:
+            if (isMovingForward) {
+                await this._delegate.createFile(operation.uri, operation.initialContent);
+                urisToRestore.add(operation.uri);
+            } else {
+                await this._delegate.deleteFile(operation.uri);
+                urisToRestore.delete(operation.uri);
+            }
+            break;
+        case FileOperationType.Delete:
+            if (isMovingForward) {
+                await this._delegate.deleteFile(operation.uri);
+                urisToRestore.delete(operation.uri);
+            } else {
+                await this._delegate.createFile(operation.uri, operation.finalContent);
+                urisToRestore.add(operation.uri);
+            }
+            break;
+        case FileOperationType.Rename:
+            if (isMovingForward) {
+                await this._delegate.renameFile(operation.oldUri, operation.newUri);
+                urisToRestore.delete(operation.oldUri);
+                urisToRestore.add(operation.newUri);
+            } else {
+                await this._delegate.renameFile(operation.newUri, operation.oldUri);
+                urisToRestore.delete(operation.newUri);
+                urisToRestore.add(operation.oldUri);
+            }
+            break;
+        case FileOperationType.TextEdit:
+        case FileOperationType.NotebookEdit:
+            urisToRestore.add(CellUri.parse(operation.uri)?.notebook ?? operation.uri);
+            break;
+        default:
+            assertNever();
         }
     }
     _applyTextEditsToContent(content, edits) {
-        const makeModel = (uri, contents) => this._instantiationService.createInstance(TextModel, contents, '', this._modelService.getCreationOptions('', uri, true), uri);
-        const tempUri = ( URI.from({ scheme: 'temp', path: `/temp-${Date.now()}.txt` }));
+        const makeModel = (uri, contents) => this._instantiationService.createInstance(
+            TextModel,
+            contents,
+            "",
+            this._modelService.getCreationOptions("", uri, true),
+            uri
+        );
+        const tempUri = ( URI.from({
+            scheme: "temp",
+            path: `/temp-${Date.now()}.txt`
+        }));
         const model = makeModel(tempUri, content);
         try {
             model.applyEdits(( edits.map(edit => ({
@@ -550,38 +594,48 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
                 text: edit.text
             }))));
             return model.getValue();
-        }
-        finally {
+        } finally {
             model.dispose();
         }
     }
     getEntryDiffBetweenStops(uri, requestId, stopId) {
-        const epochs = derivedOpts({ equalsFn: (a, b) => a.start === b.start && a.end === b.end }, reader => {
+        const epochs = 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 === requestId && c.undoStopId === stopId);
-            return { start: checkpoints[startIndex], end: checkpoints[startIndex + 1] };
+            return {
+                start: checkpoints[startIndex],
+                end: checkpoints[startIndex + 1]
+            };
         });
         return this._getEntryDiffBetweenEpochs(uri, `s\0${requestId}\0${stopId}`, epochs);
     }
     _getRequestEpochBounds(startRequestId, stopRequestId) {
-        return derivedOpts({ equalsFn: (a, b) => a.start === b.start && a.end === b.end }, reader => {
+        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];
             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 + 1) || checkpoints[checkpoints.length - 1];
             }
-            else {
-                end = checkpoints.find(c => c.requestId === stopRequestId)
-                    || findFirst(checkpoints, c => c.requestId !== startRequestId, startIndex + 1)
-                    || checkpoints[checkpoints.length - 1];
-            }
-            return { start, end };
+            return {
+                start,
+                end
+            };
         });
     }
     getEntryDiffBetweenRequests(uri, startRequestId, stopRequestId) {
-        return this._getEntryDiffBetweenEpochs(uri, `r\0${startRequestId}\0${stopRequestId}`, this._getRequestEpochBounds(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}`;
@@ -593,38 +647,55 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         return obs;
     }
     _getEntryDiffBetweenEpochsInner(uri, epochs, onLastObserverRemoved) {
-        const modelRefsPromise = derived(this, (reader) => {
-            const { start, end } = epochs.read(reader);
+        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 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(originalURI),
-                this._textModelService.createModelReference(modifiedURI),
+                this._textModelService.createModelReference(modifiedURI)
             ]).then(refs => {
                 if (store.isDisposed) {
                     refs.forEach(r => r.dispose());
-                }
-                else {
+                } else {
                     refs.forEach(r => store.add(r));
                 }
                 return {
                     refs: ( refs.map(r => ({
                         model: r.object.textEditorModel,
-                        onChange: observableSignalFromEvent(this, r.object.textEditorModel.onDidChangeContent.bind(r.object.textEditorModel)),
+                        onChange: observableSignalFromEvent(
+                            this,
+                            r.object.textEditorModel.onDidChangeContent.bind(r.object.textEditorModel)
+                        )
                     }))),
-                    isFinal: !!end,
+                    isFinal: !!end
+                };
+            }).catch(error => {
+                return {
+                    refs: [],
+                    isFinal: true,
+                    error
                 };
-            }).catch((error) => {
-                return { refs: [], isFinal: true, error };
             });
             return {
                 originalURI,
                 modifiedURI,
-                promise: ( new ObservablePromise(promise)),
+                promise: ( new ObservablePromise(promise))
             };
         });
         const diff = derived(reader => {
@@ -632,19 +703,41 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
             if (!modelsData) {
                 return;
             }
-            const { originalURI, modifiedURI, promise } = modelsData;
+            const {
+                originalURI,
+                modifiedURI,
+                promise
+            } = modelsData;
             const promiseData = promise?.promiseResult.read(reader);
             if (!promiseData?.data) {
-                return { originalURI, modifiedURI, promise: undefined };
+                return {
+                    originalURI,
+                    modifiedURI,
+                    promise: undefined
+                };
             }
-            const { refs, isFinal, error } = promiseData.data;
+            const {
+                refs,
+                isFinal,
+                error
+            } = promiseData.data;
             if (error) {
-                return { originalURI, modifiedURI, promise: ( new ObservablePromise(Promise.resolve(emptySessionEntryDiff(originalURI, modifiedURI)))) };
+                return {
+                    originalURI,
+                    modifiedURI,
+                    promise: ( new ObservablePromise(Promise.resolve(emptySessionEntryDiff(originalURI, modifiedURI))))
+                };
             }
             refs.forEach(m => m.onChange.read(reader));
-            return { originalURI, modifiedURI, promise: ( new ObservablePromise(this._computeDiff(originalURI, modifiedURI, !!isFinal))) };
+            return {
+                originalURI,
+                modifiedURI,
+                promise: ( new ObservablePromise(this._computeDiff(originalURI, modifiedURI, !!isFinal)))
+            };
         });
-        return derivedOpts({ onLastObserverRemoved }, reader => {
+        return derivedOpts({
+            onLastObserverRemoved
+        }, reader => {
             const result = diff.read(reader);
             if (!result) {
                 return undefined;
@@ -656,11 +749,18 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
             if (promised?.error) {
                 return emptySessionEntryDiff(result.originalURI, result.modifiedURI);
             }
-            return { ...emptySessionEntryDiff(result.originalURI, result.modifiedURI), isBusy: true };
+            return {
+                ...emptySessionEntryDiff(result.originalURI, result.modifiedURI),
+                isBusy: true
+            };
         });
     }
     _computeDiff(originalUri, modifiedUri, isFinal) {
-        return this._editorWorkerService.computeDiff(originalUri, modifiedUri, { ignoreTrimWhitespace: false, computeMoves: false, maxComputationTimeMs: 3000 }, 'advanced').then((diff) => {
+        return this._editorWorkerService.computeDiff(originalUri, modifiedUri, {
+            ignoreTrimWhitespace: false,
+            computeMoves: false,
+            maxComputationTimeMs: 3000
+        }, "advanced").then(diff => {
             const entryDiff = {
                 originalURI: originalUri,
                 modifiedURI: modifiedUri,
@@ -669,7 +769,7 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
                 quitEarly: !diff || diff.quitEarly,
                 added: 0,
                 removed: 0,
-                isBusy: false,
+                isBusy: false
             };
             if (diff) {
                 for (const change of diff.changes) {
@@ -695,7 +795,9 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
     }
     getDiffsForFilesInRequest(requestId) {
         const boundsObservable = this._getRequestEpochBounds(requestId);
-        const startEpochs = derivedOpts({ equalsFn: mapsStrictEqualIgnoreOrder }, reader => {
+        const startEpochs = derivedOpts({
+            equalsFn: mapsStrictEqualIgnoreOrder
+        }, reader => {
             const uris = ( new ResourceMap());
             for (const value of ( this._fileBaselines.values())) {
                 if (value.requestId === requestId) {
@@ -735,7 +837,10 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
             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 }));
+                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);
             }
@@ -746,10 +851,15 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
         }));
     }
     getDiffsForFilesInSession() {
-        const startEpochs = derivedOpts({ equalsFn: mapsStrictEqualIgnoreOrder }, reader => {
+        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));
+                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) {
@@ -770,18 +880,13 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
                 added += diff.added;
                 removed += diff.removed;
             }
-            return { added, removed };
+            return {
+                added,
+                removed
+            };
         });
     }
 };
-ChatEditingCheckpointTimelineImpl = ( __decorate([
-    ( __param(2, INotebookEditorModelResolverService)),
-    ( __param(3, INotebookService)),
-    ( __param(4, IInstantiationService)),
-    ( __param(5, IModelService)),
-    ( __param(6, ITextModelService)),
-    ( __param(7, IEditorWorkerService)),
-    ( __param(8, IConfigurationService))
-], ChatEditingCheckpointTimelineImpl));
+ChatEditingCheckpointTimelineImpl = ( __decorate([( __param(2, INotebookEditorModelResolverService)), ( __param(3, INotebookService)), ( __param(4, IInstantiationService)), ( __param(5, IModelService)), ( __param(6, ITextModelService)), ( __param(7, IEditorWorkerService)), ( __param(8, IConfigurationService))], ChatEditingCheckpointTimelineImpl));
 
 export { ChatEditingCheckpointTimelineImpl };