edits: add session-level diffs for file stats (#279254)

* edits: add session-level diffs for file stats

* rm debug

* dfgkdfghnh

Author: connor4312

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

@@ -7,7 +7,7 @@ import { VSBuffer } from '../../../../../base/common/buffer.js';
 import { IDisposable } from '../../../../../base/common/lifecycle.js';
 import { IObservable, ITransaction } from '../../../../../base/common/observable.js';
 import { URI } from '../../../../../base/common/uri.js';
-import { IEditSessionEntryDiff } from '../../common/chatEditingService.js';
+import { IEditSessionDiffStats, IEditSessionEntryDiff } from '../../common/chatEditingService.js';
 import { IChatRequestDisablement } from '../../common/chatModel.js';
 import { FileOperation, IChatEditingTimelineState, IFileBaseline } from './chatEditingOperations.js';
 
@@ -46,4 +46,6 @@ export interface IChatEditingCheckpointTimeline {
 	// Diffing
 	getEntryDiffBetweenStops(uri: URI, requestId: string | undefined, stopId: string | undefined): IObservable<IEditSessionEntryDiff | undefined> | undefined;
 	getEntryDiffBetweenRequests(uri: URI, startRequestId: string, stopRequestId: string): IObservable<IEditSessionEntryDiff | undefined>;
+	getDiffsForFilesInSession(): IObservable<readonly IEditSessionEntryDiff[]>;
+	getDiffForSession(): IObservable<IEditSessionDiffStats>;
 }

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

@@ -9,11 +9,11 @@ import { assertNever } from '../../../../../base/common/assert.js';
 import { ThrottledDelayer } from '../../../../../base/common/async.js';
 import { Event } from '../../../../../base/common/event.js';
 import { Disposable, DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
-import { ResourceSet } from '../../../../../base/common/map.js';
+import { mapsStrictEqualIgnoreOrder, ResourceMap, ResourceSet } from '../../../../../base/common/map.js';
 import { equals as objectsEqual } from '../../../../../base/common/objects.js';
-import { derived, derivedOpts, IObservable, IReader, ITransaction, ObservablePromise, observableSignalFromEvent, observableValue, observableValueOpts, transaction } from '../../../../../base/common/observable.js';
+import { constObservable, derived, derivedOpts, IObservable, IReader, ITransaction, ObservablePromise, observableSignalFromEvent, observableValue, observableValueOpts, transaction } from '../../../../../base/common/observable.js';
 import { isEqual } from '../../../../../base/common/resources.js';
-import { Mutable } from '../../../../../base/common/types.js';
+import { isDefined, Mutable } from '../../../../../base/common/types.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { generateUuid } from '../../../../../base/common/uuid.js';
 import { TextEdit } from '../../../../../editor/common/languages.js';
@@ -26,7 +26,7 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
 import { CellEditType, CellUri, INotebookTextModel } from '../../../notebook/common/notebookCommon.js';
 import { INotebookEditorModelResolverService } from '../../../notebook/common/notebookEditorModelResolverService.js';
 import { INotebookService } from '../../../notebook/common/notebookService.js';
-import { IEditSessionEntryDiff, IModifiedEntryTelemetryInfo } from '../../common/chatEditingService.js';
+import { IEditSessionDiffStats, IEditSessionEntryDiff, IModifiedEntryTelemetryInfo } from '../../common/chatEditingService.js';
 import { IChatRequestDisablement } from '../../common/chatModel.js';
 import { IChatEditingCheckpointTimeline } from './chatEditingCheckpointTimeline.js';
 import { FileOperation, FileOperationType, IChatEditingTimelineState, ICheckpoint, IFileBaseline, IReconstructedFileExistsState, IReconstructedFileNotExistsState, IReconstructedFileState } from './chatEditingOperations.js';
@@ -832,4 +832,62 @@ export class ChatEditingCheckpointTimelineImpl implements IChatEditingCheckpoint
 			return entryDiff;
 		});
 	}
+
+	public getDiffsForFilesInSession(): IObservable<readonly IEditSessionEntryDiff[]> {
+		const startEpochs = derivedOpts<ResourceMap<number>>({ equalsFn: mapsStrictEqualIgnoreOrder }, reader => {
+			const uris = new ResourceMap<number>();
+			for (const baseline of this._fileBaselines.values()) {
+				uris.set(baseline.uri, Math.min(baseline.epoch, uris.get(baseline.uri) ?? Number.MAX_SAFE_INTEGER));
+			}
+			for (const operation of this._operations.read(reader)) {
+				if (operation.type === FileOperationType.Create) {
+					uris.set(operation.uri, 0);
+				}
+			}
+
+			return uris;
+		});
+
+		// URIs are never removed from the set and we never adjust baselines backwards
+		// (history is immutable) so we can easily cache to avoid regenerating diffs when new files are added
+		const prevDiffs = new ResourceMap<IObservable<IEditSessionEntryDiff | undefined>>();
+
+		const perFileDiffs = derived(this, reader => {
+			const checkpoints = this._checkpoints.read(reader);
+			const firstCheckpoint = checkpoints[0];
+			if (!firstCheckpoint) {
+				return [];
+			}
+
+			const uris = startEpochs.read(reader);
+			const diffs: IObservable<IEditSessionEntryDiff | undefined>[] = [];
+
+			for (const [uri, epoch] of uris) {
+				const obs = prevDiffs.get(uri) ?? this._getEntryDiffBetweenEpochs(uri,
+					constObservable({ start: checkpoints.findLast(cp => cp.epoch <= epoch) || firstCheckpoint, end: undefined }));
+				prevDiffs.set(uri, obs);
+				diffs.push(obs);
+			}
+
+			return diffs;
+		});
+
+		return perFileDiffs.map((diffs, reader) => {
+			return diffs.flatMap(d => d.read(reader)).filter(isDefined);
+		});
+	}
+
+	public getDiffForSession(): IObservable<IEditSessionDiffStats> {
+		const fileDiffs = this.getDiffsForFilesInSession();
+		return derived(reader => {
+			const diffs = fileDiffs.read(reader);
+			let added = 0;
+			let removed = 0;
+			for (const diff of diffs) {
+				added += diff.added;
+				removed += diff.removed;
+			}
+			return { added, removed };
+		});
+	}
 }

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

@@ -198,6 +198,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 			chatSessionResource,
 			this._getTimelineDelegate(),
 		);
+
 		this.canRedo = this._timeline.canRedo.map((hasHistory, reader) =>
 			hasHistory && this._state.read(reader) === ChatEditingSessionState.Idle);
 		this.canUndo = this._timeline.canUndo.map((hasHistory, reader) =>
@@ -316,6 +317,14 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		return this._timeline.getEntryDiffBetweenRequests(uri, startRequestId, stopRequestId);
 	}
 
+	public getDiffsForFilesInSession() {
+		return this._timeline.getDiffsForFilesInSession();
+	}
+
+	public getDiffForSession() {
+		return this._timeline.getDiffForSession();
+	}
+
 	public createSnapshot(requestId: string, undoStop: string | undefined): void {
 		const label = undoStop ? `Request ${requestId} - Stop ${undoStop}` : `Request ${requestId}`;
 		this._timeline.createCheckpoint(requestId, undoStop, label);

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

@@ -172,6 +172,17 @@ export interface IChatEditingSession extends IDisposable {
 	 */
 	getEntryDiffBetweenRequests(uri: URI, startRequestIs: string, stopRequestId: string): IObservable<IEditSessionEntryDiff | undefined>;
 
+	/**
+	 * Gets the diff of each file modified in this session, comparing the initial
+	 * baseline to the current state.
+	 */
+	getDiffsForFilesInSession(): IObservable<readonly IEditSessionEntryDiff[]>;
+
+	/**
+	 * Gets the aggregated diff stats for all files modified in this session.
+	 */
+	getDiffForSession(): IObservable<IEditSessionDiffStats>;
+
 	readonly canUndo: IObservable<boolean>;
 	readonly canRedo: IObservable<boolean>;
 	undoInteraction(): Promise<void>;
@@ -190,7 +201,14 @@ export function chatEditingSessionIsReady(session: IChatEditingSession): Promise
 	});
 }
 
-export interface IEditSessionEntryDiff {
+export interface IEditSessionDiffStats {
+	/** Added data (e.g. line numbers) to show in the UI */
+	added: number;
+	/** Removed data (e.g. line numbers) to show in the UI */
+	removed: number;
+}
+
+export interface IEditSessionEntryDiff extends IEditSessionDiffStats {
 	/** LHS and RHS of a diff editor, if opened: */
 	originalURI: URI;
 	modifiedURI: URI;
@@ -201,11 +219,6 @@ export interface IEditSessionEntryDiff {
 
 	/** True if nothing else will be added to this diff. */
 	isFinal: boolean;
-
-	/** Added data (e.g. line numbers) to show in the UI */
-	added: number;
-	/** Removed data (e.g. line numbers) to show in the UI */
-	removed: number;
 }
 
 export const enum ModifiedFileEntryState {