Merge pull request #309939 from mjbvz/dev/mjbvz/assistant-eagle

Remove now unused `ChatSessionChangedFile` interface" (#308701)

Author: mjbvz

extensions/copilot/src/extension/chatSessions/common/chatSessionWorktreeService.ts

@@ -72,7 +72,7 @@ export interface IChatSessionWorktreeService {
 
 	getSessionIdForWorktree(folder: vscode.Uri): Promise<string | undefined>;
 
-	getWorktreeChanges(sessionId: string): Promise<readonly vscode.ChatSessionChangedFile2[] | undefined>;
+	getWorktreeChanges(sessionId: string): Promise<readonly vscode.ChatSessionChangedFile[] | undefined>;
 
 	handleRequestCompleted(sessionId: string): Promise<void>;
 

extensions/copilot/src/extension/chatSessions/vscode-node/chatSessionWorktreeServiceImpl.ts

@@ -319,7 +319,7 @@ export class ChatSessionWorktreeService extends Disposable implements IChatSessi
 		}
 	}
 
-	async getWorktreeChanges(sessionId: string): Promise<readonly vscode.ChatSessionChangedFile2[] | undefined> {
+	async getWorktreeChanges(sessionId: string): Promise<readonly vscode.ChatSessionChangedFile[] | undefined> {
 		const worktreeProperties = await this.getWorktreeProperties(sessionId);
 		if (!worktreeProperties || typeof worktreeProperties === 'string') {
 			return undefined;
@@ -800,7 +800,7 @@ export class ChatSessionWorktreeService extends Disposable implements IChatSessi
 		return { changes, ...repositoryState };
 	}
 
-	private _toChatSessionChangedFile2(sessionId: string, change: ChatSessionWorktreeFile, worktreeProperties: ChatSessionWorktreeProperties): vscode.ChatSessionChangedFile2 {
+	private _toChatSessionChangedFile2(sessionId: string, change: ChatSessionWorktreeFile, worktreeProperties: ChatSessionWorktreeProperties): vscode.ChatSessionChangedFile {
 		let originalFileRef: string, modifiedFileRef: string | undefined;
 		if (worktreeProperties.version === 2) {
 			// Commit | Working tree
@@ -816,7 +816,7 @@ export class ChatSessionWorktreeService extends Disposable implements IChatSessi
 			modifiedFileRef = worktreeProperties.branchName;
 		}
 
-		return new vscode.ChatSessionChangedFile2(
+		return new vscode.ChatSessionChangedFile(
 			vscode.Uri.file(change.filePath),
 			change.originalFilePath
 				? toGitUri(vscode.Uri.file(change.originalFilePath), originalFileRef)

extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLIChatSessions.ts

@@ -371,13 +371,13 @@ export class CopilotCLIChatSessionContentProvider extends Disposable implements
 		sessionId: string,
 		worktreeProperties: Awaited<ReturnType<IChatSessionWorktreeService['getWorktreeProperties']>>,
 		workingDirectory: vscode.Uri | undefined,
-	): Promise<vscode.ChatSessionChangedFile2[]> {
-		const changes: vscode.ChatSessionChangedFile2[] = [];
+	): Promise<vscode.ChatSessionChangedFile[]> {
+		const changes: vscode.ChatSessionChangedFile[] = [];
 		if (worktreeProperties?.repositoryPath && await vscode.workspace.isResourceTrusted(vscode.Uri.file(worktreeProperties.repositoryPath))) {
 			changes.push(...(await this.copilotCLIWorktreeManagerService.getWorktreeChanges(sessionId) ?? []));
 		} else if (workingDirectory && await vscode.workspace.isResourceTrusted(workingDirectory)) {
 			const workspaceChanges = await this._workspaceFolderService.getWorkspaceChanges(sessionId) ?? [];
-			changes.push(...workspaceChanges.map(change => new vscode.ChatSessionChangedFile2(
+			changes.push(...workspaceChanges.map(change => new vscode.ChatSessionChangedFile(
 				vscode.Uri.file(change.filePath),
 				change.originalFilePath
 					? toGitUri(vscode.Uri.file(change.originalFilePath), 'HEAD')

extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLIChatSessionsContribution.ts

@@ -266,14 +266,14 @@ export class CopilotCLIChatSessionItemProvider extends Disposable implements vsc
 		}
 
 		// Statistics (only returned for trusted workspace/worktree folders)
-		const changes: vscode.ChatSessionChangedFile2[] = [];
+		const changes: vscode.ChatSessionChangedFile[] = [];
 		if (worktreeProperties?.repositoryPath && await vscode.workspace.isResourceTrusted(vscode.Uri.file(worktreeProperties.repositoryPath))) {
 			// Worktree
 			changes.push(...(await this.worktreeManager.getWorktreeChanges(session.id) ?? []));
 		} else if (workingDirectory && await vscode.workspace.isResourceTrusted(workingDirectory)) {
 			// Workspace
 			const workspaceChanges = await this.workspaceFolderService.getWorkspaceChanges(session.id) ?? [];
-			changes.push(...workspaceChanges.map(change => new vscode.ChatSessionChangedFile2(
+			changes.push(...workspaceChanges.map(change => new vscode.ChatSessionChangedFile(
 				vscode.Uri.file(change.filePath),
 				change.originalFilePath
 					? toGitUri(vscode.Uri.file(change.originalFilePath), 'HEAD')

extensions/copilot/src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts

@@ -1176,7 +1176,7 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
 				}
 
 				const multiDiffPart = await this._prFileChangesService.getFileChangesMultiDiffPart(pr);
-				const changes = multiDiffPart?.value?.map(change => new vscode.ChatSessionChangedFile2(
+				const changes = multiDiffPart?.value?.map(change => new vscode.ChatSessionChangedFile(
 					change.goToFileUri!,
 					change.originalUri,
 					change.modifiedUri,

src/vs/workbench/api/common/extHost.api.impl.ts

@@ -2132,7 +2132,6 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			InteractiveSessionVoteDirection: extHostTypes.InteractiveSessionVoteDirection,
 			ChatCopyKind: extHostTypes.ChatCopyKind,
 			ChatSessionChangedFile: extHostTypes.ChatSessionChangedFile,
-			ChatSessionChangedFile2: extHostTypes.ChatSessionChangedFile2,
 			ChatEditingSessionActionOutcome: extHostTypes.ChatEditingSessionActionOutcome,
 			InteractiveEditorResponseFeedbackKind: extHostTypes.InteractiveEditorResponseFeedbackKind,
 			DebugStackFrame: extHostTypes.DebugStackFrame,

src/vs/workbench/api/common/extHostTypes.ts

@@ -3791,10 +3791,6 @@ export class ChatDebugEventHookContent {
 }
 
 export class ChatSessionChangedFile {
-	constructor(public readonly modifiedUri: vscode.Uri, public readonly insertions: number, public readonly deletions: number, public readonly originalUri?: vscode.Uri) { }
-}
-
-export class ChatSessionChangedFile2 {
 	constructor(public readonly uri: vscode.Uri, public readonly originalUri: vscode.Uri | undefined, public readonly modifiedUri: vscode.Uri | undefined, public readonly insertions: number, public readonly deletions: number) { }
 }
 

src/vscode-dts/vscode.proposed.chatSessionsProvider.d.ts

@@ -343,7 +343,7 @@ declare module 'vscode' {
 		/**
 		 * Statistics about the chat session.
 		 */
-		changes?: readonly ChatSessionChangedFile[] | readonly ChatSessionChangedFile2[];
+		changes?: readonly ChatSessionChangedFile[];
 
 		/**
 		 * Arbitrary metadata for the chat session. Can be anything, but must be JSON-stringifyable.
@@ -353,34 +353,7 @@ declare module 'vscode' {
 		metadata?: { readonly [key: string]: any };
 	}
 
-	/**
-	 * @deprecated Use `ChatSessionChangedFile2` instead
-	 */
 	export class ChatSessionChangedFile {
-		/**
-		 * URI of the file.
-		 */
-		modifiedUri: Uri;
-
-		/**
-		 * File opened when the user takes the 'compare' action.
-		 */
-		originalUri?: Uri;
-
-		/**
-		 * Number of insertions made during the session.
-		 */
-		insertions: number;
-
-		/**
-		 * Number of deletions made during the session.
-		 */
-		deletions: number;
-
-		constructor(modifiedUri: Uri, insertions: number, deletions: number, originalUri?: Uri);
-	}
-
-	export class ChatSessionChangedFile2 {
 		/**
 		 * URI of the file.
 		 */