@codingame/monaco-vscode-chat-service-override 18.4.0 → 19.0.0

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

@@ -30,6 +30,7 @@ import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValueOpts';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
 
 var AbstractChatEditingModifiedFileEntry_1;
 class AutoAcceptControl {
@@ -39,7 +40,7 @@ class AutoAcceptControl {
         this.cancel = cancel;
     }
 }
-const pendingRewriteMinimap = registerColor('minimap.chatEditHighlight', ( transparent(editorBackground, 0.6)), ( localize(4794, "Color of pending edit regions in the minimap")));
+const pendingRewriteMinimap = registerColor('minimap.chatEditHighlight', ( transparent(editorBackground, 0.6)), ( localize(4876, "Color of pending edit regions in the minimap")));
 let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFileEntry extends Disposable {
     static { AbstractChatEditingModifiedFileEntry_1 = this; }
     static { this.scheme = 'modified-file-entry'; }
@@ -125,7 +126,7 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
                     }
                     const remain = Math.round(future - Date.now());
                     if (remain <= 0) {
-                        this.accept(undefined);
+                        this.accept();
                     }
                     else {
                         const handle = setTimeout(update, 100);
@@ -162,23 +163,27 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
     updateTelemetryInfo(telemetryInfo) {
         this._telemetryInfo = telemetryInfo;
     }
-    async accept(tx) {
+    async accept() {
         if (this._stateObs.get() !== ModifiedFileEntryState.Modified) {
             return;
         }
-        await this._doAccept(tx);
-        this._stateObs.set(ModifiedFileEntryState.Accepted, tx);
-        this._autoAcceptCtrl.set(undefined, tx);
+        await this._doAccept();
+        transaction(tx => {
+            this._stateObs.set(ModifiedFileEntryState.Accepted, tx);
+            this._autoAcceptCtrl.set(undefined, tx);
+        });
         this._notifyAction('accepted');
     }
-    async reject(tx) {
+    async reject() {
         if (this._stateObs.get() !== ModifiedFileEntryState.Modified) {
             return;
         }
         this._notifyAction('rejected');
-        await this._doReject(tx);
-        this._stateObs.set(ModifiedFileEntryState.Rejected, tx);
-        this._autoAcceptCtrl.set(undefined, tx);
+        await this._doReject();
+        transaction(tx => {
+            this._stateObs.set(ModifiedFileEntryState.Rejected, tx);
+            this._autoAcceptCtrl.set(undefined, tx);
+        });
     }
     _notifyAction(outcome) {
         this._chatService.notifyUserAction({
@@ -208,10 +213,10 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
             this._undoRedoService.pushElement(undoRedoElement);
         }
     }
-    async acceptStreamingEditsEnd(tx) {
-        this._resetEditsState(tx);
+    async acceptStreamingEditsEnd() {
+        this._resetEditsState(undefined);
         if (await this._areOriginalAndModifiedIdentical()) {
-            await this.accept(tx);
+            await this.accept();
         }
     }
     _resetEditsState(tx) {

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

@@ -18,10 +18,10 @@ import { ICellEditOperation, IResolvedNotebookEditorModel, NotebookTextModelChan
 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";
-import { ChatEditKind, IModifiedFileEntryEditorIntegration } 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";
+import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntryEditorIntegration, ISnapshotEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+import { IChatResponseModel } from "@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { AbstractChatEditingModifiedFileEntry, IModifiedEntryTelemetryInfo, ISnapshotEntry } from "./chatEditingModifiedFileEntry.js";
+import { AbstractChatEditingModifiedFileEntry } from "./chatEditingModifiedFileEntry.js";
 import { ChatEditingNotebookCellEntry } from "./notebook/chatEditingNotebookCellEntry.js";
 import { ICellDiffInfo } from "./notebook/notebookCellChanges.js";
 export declare class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifiedFileEntry {
@@ -64,8 +64,8 @@ export declare class ChatEditingModifiedNotebookEntry extends AbstractChatEditin
     initializeModelsFromDiff(): Promise<void>;
     updateCellDiffInfo(cellsDiffInfo: ICellDiffInfo[], transcation: ITransaction | undefined): void;
     mirrorNotebookEdits(e: NotebookTextModelChangedEvent): void;
-    protected _doAccept(tx: ITransaction | undefined): Promise<void>;
-    protected _doReject(tx: ITransaction | undefined): Promise<void>;
+    protected _doAccept(): Promise<void>;
+    protected _doReject(): Promise<void>;
     private _collapse;
     protected _createEditorIntegration(editor: IEditorPane): IModifiedFileEntryEditorIntegration;
     protected _resetEditsState(tx: ITransaction): void;
@@ -88,8 +88,8 @@ export declare class ChatEditingModifiedNotebookEntry extends AbstractChatEditin
     private _applyEditsSync;
     createSnapshot(requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
     equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean;
-    restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk?: boolean): void;
-    resetToInitialContent(): void;
+    restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk?: boolean): Promise<void>;
+    resetToInitialContent(): Promise<void>;
     private restoreSnapshotInModifiedModel;
     private readonly cellTextModelMap;
     private resolveCellModel;

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

@@ -11,11 +11,10 @@ import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/reso
 import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { LineRange } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/ranges/lineRange';
-import { StringEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/edits/stringEdit';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { nullDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
 import { RangeMapping, DetailedLineRangeMapping } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/rangeMapping';
-import '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
+import { TextEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -26,9 +25,9 @@ import { UndoRedoElementType } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { IUndoRedoService } from '@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service';
 import { SaveReason } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { IFilesConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
-import { SnapshotContext } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { SnapshotContext } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
 import { NotebookTextDiffEditor } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CellEditType, NotebookCellsChangeType, NotebookSetting } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { computeDiff } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/common/notebookDiff';
 import { INotebookEditorModelResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service';
@@ -39,6 +38,7 @@ import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { getNotebookSnapshotFileURI, restoreSnapshot, createSnapshot, deserializeSnapshot, SnapshotComparer } from './notebook/chatEditingModifiedNotebookSnapshot.js';
+import { ChatEditingNewNotebookContentEdits } from './notebook/chatEditingNewNotebookContentEdits.js';
 import { ChatEditingNotebookCellEntry } from './notebook/chatEditingNotebookCellEntry.js';
 import { ChatEditingNotebookDiffEditorIntegration, ChatEditingNotebookEditorIntegration } from './notebook/chatEditingNotebookEditorIntegration.js';
 import { ChatEditingNotebookFileSystemProvider } from './notebook/chatEditingNotebookFileSystemProvider.js';
@@ -337,12 +337,12 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
             return;
         }
     }
-    async _doAccept(tx) {
-        this.updateCellDiffInfo([], tx);
+    async _doAccept() {
+        this.updateCellDiffInfo([], undefined);
         const snapshot = createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService);
         restoreSnapshot(this.originalModel, snapshot);
         this.initializeModelsFromDiff();
-        await this._collapse(tx);
+        await this._collapse(undefined);
         const config = this._fileConfigService.getAutoSaveConfiguration(this.modifiedURI);
         if (this.modifiedModel.uri.scheme !== Schemas.untitled && (!config.autoSave || !this.notebookResolver.isDirty(this.modifiedURI))) {
             await this._applyEdits(async () => {
@@ -357,8 +357,8 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
             });
         }
     }
-    async _doReject(tx) {
-        this.updateCellDiffInfo([], tx);
+    async _doReject() {
+        this.updateCellDiffInfo([], undefined);
         if (this.createdInRequestId === this._telemetryInfo.requestId) {
             await this._applyEdits(async () => {
                 await this.modifiedResourceRef.object.revert({ soft: true });
@@ -375,7 +375,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
                 }
             });
             this.initializeModelsFromDiff();
-            await this._collapse(tx);
+            await this._collapse(undefined);
         }
     }
     async _collapse(transaction) {
@@ -396,7 +396,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(4795, "Chat Edit: '{0}'", request.message.text)) : ( localize(4796, "Chat Edit"));
+        const label = request?.message.text ? ( localize(4877, "Chat Edit: '{0}'", request.message.text)) : ( localize(4878, "Chat Edit"));
         const transientOptions = this.transientOptions;
         const outputSizeLimit = this.configurationService.getValue(NotebookSetting.outputBackupSizeLimit) * 1024;
         let initial = createSnapshot(this.modifiedModel, transientOptions, outputSizeLimit);
@@ -451,6 +451,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
     async acceptAgentEdits(resource, edits, isLastEdits, responseModel) {
         const isCellUri = resource.scheme === Schemas.vscodeNotebookCell;
         const cell = isCellUri && this.modifiedModel.cells.find(cell => isEqual(cell.uri, resource));
+        let cellEntry;
         if (cell) {
             const index = this.modifiedModel.cells.indexOf(cell);
             const entry = this._cellsDiffInfo.get().slice().find(entry => entry.modifiedCellIndex === index);
@@ -458,20 +459,41 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
                 console.error('Original cell model not found');
                 return;
             }
-            this.getOrCreateModifiedTextFileEntryForCell(cell, await entry.modifiedModel.promise, await entry.originalModel.promise);
+            cellEntry = this.getOrCreateModifiedTextFileEntryForCell(cell, await entry.modifiedModel.promise, await entry.originalModel.promise);
         }
-        const finishPreviousCells = () => {
-            this.editedCells.forEach(uri => {
+        const finishPreviousCells = async () => {
+            await Promise.all(( Array.from(this.editedCells).map(async (uri) => {
                 const cell = this.modifiedModel.cells.find(cell => isEqual(cell.uri, uri));
                 const cellEntry = cell && this.cellEntryMap.get(cell.uri);
-                cellEntry?.acceptAgentEdits([], true, responseModel);
-            });
+                await cellEntry?.acceptAgentEdits([], true, responseModel);
+            })));
             this.editedCells.clear();
         };
-        this._applyEditsSync(async () => {
+        this._applyEdits(async () => {
+            await Promise.all(( edits.map(async (edit, idx) => {
+                const last = isLastEdits && idx === edits.length - 1;
+                if (TextEdit.isTextEdit(edit)) {
+                    if (isEqual(resource, this.modifiedModel.uri)) {
+                        this.newNotebookEditGenerator ??= this._instantiationService.createInstance(ChatEditingNewNotebookContentEdits, this.modifiedModel);
+                        this.newNotebookEditGenerator.acceptTextEdits([edit]);
+                    }
+                    else {
+                        this.newNotebookEditGenerator = undefined;
+                        if (!( this.editedCells.has(resource))) {
+                            await finishPreviousCells();
+                            this.editedCells.add(resource);
+                        }
+                        await cellEntry?.acceptAgentEdits([edit], last, responseModel);
+                    }
+                }
+                else {
+                    this.newNotebookEditGenerator = undefined;
+                    this.acceptNotebookEdit(edit);
+                }
+            })));
         });
         if (isLastEdits) {
-            finishPreviousCells();
+            await finishPreviousCells();
         }
         isLastEdits = !isCellUri && isLastEdits;
         if (isLastEdits && this.newNotebookEditGenerator) {
@@ -487,7 +509,6 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
                 this._rewriteRatioObs.set(Math.min(1, newRewriteRation), tx);
             }
             else {
-                finishPreviousCells();
                 this.editedCells.clear();
                 this._resetEditsState(tx);
                 this._rewriteRatioObs.set(1, tx);
@@ -746,7 +767,6 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
             snapshotUri: getNotebookSnapshotFileURI(this._telemetryInfo.sessionId, requestId, undoStop, this.modifiedURI.path, this.modifiedModel.viewType),
             original: createSnapshot(this.originalModel, this.transientOptions, this.configurationService),
             current: createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService),
-            originalToCurrentEdit: StringEdit.empty,
             state: this.state.get(),
             telemetryInfo: this.telemetryInfo,
         };
@@ -758,7 +778,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
             ( new SnapshotComparer(snapshot.original)).isEqual(this.originalModel) &&
             ( new SnapshotComparer(snapshot.current)).isEqual(this.modifiedModel);
     }
-    restoreFromSnapshot(snapshot, restoreToDisk = true) {
+    async restoreFromSnapshot(snapshot, restoreToDisk = true) {
         this.updateCellDiffInfo([], undefined);
         this._stateObs.set(snapshot.state, undefined);
         restoreSnapshot(this.originalModel, snapshot.original);
@@ -767,7 +787,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
         }
         this.initializeModelsFromDiff();
     }
-    resetToInitialContent() {
+    async resetToInitialContent() {
         this.updateCellDiffInfo([], undefined);
         this.restoreSnapshotInModifiedModel(this.initialContent);
         this.initializeModelsFromDiff();

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

@@ -18,7 +18,7 @@ import { IMultiDiffSourceResolverService } from "@codingame/monaco-vscode-api/vs
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
 import { IChatEditingSession, IChatRelatedFile, IChatRelatedFilesProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
 import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service";
-import { ChatModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { ChatModel } from "@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 export declare class ChatEditingService extends Disposable implements IChatEditingService {
     private readonly _instantiationService;

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

@@ -32,10 +32,10 @@ import { CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contri
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { chatEditingSnapshotScheme, chatEditingAgentSupportsReadonlyReferencesContextKey, ChatEditingSessionState, ModifiedFileEntryState, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, parseChatMultiDiffUri, chatEditingResourceContextKey, inChatEditingSessionContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
-import { isCellTextEditOperation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { isCellTextEditOperation } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ChatEditorInput } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { ChatEditingSession } from './chatEditingSession.js';
 import { ChatEditingTextModelContentProvider, ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
@@ -95,7 +95,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
             }
             e.join(storageTask, {
                 id: 'join.chatEditingSession',
-                label: ( localize(4797, "Saving chat edits history"))
+                label: ( localize(4879, "Saving chat edits history"))
             });
         }));
     }
@@ -323,7 +323,7 @@ let ChatDecorationsProvider = class ChatDecorationsProvider extends Disposable {
         super();
         this._sessions = _sessions;
         this._chatAgentService = _chatAgentService;
-        this.label = ( localize(4798, "Chat Editing"));
+        this.label = ( localize(4880, "Chat Editing"));
         this._currentEntries = derived(this, (r) => {
             const sessions = this._sessions.read(r);
             if (!sessions) {
@@ -363,7 +363,7 @@ let ChatDecorationsProvider = class ChatDecorationsProvider extends Disposable {
             return {
                 weight: 1000,
                 letter: Codicon.diffModified,
-                tooltip: defaultAgentName ? ( localize(4799, "Pending changes from {0}", defaultAgentName)) : ( localize(4800, "Pending changes from chat")),
+                tooltip: defaultAgentName ? ( localize(4881, "Pending changes from {0}", defaultAgentName)) : ( localize(4882, "Pending changes from chat")),
                 bubble: true
             };
         }

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

@@ -13,10 +13,10 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
-import { ChatEditingSessionState, IChatEditingSession, IEditSessionEntryDiff, IModifiedFileEntry, IStreamingEdits } 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";
+import { ChatEditingSessionState, IChatEditingSession, IEditSessionEntryDiff, IModifiedFileEntry, ISnapshotEntry, IStreamingEdits } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+import { IChatResponseModel } from "@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { AbstractChatEditingModifiedFileEntry, ISnapshotEntry } from "./chatEditingModifiedFileEntry.js";
+import { AbstractChatEditingModifiedFileEntry } from "./chatEditingModifiedFileEntry.js";
 export declare class ChatEditingSession extends Disposable implements IChatEditingSession {
     readonly chatSessionId: string;
     readonly isGlobalEditingSession: boolean;
@@ -69,7 +69,6 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     private _pendingSnapshot;
     restoreSnapshot(requestId: string | undefined, stopId: string | undefined): Promise<void>;
     private _restoreSnapshot;
-    remove(...uris: URI[]): void;
     private _assertNotDisposed;
     accept(...uris: URI[]): Promise<void>;
     reject(...uris: URI[]): Promise<void>;

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

@@ -11,6 +11,7 @@ import { Disposable, DisposableStore, dispose } from '@codingame/monaco-vscode-a
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService.service';
 import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
 import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service';
@@ -39,7 +40,7 @@ import { ChatEditingTextModelContentProvider } from './chatEditingTextModelConte
 import { ChatEditingModifiedNotebookDiff } from './notebook/chatEditingModifiedNotebookDiff.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { derived, derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
-import { asyncTransaction, transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
+import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { ObservablePromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/promise';
 
@@ -185,9 +186,9 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
             for (const [uri, content] of restoredSessionState.initialFileContents) {
                 this._initialFileContents.set(uri, content);
             }
-            await asyncTransaction(async (tx) => {
-                this._pendingSnapshot = restoredSessionState.pendingSnapshot;
-                await this._restoreSnapshot(restoredSessionState.recentSnapshot, tx, false);
+            this._pendingSnapshot = restoredSessionState.pendingSnapshot;
+            await this._restoreSnapshot(restoredSessionState.recentSnapshot, false);
+            transaction(async (tx) => {
                 this._linearHistory.set(restoredSessionState.linearHistory, tx);
                 this._linearHistoryIndex.set(restoredSessionState.linearHistoryIndex, tx);
                 this._state.set(ChatEditingSessionState.Idle, tx);
@@ -343,7 +344,10 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         const linearHistoryPtr = this._linearHistoryIndex.get();
         const newLinearHistory = [];
         for (const entry of this._linearHistory.get()) {
-            if (linearHistoryPtr - entry.startIndex < entry.stops.length) {
+            if (entry.startIndex >= linearHistoryPtr) {
+                break;
+            }
+            else if (linearHistoryPtr - entry.startIndex < entry.stops.length) {
                 newLinearHistory.push({ requestId: entry.requestId, stops: entry.stops.slice(0, linearHistoryPtr - entry.startIndex), startIndex: entry.startIndex, postEdit: undefined });
             }
             else {
@@ -352,6 +356,12 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         }
         const lastEntry = newLinearHistory.at(-1);
         if (requestId && lastEntry?.requestId === requestId) {
+            if (lastEntry.postEdit && undoStop) {
+                const rebaseUri = (uri) => ( URI.parse(( uri.toString()).replaceAll(POST_EDIT_STOP_ID, undoStop)));
+                for (const [uri, prev] of lastEntry.postEdit.entries()) {
+                    snapshot.entries.set(uri, { ...prev, snapshotUri: rebaseUri(prev.snapshotUri), resource: rebaseUri(prev.resource) });
+                }
+            }
             newLinearHistory[newLinearHistory.length - 1] = { ...lastEntry, stops: [...lastEntry.stops, snapshot], postEdit: undefined };
         }
         else {
@@ -401,10 +411,8 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
             const stopRef = this._findEditStop(requestId, stopId);
             if (stopRef) {
                 this._ensurePendingSnapshot();
-                await asyncTransaction(async (tx) => {
-                    this._linearHistoryIndex.set(stopRef.historyIndex, tx);
-                    await this._restoreSnapshot(stopRef.stop, tx);
-                });
+                this._linearHistoryIndex.set(stopRef.historyIndex, undefined);
+                await this._restoreSnapshot(stopRef.stop);
                 this._updateRequestHiddenState();
             }
         }
@@ -417,11 +425,11 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
             await this._restoreSnapshot(pendingSnapshot, undefined);
         }
     }
-    async _restoreSnapshot({ entries }, tx, restoreResolvedToDisk = true) {
+    async _restoreSnapshot({ entries }, restoreResolvedToDisk = true) {
         for (const entry of this._entriesObs.get()) {
             const snapshotEntry = entries.get(entry.modifiedURI);
             if (!snapshotEntry) {
-                entry.resetToInitialContent();
+                await entry.resetToInitialContent();
                 entry.dispose();
             }
         }
@@ -429,26 +437,10 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         for (const snapshotEntry of ( entries.values())) {
             const entry = await this._getOrCreateModifiedFileEntry(snapshotEntry.resource, snapshotEntry.telemetryInfo);
             const restoreToDisk = snapshotEntry.state === ModifiedFileEntryState.Modified || restoreResolvedToDisk;
-            entry.restoreFromSnapshot(snapshotEntry, restoreToDisk);
+            await entry.restoreFromSnapshot(snapshotEntry, restoreToDisk);
             entriesArr.push(entry);
         }
-        this._entriesObs.set(entriesArr, tx);
-    }
-    remove(...uris) {
-        this._assertNotDisposed();
-        let didRemoveUris = false;
-        for (const uri of uris) {
-            const entry = this._entriesObs.get().find(e => isEqual(e.modifiedURI, uri));
-            if (entry) {
-                entry.dispose();
-                const newEntries = this._entriesObs.get().filter(e => !isEqual(e.modifiedURI, uri));
-                this._entriesObs.set(newEntries, undefined);
-                didRemoveUris = true;
-            }
-        }
-        if (!didRemoveUris) {
-            return;
-        }
+        this._entriesObs.set(entriesArr, undefined);
     }
     _assertNotDisposed() {
         if (this._state.get() === ChatEditingSessionState.Disposed) {
@@ -457,32 +449,28 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
     }
     async accept(...uris) {
         this._assertNotDisposed();
-        await asyncTransaction(async (tx) => {
-            if (uris.length === 0) {
-                await Promise.all(( this._entriesObs.get().map(entry => entry.accept(tx))));
-            }
-            for (const uri of uris) {
-                const entry = this._entriesObs.get().find(e => isEqual(e.modifiedURI, uri));
-                if (entry) {
-                    await entry.accept(tx);
-                }
+        if (uris.length === 0) {
+            await Promise.all(( this._entriesObs.get().map(entry => entry.accept())));
+        }
+        for (const uri of uris) {
+            const entry = this._entriesObs.get().find(e => isEqual(e.modifiedURI, uri));
+            if (entry) {
+                await entry.accept();
             }
-        });
+        }
         this._accessibilitySignalService.playSignal(AccessibilitySignal.editsKept, { allowManyInParallel: true });
     }
     async reject(...uris) {
         this._assertNotDisposed();
-        await asyncTransaction(async (tx) => {
-            if (uris.length === 0) {
-                await Promise.all(( this._entriesObs.get().map(entry => entry.reject(tx))));
-            }
-            for (const uri of uris) {
-                const entry = this._entriesObs.get().find(e => isEqual(e.modifiedURI, uri));
-                if (entry) {
-                    await entry.reject(tx);
-                }
+        if (uris.length === 0) {
+            await Promise.all(( this._entriesObs.get().map(entry => entry.reject())));
+        }
+        for (const uri of uris) {
+            const entry = this._entriesObs.get().find(e => isEqual(e.modifiedURI, uri));
+            if (entry) {
+                await entry.reject();
             }
-        });
+        }
         this._accessibilitySignalService.playSignal(AccessibilitySignal.editsUndone, { allowManyInParallel: true });
     }
     async show(previousChanges) {
@@ -498,7 +486,7 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         }
         const input = MultiDiffEditorInput.fromResourceMultiDiffEditorInput({
             multiDiffSource: getMultiDiffSourceUri(this, previousChanges),
-            label: ( localize(4801, "Suggested Edits"))
+            label: ( localize(4883, "Suggested Edits"))
         }, this._instantiationService);
         this._editorPane = await this._editorGroupsService.activeGroup.openEditor(input, { pinned: true, activation: EditorActivation.ACTIVATE });
     }
@@ -601,10 +589,8 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
             return;
         }
         this._ensurePendingSnapshot();
-        await asyncTransaction(async (tx) => {
-            await this._restoreSnapshot(previousSnapshot.stop, tx);
-            this._linearHistoryIndex.set(newIndex, tx);
-        });
+        await this._restoreSnapshot(previousSnapshot.stop);
+        this._linearHistoryIndex.set(newIndex, undefined);
         this._updateRequestHiddenState();
     }
     async redoInteraction() {
@@ -617,10 +603,8 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         if (!nextSnapshot) {
             return;
         }
-        await asyncTransaction(async (tx) => {
-            await this._restoreSnapshot(nextSnapshot, tx);
-            this._linearHistoryIndex.set(newIndex, tx);
-        });
+        await this._restoreSnapshot(nextSnapshot);
+        this._linearHistoryIndex.set(newIndex, undefined);
         this._updateRequestHiddenState();
     }
     _updateRequestHiddenState() {
@@ -697,18 +681,16 @@ let ChatEditingSession = class ChatEditingSession extends Disposable {
         };
     }
     async _resolve(requestId, undoStop, resource) {
-        await asyncTransaction(async (tx) => {
-            const hasOtherTasks = ( Iterable.some(( this._streamingEditLocks.keys()), k => k !== ( resource.toString())));
-            if (!hasOtherTasks) {
-                this._state.set(ChatEditingSessionState.Idle, tx);
-            }
-            const entry = this._getEntry(resource);
-            if (!entry) {
-                return;
-            }
-            this.ensureEditInUndoStopMatches(requestId, undoStop, entry,  true, tx);
-            return entry.acceptStreamingEditsEnd(tx);
-        });
+        const hasOtherTasks = ( Iterable.some(( this._streamingEditLocks.keys()), k => k !== ( resource.toString())));
+        if (!hasOtherTasks) {
+            this._state.set(ChatEditingSessionState.Idle, undefined);
+        }
+        const entry = this._getEntry(resource);
+        if (!entry) {
+            return;
+        }
+        this.ensureEditInUndoStopMatches(requestId, undoStop, entry,  true, undefined);
+        return entry.acceptStreamingEditsEnd();
     }
     async _getOrCreateModifiedFileEntry(resource, telemetryInfo) {
         resource = CellUri.parse(resource)?.notebook ?? resource;

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

@@ -4,7 +4,7 @@ import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/plat
 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";
-import { ISnapshotEntry } from "./chatEditingModifiedFileEntry.js";
+import { ISnapshotEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
 export interface StoredSessionState {
     readonly initialFileContents: ResourceMap<string>;
     readonly pendingSnapshot?: IChatEditingSessionStop;

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

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