Copilot CLI: refactor how uncommitted changes are determined before creating a new CLI session (#4756)

* Copilot CLI: refactor how uncommitted changes are determined before creating a new CLI session

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

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Updates

* Address review comments

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: DonJayamanne

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

@@ -6,17 +6,14 @@
 import { promises as fs } from 'fs';
 import * as vscode from 'vscode';
 import { IVSCodeExtensionContext } from '../../../platform/extContext/common/extensionContext';
-import { IFileSystemService } from '../../../platform/filesystem/common/fileSystemService';
-import { RelativePattern } from '../../../platform/filesystem/common/fileTypes';
 import { IGitService, RepoContext } from '../../../platform/git/common/gitService';
 import { parseGitChangesRaw } from '../../../platform/git/vscode-node/utils';
 import { DiffChange } from '../../../platform/git/vscode/git';
 import { ILogService } from '../../../platform/log/common/logService';
 import { coalesce } from '../../../util/vs/base/common/arrays';
 import { SequencerByKey } from '../../../util/vs/base/common/async';
-import { Disposable, DisposableResourceMap, DisposableStore } from '../../../util/vs/base/common/lifecycle';
+import { Disposable } from '../../../util/vs/base/common/lifecycle';
 import { ResourceMap, ResourceSet } from '../../../util/vs/base/common/map';
-import { autorun } from '../../../util/vs/base/common/observableInternal';
 import * as path from '../../../util/vs/base/common/path';
 import { isEqual } from '../../../util/vs/base/common/resources';
 import { generateUuid } from '../../../util/vs/base/common/uuid';
@@ -37,14 +34,12 @@ export class ChatSessionWorkspaceFolderService extends Disposable implements ICh
 	private recentFolders: { folder: vscode.Uri; lastAccessTime: number }[] = [];
 	private readonly deletedFolders = new ResourceSet();
 	private readonly workspaceChangesSequencer = new SequencerByKey<string>();
-	private readonly repoStateSubscriptions = this._register(new DisposableResourceMap());
 
 	constructor(
 		@IGitService private readonly gitService: IGitService,
 		@ILogService private readonly logService: ILogService,
 		@IChatSessionMetadataStore private readonly metadataStore: IChatSessionMetadataStore,
 		@IVSCodeExtensionContext private readonly extensionContext: IVSCodeExtensionContext,
-		@IFileSystemService private readonly fileSystemService: IFileSystemService,
 		@IAgentSessionsWorkspace private readonly agentSessionsWorkspace: IAgentSessionsWorkspace,
 	) {
 		super();
@@ -118,9 +113,6 @@ export class ChatSessionWorkspaceFolderService extends Disposable implements ICh
 				return [];
 			}
 
-			// Subscribe to repository state changes to invalidate the cache
-			this.subscribeToRepoStateChanges(workspaceFolderUri, repository);
-
 			// Workspace changes are handled differently in the Sessions app,
 			// where all changes remain in the working tree and are not being
 			// staged.
@@ -222,30 +214,4 @@ export class ChatSessionWorkspaceFolderService extends Disposable implements ICh
 	clearWorkspaceChanges(workspaceFolderUri: vscode.Uri): void {
 		this.workspaceFolderChanges.delete(workspaceFolderUri);
 	}
-
-	private subscribeToRepoStateChanges(workspaceFolderUri: vscode.Uri, repository: RepoContext): void {
-		if (this.repoStateSubscriptions.has(workspaceFolderUri)) {
-			return;
-		}
-
-		const disposables = new DisposableStore();
-
-		// Invalidate cache when the HEAD commit changes (e.g. after a commit, checkout, merge, rebase)
-		disposables.add(autorun(reader => {
-			repository.headCommitHashObs.read(reader);
-			this.workspaceFolderChanges.delete(workspaceFolderUri);
-		}));
-
-		// Invalidate cache when files change in the workspace folder
-		const watcher = this.fileSystemService.createFileSystemWatcher(new RelativePattern(workspaceFolderUri, '**'));
-		disposables.add(watcher);
-		const onFileChange = () => {
-			this.workspaceFolderChanges.delete(workspaceFolderUri);
-		};
-		disposables.add(watcher.onDidChange(onFileChange));
-		disposables.add(watcher.onDidCreate(onFileChange));
-		disposables.add(watcher.onDidDelete(onFileChange));
-
-		this.repoStateSubscriptions.set(workspaceFolderUri, disposables);
-	}
 }

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

@@ -15,7 +15,6 @@ import { Disposable, DisposableStore } from '../../../util/vs/base/common/lifecy
 import { ResourceSet } from '../../../util/vs/base/common/map';
 import { isEqual } from '../../../util/vs/base/common/resources';
 import { createTimeout } from '../../inlineEdits/common/common';
-import { ToolName } from '../../tools/common/toolNames';
 import { IToolsService } from '../../tools/common/toolsService';
 import { IChatSessionWorkspaceFolderService } from '../common/chatSessionWorkspaceFolderService';
 import { ChatSessionWorktreeFile, ChatSessionWorktreeProperties, IChatSessionWorktreeService } from '../common/chatSessionWorktreeService';
@@ -254,7 +253,7 @@ 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) {
-			uncommittedChangesAction = await this.promptForUncommittedChangesAction(sessionId, toolInvocationToken, token);
+			uncommittedChangesAction = await this.promptForUncommittedChangesAction(sessionId, repository, branch, toolInvocationToken, token);
 			if (uncommittedChangesAction === 'cancel') {
 				return { folder, repository, worktree, worktreeProperties, trusted: true, cancelled: true };
 			}
@@ -374,18 +373,16 @@ export abstract class FolderRepositoryManager extends Disposable implements IFol
 	 */
 	private async promptForUncommittedChangesAction(
 		sessionId: string | undefined,
+		repositoryUri: vscode.Uri,
+		branch: string | undefined,
 		toolInvocationToken: vscode.ChatParticipantToolToken,
 		token: vscode.CancellationToken
 	): Promise<'move' | 'copy' | 'skip' | 'cancel' | undefined> {
-		const uncommittedChanges = await this.getUncommittedChangesPromptData(sessionId, token);
+		const uncommittedChanges = await this.getUncommittedChanges(repositoryUri, branch, 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 Copilot CLI')
@@ -422,48 +419,6 @@ export abstract class FolderRepositoryManager extends Disposable implements IFol
 		}
 	}
 
-	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 Copilot CLI')
-			: l10n.t('Uncommitted Changes');
-		const message = isDelegation
-			? l10n.t('Copilot CLI 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 cancel = l10n.t('Cancel');
-		const buttons = [copyChanges, moveChanges, skipChanges, cancel];
-		const input = {
-			title,
-			message,
-			buttons
-		};
-		const result = await this.toolsService.invokeTool(ToolName.CoreConfirmationToolWithOptions, { input, toolInvocationToken }, token);
-
-		const firstResultPart = result.content.at(0);
-		const selection = firstResultPart instanceof LanguageModelTextPart ? firstResultPart.value : undefined;
-
-		switch (selection?.toUpperCase()) {
-			case moveChanges.toUpperCase():
-				return 'move';
-			case copyChanges.toUpperCase():
-				return 'copy';
-			case skipChanges.toUpperCase():
-				return 'skip';
-			default:
-				return 'cancel';
-		}
-	}
-
 	private getSelectedUncommittedChangesAction(
 		result: vscode.LanguageModelToolResult,
 		options: readonly string[]
@@ -482,15 +437,21 @@ export abstract class FolderRepositoryManager extends Disposable implements IFol
 		return undefined;
 	}
 
-	private async getUncommittedChangesPromptData(
-		sessionId: string | undefined,
+	private async getUncommittedChanges(
+		folderPath: vscode.Uri,
+		branch: 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);
+		const repository = await this.gitService.getRepository(folderPath);
 		if (!repository) {
 			return undefined;
 		}
 
+		// If the current branch is not the same as the requested branch, we cannot reliably determine the uncommitted changes, so skip the confirmation.
+		if (branch && repository.headBranchName !== branch) {
+			return undefined;
+		}
+
 		const modifiedFiles = await this.getModifiedFilesForConfirmation(repository.rootUri, repository, token);
 		if (modifiedFiles.length === 0) {
 			return undefined;
@@ -502,27 +463,6 @@ export abstract class FolderRepositoryManager extends Disposable implements IFol
 		};
 	}
 
-	private async getRepositoryForUncommittedChanges(sessionId: string | undefined): Promise<ReturnType<IGitService['activeRepository']['get']> | undefined> {
-		if (sessionId && isUntitledSessionId(sessionId)) {
-			const folder = this._newSessionFolders.get(sessionId)?.uri
-				?? await this.workspaceFolderService.getSessionWorkspaceFolder(sessionId);
-			if (folder) {
-				return await this.gitService.getRepository(folder, false);
-			}
-			// No folder selected, fall through to the active repository check.
-		}
-
-		if (sessionId && !isUntitledSessionId(sessionId)) {
-			return undefined;
-		}
-
-		if (!isWelcomeView(this.workspaceService) && this.workspaceService.getWorkspaceFolders().length === 1) {
-			return this.gitService.activeRepository.get();
-		}
-
-		return undefined;
-	}
-
 	private async getModifiedFilesForConfirmation(
 		repositoryUri: vscode.Uri,
 		repository: NonNullable<ReturnType<IGitService['activeRepository']['get']>>,