Show Copilot Coding Agent tasks overall progress (#7297)

Fixes #7148

Author: alexr00

src/github/copilotPrWatcher.ts

@@ -46,18 +46,26 @@ export class CopilotStateModel extends Disposable {
 		}
 	}
 
-	set(pullRequestModel: PullRequestModel, status: CopilotPRStatus): void {
-		const key = this.makeKey(pullRequestModel.remote.owner, pullRequestModel.remote.repositoryName, pullRequestModel.number);
-		const currentStatus = this._states.get(key);
-		if (currentStatus?.status === status) {
-			return;
+	set(statuses: { pullRequestModel: PullRequestModel, status: CopilotPRStatus }[]): void {
+		const changedModels: PullRequestModel[] = [];
+		const changedKeys: string[] = [];
+		for (const { pullRequestModel, status } of statuses) {
+			const key = this.makeKey(pullRequestModel.remote.owner, pullRequestModel.remote.repositoryName, pullRequestModel.number);
+			const currentStatus = this._states.get(key);
+			if (currentStatus?.status === status) {
+				continue;
+			}
+			this._states.set(key, { item: pullRequestModel, status });
+			changedModels.push(pullRequestModel);
+			changedKeys.push(key);
 		}
-		this._states.set(key, { item: pullRequestModel, status });
 		if (this._isInitialized) {
-			this._showNotification.add(key);
-			this._onDidChangeNotifications.fire(pullRequestModel ? [pullRequestModel] : []);
+			changedKeys.forEach(key => this._showNotification.add(key));
+			this._onDidChangeNotifications.fire(changedModels);
+		}
+		if (changedModels.length > 0) {
+			this._onDidChangeStates.fire();
 		}
-		this._onDidChangeStates.fire();
 	}
 
 	get(owner: string, repo: string, prNumber: number): CopilotPRStatus {
@@ -86,13 +94,42 @@ export class CopilotStateModel extends Disposable {
 	get isInitialized(): boolean {
 		return this._isInitialized;
 	}
+
+	getCounts(): { total: number; inProgress: number; error: number } {
+		let inProgressCount = 0;
+		let errorCount = 0;
+
+		for (const state of this._states.values()) {
+			if (state.status === CopilotPRStatus.Started) {
+				inProgressCount++;
+			} else if (state.status === CopilotPRStatus.Failed) {
+				errorCount++;
+			}
+		}
+
+		return {
+			total: this._states.size,
+			inProgress: inProgressCount,
+			error: errorCount
+		};
+	}
 }
 
 export class CopilotPRWatcher extends Disposable {
 
 	constructor(private readonly _reposManager: RepositoriesManager, private readonly _model: CopilotStateModel) {
 		super();
+		if (this._reposManager.folderManagers.length === 0) {
+			const initDisposable = this._reposManager.onDidChangeAnyGitHubRepository(() => {
+				initDisposable.dispose();
+				this._initialize();
+			});
+		} else {
+			this._initialize();
+		}
+	}
 
+	private _initialize() {
 		this._getStateChanges();
 		this._pollForChanges();
 		this._register(this._reposManager.onDidChangeAnyPullRequests(() => this._getStateChanges()));
@@ -138,6 +175,7 @@ export class CopilotPRWatcher extends Disposable {
 		const unseenKeys: Set<string> = new Set(this._model.keys());
 		let initialized = 0;
 
+		const changes: { pullRequestModel: PullRequestModel, status: CopilotPRStatus }[] = [];
 		for (const folderManager of this._reposManager.folderManagers) {
 			// It doesn't matter which repo we use since the query will specify the owner/repo.
 			const githubRepository = folderManager.gitHubRepositories[0];
@@ -161,14 +199,15 @@ export class CopilotPRWatcher extends Disposable {
 						prNumber: pr.number,
 						status: latestEvent
 					});
-					this._model.set(pr, latestEvent);
+					changes.push({ pullRequestModel: pr, status: latestEvent });
 				}
 			}
 
 			for (const key of unseenKeys) {
 				this._model.deleteKey(key);
 			}
 		}
+		this._model.set(changes);
 		if (!this._model.isInitialized) {
 			if ((initialized === this._reposManager.folderManagers.length) && (this._reposManager.folderManagers.length > 0)) {
 				this._model.setInitialized();

src/github/copilotRemoteAgent.ts

@@ -668,7 +668,11 @@ export class CopilotRemoteAgentManager extends Disposable {
 		return this._stateModel.notifications.has(key);
 	}
 
-	public getStateForPR(owner: string, repo: string, prNumber: number): CopilotPRStatus {
+	getStateForPR(owner: string, repo: string, prNumber: number): CopilotPRStatus {
 		return this._stateModel.get(owner, repo, prNumber);
 	}
+
+	getCounts(): { total: number; inProgress: number; error: number } {
+		return this._stateModel.getCounts();
+	}
 }

src/github/repositoriesManager.ts

@@ -48,6 +48,9 @@ export class RepositoriesManager extends Disposable {
 	private _onDidChangeAnyPullRequests = new vscode.EventEmitter<IssueModel[]>();
 	readonly onDidChangeAnyPullRequests = this._onDidChangeAnyPullRequests.event;
 
+	private _onDidAddAnyGitHubRepository = new vscode.EventEmitter<FolderRepositoryManager>();
+	readonly onDidChangeAnyGitHubRepository = this._onDidAddAnyGitHubRepository.event;
+
 	private _state: ReposManagerState = ReposManagerState.Initializing;
 
 	constructor(
@@ -82,6 +85,7 @@ export class RepositoriesManager extends Disposable {
 			folderManager.onDidChangeActivePullRequest(() => this.updateActiveReviewCount()),
 			folderManager.onDidDispose(() => this.removeRepo(folderManager.repository)),
 			folderManager.onDidChangeAnyPullRequests(e => this._onDidChangeAnyPullRequests.fire(e)),
+			folderManager.onDidChangeGithubRepositories(() => this._onDidAddAnyGitHubRepository.fire(folderManager)),
 		];
 		this._subs.set(folderManager, disposables);
 	}

src/view/prsTreeDataProvider.ts

@@ -110,6 +110,9 @@ export class PullRequestsTreeDataProvider extends Disposable implements vscode.T
 			} else {
 				this._view.badge = undefined;
 			}
+
+			// also need to refresh the Copilot query category to update the status
+			this.refresh(undefined);
 		}));
 
 		this._register(this._copilotManager.onDidCreatePullRequest(() => this.refresh(undefined, true)));

src/view/treeNodes/categoryNode.ts

@@ -131,6 +131,7 @@ export class CategoryTreeNode extends TreeNode implements vscode.TreeItem {
 	public contextValue: string;
 	public resourceUri: vscode.Uri;
 	public tooltip?: string | vscode.MarkdownString | undefined;
+	readonly isCopilot: boolean;
 
 	constructor(
 		parent: TreeNodeParent,
@@ -146,8 +147,8 @@ export class CategoryTreeNode extends TreeNode implements vscode.TreeItem {
 		super(parent);
 
 		this.prs = new Map();
-		const isCopilot = _categoryQuery && isCopilotQuery(_categoryQuery);
-		const hasCopilotChanges = isCopilot && this._copilotManager.notificationsCount > 0;
+		this.isCopilot = !!_categoryQuery && isCopilotQuery(_categoryQuery);
+		const hasCopilotChanges = this.isCopilot && this._copilotManager.notificationsCount > 0;
 
 		switch (this.type) {
 			case PRType.All:
@@ -184,7 +185,7 @@ export class CategoryTreeNode extends TreeNode implements vscode.TreeItem {
 			this.contextValue = 'query';
 		}
 
-		if (isCopilot) {
+		if (this.isCopilot) {
 			this.tooltip = vscode.l10n.t('Pull requests you asked the coding agent to create');
 		} else if (this.type === PRType.LocalPullRequest) {
 			this.tooltip = vscode.l10n.t('Pull requests for branches you have locally');
@@ -195,6 +196,28 @@ export class CategoryTreeNode extends TreeNode implements vscode.TreeItem {
 		} else {
 			this.tooltip = this.label;
 		}
+
+		this.description = this._getDescription();
+	}
+
+	private _getDescription(): string | undefined {
+		if (!this.isCopilot) {
+			return undefined;
+		}
+		const counts = this._copilotManager.getCounts();
+		if (counts.total === 0) {
+			return undefined;
+		} else if (counts.error > 0) {
+			if (counts.inProgress > 0) {
+				return vscode.l10n.t('{0} in progress, {1} with errors', counts.inProgress, counts.error);
+			} else {
+				return vscode.l10n.t('{0} with errors', counts.error);
+			}
+		} else if (counts.inProgress > 0) {
+			return vscode.l10n.t('{0} in progress', counts.inProgress);
+		} else {
+			return vscode.l10n.t('done working on {0}', counts.total);
+		}
 	}
 
 	public async expandPullRequest(pullRequest: PullRequestModel, retry: boolean = true): Promise<boolean> {

src/view/treeNodes/commitNode.ts

@@ -22,7 +22,6 @@ export class CommitNode extends TreeNode implements vscode.TreeItem {
 	public collapsibleState: vscode.TreeItemCollapsibleState;
 	public iconPath: vscode.Uri | undefined;
 	public contextValue?: string;
-	public description: string | undefined;
 
 	constructor(
 		parent: TreeNodeParent,

src/view/treeNodes/fileChangeNode.ts

@@ -139,13 +139,14 @@ export class FileChangeNode extends TreeNode implements vscode.TreeItem {
 		);
 
 		this.accessibilityInformation = { label: `${this.label} pull request diff`, role: 'link' };
+		this.description = this._getDescription();
 	}
 
 	get resourceUri(): vscode.Uri {
 		return this.changeModel.filePath.with({ query: this.fileChangeResourceUri.query });
 	}
 
-	get description(): string | true {
+	protected _getDescription(): string | true {
 		const layout = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<string>(FILE_LIST_LAYOUT);
 		if (layout === 'flat') {
 			return true;
@@ -221,7 +222,7 @@ export class FileChangeNode extends TreeNode implements vscode.TreeItem {
  * File change node whose content can not be resolved locally and we direct users to GitHub.
  */
 export class RemoteFileChangeNode extends FileChangeNode implements vscode.TreeItem {
-	override get description(): string {
+	protected override _getDescription(): string {
 		let description = vscode.workspace.asRelativePath(path.dirname(this.changeModel.fileName), false);
 		if (description === '.') {
 			description = '';
@@ -406,7 +407,6 @@ export class GitFileChangeNode extends FileChangeNode implements vscode.TreeItem
  * File change node whose content is resolved from GitHub. For files not yet associated with a pull request.
  */
 export class GitHubFileChangeNode extends TreeNode implements vscode.TreeItem {
-	public description: string;
 	public iconPath: vscode.ThemeIcon;
 	public fileChangeResourceUri: vscode.Uri;
 	public readonly tooltip: string;

src/view/treeNodes/repositoryChangesNode.ts

@@ -23,7 +23,6 @@ export class RepositoryChangesNode extends TreeNode implements vscode.TreeItem {
 	public contextValue?: string;
 	public tooltip: string;
 	public iconPath: vscode.ThemeIcon | vscode.Uri | undefined;
-	public description?: string;
 	readonly collapsibleState = vscode.TreeItemCollapsibleState.Expanded;
 	private isLocal: boolean;
 	public readonly repository: Repository;

src/view/treeNodes/treeNode.ts

@@ -22,6 +22,7 @@ export abstract class TreeNode extends Disposable {
 	label?: string;
 	accessibilityInformation?: vscode.AccessibilityInformation;
 	id?: string;
+	description?: string | boolean;
 
 	constructor(public parent: TreeNodeParent) {
 		super();