Append file changes in response stream (#7404)

* Append file changes in response stream

* 💄

Author: rebornix

src/@types/vscode.proposed.chatParticipantAdditions.d.ts

@@ -107,8 +107,49 @@ declare module 'vscode' {
 		constructor(toolName: string, toolCallId: string, isError?: boolean);
 	}
 
-	export type ExtendedChatResponsePart = ChatResponsePart | ChatResponseTextEditPart | ChatResponseNotebookEditPart | ChatResponseConfirmationPart | ChatResponseCodeCitationPart | ChatResponseReferencePart2 | ChatResponseMovePart | ChatResponseExtensionsPart | ChatPrepareToolInvocationPart;
+	/**
+	 * Represents a single file diff entry in a multi diff view.
+	 */
+	export interface ChatResponseDiffEntry {
+		/**
+		 * The original file URI (undefined for new files).
+		 */
+		originalUri?: Uri;
+
+		/**
+		 * The modified file URI (undefined for deleted files).
+		 */
+		modifiedUri?: Uri;
+
+		/**
+		 * Optional URI to navigate to when clicking on the file.
+		 */
+		goToFileUri?: Uri;
+	}
+
+	/**
+	 * Represents a part of a chat response that shows multiple file diffs.
+	 */
+	export class ChatResponseMultiDiffPart {
+		/**
+		 * Array of file diff entries to display.
+		 */
+		value: ChatResponseDiffEntry[];
+
+		/**
+		 * The title for the multi diff editor.
+		 */
+		title: string;
 
+		/**
+		 * Create a new ChatResponseMultiDiffPart.
+		 * @param value Array of file diff entries.
+		 * @param title The title for the multi diff editor.
+		 */
+		constructor(value: ChatResponseDiffEntry[], title: string);
+	}
+
+	export type ExtendedChatResponsePart = ChatResponsePart | ChatResponseTextEditPart | ChatResponseNotebookEditPart | ChatResponseConfirmationPart | ChatResponseCodeCitationPart | ChatResponseReferencePart2 | ChatResponseMovePart | ChatResponseExtensionsPart | ChatResponsePullRequestPart | ChatPrepareToolInvocationPart | ChatToolInvocationPart | ChatResponseMultiDiffPart;
 	export class ChatResponseWarningPart {
 		value: MarkdownString;
 		constructor(value: string | MarkdownString);
@@ -194,6 +235,15 @@ declare module 'vscode' {
 		constructor(extensions: string[]);
 	}
 
+	export class ChatResponsePullRequestPart {
+		readonly uri: Uri;
+		readonly linkTag: string;
+		readonly title: string;
+		readonly description: string;
+		readonly author: string;
+		constructor(uri: Uri, title: string, description: string, author: string, linkTag: string);
+	}
+
 	export interface ChatResponseStream {
 
 		/**
@@ -374,6 +424,10 @@ declare module 'vscode' {
 			participant?: string;
 			command?: string;
 		};
+		/**
+		 * An optional detail string that will be rendered at the end of the response in certain UI contexts.
+		 */
+		details?: string;
 	}
 
 	export namespace chat {
@@ -468,6 +522,15 @@ declare module 'vscode' {
 		outcome: ChatEditingSessionActionOutcome;
 	}
 
+	export interface ChatEditingHunkAction {
+		// eslint-disable-next-line local/vscode-dts-string-type-literals
+		kind: 'chatEditingHunkAction';
+		uri: Uri;
+		lineCount: number;
+		outcome: ChatEditingSessionActionOutcome;
+		hasRemainingEdits: boolean;
+	}
+
 	export enum ChatEditingSessionActionOutcome {
 		Accepted = 1,
 		Rejected = 2,
@@ -476,7 +539,7 @@ declare module 'vscode' {
 
 	export interface ChatUserActionEvent {
 		readonly result: ChatResult;
-		readonly action: ChatCopyAction | ChatInsertAction | ChatApplyAction | ChatTerminalAction | ChatCommandAction | ChatFollowupAction | ChatBugReportAction | ChatEditorAction | ChatEditingSessionAction;
+		readonly action: ChatCopyAction | ChatInsertAction | ChatApplyAction | ChatTerminalAction | ChatCommandAction | ChatFollowupAction | ChatBugReportAction | ChatEditorAction | ChatEditingSessionAction | ChatEditingHunkAction;
 	}
 
 	export interface ChatPromptReference {

src/github/copilotRemoteAgent.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import vscode, { ThemeIcon } from 'vscode';
+import vscode from 'vscode';
 import { parseSessionLogs, parseToolCallDetails } from '../../common/sessionParsing';
 import { Repository } from '../api/api';
 import { COPILOT_LOGINS, copilotEventToStatus, CopilotPRStatus, mostRecentCopilotEvent } from '../common/copilot';
@@ -782,7 +782,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 		}
 		return [];
 	}
-  
+
 	private extractPromptFromEvent(event: TimelineEvent): string {
 		let body = '';
 		if (event.event === EventType.Commented) {
@@ -876,7 +876,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 			history.push(sessionRequest);
 
 			// Create response turn
-			const responseHistory = await this.createResponseTurn(logs, session);
+			const responseHistory = await this.createResponseTurn(pullRequest, logs, session);
 			if (responseHistory) {
 				history.push(responseHistory);
 			}
@@ -1019,9 +1019,9 @@ export class CopilotRemoteAgentManager extends Disposable {
 			});
 	}
 
-	private async createResponseTurn(logs: string, session: SessionInfo): Promise<vscode.ChatResponseTurn2 | undefined> {
+	private async createResponseTurn(pullRequest: PullRequestModel, logs: string, session: SessionInfo): Promise<vscode.ChatResponseTurn2 | undefined> {
 		if (logs.trim().length > 0) {
-			return await this.parseSessionLogsIntoResponseTurn(logs, session);
+			return await this.parseSessionLogsIntoResponseTurn(pullRequest, logs, session);
 		} else if (session.state === 'in_progress') {
 			// For in-progress sessions without logs, create a placeholder response
 			const placeholderParts = [new vscode.ChatResponseMarkdownPart('Session is initializing...')];
@@ -1135,7 +1135,12 @@ export class CopilotRemoteAgentManager extends Disposable {
 		const pollingInterval = 3000; // 3 seconds
 
 		return new Promise<void>((resolve, reject) => {
-			const complete = () => {
+			const complete = async () => {
+				const multiDiffPart = await this.getFileChangesMultiDiffPart(pullRequest);
+				if (multiDiffPart) {
+					stream.push(multiDiffPart);
+				}
+
 				stream.push(new vscode.ChatResponseCommandButtonPart({
 					title: vscode.l10n.t('Open Changes'),
 					command: 'pr.openChanges',
@@ -1218,6 +1223,37 @@ export class CopilotRemoteAgentManager extends Disposable {
 		});
 	}
 
+	private async getFileChangesMultiDiffPart(pullRequest: PullRequestModel): Promise<vscode.ChatResponseMultiDiffPart | undefined> {
+		try {
+			const repoInfo = await this.repoInfo();
+			if (!repoInfo) {
+				return undefined;
+			}
+
+			const { fm: folderManager } = repoInfo;
+			const changeModels = await PullRequestModel.getChangeModels(folderManager, pullRequest);
+
+			if (changeModels.length === 0) {
+				return undefined;
+			}
+
+			const diffEntries: vscode.ChatResponseDiffEntry[] = [];
+			for (const changeModel of changeModels) {
+				diffEntries.push({
+					originalUri: changeModel.parentFilePath,
+					modifiedUri: changeModel.filePath,
+					goToFileUri: changeModel.filePath
+				});
+			}
+
+			const title = `Changes in Pull Request #${pullRequest.number}`;
+			return new vscode.ChatResponseMultiDiffPart(diffEntries, title);
+		} catch (error) {
+			Logger.error(`Failed to get file changes multi diff part: ${error}`, CopilotRemoteAgentManager.ID);
+			return undefined;
+		}
+	}
+
 	private findPullRequestById(id: number): PullRequestModel | undefined {
 		for (const folderManager of this.repositoriesManager.folderManagers) {
 			for (const githubRepo of folderManager.gitHubRepositories) {
@@ -1273,10 +1309,10 @@ export class CopilotRemoteAgentManager extends Disposable {
 		return toolPart;
 	}
 
-	private async parseSessionLogsIntoResponseTurn(logs: string, _session: SessionInfo): Promise<vscode.ChatResponseTurn2 | undefined> {
+	private async parseSessionLogsIntoResponseTurn(pullRequest: PullRequestModel, logs: string, session: SessionInfo): Promise<vscode.ChatResponseTurn2 | undefined> {
 		try {
 			const logChunks = parseSessionLogs(logs);
-			const responseParts: Array<vscode.ChatResponseMarkdownPart | vscode.ChatToolInvocationPart> = [];
+			const responseParts: Array<vscode.ChatResponseMarkdownPart | vscode.ChatToolInvocationPart | vscode.ChatResponseMultiDiffPart> = [];
 			let currentResponseContent = '';
 
 			for (const chunk of logChunks) {
@@ -1312,6 +1348,13 @@ export class CopilotRemoteAgentManager extends Disposable {
 				responseParts.push(new vscode.ChatResponseMarkdownPart(currentResponseContent.trim()));
 			}
 
+			if (session.state === 'completed') {
+				const fileChangesPart = await this.getFileChangesMultiDiffPart(pullRequest);
+				if (fileChangesPart) {
+					responseParts.push(fileChangesPart);
+				}
+			}
+
 			if (responseParts.length > 0) {
 				const responseResult: vscode.ChatResult = {};
 				return new vscode.ChatResponseTurn2(responseParts, responseResult, 'copilot-swe-agent');
@@ -1427,7 +1470,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 		const isDark = vscode.window.activeColorTheme.kind === vscode.ColorThemeKind.Dark ||
 			vscode.window.activeColorTheme.kind === vscode.ColorThemeKind.HighContrast;
 		const themeKind = isDark ? 'dark' : 'light';
-    
+
 		switch (status) {
 			case CopilotPRStatus.Completed:
 				return DataUri.copilotSuccessAsImageDataURI(