Sessions - add action to discard changes (#4781)

lszomoru · web-flow · commit 9812a32a353d · 2026-03-27T21:41:04.000Z
diff --git a/package.json b/package.json
@@ -2833,6 +2833,13 @@
 				"icon": "$(git-commit)",
 				"category": "GitHub Copilot"
 			},
+			{
+				"command": "github.copilot.sessions.discardChanges",
+				"title": "%github.copilot.command.sessions.discardChanges%",
+				"enablement": "!chatSessionRequestInProgress",
+				"icon": "$(discard)",
+				"category": "GitHub Copilot"
+			},
 			{
 				"command": "github.copilot.chat.createPullRequestCopilotCLIAgentSession.createPR",
 				"title": "%github.copilot.chat.createPullRequestCopilotCLIAgentSession.createPR%",
@@ -5246,6 +5253,10 @@
 					"command": "github.copilot.sessions.commitChanges",
 					"when": "false"
 				},
+				{
+					"command": "github.copilot.sessions.discardChanges",
+					"when": "false"
+				},
 				{
 					"command": "github.copilot.sessions.refreshChanges",
 					"when": "false"
@@ -5624,6 +5635,12 @@
 					"when": "chatSessionType == copilotcli && isSessionsWindow",
 					"group": "9_refresh@1"
 				}
+			],
+			"chat/input/editing/sessionChangeToolbar": [
+				{
+					"command": "github.copilot.sessions.discardChanges",
+					"group": "navigation@1"
+				}
 			]
 		},
 		"icons": {
diff --git a/package.nls.json b/package.nls.json
@@ -484,5 +484,6 @@
 	"github.copilot.session.providerDescription.cloud": "Delegate tasks to the GitHub Copilot coding agent. The agent iterates via chat and works asynchronously in the cloud to implement changes and pull requests as needed.",
 	"github.copilot.session.providerDescription.background": "Delegate tasks to a background agent running locally on your machine. The agent iterates via chat and works asynchronously in a Git worktree to implement changes isolated from your main workspace using the GitHub Copilot CLI.",
 	"github.copilot.command.sessions.commitChanges": "Commit",
+	"github.copilot.command.sessions.discardChanges": "Discard Changes",
 	"github.copilot.command.sessions.refreshChanges": "Refresh"
 }
diff --git a/src/extension/chatSessions/vscode-node/copilotCLIChatSessions.ts b/src/extension/chatSessions/vscode-node/copilotCLIChatSessions.ts
@@ -2266,15 +2266,22 @@ export function registerCLIChatCommands(
 
 		const sessionId = SessionIdForCLI.parse(resource);
 		const worktreeProperties = await copilotCLIWorktreeManagerService.getWorktreeProperties(sessionId);
+		const workspaceFolder = await copilotCliWorkspaceSession.getSessionWorkspaceFolder(sessionId);
 
-		if (!worktreeProperties) {
+		if (!worktreeProperties && !workspaceFolder) {
 			return;
 		}
 
-		await copilotCLIWorktreeManagerService.setWorktreeProperties(sessionId, {
-			...worktreeProperties,
-			changes: undefined
-		});
+		if (worktreeProperties) {
+			// Worktree
+			await copilotCLIWorktreeManagerService.setWorktreeProperties(sessionId, {
+				...worktreeProperties,
+				changes: undefined
+			});
+		} else if (workspaceFolder) {
+			// Workspace
+			copilotCliWorkspaceSession.clearWorkspaceChanges(workspaceFolder);
+		}
 
 		await contentProvider.refreshSession({ reason: 'update', sessionId });
 	}));
@@ -2294,6 +2301,24 @@ export function registerCLIChatCommands(
 		});
 	}));
 
+	disposableStore.add(vscode.commands.registerCommand('github.copilot.sessions.discardChanges', async (sessionResource: vscode.Uri, ref: string, ...resources: vscode.Uri[]) => {
+		if (!isUri(sessionResource) || resources.some(r => !isUri(r))) {
+			return;
+		}
+
+		const sessionId = SessionIdForCLI.parse(sessionResource);
+		const worktreeProperties = await copilotCLIWorktreeManagerService.getWorktreeProperties(sessionId);
+		const workspaceFolder = await copilotCliWorkspaceSession.getSessionWorkspaceFolder(sessionId);
+
+		const repositoryUri = worktreeProperties ? Uri.file(worktreeProperties.worktreePath) : workspaceFolder;
+		const repository = repositoryUri ? await gitService.getRepository(repositoryUri) : undefined;
+		if (!repository) {
+			return;
+		}
+
+		await gitService.restore(repository.rootUri, resources.map(r => r.fsPath), { ref });
+	}));
+
 	disposableStore.add(vscode.commands.registerCommand('github.copilot.chat.createPullRequestCopilotCLIAgentSession.createPR', async (sessionItemOrResource?: vscode.ChatSessionItem | vscode.Uri) => {
 		const resource = sessionItemOrResource instanceof vscode.Uri
 			? sessionItemOrResource
diff --git a/src/extension/chatSessions/vscode-node/copilotCLIChatSessionsContribution.ts b/src/extension/chatSessions/vscode-node/copilotCLIChatSessionsContribution.ts
@@ -2319,15 +2319,22 @@ export function registerCLIChatCommands(
 
 		const sessionId = SessionIdForCLI.parse(resource);
 		const worktreeProperties = await copilotCLIWorktreeManagerService.getWorktreeProperties(sessionId);
+		const workspaceFolder = await copilotCliWorkspaceSession.getSessionWorkspaceFolder(sessionId);
 
-		if (!worktreeProperties) {
+		if (!worktreeProperties && !workspaceFolder) {
 			return;
 		}
 
-		await copilotCLIWorktreeManagerService.setWorktreeProperties(sessionId, {
-			...worktreeProperties,
-			changes: undefined
-		});
+		if (worktreeProperties) {
+			// Worktree
+			await copilotCLIWorktreeManagerService.setWorktreeProperties(sessionId, {
+				...worktreeProperties,
+				changes: undefined
+			});
+		} else if (workspaceFolder) {
+			// Workspace
+			copilotCliWorkspaceSession.clearWorkspaceChanges(workspaceFolder);
+		}
 
 		copilotcliSessionItemProvider.notifySessionsChange();
 	}));
@@ -2347,6 +2354,24 @@ export function registerCLIChatCommands(
 		});
 	}));
 
+	disposableStore.add(vscode.commands.registerCommand('github.copilot.sessions.discardChanges', async (sessionResource: vscode.Uri, ref: string, ...resources: vscode.Uri[]) => {
+		if (!isUri(sessionResource) || resources.some(r => !isUri(r))) {
+			return;
+		}
+
+		const sessionId = SessionIdForCLI.parse(sessionResource);
+		const worktreeProperties = await copilotCLIWorktreeManagerService.getWorktreeProperties(sessionId);
+		const workspaceFolder = await copilotCliWorkspaceSession.getSessionWorkspaceFolder(sessionId);
+
+		const repositoryUri = worktreeProperties ? Uri.file(worktreeProperties.worktreePath) : workspaceFolder;
+		const repository = repositoryUri ? await gitService.getRepository(repositoryUri) : undefined;
+		if (!repository) {
+			return;
+		}
+
+		await gitService.restore(repository.rootUri, resources.map(r => r.fsPath), { ref });
+	}));
+
 	disposableStore.add(vscode.commands.registerCommand('github.copilot.chat.createPullRequestCopilotCLIAgentSession.createPR', async (sessionItemOrResource?: vscode.ChatSessionItem | vscode.Uri) => {
 		const resource = sessionItemOrResource instanceof vscode.Uri
 			? sessionItemOrResource
diff --git a/src/extension/prompt/node/test/repoInfoTelemetry.spec.ts b/src/extension/prompt/node/test/repoInfoTelemetry.spec.ts
@@ -94,6 +94,7 @@ suite('RepoInfoTelemetry', () => {
 			diffIndexWithHEADShortStats: vi.fn(),
 			fetch: vi.fn(),
 			getMergeBase: vi.fn(),
+			restore: vi.fn(),
 			add: vi.fn(),
 			createWorktree: vi.fn(),
 			deleteWorktree: vi.fn(),
diff --git a/src/platform/git/common/gitService.ts b/src/platform/git/common/gitService.ts
@@ -66,6 +66,7 @@ export interface IGitService extends IDisposable {
 	diffIndexWithHEADShortStats(uri: URI): Promise<CommitShortStat | undefined>;
 	fetch(uri: URI, remote?: string, ref?: string, depth?: number): Promise<void>;
 	getMergeBase(uri: URI, ref1: string, ref2: string): Promise<string | undefined>;
+	restore(uri: URI, paths: string[], options?: { staged?: boolean; ref?: string }): Promise<void>;
 
 	createWorktree(uri: URI, options?: { path?: string; commitish?: string; branch?: string }): Promise<string | undefined>;
 	deleteWorktree(uri: URI, path: string, options?: { force?: boolean }): Promise<void>;
diff --git a/src/platform/git/vscode-node/gitServiceImpl.ts b/src/platform/git/vscode-node/gitServiceImpl.ts
@@ -228,6 +228,12 @@ export class GitServiceImpl extends Disposable implements IGitService {
 		await repository?.add(paths);
 	}
 
+	async restore(uri: URI, paths: string[], options?: { staged?: boolean; ref?: string }): Promise<void> {
+		const gitAPI = this.gitExtensionService.getExtensionApi();
+		const repository = gitAPI?.getRepository(uri);
+		await repository?.restore(paths, options);
+	}
+
 	async log(uri: vscode.Uri, options?: LogOptions): Promise<Commit[] | undefined> {
 		const gitAPI = this.gitExtensionService.getExtensionApi();
 		if (!gitAPI) {
diff --git a/src/platform/git/vscode/git.d.ts b/src/platform/git/vscode/git.d.ts
@@ -249,6 +249,7 @@ export interface Repository {
 	add(paths: string[]): Promise<void>;
 	revert(paths: string[]): Promise<void>;
 	clean(paths: string[]): Promise<void>;
+	restore(paths: string[], options?: { staged?: boolean; ref?: string }): Promise<void>;
 
 	apply(patch: string, reverse?: boolean): Promise<void>;
 	diff(cached?: boolean): Promise<string>;
diff --git a/src/platform/ignore/node/test/mockGitService.ts b/src/platform/ignore/node/test/mockGitService.ts
@@ -70,6 +70,10 @@ export class MockGitService implements IGitService {
 		return Promise.resolve();
 	}
 
+	restore(_uri: URI, _paths: string[], _options?: { staged?: boolean; ref?: string }): Promise<void> {
+		return Promise.resolve();
+	}
+
 	log(_uri: URI, _options?: LogOptions): Promise<Commit[] | undefined> {
 		return Promise.resolve(undefined);
 	}
diff --git a/src/platform/test/node/simulationWorkspaceServices.ts b/src/platform/test/node/simulationWorkspaceServices.ts
@@ -786,6 +786,10 @@ export class TestingGitService implements IGitService {
 		return;
 	}
 
+	async restore(_uri: URI, _paths: string[], _options?: { staged?: boolean; ref?: string }): Promise<void> {
+		return;
+	}
+
 	async createWorktree(uri: URI, options?: { path?: string; commitish?: string; branch?: string }): Promise<string | undefined> {
 		return undefined;
 	}

Original file line number	Diff line number	Diff line change
`@@ -484,5 +484,6 @@`
`484`	`484`	`"github.copilot.session.providerDescription.cloud": "Delegate tasks to the GitHub Copilot coding agent. The agent iterates via chat and works asynchronously in the cloud to implement changes and pull requests as needed.",`
`485`	`485`	`"github.copilot.session.providerDescription.background": "Delegate tasks to a background agent running locally on your machine. The agent iterates via chat and works asynchronously in a Git worktree to implement changes isolated from your main workspace using the GitHub Copilot CLI.",`
`486`	`486`	`"github.copilot.command.sessions.commitChanges": "Commit",`
	`487`	`+ "github.copilot.command.sessions.discardChanges": "Discard Changes",`
`487`	`488`	`"github.copilot.command.sessions.refreshChanges": "Refresh"`
`488`	`489`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,10 @@ export class MockGitService implements IGitService {`
`70`	`70`	`return Promise.resolve();`
`71`	`71`	`}`
`72`	`72`
	`73`	`+ restore(_uri: URI, _paths: string[], _options?: { staged?: boolean; ref?: string }): Promise<void> {`
	`74`	`+ return Promise.resolve();`
	`75`	`+ }`
	`76`	`+`
`73`	`77`	`log(_uri: URI, _options?: LogOptions): Promise<Commit[] \| undefined> {`
`74`	`78`	`return Promise.resolve(undefined);`
`75`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -786,6 +786,10 @@ export class TestingGitService implements IGitService {`
`786`	`786`	`return;`
`787`	`787`	`}`
`788`	`788`
	`789`	`+ async restore(_uri: URI, _paths: string[], _options?: { staged?: boolean; ref?: string }): Promise<void> {`
	`790`	`+ return;`
	`791`	`+ }`
	`792`	`+`
`789`	`793`	`async createWorktree(uri: URI, options?: { path?: string; commitish?: string; branch?: string }): Promise<string \| undefined> {`
`790`	`794`	`return undefined;`
`791`	`795`	`}`