Sessions - wire up the discard changes action#305830
Merged
Conversation
joshspicer
approved these changes
Mar 27, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the Agent Sessions “Changes” view to correctly pass a discard reference to its per-file actions, and enhances the built-in Git extension so discarding/restoring changes also clears AI-edit contribution tracking and properly handles untracked resources.
Changes:
- Update the Sessions changes view action runner to supply a single “discard ref” argument (derived from session checkpoints) instead of an original/modified ref pair.
- In the Git extension, improve
Repository.restore()to clean untracked/ignored resources and clear AI contribution tracking when discarding/restoring. - Refactor untracked deletion logic into a shared
_clean()helper used by bothclean()andrestore().
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| src/vs/sessions/contrib/changes/browser/changesView.ts | Adjusts Sessions changes-view action wiring to pass a discard reference based on checkpoint refs/version mode. |
| extensions/git/src/repository.ts | Ensures restore/discard clears AI contribution state and can delete untracked/ignored resources; refactors trash/permanent delete flow into a helper. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.