@codingame/monaco-vscode-chat-service-override 22.1.8 → 23.0.0

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

@@ -5,12 +5,11 @@ import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { ISnapshotEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+import { IChatEditingTimelineState } from "./chatEditingOperations.js";
 export interface StoredSessionState {
     readonly initialFileContents: ResourceMap<string>;
-    readonly pendingSnapshot?: IChatEditingSessionStop;
     readonly recentSnapshot: IChatEditingSessionStop;
-    readonly linearHistoryIndex: number;
-    readonly linearHistory: readonly IChatEditingSessionSnapshot[];
+    readonly timeline: IChatEditingTimelineState | undefined;
 }
 export declare class ChatEditingSessionStorage {
     private readonly chatSessionId;

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

@@ -3,6 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { hashAsync } from '@codingame/monaco-vscode-api/vscode/vs/base/common/hash';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
+import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
 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 { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
@@ -47,16 +48,6 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
             const entries = await deserializeSnapshotEntriesDTO(stopDTO.entries);
             return { stopId: 'stopId' in stopDTO ? stopDTO.stopId : undefined, entries };
         };
-        const normalizeSnapshotDtos = (snapshot) => {
-            if ('stops' in snapshot) {
-                return snapshot;
-            }
-            return { requestId: snapshot.requestId, stops: [{ stopId: undefined, entries: snapshot.entries }] };
-        };
-        const deserializeChatEditingSessionSnapshot = async (startIndex, snapshot) => {
-            const stops = await Promise.all(( snapshot.stops.map(deserializeChatEditingStopDTO)));
-            return { startIndex, requestId: snapshot.requestId, stops };
-        };
         const deserializeSnapshotEntry = async (entry) => {
             return {
                 resource: ( URI.parse(entry.resource)),
@@ -90,25 +81,15 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
             if (!COMPATIBLE_STORAGE_VERSIONS.includes(data.version)) {
                 return undefined;
             }
-            let linearHistoryIndex = 0;
-            const linearHistory = await Promise.all(( data.linearHistory.map(snapshot => {
-                const norm = normalizeSnapshotDtos(snapshot);
-                const result = deserializeChatEditingSessionSnapshot(linearHistoryIndex, norm);
-                linearHistoryIndex += norm.stops.length;
-                return result;
-            })));
             const initialFileContents = ( new ResourceMap());
             for (const fileContentDTO of data.initialFileContents) {
                 initialFileContents.set(( URI.parse(fileContentDTO[0])), await getFileContent(fileContentDTO[1]));
             }
-            const pendingSnapshot = data.pendingSnapshot ? await deserializeChatEditingStopDTO(data.pendingSnapshot) : undefined;
             const recentSnapshot = await deserializeChatEditingStopDTO(data.recentSnapshot);
             return {
                 initialFileContents,
-                pendingSnapshot,
                 recentSnapshot,
-                linearHistoryIndex: data.linearHistoryIndex,
-                linearHistory
+                timeline: revive(data.timeline),
             };
         }
         catch (e) {
@@ -163,12 +144,6 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
                 entries: await Promise.all(( Array.from(( stop.entries.values())).map(serializeSnapshotEntry)))
             };
         };
-        const serializeChatEditingSessionSnapshot = async (snapshot) => {
-            return {
-                requestId: snapshot.requestId,
-                stops: await Promise.all(( snapshot.stops.map(serializeChatEditingSessionStop))),
-            };
-        };
         const serializeSnapshotEntry = async (entry) => {
             return {
                 resource: ( entry.resource.toString()),
@@ -184,10 +159,8 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
             const data = {
                 version: STORAGE_VERSION,
                 sessionId: this.chatSessionId,
-                linearHistory: await Promise.all(( state.linearHistory.map(serializeChatEditingSessionSnapshot))),
-                linearHistoryIndex: state.linearHistoryIndex,
                 initialFileContents: await serializeResourceMap(state.initialFileContents, value => addFileContent(value)),
-                pendingSnapshot: state.pendingSnapshot ? await serializeChatEditingSessionStop(state.pendingSnapshot) : undefined,
+                timeline: state.timeline,
                 recentSnapshot: await serializeChatEditingSessionStop(state.recentSnapshot),
             };
             this._logService.debug(`chatEditingSession: Storing editing session at ${( storageFolder.toString())}: ${contentWritePromises.size} files`);

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

@@ -9,7 +9,7 @@ import { IEditorWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/edi
 import { IAccessibilitySignalService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
 import { ICellEditOperation } 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 { IChatResponseModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatResponseModel } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 type affectedLines = {
     linesAdded: number;
     linesRemoved: number;
@@ -32,6 +32,7 @@ export declare class ChatEditingTextModelChangeService extends Disposable {
     get isEditFromUs(): boolean;
     private _allEditsAreFromUs;
     get allEditsAreFromUs(): boolean;
+    private _isExternalEditInProgress;
     private _diffOperation;
     private _diffOperationIds;
     private readonly _diffInfo;
@@ -52,20 +53,22 @@ export declare class ChatEditingTextModelChangeService extends Disposable {
     private readonly _didAcceptOrRejectLines;
     readonly onDidAcceptOrRejectLines: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<acceptedOrRejectedLines>;
     private notifyHunkAction;
+    private _didUserEditModelFired;
     private readonly _didUserEditModel;
     readonly onDidUserEditModel: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     private _originalToModifiedEdit;
     private lineChangeCount;
     private linesAdded;
     private linesRemoved;
-    constructor(originalModel: ITextModel, modifiedModel: ITextModel, state: IObservable<ModifiedFileEntryState>, _editorWorkerService: IEditorWorkerService, _accessibilitySignalService: IAccessibilitySignalService);
+    constructor(originalModel: ITextModel, modifiedModel: ITextModel, state: IObservable<ModifiedFileEntryState>, isExternalEditInProgress: (() => boolean) | undefined, _editorWorkerService: IEditorWorkerService, _accessibilitySignalService: IAccessibilitySignalService);
     private updateLineChangeCount;
     clearCurrentEditLineDecoration(): void;
     areOriginalAndModifiedIdentical(): Promise<boolean>;
-    acceptAgentEdits(resource: URI, textEdits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<{
+    acceptAgentEdits(resource: URI, textEdits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel | undefined): Promise<{
         rewriteRatio: number;
         maxLineNumber: number;
     }>;
+    private _createEditSource;
     private _applyEdits;
     /**
      * Keeps the current modified document as the final contents.
@@ -75,6 +78,7 @@ export declare class ChatEditingTextModelChangeService extends Disposable {
      * Undoes the current modified document as the final contents.
      */
     undo(): void;
+    private _reset;
     resetDocumentValues(newOriginal: string | ITextSnapshot | undefined, newModified: string | undefined): Promise<void>;
     private _mirrorEdits;
     private _keepHunk;

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

@@ -34,6 +34,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/misc
 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 { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { pendingRewriteMinimap } from './chatEditingModifiedFileEntry.js';
 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';
@@ -91,7 +92,7 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
             this._didAcceptOrRejectLines.fire({ state, ...affectedLines });
         }
     }
-    constructor(originalModel, modifiedModel, state, _editorWorkerService, _accessibilitySignalService) {
+    constructor(originalModel, modifiedModel, state, isExternalEditInProgress, _editorWorkerService, _accessibilitySignalService) {
         super();
         this.originalModel = originalModel;
         this.modifiedModel = modifiedModel;
@@ -111,12 +112,14 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
         this.onDidAcceptOrRejectAllHunks = this._didAcceptOrRejectAllHunks.event;
         this._didAcceptOrRejectLines = this._register(( new Emitter()));
         this.onDidAcceptOrRejectLines = this._didAcceptOrRejectLines.event;
+        this._didUserEditModelFired = false;
         this._didUserEditModel = this._register(( new Emitter()));
         this.onDidUserEditModel = this._didUserEditModel.event;
         this._originalToModifiedEdit = StringEdit.empty;
         this.lineChangeCount = 0;
         this.linesAdded = 0;
         this.linesRemoved = 0;
+        this._isExternalEditInProgress = isExternalEditInProgress;
         this._register(this.modifiedModel.onDidChangeContent(e => {
             this._mirrorEdits(e);
         }));
@@ -124,6 +127,9 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
             this.clearCurrentEditLineDecoration();
         }));
         this._register(autorun(r => this.updateLineChangeCount(this._diffInfo.read(r))));
+        if (!originalModel.equalsTextBuffer(modifiedModel.getTextBuffer())) {
+            this._updateDiffInfoSeq();
+        }
     }
     updateLineChangeCount(diff) {
         this.lineChangeCount = 0;
@@ -138,7 +144,9 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
         }
     }
     clearCurrentEditLineDecoration() {
-        this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, []);
+        if (!this.modifiedModel.isDisposed()) {
+            this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, []);
+        }
     }
     async areOriginalAndModifiedIdentical() {
         const diff = await this._diffOperation;
@@ -150,20 +158,7 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
         const isAtomicEdits = textEdits.length > 0 && isLastEdits;
         let maxLineNumber = 0;
         let rewriteRatio = 0;
-        const sessionId = responseModel.session.sessionId;
-        const request = responseModel.session.getRequests().at(-1);
-        const languageId = this.modifiedModel.getLanguageId();
-        const agent = responseModel.agent;
-        const extensionId = VersionedExtensionId.tryCreate(agent?.extensionId.value, agent?.extensionVersion);
-        const source = EditSources.chatApplyEdits({
-            modelId: request?.modelId,
-            requestId: request?.id,
-            sessionId: sessionId,
-            languageId,
-            mode: request?.modeInfo?.modeId,
-            extensionId,
-            codeBlockSuggestionId: request?.modeInfo?.applyCodeBlockSuggestionId,
-        });
+        const source = this._createEditSource(responseModel);
         if (isAtomicEdits) {
             const minimalEdits = (await this._editorWorkerService.computeMoreMinimalEdits(this.modifiedModel.uri, textEdits)) ?? textEdits;
             const ops = ( minimalEdits.map(TextEdit.asEditOperation));
@@ -221,7 +216,38 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
         }
         return { rewriteRatio, maxLineNumber };
     }
+    _createEditSource(responseModel) {
+        if (!responseModel) {
+            return EditSources.unknown({ name: 'editSessionUndoRedo' });
+        }
+        const sessionId = responseModel.session.sessionId;
+        const request = responseModel.session.getRequests().at(-1);
+        const languageId = this.modifiedModel.getLanguageId();
+        const agent = responseModel.agent;
+        const extensionId = VersionedExtensionId.tryCreate(agent?.extensionId.value, agent?.extensionVersion);
+        if (responseModel.request?.locationData?.type === ChatAgentLocation.EditorInline) {
+            return EditSources.inlineChatApplyEdit({
+                modelId: request?.modelId,
+                requestId: request?.id,
+                sessionId,
+                languageId,
+                extensionId,
+            });
+        }
+        return EditSources.chatApplyEdits({
+            modelId: request?.modelId,
+            requestId: request?.id,
+            sessionId,
+            languageId,
+            mode: request?.modeInfo?.modeId,
+            extensionId,
+            codeBlockSuggestionId: request?.modeInfo?.applyCodeBlockSuggestionId,
+        });
+    }
     _applyEdits(edits, source) {
+        if (edits.length === 0) {
+            return [];
+        }
         try {
             this._isEditFromUs = true;
             let result = [];
@@ -238,16 +264,19 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
     keep() {
         this.notifyHunkAction('accepted', { linesAdded: this.linesAdded, linesRemoved: this.linesRemoved, lineCount: this.lineChangeCount, hasRemainingEdits: false });
         this.originalModel.setValue(this.modifiedModel.createSnapshot());
-        this._diffInfo.set(nullDocumentDiff, undefined);
-        this._originalToModifiedEdit = StringEdit.empty;
+        this._reset();
     }
     undo() {
         this.notifyHunkAction('rejected', { linesAdded: this.linesAdded, linesRemoved: this.linesRemoved, lineCount: this.lineChangeCount, hasRemainingEdits: false });
         this.modifiedModel.pushStackElement();
         this._applyEdits([(EditOperation.replace(this.modifiedModel.getFullModelRange(), this.originalModel.getValue()))], EditSources.chatUndoEdits());
         this.modifiedModel.pushStackElement();
+        this._reset();
+    }
+    _reset() {
         this._originalToModifiedEdit = StringEdit.empty;
         this._diffInfo.set(nullDocumentDiff, undefined);
+        this._didUserEditModelFired = false;
     }
     async resetDocumentValues(newOriginal, newModified) {
         let didChange = false;
@@ -267,10 +296,14 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
     }
     _mirrorEdits(event) {
         const edit = offsetEditFromContentChanges(event.changes);
-        if (this._isEditFromUs) {
+        const isExternalEdit = this._isExternalEditInProgress?.();
+        if (this._isEditFromUs || isExternalEdit) {
             const e_sum = this._originalToModifiedEdit;
             const e_ai = edit;
             this._originalToModifiedEdit = e_sum.compose(e_ai);
+            if (isExternalEdit) {
+                this._updateDiffInfoSeq();
+            }
         }
         else {
             const e_ai = this._originalToModifiedEdit;
@@ -286,7 +319,10 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
             }
             this._allEditsAreFromUs = false;
             this._updateDiffInfoSeq();
-            this._didUserEditModel.fire();
+            if (!this._didUserEditModelFired) {
+                this._didUserEditModelFired = true;
+                this._didUserEditModel.fire();
+            }
         }
     }
     async _keepHunk(change) {
@@ -376,8 +412,8 @@ let ChatEditingTextModelChangeService = class ChatEditingTextModelChangeService
     }
 };
 ChatEditingTextModelChangeService = ChatEditingTextModelChangeService_1 = ( __decorate([
-    ( __param(3, IEditorWorkerService)),
-    ( __param(4, IAccessibilitySignalService))
+    ( __param(4, IEditorWorkerService)),
+    ( __param(5, IAccessibilitySignalService))
 ], ChatEditingTextModelChangeService));
 
 export { ChatEditingTextModelChangeService };

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

@@ -14,7 +14,7 @@ export declare class ChatEditingTextModelContentProvider implements ITextModelCo
 export declare class ChatEditingSnapshotTextModelContentProvider implements ITextModelContentProvider {
     private readonly _chatEditingService;
     private readonly _modelService;
-    static getSnapshotFileURI(chatSessionId: string, requestId: string | undefined, undoStop: string | undefined, path: string): URI;
+    static getSnapshotFileURI(chatSessionId: string, requestId: string | undefined, undoStop: string | undefined, path: string, scheme?: string): URI;
     constructor(_chatEditingService: IChatEditingService, _modelService: IModelService);
     provideTextContent(resource: URI): Promise<ITextModel | null>;
 }

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

@@ -3,6 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
+import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
 
 var ChatEditingTextModelContentProvider_1;
 let ChatEditingTextModelContentProvider = class ChatEditingTextModelContentProvider {
@@ -25,7 +26,7 @@ let ChatEditingTextModelContentProvider = class ChatEditingTextModelContentProvi
             return existing;
         }
         const data = JSON.parse(resource.query);
-        const session = this._chatEditingService.getEditingSession(data.chatSessionId);
+        const session = this._chatEditingService.getEditingSession(LocalChatSessionUri.forSession(data.chatSessionId));
         const entry = session?.entries.get().find(candidate => candidate.entryId === data.documentId);
         if (!entry) {
             return null;
@@ -37,11 +38,11 @@ ChatEditingTextModelContentProvider = ChatEditingTextModelContentProvider_1 = (
     ( __param(1, IModelService))
 ], ChatEditingTextModelContentProvider));
 let ChatEditingSnapshotTextModelContentProvider = class ChatEditingSnapshotTextModelContentProvider {
-    static getSnapshotFileURI(chatSessionId, requestId, undoStop, path) {
+    static getSnapshotFileURI(chatSessionId, requestId, undoStop, path, scheme) {
         return ( URI.from({
             scheme: Schemas.chatEditingSnapshotScheme,
             path,
-            query: JSON.stringify({ sessionId: chatSessionId, requestId: requestId ?? '', undoStop: undoStop ?? '' }),
+            query: JSON.stringify({ sessionId: chatSessionId, requestId: requestId ?? '', undoStop: undoStop ?? '', scheme }),
         }));
     }
     constructor(_chatEditingService, _modelService) {
@@ -54,7 +55,7 @@ let ChatEditingSnapshotTextModelContentProvider = class ChatEditingSnapshotTextM
             return existing;
         }
         const data = JSON.parse(resource.query);
-        const session = this._chatEditingService.getEditingSession(data.sessionId);
+        const session = this._chatEditingService.getEditingSession(LocalChatSessionUri.forSession(data.sessionId));
         if (!session || !data.requestId) {
             return null;
         }

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

@@ -1,7 +1,7 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { NotebookTextModel } from "@codingame/monaco-vscode-notebook-service-override/vscode/vs/workbench/contrib/notebook/common/model/notebookTextModel";
-import { NotebookData, TransientOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
+import { INotebookTextModel, NotebookData, TransientOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 type ChatEditingSnapshotNotebookContentQueryData = {
     sessionId: string;
     requestId: string | undefined;
@@ -11,8 +11,8 @@ type ChatEditingSnapshotNotebookContentQueryData = {
 export declare const ChatEditingNotebookSnapshotScheme = "chat-editing-notebook-snapshot-model";
 export declare function getNotebookSnapshotFileURI(chatSessionId: string, requestId: string | undefined, undoStop: string | undefined, path: string, viewType: string): URI;
 export declare function parseNotebookSnapshotFileURI(resource: URI): ChatEditingSnapshotNotebookContentQueryData;
-export declare function createSnapshot(notebook: NotebookTextModel, transientOptions: TransientOptions | undefined, outputSizeConfig: IConfigurationService | number): string;
-export declare function restoreSnapshot(notebook: NotebookTextModel, snapshot: string): void;
+export declare function createSnapshot(notebook: INotebookTextModel, transientOptions: TransientOptions | undefined, outputSizeConfig: IConfigurationService | number): string;
+export declare function restoreSnapshot(notebook: INotebookTextModel, snapshot: string): void;
 export declare class SnapshotComparer {
     private readonly data;
     private readonly transientOptions;

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

@@ -2,7 +2,7 @@
 import { VSBuffer, encodeBase64, decodeBase64 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { filter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { SnapshotContext } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { SnapshotContext } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
 import { NotebookCellTextModel } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 import { NotebookSetting, CellEditType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 

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

@@ -10,7 +10,7 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { INotebookEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service";
 import { NotebookCellTextModel } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
 import { ModifiedFileEntryState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatResponseModel } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 /**
  * This is very closely similar to the ChatEditingModifiedDocumentEntry class.
  * Most of the code has been borrowed from there, as a cell is effectively a document.
@@ -33,10 +33,10 @@ export declare class ChatEditingNotebookCellEntry extends Disposable {
     readonly state: IObservable<ModifiedFileEntryState>;
     private readonly initialContent;
     private readonly _textModelChangeService;
-    constructor(notebookUri: URI, cell: NotebookCellTextModel, modifiedModel: ITextModel, originalModel: ITextModel, disposables: DisposableStore, notebookEditorService: INotebookEditorService, instantiationService: IInstantiationService);
+    constructor(notebookUri: URI, cell: NotebookCellTextModel, modifiedModel: ITextModel, originalModel: ITextModel, isExternalEditInProgress: (() => boolean) | undefined, disposables: DisposableStore, notebookEditorService: INotebookEditorService, instantiationService: IInstantiationService);
     hasModificationAt(range: IRange): boolean;
     clearCurrentEditLineDecoration(): void;
-    acceptAgentEdits(textEdits: TextEdit[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void>;
+    acceptAgentEdits(textEdits: TextEdit[], isLastEdits: boolean, responseModel: IChatResponseModel | undefined): Promise<void>;
     revertMarkdownPreviewState(): void;
     keep(change: DetailedLineRangeMapping): Promise<boolean>;
     undo(change: DetailedLineRangeMapping): Promise<boolean>;

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { CellEditState } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-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';
@@ -24,7 +24,7 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Di
     get diffInfo() {
         return this._textModelChangeService.diffInfo;
     }
-    constructor(notebookUri, cell, modifiedModel, originalModel, disposables, notebookEditorService, instantiationService) {
+    constructor(notebookUri, cell, modifiedModel, originalModel, isExternalEditInProgress, disposables, notebookEditorService, instantiationService) {
         super();
         this.notebookUri = notebookUri;
         this.cell = cell;
@@ -38,7 +38,7 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Di
         this.state = this._stateObs;
         this.initialContent = this.originalModel.getValue();
         this._register(disposables);
-        this._textModelChangeService = this._register(this.instantiationService.createInstance(ChatEditingTextModelChangeService, this.originalModel, this.modifiedModel, this.state));
+        this._textModelChangeService = this._register(this.instantiationService.createInstance(ChatEditingTextModelChangeService, this.originalModel, this.modifiedModel, this.state, isExternalEditInProgress));
         this._register(this._textModelChangeService.onDidAcceptOrRejectAllHunks(action => {
             this.revertMarkdownPreviewState();
             this._stateObs.set(action, undefined);
@@ -92,8 +92,8 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Di
     }
 };
 ChatEditingNotebookCellEntry = ( __decorate([
-    ( __param(5, INotebookEditorService)),
-    ( __param(6, IInstantiationService))
+    ( __param(6, INotebookEditorService)),
+    ( __param(7, IInstantiationService))
 ], ChatEditingNotebookCellEntry));
 
 export { ChatEditingNotebookCellEntry };

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

@@ -18,11 +18,9 @@ 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-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane, CellEditState } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-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';
-import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ChatEditingCodeEditorIntegration } from '../chatEditingCodeEditorIntegration.js';
 import { sortCellChanges, countChanges } from './notebookCellChanges.js';
 import { OverlayToolbarDecorator } from './overlayToolbarDecorator.js';
@@ -81,7 +79,7 @@ ChatEditingNotebookEditorIntegration = ( __decorate([
     ( __param(5, IInstantiationService))
 ], ChatEditingNotebookEditorIntegration));
 let ChatEditingNotebookEditorWidgetIntegration = class ChatEditingNotebookEditorWidgetIntegration extends Disposable {
-    constructor(_entry, notebookEditor, notebookModel, originalModel, cellChanges, instantiationService, _editorService, _chatAgentService, notebookEditorService, accessibilitySignalService, logService) {
+    constructor(_entry, notebookEditor, notebookModel, originalModel, cellChanges, instantiationService, _editorService, notebookEditorService, accessibilitySignalService, logService) {
         super();
         this._entry = _entry;
         this.notebookEditor = notebookEditor;
@@ -89,7 +87,6 @@ let ChatEditingNotebookEditorWidgetIntegration = class ChatEditingNotebookEditor
         this.cellChanges = cellChanges;
         this.instantiationService = instantiationService;
         this._editorService = _editorService;
-        this._chatAgentService = _chatAgentService;
         this.accessibilitySignalService = accessibilitySignalService;
         this.logService = logService;
         this._currentIndex = observableValue(this, -1);
@@ -547,18 +544,10 @@ let ChatEditingNotebookEditorWidgetIntegration = class ChatEditingNotebookEditor
         }
     }
     async toggleDiff(_change, _show) {
-        const defaultAgentName = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Chat)?.fullName;
         const diffInput = {
             original: { resource: this._entry.originalURI },
             modified: { resource: this._entry.modifiedURI },
-            label: defaultAgentName
-                ? ( localize(
-                5109,
-                '{0} (changes from {1})',
-                basename(this._entry.modifiedURI),
-                defaultAgentName
-            ))
-                : ( localize(5110, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
+            label: ( localize(5185, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
         };
         await this._editorService.openEditor(diffInput);
     }
@@ -566,10 +555,9 @@ let ChatEditingNotebookEditorWidgetIntegration = class ChatEditingNotebookEditor
 ChatEditingNotebookEditorWidgetIntegration = ( __decorate([
     ( __param(5, IInstantiationService)),
     ( __param(6, IEditorService)),
-    ( __param(7, IChatAgentService)),
-    ( __param(8, INotebookEditorService)),
-    ( __param(9, IAccessibilitySignalService)),
-    ( __param(10, ILogService))
+    ( __param(7, INotebookEditorService)),
+    ( __param(8, IAccessibilitySignalService)),
+    ( __param(9, ILogService))
 ], ChatEditingNotebookEditorWidgetIntegration));
 class ChatEditingNotebookDiffEditorIntegration extends Disposable {
     constructor(notebookDiffEditor, cellChanges) {

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

@@ -8,7 +8,6 @@ import { FileSystemProviderCapabilities, FileType, IFileChange, IFileDeleteOptio
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
-import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
 import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service";
 export declare class ChatEditingNotebookFileSystemProviderContrib extends Disposable implements IWorkbenchContribution {
     private readonly fileService;
@@ -17,11 +16,10 @@ export declare class ChatEditingNotebookFileSystemProviderContrib extends Dispos
 }
 export declare class ChatEditingNotebookFileSystemProvider implements IFileSystemProvider {
     private readonly _chatEditingService;
-    private readonly notebookService;
     private static registeredFiles;
     readonly capabilities: FileSystemProviderCapabilities;
     static registerFile(resource: URI, buffer: VSBuffer): IDisposable;
-    constructor(_chatEditingService: IChatEditingService, notebookService: INotebookService);
+    constructor(_chatEditingService: IChatEditingService);
     readonly onDidChangeCapabilities: Event<any>;
     readonly onDidChangeFile: Event<readonly IFileChange[]>;
     watch(_resource: URI, _opts: IWatchOptions): IDisposable;

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

@@ -6,9 +6,9 @@ import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/
 import { FileSystemProviderCapabilities, FileType } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
-import { ChatEditingNotebookSnapshotScheme, deserializeSnapshot } from './chatEditingModifiedNotebookSnapshot.js';
+import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
+import { ChatEditingNotebookSnapshotScheme } from './chatEditingModifiedNotebookSnapshot.js';
 
 var ChatEditingNotebookFileSystemProvider_1;
 let ChatEditingNotebookFileSystemProviderContrib = class ChatEditingNotebookFileSystemProviderContrib extends Disposable {
@@ -37,9 +37,8 @@ let ChatEditingNotebookFileSystemProvider = class ChatEditingNotebookFileSystemP
             }
         };
     }
-    constructor(_chatEditingService, notebookService) {
+    constructor(_chatEditingService) {
         this._chatEditingService = _chatEditingService;
-        this.notebookService = notebookService;
         this.capabilities = FileSystemProviderCapabilities.Readonly | FileSystemProviderCapabilities.FileAtomicRead | FileSystemProviderCapabilities.FileReadWrite;
         this.onDidChangeCapabilities = Event.None;
         this.onDidChangeFile = Event.None;
@@ -79,17 +78,15 @@ let ChatEditingNotebookFileSystemProvider = class ChatEditingNotebookFileSystemP
         if (!queryData.viewType) {
             throw ( new Error('File not found, viewType not found'));
         }
-        const session = this._chatEditingService.getEditingSession(queryData.sessionId);
+        const session = this._chatEditingService.getEditingSession(LocalChatSessionUri.forSession(queryData.sessionId));
         if (!session || !queryData.requestId) {
             throw ( new Error('File not found, session not found'));
         }
-        const snapshotEntry = session.getSnapshot(queryData.requestId, queryData.undoStop || undefined, resource);
+        const snapshotEntry = await session.getSnapshotContents(queryData.requestId, resource, queryData.undoStop || undefined);
         if (!snapshotEntry) {
             throw ( new Error('File not found, snapshot not found'));
         }
-        const { data } = deserializeSnapshot(snapshotEntry.current);
-        const { serializer } = await this.notebookService.withNotebookDataProvider(queryData.viewType);
-        return serializer.notebookToData(data).then(s => s.buffer);
+        return snapshotEntry.buffer;
     }
     writeFile(__resource, _content, _opts) {
         throw ( new Error('Method not implemented7.'));
@@ -114,8 +111,7 @@ let ChatEditingNotebookFileSystemProvider = class ChatEditingNotebookFileSystemP
     }
 };
 ChatEditingNotebookFileSystemProvider = ChatEditingNotebookFileSystemProvider_1 = ( __decorate([
-    ( __param(0, IChatEditingService)),
-    ( __param(1, INotebookService))
+    ( __param(0, IChatEditingService))
 ], ChatEditingNotebookFileSystemProvider));
 
 export { ChatEditingNotebookFileSystemProvider, ChatEditingNotebookFileSystemProviderContrib };

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-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor } from "@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-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 {