Update background change migration UI (#4288)

* New UI for workspace change confirmation UI in Copilot CLI

* Fixes

* Updates

* Fix tests

Author: DonJayamanne

src/extension/chatSessions/copilotcli/node/test/copilotcliSession.spec.ts

@@ -30,13 +30,10 @@ import { PermissionRequest } from '../permissionHelpers';
 import { IUserQuestionHandler, UserInputRequest, UserInputResponse } from '../userInputHelpers';
 import { NullICopilotCLIImageSupport } from './copilotCliSessionService.spec';
 
-vi.mock('../cliHelpers', async importOriginal => {
-	const actual = await importOriginal<typeof import('../cliHelpers')>();
-	return {
-		...actual,
-		getCopilotCLISessionStateDir: () => '/mock-session-state',
-	};
-});
+vi.mock('../cliHelpers', async (importOriginal) => ({
+	...(await importOriginal<typeof import('../cliHelpers')>()),
+	getCopilotCLISessionStateDir: () => '/mock-session-state',
+}));
 
 // Minimal shapes for types coming from the Copilot SDK we interact with
 interface MockSdkEventHandler { (payload: unknown): void }

src/extension/chatSessions/vscode-node/folderRepositoryManagerImpl.ts

@@ -14,12 +14,10 @@ import { raceCancellation } from '../../../util/vs/base/common/async';
 import { Disposable, DisposableStore } from '../../../util/vs/base/common/lifecycle';
 import { ResourceSet } from '../../../util/vs/base/common/map';
 import { isEqual } from '../../../util/vs/base/common/resources';
-import { isWelcomeView } from '../copilotcli/node/copilotCli';
-import { ICopilotCLISessionService } from '../copilotcli/node/copilotcliSessionService';
 import { createTimeout } from '../../inlineEdits/common/common';
 import { IToolsService } from '../../tools/common/toolsService';
 import { IChatSessionWorkspaceFolderService } from '../common/chatSessionWorkspaceFolderService';
-import { ChatSessionWorktreeProperties, IChatSessionWorktreeService } from '../common/chatSessionWorktreeService';
+import { ChatSessionWorktreeFile, ChatSessionWorktreeProperties, IChatSessionWorktreeService } from '../common/chatSessionWorktreeService';
 import {
 	FolderRepositoryInfo,
 	FolderRepositoryMRUEntry,
@@ -28,6 +26,8 @@ import {
 	InitializeFolderRepositoryOptions
 } from '../common/folderRepositoryManager';
 import { isUntitledSessionId } from '../common/utils';
+import { isWelcomeView } from '../copilotcli/node/copilotCli';
+import { ICopilotCLISessionService } from '../copilotcli/node/copilotcliSessionService';
 
 /**
  * Message shown when user needs to trust a folder to continue.
@@ -274,11 +274,9 @@ export abstract class FolderRepositoryManager extends Disposable implements IFol
 		// Check for uncommitted changes and prompt user before creating worktree
 		let uncommittedChangesAction: 'move' | 'copy' | 'skip' | 'cancel' | undefined = undefined;
 		if ((!sessionId || isUntitledSessionId(sessionId)) && !worktreeProperties) {
-			if (await this.checkIfRepoHasUncommittedChanges(sessionId, token)) {
-				uncommittedChangesAction = await this.promptForUncommittedChangesAction(sessionId, toolInvocationToken, token);
-				if (uncommittedChangesAction === 'cancel') {
-					return { folder, repository, worktree, worktreeProperties, trusted: true, cancelled: true };
-				}
+			uncommittedChangesAction = await this.promptForUncommittedChangesAction(sessionId, toolInvocationToken, token);
+			if (uncommittedChangesAction === 'cancel') {
+				return { folder, repository, worktree, worktreeProperties, trusted: true, cancelled: true };
 			}
 		}
 
@@ -406,11 +404,56 @@ export abstract class FolderRepositoryManager extends Disposable implements IFol
 		toolInvocationToken: vscode.ChatParticipantToolToken,
 		token: vscode.CancellationToken
 	): Promise<'move' | 'copy' | 'skip' | 'cancel' | undefined> {
-		const hasUncommittedChanges = await this.checkIfRepoHasUncommittedChanges(sessionId, token);
-		if (!hasUncommittedChanges) {
+		const uncommittedChanges = await this.getUncommittedChangesPromptData(sessionId, token);
+		if (!uncommittedChanges) {
 			return undefined;
 		}
 
+		if (!this.toolsService.getTool('vscode_get_modified_files_confirmation')) {
+			return this.promptForUncommittedChangesActionOld(sessionId, toolInvocationToken, token);
+		}
+
+		const isDelegation = !sessionId;
+		const title = isDelegation
+			? l10n.t('Delegate to Background Agent')
+			: l10n.t('Uncommitted Changes');
+		const message = isDelegation
+			? l10n.t('Background Agent will work in an isolated worktree to implement your requested changes.')
+			+ '\n\n'
+			+ l10n.t('The selected repository has uncommitted changes. Should these changes be included in the new worktree?')
+			: l10n.t('The selected repository has uncommitted changes. Should these changes be included in the new worktree?');
+
+		const copyChanges = l10n.t('Copy Changes');
+		const moveChanges = l10n.t('Move Changes');
+		const skipChanges = l10n.t('Skip Changes');
+		const options = [copyChanges, moveChanges, skipChanges];
+		const input = {
+			title,
+			message,
+			options,
+			modifiedFiles: uncommittedChanges.modifiedFiles
+		};
+		const result = await this.toolsService.invokeTool('vscode_get_modified_files_confirmation', { input, toolInvocationToken }, token);
+
+		const selection = this.getSelectedUncommittedChangesAction(result, options);
+
+		switch (selection?.toUpperCase()) {
+			case moveChanges.toUpperCase():
+				return 'move';
+			case copyChanges.toUpperCase():
+				return 'copy';
+			case skipChanges.toUpperCase():
+				return 'skip';
+			default:
+				return 'cancel';
+		}
+	}
+
+	private async promptForUncommittedChangesActionOld(
+		sessionId: string | undefined,
+		toolInvocationToken: vscode.ChatParticipantToolToken,
+		token: vscode.CancellationToken
+	): Promise<'move' | 'copy' | 'skip' | 'cancel' | undefined> {
 		const isDelegation = !sessionId;
 		const title = isDelegation
 			? l10n.t('Delegate to Background Agent')
@@ -448,35 +491,103 @@ export abstract class FolderRepositoryManager extends Disposable implements IFol
 		}
 	}
 
-	/**
-	 * Check if the repository associated with a session has uncommitted changes.
-	 */
-	private async checkIfRepoHasUncommittedChanges(sessionId: string | undefined, _token: vscode.CancellationToken): Promise<boolean> {
+	private getSelectedUncommittedChangesAction(
+		result: vscode.LanguageModelToolResult,
+		options: readonly string[]
+	): string | undefined {
+		for (const part of result.content) {
+			if (!(part instanceof LanguageModelTextPart)) {
+				continue;
+			}
+
+			const matchedOption = options.find(option => option.toUpperCase() === part.value.toUpperCase());
+			if (matchedOption) {
+				return matchedOption;
+			}
+		}
+
+		return undefined;
+	}
+
+	private async getUncommittedChangesPromptData(
+		sessionId: string | undefined,
+		token: vscode.CancellationToken
+	): Promise<{ repository: vscode.Uri; modifiedFiles: Array<{ uri: vscode.Uri; originalUri?: vscode.Uri; insertions?: number; deletions?: number }> } | undefined> {
+		const repository = await this.getRepositoryForUncommittedChanges(sessionId);
+		if (!repository) {
+			return undefined;
+		}
+
+		const modifiedFiles = await this.getModifiedFilesForConfirmation(repository.rootUri, repository, token);
+		if (modifiedFiles.length === 0) {
+			return undefined;
+		}
+
+		return {
+			repository: repository.rootUri,
+			modifiedFiles
+		};
+	}
+
+	private async getRepositoryForUncommittedChanges(sessionId: string | undefined): Promise<ReturnType<IGitService['activeRepository']['get']> | undefined> {
 		if (sessionId && isUntitledSessionId(sessionId)) {
 			const folder = this._untitledSessionFolders.get(sessionId)?.uri
 				?? await this.workspaceFolderService.getSessionWorkspaceFolder(sessionId);
 			if (folder) {
-				const repo = await this.gitService.getRepository(folder, false);
-				return repo?.changes
-					? (repo.changes.indexChanges.length > 0 || repo.changes.workingTree.length > 0)
-					: false;
+				return await this.gitService.getRepository(folder, false);
 			}
-			// No folder selected, fall through to active repo check
-		} else if (sessionId) {
-			// Non-untitled session, no need to check
-			return false;
+			// No folder selected, fall through to the active repository check.
+		}
+
+		if (sessionId && !isUntitledSessionId(sessionId)) {
+			return undefined;
 		}
 
-		// For delegation (no session) or untitled session without explicit folder selection,
-		// check active repository if there's a single workspace folder
 		if (!isWelcomeView(this.workspaceService) && this.workspaceService.getWorkspaceFolders().length === 1) {
-			const repo = this.gitService.activeRepository.get();
-			return repo?.changes
-				? (repo.changes.indexChanges.length > 0 || repo.changes.workingTree.length > 0)
-				: false;
+			return this.gitService.activeRepository.get();
 		}
 
-		return false;
+		return undefined;
+	}
+
+	private async getModifiedFilesForConfirmation(
+		repositoryUri: vscode.Uri,
+		repository: NonNullable<ReturnType<IGitService['activeRepository']['get']>>,
+		token: vscode.CancellationToken
+	): Promise<Array<{ uri: vscode.Uri; originalUri?: vscode.Uri; insertions?: number; deletions?: number }>> {
+		const workspaceChanges = await this.workspaceFolderService.getWorkspaceChanges(repositoryUri) ?? [];
+		if (workspaceChanges.length > 0) {
+			return workspaceChanges.map(change => this.toModifiedFileConfirmationEntry(change));
+		}
+
+		if (token.isCancellationRequested || !repository.changes) {
+			return [];
+		}
+
+		const modifiedFiles = new Map<string, { uri: vscode.Uri; originalUri?: vscode.Uri; insertions?: number; deletions?: number }>();
+		for (const change of [...repository.changes.indexChanges, ...repository.changes.workingTree]) {
+			const changePath = (change as { path?: string }).path;
+			const fileUri = change.uri ?? (changePath ? vscode.Uri.joinPath(repositoryUri, changePath) : undefined);
+			if (!fileUri) {
+				continue;
+			}
+			modifiedFiles.set(fileUri.toString(), {
+				uri: fileUri,
+				originalUri: change.originalUri
+			});
+		}
+
+		return [...modifiedFiles.values()];
+	}
+
+	private toModifiedFileConfirmationEntry(change: ChatSessionWorktreeFile): { uri: vscode.Uri; originalUri?: vscode.Uri; insertions?: number; deletions?: number } {
+		const uri = vscode.Uri.file(change.modifiedFilePath ?? change.filePath);
+		return {
+			uri: uri,
+			originalUri: change.originalFilePath ? vscode.Uri.file(change.originalFilePath) : undefined,
+			insertions: change.statistics.additions,
+			deletions: change.statistics.deletions
+		};
 	}
 
 	/**

src/extension/chatSessions/vscode-node/test/copilotCLIChatSessionParticipant.spec.ts

@@ -34,7 +34,7 @@ import { MockChatResponseStream, TestChatRequest } from '../../../test/node/test
 import { type IToolsService } from '../../../tools/common/toolsService';
 import { mockLanguageModelChat } from '../../../tools/node/test/searchToolTestUtils';
 import { IChatSessionWorkspaceFolderService } from '../../common/chatSessionWorkspaceFolderService';
-import { IChatSessionWorktreeService, type ChatSessionWorktreeProperties } from '../../common/chatSessionWorktreeService';
+import { IChatSessionWorktreeService, type ChatSessionWorktreeFile, type ChatSessionWorktreeProperties } from '../../common/chatSessionWorktreeService';
 import { getWorkingDirectory, IWorkspaceInfo } from '../../common/workspaceInfo';
 import { IChatDelegationSummaryService } from '../../copilotcli/common/delegationSummaryService';
 import { type CopilotCLIModelInfo, type ICopilotCLIModels, type ICopilotCLISDK } from '../../copilotcli/node/copilotCli';
@@ -87,8 +87,14 @@ vi.mock('vscode', async (importOriginal) => {
 
 class FakeToolsService extends mock<IToolsService>() {
 	nextConfirmationButton: string | undefined = undefined;
+	override getTool(name: string) {
+		if (name === 'vscode_get_modified_files_confirmation') {
+			return { name } as any;
+		}
+		return undefined;
+	}
 	override invokeTool = vi.fn(async (name: string, _options: unknown, _token: unknown) => {
-		if (name === 'vscode_get_confirmation_with_options') {
+		if (name === 'vscode_get_modified_files_confirmation') {
 			const button = this.nextConfirmationButton;
 			if (button !== undefined) {
 				return new LanguageModelToolResult2([new LanguageModelTextPart(button)]);
@@ -102,6 +108,7 @@ class FakeToolsService extends mock<IToolsService>() {
 class FakeChatSessionWorkspaceFolderService extends mock<IChatSessionWorkspaceFolderService>() {
 	private _sessionWorkspaceFolders = new Map<string, vscode.Uri>();
 	private _recentFolders: { folder: vscode.Uri; lastAccessTime: number }[] = [];
+	private _workspaceChanges = new Map<string, readonly ChatSessionWorktreeFile[] | undefined>();
 	override trackSessionWorkspaceFolder = vi.fn(async (sessionId: string, workspaceFolderUri: string) => {
 		this._sessionWorkspaceFolders.set(sessionId, vscode.Uri.file(workspaceFolderUri));
 	});
@@ -114,12 +121,18 @@ class FakeChatSessionWorkspaceFolderService extends mock<IChatSessionWorkspaceFo
 	override getRecentFolders = vi.fn((): Promise<{ folder: vscode.Uri; lastAccessTime: number }[]> => {
 		return Promise.resolve(this._recentFolders);
 	});
+	override getWorkspaceChanges = vi.fn(async (workspaceFolderUri: vscode.Uri): Promise<readonly ChatSessionWorktreeFile[] | undefined> => {
+		return this._workspaceChanges.get(workspaceFolderUri.toString());
+	});
 	setTestRecentFolders(folders: { folder: vscode.Uri; lastAccessTime: number }[]): void {
 		this._recentFolders = folders;
 	}
 	setTestSessionWorkspaceFolder(sessionId: string, folder: vscode.Uri): void {
 		this._sessionWorkspaceFolders.set(sessionId, folder);
 	}
+	setTestWorkspaceChanges(folder: vscode.Uri, changes: readonly ChatSessionWorktreeFile[] | undefined): void {
+		this._workspaceChanges.set(folder.toString(), changes);
+	}
 }
 
 class FakeChatSessionWorktreeService extends mock<IChatSessionWorktreeService>() {
@@ -566,11 +579,12 @@ describe('CopilotCLIChatSessionParticipant.handleRequest', () => {
 
 		// With the awaitable confirmation, the session should be created in a single request
 		expect(manager.sessions.size).toBe(1);
-		expect(tools.invokeTool).toHaveBeenCalledWith(
-			'vscode_get_confirmation_with_options',
-			expect.objectContaining({ input: expect.objectContaining({ title: 'Delegate to Background Agent' }) }),
-			token
-		);
+		const delegateCallArgs = (tools.invokeTool as unknown as ReturnType<typeof vi.fn>).mock.calls[0];
+		expect(delegateCallArgs[0]).toBe('vscode_get_modified_files_confirmation');
+		expect(delegateCallArgs[1].input.title).toBe('Delegate to Background Agent');
+		expect(delegateCallArgs[1].input.modifiedFiles).toHaveLength(1);
+		expect(delegateCallArgs[1].input.modifiedFiles[0].uri.toString()).toBe(Uri.file(`${sep}workspace${sep}file.ts`).toString());
+		expect(delegateCallArgs[2]).toBe(token);
 	});
 
 	it('handles /delegate command from another chat without active repository', async () => {
@@ -701,11 +715,12 @@ describe('CopilotCLIChatSessionParticipant.handleRequest', () => {
 		expect(cliSessions[0].requests.length).toBe(1);
 		expect(cliSessions[0].requests[0].input).toEqual({ prompt: 'Fix the bug', plan: false });
 		// Verify confirmation tool was invoked with the right title
-		expect(tools.invokeTool).toHaveBeenCalledWith(
-			'vscode_get_confirmation_with_options',
-			expect.objectContaining({ input: expect.objectContaining({ title: 'Uncommitted Changes' }) }),
-			token
-		);
+		const confirmCallArgs = (tools.invokeTool as unknown as ReturnType<typeof vi.fn>).mock.calls[0];
+		expect(confirmCallArgs[0]).toBe('vscode_get_modified_files_confirmation');
+		expect(confirmCallArgs[1].input.title).toBe('Uncommitted Changes');
+		expect(confirmCallArgs[1].input.modifiedFiles).toHaveLength(1);
+		expect(confirmCallArgs[1].input.modifiedFiles[0].uri.toString()).toBe(Uri.file(`${sep}repo${sep}file.ts`).toString());
+		expect(confirmCallArgs[2]).toBe(token);
 	});
 
 	it('uses request prompt directly when user accepts uncommitted changes confirmation', async () => {