Agents - add support for "Discard Changes" in "Uncommitted Changes" (#313530)

Author: lszomoru

extensions/copilot/package.json

@@ -5830,7 +5830,7 @@
 			"chat/input/editing/sessionChangeToolbar": [
 				{
 					"command": "github.copilot.sessions.discardChanges",
-					"when": "chatSessionType == copilotcli && isSessionsWindow && sessions.hasGitRepository && sessions.changesVersionMode == branchChanges && !sessions.isAgentHostSession",
+					"when": "chatSessionType == copilotcli && isSessionsWindow && sessions.hasGitRepository && !sessions.isAgentHostSession && (sessions.changesVersionMode == branchChanges || sessions.changesVersionMode == uncommittedChanges)",
 					"group": "navigation@2"
 				}
 			],

src/vs/sessions/contrib/changes/browser/changesViewModel.ts

@@ -259,12 +259,26 @@ export class ChangesViewModel extends Disposable {
 		});
 
 		// Uncommitted changes
+		const activeSessionUncommittedChangesCountObs = derived(reader => {
+			const sessionMetadata = this._activeSessionMetadataObs.read(reader);
+			const uncommittedChanges = sessionMetadata?.uncommittedChanges as number | undefined;
+
+			const activeSession = this.sessionManagementService.activeSession.read(reader);
+			const workspace = activeSession?.workspace.read(reader);
+			const workspaceRepository = workspace?.repositories[0];
+
+			return uncommittedChanges ?? workspaceRepository?.uncommittedChanges;
+		});
+
 		this._activeSessionUncommittedChangesPromiseObs = derived(reader => {
 			const repositoryPath = activeSessionRepositoryPathObs.read(reader);
 			if (!repositoryPath) {
 				return constObservable([]);
 			}
 
+			// Re-run when the number of uncommitted changes changes
+			activeSessionUncommittedChangesCountObs.read(reader);
+
 			const diffPromise = this._getRepositoryChanges(repositoryPath, 'HEAD', undefined);
 			return new ObservablePromise(diffPromise).resolvedValue;
 		});