fix: delete files created by chat editing that were subsequently reverted (microsoft#232196)

Author: joyceerhl

src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { RunOnceScheduler, timeout } from '../../../../../base/common/async.js';
+import { Emitter } from '../../../../../base/common/event.js';
 import { Disposable, IReference, toDisposable } from '../../../../../base/common/lifecycle.js';
 import { IObservable, ITransaction, observableValue, transaction } from '../../../../../base/common/observable.js';
 import { themeColorFromId } from '../../../../../base/common/themables.js';
@@ -24,10 +25,11 @@ import { IModelService } from '../../../../../editor/common/services/model.js';
 import { IResolvedTextEditorModel, ITextModelService } from '../../../../../editor/common/services/resolverService.js';
 import { IModelContentChange, IModelContentChangedEvent } from '../../../../../editor/common/textModelEvents.js';
 import { localize } from '../../../../../nls.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
 import { editorSelectionBackground } from '../../../../../platform/theme/common/colorRegistry.js';
 import { IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.js';
 import { IChatAgentResult } from '../../common/chatAgents.js';
-import { IModifiedFileEntry, WorkingSetEntryState } from '../../common/chatEditingService.js';
+import { ChatEditKind, IModifiedFileEntry, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { IChatService } from '../../common/chatService.js';
 import { ChatEditingSnapshotTextModelContentProvider, ChatEditingTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
 
@@ -40,6 +42,11 @@ export class ChatEditingModifiedFileEntry extends Disposable implements IModifie
 	public readonly docSnapshot: ITextModel;
 	private readonly doc: ITextModel;
 
+	private readonly _onDidDelete = this._register(new Emitter<void>());
+	public get onDidDelete() {
+		return this._onDidDelete.event;
+	}
+
 	get originalURI(): URI {
 		return this.docSnapshot.uri;
 	}
@@ -95,6 +102,8 @@ export class ChatEditingModifiedFileEntry extends Disposable implements IModifie
 		return this._telemetryInfo;
 	}
 
+	readonly createdInRequestId: string | undefined;
+
 	get lastModifyingRequestId() {
 		return this._telemetryInfo.requestId;
 	}
@@ -104,15 +113,20 @@ export class ChatEditingModifiedFileEntry extends Disposable implements IModifie
 		resourceRef: IReference<IResolvedTextEditorModel>,
 		private readonly _multiDiffEntryDelegate: { collapse: (transaction: ITransaction | undefined) => void },
 		private _telemetryInfo: IModifiedEntryTelemetryInfo,
+		kind: ChatEditKind,
 		@IModelService modelService: IModelService,
 		@ITextModelService textModelService: ITextModelService,
 		@ILanguageService languageService: ILanguageService,
 		@IBulkEditService public readonly bulkEditService: IBulkEditService,
 		@IChatService private readonly _chatService: IChatService,
 		@IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService,
-		@IUndoRedoService private readonly _undoRedoService: IUndoRedoService
+		@IUndoRedoService private readonly _undoRedoService: IUndoRedoService,
+		@IFileService private readonly _fileService: IFileService,
 	) {
 		super();
+		if (kind === ChatEditKind.Created) {
+			this.createdInRequestId = this._telemetryInfo.requestId;
+		}
 		this.doc = resourceRef.object.textEditorModel;
 		const docSnapshot = this.docSnapshot = this._register(
 			modelService.createModel(
@@ -316,11 +330,16 @@ export class ChatEditingModifiedFileEntry extends Disposable implements IModifie
 			return;
 		}
 
-		this._setDocValue(this.docSnapshot.getValue());
-
 		this._stateObs.set(WorkingSetEntryState.Rejected, transaction);
-		await this.collapse(transaction);
 		this._notifyAction('rejected');
+		if (this.createdInRequestId === this._telemetryInfo.requestId) {
+			await this._fileService.del(this.resource);
+			this._onDidDelete.fire();
+			this.dispose();
+		} else {
+			this._setDocValue(this.docSnapshot.getValue());
+			await this.collapse(transaction);
+		}
 	}
 
 	private _setDocValue(value: string): void {

src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts

@@ -30,7 +30,7 @@ import { IEditorService } from '../../../../services/editor/common/editorService
 import { MultiDiffEditor } from '../../../multiDiffEditor/browser/multiDiffEditor.js';
 import { MultiDiffEditorInput } from '../../../multiDiffEditor/browser/multiDiffEditorInput.js';
 import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
-import { ChatEditingSessionState, IChatEditingSession, WorkingSetEntryState } from '../../common/chatEditingService.js';
+import { ChatEditingSessionState, ChatEditKind, IChatEditingSession, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { IChatResponseModel } from '../../common/chatModel.js';
 import { IChatWidgetService } from '../chat.js';
 import { ChatEditingMultiDiffSourceResolver } from './chatEditingService.js';
@@ -566,6 +566,15 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		if (!this._initialFileContents.has(resource)) {
 			this._initialFileContents.set(resource, entry.modifiedModel.getValue());
 		}
+		// If an entry is deleted e.g. reverting a created file,
+		// remove it from the entries and don't show it in the working set anymore
+		// so that it can be recreated e.g. through retry
+		this._register(entry.onDidDelete(() => {
+			const newEntries = this._entriesObs.get().filter(e => e.modifiedURI.toString() !== entry.modifiedURI.toString());
+			this._entriesObs.set(newEntries, undefined);
+			this._workingSet.delete(entry.modifiedURI);
+			this._onDidChange.fire();
+		}));
 		const entriesArr = [...this._entriesObs.get(), entry];
 		this._entriesObs.set(entriesArr, undefined);
 		this._onDidChange.fire();
@@ -576,7 +585,8 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 	private async _createModifiedFileEntry(resource: URI, responseModel: IModifiedEntryTelemetryInfo, mustExist = false): Promise<ChatEditingModifiedFileEntry> {
 		try {
 			const ref = await this._textModelService.createModelReference(resource);
-			return this._instantiationService.createInstance(ChatEditingModifiedFileEntry, resource, ref, { collapse: (transaction: ITransaction | undefined) => this._collapse(resource, transaction) }, responseModel);
+
+			return this._instantiationService.createInstance(ChatEditingModifiedFileEntry, resource, ref, { collapse: (transaction: ITransaction | undefined) => this._collapse(resource, transaction) }, responseModel, mustExist ? ChatEditKind.Created : ChatEditKind.Modified);
 		} catch (err) {
 			if (mustExist) {
 				throw err;

src/vs/workbench/contrib/chat/common/chatEditingService.ts

@@ -111,3 +111,8 @@ export const hasAppliedChatEditsContextKey = new RawContextKey<boolean | undefin
 
 export const chatEditingMaxFileAssignmentName = 'chatEditingSessionFileLimit';
 export const defaultChatEditingMaxFileLimit = 10;
+
+export const enum ChatEditKind {
+	Created,
+	Modified,
+}