Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 03:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sessions - support last turn's changes when using checkpoints (#303001)

Browse Source 
* Sessions - support last turn's changes when using checkpoints

* Potential fix for pull request finding

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

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
Ladislau Szomoru
2026-03-18 22:58:21 +00:00
committed by GitHub
parent 9b39e51a9f
commit 4a0c7fcf30
6 changed files with 92 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/vs/sessions/contrib/changes/browser/changesView.ts
View File

@@ -586,14 +586,48 @@ export class ChangesViewPane extends ViewPane {
return repository?.state.read(reader)?.HEAD?.commit;
});
const lastCheckpointRefObs = derived(reader => {
const sessionResource = activeSessionResource.read(reader);
if (!sessionResource) {
return undefined;
}
sessionsChangedSignal.read(reader);
const model = this.agentSessionsService.getSession(sessionResource);
return model?.metadata?.lastCheckpointRef as string | undefined;
});
const beforeLastCheckpointRefObs = derived(reader => {
const lastCheckpointRef = lastCheckpointRefObs.read(reader);
if (!lastCheckpointRef) {
return undefined;
}
const checkpointSegments = lastCheckpointRef.split('/');
const turnCount = parseInt(checkpointSegments.pop() ?? '-1', 10);
if (!Number.isFinite(turnCount) || turnCount <= 0) {
return undefined;
}
checkpointSegments.push(`${turnCount - 1}`);
return checkpointSegments.join('/');
});
const lastTurnChangesObs = derived(reader => {
const repository = this.activeSessionRepositoryObs.read(reader);
const headCommit = headCommitObs.read(reader);
if (!repository || !headCommit) {
return constObservable(undefined);
}
return new ObservablePromise(repository.diffBetweenWithStats(`${headCommit}^`, headCommit)).resolvedValue;
const lastCheckpointRef = lastCheckpointRefObs.read(reader);
const beforeLastCheckpointRef = beforeLastCheckpointRefObs.read(reader);
return lastCheckpointRef && beforeLastCheckpointRef
? new ObservablePromise(repository.diffBetweenWithStats2(`${beforeLastCheckpointRef}..${lastCheckpointRef}`)).resolvedValue
: new ObservablePromise(repository.diffBetweenWithStats(`${headCommit}^`, headCommit)).resolvedValue;
});
// Combine both entry sources for display
@@ -607,13 +641,30 @@ export class ChangesViewPane extends ViewPane {
let sourceEntries: IChangesFileItem[];
if (versionMode === ChangesVersionMode.LastTurn) {
const diffChanges = lastTurnDiffChanges ?? [];
const parentRef = headCommit ? `${headCommit}^` : '';
const lastCheckpointRef = lastCheckpointRefObs.read(undefined);
const beforeLastCheckpointRef = beforeLastCheckpointRefObs.read(undefined);
const ref = lastCheckpointRef
? lastCheckpointRef
: headCommit;
const parentRef = beforeLastCheckpointRef
? beforeLastCheckpointRef
: headCommit ? `${headCommit}^` : undefined;
sourceEntries = diffChanges.map(change => {
const isDeletion = change.modifiedUri === undefined;
const isAddition = change.originalUri === undefined;
const fileUri = change.modifiedUri ?? change.uri;
const originalUri = isAddition ? change.originalUri
: headCommit ? fileUri.with({ scheme: 'git', query: JSON.stringify({ path: fileUri.fsPath, ref: parentRef }) })
const uri = change.modifiedUri ?? change.uri;
const fileUri = isDeletion
? uri
: ref
? uri.with({ scheme: 'git', query: JSON.stringify({ path: uri.fsPath, ref }) })
: uri;
const originalUri = isAddition
? change.originalUri
: parentRef
? fileUri.with({ scheme: 'git', query: JSON.stringify({ path: fileUri.fsPath, ref: parentRef }) })
: change.originalUri;
return {
type: 'file',