Clear workspace changes before retrieving modified files in FolderRepositoryManager (#4831)

* Clear workspace changes before retrieving modified files in FolderRepositoryManager

* Fix tests

Author: DonJayamanne

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

@@ -69,6 +69,7 @@ class NullChatSessionWorkspaceFolderService extends mock<IChatSessionWorkspaceFo
 	override getSessionWorkspaceFolder = vi.fn(async () => undefined);
 	override handleRequestCompleted = vi.fn(async () => { });
 	override getWorkspaceChanges = vi.fn(async () => undefined);
+	override clearWorkspaceChanges = vi.fn(() => { });
 }
 
 class NullChatSessionWorktreeService extends mock<IChatSessionWorktreeService>() {

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

@@ -468,6 +468,7 @@ export abstract class FolderRepositoryManager extends Disposable implements IFol
 		repository: NonNullable<ReturnType<IGitService['activeRepository']['get']>>,
 		token: vscode.CancellationToken
 	): Promise<Array<{ uri: vscode.Uri; originalUri?: vscode.Uri; insertions?: number; deletions?: number }>> {
+		this.workspaceFolderService.clearWorkspaceChanges(repositoryUri);
 		const workspaceChanges = await this.workspaceFolderService.getWorkspaceChanges(repositoryUri) ?? [];
 		if (workspaceChanges.length > 0) {
 			return workspaceChanges.map(change => this.toModifiedFileConfirmationEntry(change));

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

@@ -151,6 +151,9 @@ class FakeChatSessionWorkspaceFolderService extends mock<IChatSessionWorkspaceFo
 	setTestWorkspaceChanges(folder: vscode.Uri, changes: readonly ChatSessionWorktreeFile[] | undefined): void {
 		this._workspaceChanges.set(folder.toString(), changes);
 	}
+	override clearWorkspaceChanges(workspaceFolderUri: vscode.Uri): void {
+		this._workspaceChanges.delete(workspaceFolderUri.toString());
+	}
 }
 
 class FakeChatSessionWorktreeService extends mock<IChatSessionWorktreeService>() {

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

@@ -96,6 +96,9 @@ class FakeChatSessionWorkspaceFolderService extends mock<IChatSessionWorkspaceFo
 	setTestWorkspaceChanges(folder: vscode.Uri, changes: readonly ChatSessionWorktreeFile[] | undefined): void {
 		this._workspaceChanges.set(folder.toString(), changes);
 	}
+	override clearWorkspaceChanges(workspaceFolderUri: vscode.Uri): void {
+		this._workspaceChanges.delete(workspaceFolderUri.toString());
+	}
 }
 
 /**