@codingame/monaco-vscode-chat-service-override 16.1.0 → 17.0.0

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

@@ -0,0 +1,214 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
+import { StringSHA1 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/hash';
+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 { 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';
+import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
+
+const STORAGE_CONTENTS_FOLDER = 'contents';
+const STORAGE_STATE_FILE = 'state.json';
+let ChatEditingSessionStorage = class ChatEditingSessionStorage {
+    constructor(chatSessionId, _fileService, _environmentService, _logService, _workspaceContextService) {
+        this.chatSessionId = chatSessionId;
+        this._fileService = _fileService;
+        this._environmentService = _environmentService;
+        this._logService = _logService;
+        this._workspaceContextService = _workspaceContextService;
+    }
+    _getStorageLocation() {
+        const workspaceId = this._workspaceContextService.getWorkspace().id;
+        return joinPath(this._environmentService.workspaceStorageHome, workspaceId, 'chatEditingSessions', this.chatSessionId);
+    }
+    async restoreState() {
+        const storageLocation = this._getStorageLocation();
+        const fileContents = ( new Map());
+        const getFileContent = (hash) => {
+            let readPromise = fileContents.get(hash);
+            if (!readPromise) {
+                readPromise = this._fileService.readFile(joinPath(storageLocation, STORAGE_CONTENTS_FOLDER, hash)).then(content => ( content.value.toString()));
+                fileContents.set(hash, readPromise);
+            }
+            return readPromise;
+        };
+        const deserializeSnapshotEntriesDTO = async (dtoEntries) => {
+            const entries = ( new ResourceMap());
+            for (const entryDTO of dtoEntries) {
+                const entry = await deserializeSnapshotEntry(entryDTO);
+                entries.set(entry.resource, entry);
+            }
+            return entries;
+        };
+        const deserializeChatEditingStopDTO = async (stopDTO) => {
+            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 }], postEdit: undefined };
+        };
+        const deserializeChatEditingSessionSnapshot = async (startIndex, snapshot) => {
+            const stops = await Promise.all(( snapshot.stops.map(deserializeChatEditingStopDTO)));
+            return { startIndex, requestId: snapshot.requestId, stops, postEdit: snapshot.postEdit && (await deserializeSnapshotEntriesDTO(snapshot.postEdit)) };
+        };
+        const deserializeSnapshotEntry = async (entry) => {
+            return {
+                resource: ( URI.parse(entry.resource)),
+                languageId: entry.languageId,
+                original: await getFileContent(entry.originalHash),
+                current: await getFileContent(entry.currentHash),
+                originalToCurrentEdit: OffsetEdit.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 }
+            };
+        };
+        try {
+            const stateFilePath = joinPath(storageLocation, STORAGE_STATE_FILE);
+            if (!(await this._fileService.exists(stateFilePath))) {
+                this._logService.debug(`chatEditingSession: No editing session state found at ${( stateFilePath.toString())}`);
+                return undefined;
+            }
+            this._logService.debug(`chatEditingSession: Restoring editing session at ${( stateFilePath.toString())}`);
+            const stateFileContent = await this._fileService.readFile(stateFilePath);
+            const data = JSON.parse(( stateFileContent.value.toString()));
+            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
+            };
+        }
+        catch (e) {
+            this._logService.error(`Error restoring chat editing session from ${( storageLocation.toString())}`, e);
+        }
+        return undefined;
+    }
+    async storeState(state) {
+        const storageFolder = this._getStorageLocation();
+        const contentsFolder = URI.joinPath(storageFolder, STORAGE_CONTENTS_FOLDER);
+        const existingContents = ( new Set());
+        try {
+            const stat = await this._fileService.resolve(contentsFolder);
+            stat.children?.forEach(child => {
+                if (child.isFile) {
+                    existingContents.add(child.name);
+                }
+            });
+        }
+        catch (e) {
+            try {
+                await this._fileService.createFolder(contentsFolder);
+            }
+            catch (e) {
+                this._logService.error(`Error creating chat editing session content folder ${( contentsFolder.toString())}`, e);
+                return;
+            }
+        }
+        const fileContents = ( new Map());
+        const addFileContent = (content) => {
+            const shaComputer = ( new StringSHA1());
+            shaComputer.update(content);
+            const sha = shaComputer.digest().substring(0, 7);
+            fileContents.set(sha, content);
+            return sha;
+        };
+        const serializeResourceMap = (resourceMap, serialize) => {
+            return ( Array.from(resourceMap.entries()).map(([resourceURI, value]) => [( resourceURI.toString()), serialize(value)]));
+        };
+        const serializeChatEditingSessionStop = (stop) => {
+            return {
+                stopId: stop.stopId,
+                entries: ( Array.from(( stop.entries.values())).map(serializeSnapshotEntry))
+            };
+        };
+        const serializeChatEditingSessionSnapshot = (snapshot) => {
+            return {
+                requestId: snapshot.requestId,
+                stops: ( snapshot.stops.map(serializeChatEditingSessionStop)),
+                postEdit: snapshot.postEdit ? ( Array.from(( snapshot.postEdit.values())).map(serializeSnapshotEntry)) : undefined
+            };
+        };
+        const serializeSnapshotEntry = (entry) => {
+            return {
+                resource: ( entry.resource.toString()),
+                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 })
+                )),
+                state: entry.state,
+                snapshotUri: ( entry.snapshotUri.toString()),
+                telemetryInfo: { requestId: entry.telemetryInfo.requestId, agentId: entry.telemetryInfo.agentId, command: entry.telemetryInfo.command }
+            };
+        };
+        try {
+            const data = {
+                version: STORAGE_VERSION,
+                sessionId: this.chatSessionId,
+                linearHistory: ( state.linearHistory.map(serializeChatEditingSessionSnapshot)),
+                linearHistoryIndex: state.linearHistoryIndex,
+                initialFileContents: serializeResourceMap(state.initialFileContents, value => addFileContent(value)),
+                pendingSnapshot: state.pendingSnapshot ? serializeChatEditingSessionStop(state.pendingSnapshot) : undefined,
+                recentSnapshot: serializeChatEditingSessionStop(state.recentSnapshot),
+            };
+            this._logService.debug(`chatEditingSession: Storing editing session at ${( storageFolder.toString())}: ${fileContents.size} files`);
+            for (const [hash, content] of fileContents) {
+                if (!( existingContents.has(hash))) {
+                    await this._fileService.writeFile(joinPath(contentsFolder, hash), VSBuffer.fromString(content));
+                }
+            }
+            await this._fileService.writeFile(joinPath(storageFolder, STORAGE_STATE_FILE), VSBuffer.fromString(JSON.stringify(data)));
+        }
+        catch (e) {
+            this._logService.debug(`Error storing chat editing session to ${( storageFolder.toString())}`, e);
+        }
+    }
+    async clearState() {
+        const storageFolder = this._getStorageLocation();
+        if (await this._fileService.exists(storageFolder)) {
+            this._logService.debug(`chatEditingSession: Clearing editing session at ${( storageFolder.toString())}`);
+            try {
+                await this._fileService.del(storageFolder, { recursive: true });
+            }
+            catch (e) {
+                this._logService.debug(`Error clearing chat editing session from ${( storageFolder.toString())}`, e);
+            }
+        }
+    }
+};
+ChatEditingSessionStorage = ( __decorate([
+    ( __param(1, IFileService)),
+    ( __param(2, IEnvironmentService)),
+    ( __param(3, ILogService)),
+    ( __param(4, IWorkspaceContextService))
+], ChatEditingSessionStorage));
+const COMPATIBLE_STORAGE_VERSIONS = [1, 2];
+const STORAGE_VERSION = 2;
+
+export { ChatEditingSessionStorage };

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

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { computeDiff } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/notebookDiff';
+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';
 import { INotebookLoggingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service';
 import { INotebookEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/services/notebookWorkerService.service';

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

@@ -3,7 +3,7 @@ import { VSBuffer, encodeBase64, decodeBase64 } from '@codingame/monaco-vscode-a
 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 { NotebookCellTextModel } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
+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';
 
 const BufferMarker = 'ArrayBuffer-4f56482b-5a03-49ba-8356-210d3b0c1c3d';

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

@@ -1,6 +1,6 @@
 import { DisposableStore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ITransaction, IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
-import { ObservableDisposable } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/base/common/observableDisposable";
+import { ObservableDisposable } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/base/common/observableDisposable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IDocumentDiff } from "../../../../../../editor/common/diff/documentDiffProvider.js";
 import { DetailedLineRangeMapping } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/rangeMapping";
@@ -9,9 +9,9 @@ import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common
 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 { INotebookEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service";
-import { NotebookCellTextModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
-import { WorkingSetEntryState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+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-api/vscode/vs/workbench/contrib/chat/common/chatModel";
 export declare class ChatEditingNotebookCellEntry extends ObservableDisposable {
     readonly notebookUri: URI;
     readonly cell: NotebookCellTextModel;
@@ -35,8 +35,8 @@ export declare class ChatEditingNotebookCellEntry extends ObservableDisposable {
     private readonly _editDecorationClear;
     private _editDecorations;
     private readonly _diffTrimWhitespace;
-    protected readonly _stateObs: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<WorkingSetEntryState, void>;
-    readonly state: IObservable<WorkingSetEntryState>;
+    protected readonly _stateObs: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<ModifiedFileEntryState, void>;
+    readonly state: IObservable<ModifiedFileEntryState>;
     protected readonly _isCurrentlyBeingModifiedByObs: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<IChatResponseModel | undefined, void>;
     readonly isCurrentlyBeingModifiedBy: IObservable<IChatResponseModel | undefined>;
     private readonly initialContent;
@@ -45,6 +45,7 @@ export declare class ChatEditingNotebookCellEntry extends ObservableDisposable {
     private _mirrorEdits;
     acceptAgentEdits(textEdits: TextEdit[], isLastEdits: boolean, responseModel: IChatResponseModel): void;
     scheduleEditDecorations(): void;
+    revertMarkdownPreviewState(): void;
     protected _resetEditsState(tx: ITransaction): void;
     keep(change: DetailedLineRangeMapping): Promise<boolean>;
     private _acceptHunk;

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 { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { ObservableDisposable } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/base/common/observableDisposable';
+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';
@@ -27,9 +27,10 @@ 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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-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 { WorkingSetEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+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';
@@ -85,7 +86,7 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Ob
             500
         )));
         this._editDecorations = [];
-        this._stateObs = observableValue(this, WorkingSetEntryState.Modified);
+        this._stateObs = observableValue(this, ModifiedFileEntryState.Modified);
         this.state = this._stateObs;
         this._isCurrentlyBeingModifiedByObs = observableValue(this, undefined);
         this.isCurrentlyBeingModifiedBy = this._isCurrentlyBeingModifiedByObs;
@@ -133,9 +134,9 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Ob
             const didResetToOriginalContent = this.modifiedModel.getValue() === this.initialContent;
             const currentState = this._stateObs.get();
             switch (currentState) {
-                case WorkingSetEntryState.Modified:
+                case ModifiedFileEntryState.Modified:
                     if (didResetToOriginalContent) {
-                        this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
+                        this._stateObs.set(ModifiedFileEntryState.Rejected, undefined);
                         break;
                     }
             }
@@ -165,7 +166,7 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Ob
         this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, newDecorations);
         transaction((tx) => {
             if (!isLastEdits) {
-                this._stateObs.set(WorkingSetEntryState.Modified, tx);
+                this._stateObs.set(ModifiedFileEntryState.Modified, tx);
                 this._isCurrentlyBeingModifiedByObs.set(responseModel, tx);
                 this._maxModifiedLineNumber.set(maxLineNumber, tx);
             }
@@ -180,6 +181,19 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Ob
     scheduleEditDecorations() {
         this._editDecorationClear.schedule();
     }
+    revertMarkdownPreviewState() {
+        if (this.cell.cellKind !== CellKind.Markup) {
+            return;
+        }
+        const notebookEditor = this.notebookEditorService.retrieveExistingWidgetFromURI(this.notebookUri)?.value;
+        if (notebookEditor) {
+            const vm = notebookEditor.getCellByHandle(this.cell.handle);
+            if (vm?.getEditState() === CellEditState.Editing &&
+                (vm.editStateSource === 'chatEdit' || vm.editStateSource === 'chatEditNavigation')) {
+                vm?.updateEditState(CellEditState.Preview, 'chatEdit');
+            }
+        }
+    }
     _resetEditsState(tx) {
         this._isCurrentlyBeingModifiedByObs.set(undefined, tx);
         this._maxModifiedLineNumber.set(0, tx);
@@ -190,7 +204,7 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Ob
     async _acceptHunk(change) {
         this._isEditFromUs = true;
         try {
-            if (!this._diffInfo.get().changes.includes(change)) {
+            if (!this._diffInfo.get().changes.filter(c => c.modified.equals(change.modified) && c.original.equals(change.original)).length) {
                 return false;
             }
             const edits = [];
@@ -205,7 +219,8 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Ob
         }
         await this._updateDiffInfoSeq();
         if (this._diffInfo.get().identical) {
-            this._stateObs.set(WorkingSetEntryState.Accepted, undefined);
+            this.revertMarkdownPreviewState();
+            this._stateObs.set(ModifiedFileEntryState.Accepted, undefined);
         }
         return true;
     }
@@ -230,7 +245,8 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Ob
         }
         await this._updateDiffInfoSeq();
         if (this._diffInfo.get().identical) {
-            this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
+            this.revertMarkdownPreviewState();
+            this._stateObs.set(ModifiedFileEntryState.Rejected, undefined);
         }
         return true;
     }

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

@@ -2,7 +2,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IEditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
-import { INotebookTextDiffEditor } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser";
+import { INotebookTextDiffEditor } from "@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser";
 import { NotebookTextModel } from "@codingame/monaco-vscode-notebook-service-override/vscode/vs/workbench/contrib/notebook/common/model/notebookTextModel";
 import { IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
 import { ChatEditingModifiedNotebookEntry } from "../chatEditingModifiedNotebookEntry.js";
@@ -17,9 +17,9 @@ export declare class ChatEditingNotebookEditorIntegration extends Disposable imp
     next(wrap: boolean): boolean;
     previous(wrap: boolean): boolean;
     enableAccessibleDiffView(): void;
-    acceptNearestChange(change: IModifiedFileEntryChangeHunk): void;
-    rejectNearestChange(change: IModifiedFileEntryChangeHunk): void;
-    toggleDiff(change: IModifiedFileEntryChangeHunk | undefined): Promise<void>;
+    acceptNearestChange(change: IModifiedFileEntryChangeHunk | undefined): Promise<void>;
+    rejectNearestChange(change: IModifiedFileEntryChangeHunk | undefined): Promise<void>;
+    toggleDiff(change: IModifiedFileEntryChangeHunk | undefined, show?: boolean): Promise<void>;
     dispose(): void;
 }
 export declare class ChatEditingNotebookDiffEditorIntegration extends Disposable implements IModifiedFileEntryEditorIntegration {
@@ -32,7 +32,7 @@ export declare class ChatEditingNotebookDiffEditorIntegration extends Disposable
     next(_wrap: boolean): boolean;
     previous(_wrap: boolean): boolean;
     enableAccessibleDiffView(): void;
-    acceptNearestChange(change: IModifiedFileEntryChangeHunk): void;
-    rejectNearestChange(change: IModifiedFileEntryChangeHunk): void;
-    toggleDiff(_change: IModifiedFileEntryChangeHunk | undefined): Promise<void>;
+    acceptNearestChange(change: IModifiedFileEntryChangeHunk): Promise<void>;
+    rejectNearestChange(change: IModifiedFileEntryChangeHunk): Promise<void>;
+    toggleDiff(_change: IModifiedFileEntryChangeHunk | undefined, _show?: boolean): Promise<void>;
 }