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 - changes view improvements (#305294)

Browse Source 
* Only load the changes from last turn when needed

* Update action rendering

* Update title actions/context when switching sessions

* Add progress indicator

---------

Co-authored-by: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
This commit is contained in:
Ladislau Szomoru
2026-03-26 22:07:25 +00:00
committed by GitHub
parent 556c436dc4
commit e159670b49
2 changed files with 87 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@ import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.j
import { Event } from '../../../../base/common/event.js';
import { autorun, constObservable, derived, derivedOpts, IObservable, IObservableWithChange, ISettableObservable, ObservablePromise, observableSignalFromEvent, observableValue, runOnChange } from '../../../../base/common/observable.js';
import { basename, dirname } from '../../../../base/common/path.js';
import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';
import { extUriBiasedIgnorePathCase, isEqual } from '../../../../base/common/resources.js';
import { ThemeIcon } from '../../../../base/common/themables.js';
import { URI } from '../../../../base/common/uri.js';
@@ -38,6 +39,7 @@ import { ServiceCollection } from '../../../../platform/instantiation/common/ser
import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
import { IThemeService } from '../../../../platform/theme/common/themeService.js';
import { defaultProgressBarStyles } from '../../../../platform/theme/browser/defaultStyles.js';
import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
import { fillEditorsDragData } from '../../../../workbench/browser/dnd.js';
import { IResourceLabel, ResourceLabels } from '../../../../workbench/browser/labels.js';
@@ -91,8 +93,14 @@ const enum ChangesVersionMode {
LastTurn = 'lastTurn'
}
const enum IsolationMode {
Workspace = 'workspace',
Worktree = 'worktree'
}
const changesVersionModeContextKey = new RawContextKey<ChangesVersionMode>('sessions.changesVersionMode', ChangesVersionMode.AllChanges);
const isMergeBaseBranchProtectedContextKey = new RawContextKey<boolean>('sessions.isMergeBaseBranchProtected', false);
const isolationModeContextKey = new RawContextKey<IsolationMode>('sessions.isolationMode', IsolationMode.Workspace);
const hasOpenPullRequestContextKey = new RawContextKey<boolean>('sessions.hasOpenPullRequest', false);
const hasIncomingChangesContextKey = new RawContextKey<boolean>('sessions.hasIncomingChanges', false);
const hasOutgoingChangesContextKey = new RawContextKey<boolean>('sessions.hasOutgoingChanges', false);
@@ -315,6 +323,7 @@ export class ChangesViewPane extends ViewPane {
// Actions container is positioned outside the card for this layout experiment
private actionsContainer: HTMLElement | undefined;
private changesProgressBar!: ProgressBar;
private tree: WorkbenchCompressibleObjectTree<ChangesTreeElement> | undefined;
private ciStatusWidget: CIStatusWidget | undefined;
private splitView: SplitView | undefined;
@@ -369,6 +378,11 @@ export class ChangesViewPane extends ViewPane {
return activeSession?.sessionType ?? '';
}));
// Title actions
this._register(autorun(reader => {
this.viewModel.activeSessionResourceObs.read(reader);
this.updateActions();
}));
}
protected override renderBody(container: HTMLElement): void {
@@ -410,6 +424,11 @@ export class ChangesViewPane extends ViewPane {
this.overviewContainer = dom.append(this.contentContainer, $('.chat-editing-session-overview'));
this.summaryContainer = dom.append(this.overviewContainer, $('.changes-summary'));
// Changes card progress bar
const progressContainer = dom.append(this.contentContainer, $('.changes-progress'));
this.changesProgressBar = this._register(new ProgressBar(progressContainer, defaultProgressBarStyles));
this.changesProgressBar.stop().hide();
// List container
this.listContainer = dom.append(this.contentContainer, $('.chat-editing-session-list'));
@@ -589,22 +608,50 @@ export class ChangesViewPane extends ViewPane {
const lastCheckpointRef = lastCheckpointRefObs.read(reader);
return lastCheckpointRef
? new ObservablePromise(repository.diffBetweenWithStats(`${lastCheckpointRef}^`, lastCheckpointRef)).resolvedValue
: new ObservablePromise(repository.diffBetweenWithStats(`${headCommit}^`, headCommit)).resolvedValue;
const diffPromise = lastCheckpointRef
? repository.diffBetweenWithStats(`${lastCheckpointRef}^`, lastCheckpointRef)
: repository.diffBetweenWithStats(`${headCommit}^`, headCommit);
return new ObservablePromise(diffPromise).resolvedValue;
});
const isLoadingLastTurnObs = derived(reader => {
const versionMode = this.viewModel.versionModeObs.read(reader);
if (versionMode !== ChangesVersionMode.LastTurn) {
return false;
}
const headCommit = headCommitObs.read(reader);
const repository = this.viewModel.activeSessionRepositoryObs.read(reader);
if (!repository || !headCommit) {
return false;
}
const result = lastTurnChangesObs.read(reader).read(reader);
return result === undefined;
});
this.renderDisposables.add(autorun(reader => {
const isLoading = isLoadingLastTurnObs.read(reader);
if (isLoading) {
this.changesProgressBar.infinite().show(200);
} else {
this.changesProgressBar.stop().hide();
}
}));
// Combine both entry sources for display
const combinedEntriesObs = derived(reader => {
const headCommit = headCommitObs.read(reader);
const sessionFiles = sessionFilesObs.read(reader);
const lastTurnDiffChanges = lastTurnChangesObs.read(reader).read(reader);
const versionMode = this.viewModel.versionModeObs.read(reader);
let sourceEntries: IChangesFileItem[];
if (versionMode === ChangesVersionMode.LastTurn) {
const lastCheckpointRef = lastCheckpointRefObs.read(reader);
const lastTurnDiffChanges = lastTurnChangesObs.read(reader).read(reader);
const diffChanges = lastTurnDiffChanges ?? [];
const lastCheckpointRef = lastCheckpointRefObs.read(undefined);
const ref = lastCheckpointRef
? lastCheckpointRef
@@ -673,9 +720,21 @@ export class ChangesViewPane extends ViewPane {
if (this.actionsContainer) {
dom.clearNode(this.actionsContainer);
let lastHasChanges = false;
this.renderDisposables.add(bindContextKey(ChatContextKeys.hasAgentSessionChanges, this.scopedContextKeyService, reader => {
if (isLoadingLastTurnObs.read(reader)) {
return lastHasChanges;
}
const { files } = topLevelStats.read(reader);
return files > 0;
lastHasChanges = files > 0;
return lastHasChanges;
}));
this.renderDisposables.add(bindContextKey(isolationModeContextKey, this.scopedContextKeyService, reader => {
const activeSession = this.sessionManagementService.activeSession.read(reader);
return activeSession?.workspace.read(reader)?.repositories[0].workingDirectory === undefined
? IsolationMode.Workspace
: IsolationMode.Worktree;
}));
this.renderDisposables.add(bindContextKey(isMergeBaseBranchProtectedContextKey, this.scopedContextKeyService, reader => {
@@ -787,6 +846,10 @@ export class ChangesViewPane extends ViewPane {
if (action.id === 'github.copilot.chat.mergeCopilotCLIAgentSessionChanges.merge') {
return { showIcon: true, showLabel: true, isSecondary: false };
}
if (action.id === 'github.copilot.sessions.commitChanges') {
return { showIcon: true, showLabel: true, isSecondary: false };
}
return undefined;
}
}
@@ -796,6 +859,10 @@ export class ChangesViewPane extends ViewPane {
// Update visibility and file count badge based on entries
this.renderDisposables.add(autorun(reader => {
if (isLoadingLastTurnObs.read(reader)) {
return;
}
const { files } = topLevelStats.read(reader);
const hasEntries = files > 0;
@@ -820,6 +887,10 @@ export class ChangesViewPane extends ViewPane {
this.summaryContainer.appendChild(linesRemovedSpan);
this.renderDisposables.add(autorun(reader => {
if (isLoadingLastTurnObs.read(reader)) {
return;
}
const { added, removed } = topLevelStats.read(reader);
linesAddedSpan.textContent = `+${added}`;
@@ -968,8 +1039,9 @@ export class ChangesViewPane extends ViewPane {
this.renderDisposables.add(autorun(reader => {
const entries = combinedEntriesObs.read(reader);
const viewMode = this.viewModel.viewModeObs.read(reader);
const isLoading = isLoadingLastTurnObs.read(reader);
if (!this.tree) {
if (!this.tree || isLoading) {
return;
}
@@ -1309,7 +1381,7 @@ registerAction2(SetChangesTreeViewModeAction);
MenuRegistry.appendMenuItem(MenuId.ChatEditingSessionTitleToolbar, {
submenu: MenuId.ChatEditingSessionChangesVersionsSubmenu,
title: localize2('versionsActions', 'Versions'),
icon: Codicon.versions,
icon: Codicon.listFilter,
group: 'navigation',
order: 9,
when: ContextKeyExpr.and(ContextKeyExpr.equals('view', CHANGES_VIEW_ID), IsSessionsWindowContext),