Switch to decoration for the padawan query notification (#7071)

* Switch to decoration for the padawan query notification

* Clear notification timeout

Author: alexr00

src/common/uri.ts

@@ -576,8 +576,11 @@ export enum Schemes {
 	NewIssue = 'newissue', // New issue file
 	Repo = 'repo', // New issue file for passing data
 	Git = 'git', // File content from the git extension
+	PRQuery = 'prquery', // PR query tree item
 }
 
+export const COPILOT_QUERY = vscode.Uri.from({ scheme: Schemes.PRQuery, path: 'copilot' });
+
 export function resolvePath(from: vscode.Uri, to: string) {
 	if (from.scheme === Schemes.File) {
 		return pathUtils.resolve(from.fsPath, to);

src/github/copilotPrWatcher.ts

@@ -41,8 +41,10 @@ export class CopilotStateModel extends Disposable {
 	private _isInitialized = false;
 	private readonly _states: Map<string, CopilotPRStatus> = new Map();
 	private readonly _showNotification: Set<string> = new Set();
-	private readonly _onDidChange = this._register(new vscode.EventEmitter<void>());
-	readonly onDidChange = this._onDidChange.event;
+	private readonly _onDidChangeStates = this._register(new vscode.EventEmitter<void>());
+	readonly onDidChangeStates = this._onDidChangeStates.event;
+	private readonly _onDidChangeNotifications = this._register(new vscode.EventEmitter<void>());
+	readonly onDidChangeNotifications = this._onDidChangeNotifications.event;
 
 	makeKey(owner: string, repo: string, prNumber: number): string {
 		return `${owner}/${repo}#${prNumber}`;
@@ -57,8 +59,9 @@ export class CopilotStateModel extends Disposable {
 			this._states.delete(key);
 			if (this._showNotification.has(key)) {
 				this._showNotification.delete(key);
+				this._onDidChangeNotifications.fire();
 			}
-			this._onDidChange.fire();
+			this._onDidChangeStates.fire();
 		}
 	}
 
@@ -71,8 +74,9 @@ export class CopilotStateModel extends Disposable {
 		this._states.set(key, status);
 		if (this._isInitialized) {
 			this._showNotification.add(key);
+			this._onDidChangeNotifications.fire();
 		}
-		this._onDidChange.fire();
+		this._onDidChangeStates.fire();
 	}
 
 	get(owner: string, repo: string, prNumber: number): CopilotPRStatus {
@@ -86,6 +90,7 @@ export class CopilotStateModel extends Disposable {
 
 	clearNotifications(): void {
 		this._showNotification.clear();
+		this._onDidChangeNotifications.fire();
 	}
 
 	get notifications(): ReadonlySet<string> {

src/view/prStatusDecorationProvider.ts

@@ -5,7 +5,8 @@
 
 import * as vscode from 'vscode';
 import { Disposable } from '../common/lifecycle';
-import { createPRNodeUri, fromPRNodeUri, Schemes } from '../common/uri';
+import { COPILOT_QUERY, createPRNodeUri, fromPRNodeUri, Schemes } from '../common/uri';
+import { CopilotStateModel } from '../github/copilotPrWatcher';
 import { getStatusDecoration } from '../github/markdownUtils';
 import { PrsTreeModel } from './prsTreeModel';
 
@@ -16,20 +17,28 @@ export class PRStatusDecorationProvider extends Disposable implements vscode.Fil
 	>();
 	onDidChangeFileDecorations: vscode.Event<vscode.Uri | vscode.Uri[]> = this._onDidChangeFileDecorations.event;
 
-	constructor(private readonly _prsTreeModel: PrsTreeModel) {
+	constructor(private readonly _prsTreeModel: PrsTreeModel, private readonly _copilotStateModel: CopilotStateModel) {
 		super();
 		this._register(vscode.window.registerFileDecorationProvider(this));
 		this._register(
 			this._prsTreeModel.onDidChangePrStatus(identifiers => {
 				this._onDidChangeFileDecorations.fire(identifiers.map(id => createPRNodeUri(id)));
 			})
 		);
+
+		this._register(this._copilotStateModel.onDidChangeNotifications(() => {
+			this._onDidChangeFileDecorations.fire(COPILOT_QUERY);
+		}));
 	}
 
 	provideFileDecoration(
 		uri: vscode.Uri,
 		_token: vscode.CancellationToken,
 	): vscode.ProviderResult<vscode.FileDecoration> {
+		if (uri.scheme === Schemes.PRQuery) {
+			return this._queryDecoration(uri);
+		}
+
 		if (uri.scheme !== Schemes.PRNode) {
 			return;
 		}
@@ -44,4 +53,16 @@ export class PRStatusDecorationProvider extends Disposable implements vscode.Fil
 
 		return getStatusDecoration(status.status) as vscode.FileDecoration;
 	}
+
+	private _queryDecoration(uri: vscode.Uri): vscode.ProviderResult<vscode.FileDecoration> {
+		if (uri.path === 'copilot') {
+			if (this._copilotStateModel.notifications.size > 0) {
+				return {
+					tooltip: vscode.l10n.t('Coding agent has made changes', this._copilotStateModel.notifications.size),
+					badge: new vscode.ThemeIcon('copilot') as any,
+					color: new vscode.ThemeColor('pullRequests.notification'),
+				};
+			}
+		}
+	}
 }

src/view/prsTreeDataProvider.ts

@@ -45,6 +45,7 @@ export class PullRequestsTreeDataProvider extends Disposable implements vscode.T
 	private _initialized: boolean = false;
 	public notificationProvider: NotificationProvider;
 	public readonly prsTreeModel: PrsTreeModel;
+	private _notificationClearTimeout: NodeJS.Timeout | undefined;
 
 	get view(): vscode.TreeView<TreeNode> {
 		return this._view;
@@ -54,7 +55,7 @@ export class PullRequestsTreeDataProvider extends Disposable implements vscode.T
 		super();
 		this.prsTreeModel = this._register(new PrsTreeModel(this._telemetry, this._reposManager, _context));
 		this._register(this.prsTreeModel.onDidChangeData(folderManager => folderManager ? this.refreshRepo(folderManager) : this.refresh()));
-		this._register(new PRStatusDecorationProvider(this.prsTreeModel));
+		this._register(new PRStatusDecorationProvider(this.prsTreeModel, this._copilotStateModel));
 		this._register(vscode.commands.registerCommand('pr.refreshList', _ => {
 			this.refresh(undefined, true);
 		}));
@@ -71,12 +72,28 @@ export class PullRequestsTreeDataProvider extends Disposable implements vscode.T
 
 		this._register(this._view.onDidChangeVisibility(e => {
 			if (e.visible) {
-				_copilotStateModel.clearNotifications();
-				this._view.badge = undefined;
+				// Clear notifications with a delay of 5 seconds
+				if (this._notificationClearTimeout) {
+					clearTimeout(this._notificationClearTimeout);
+				}
+				this._notificationClearTimeout = setTimeout(() => {
+					_copilotStateModel.clearNotifications();
+					this._view.badge = undefined;
+					this._notificationClearTimeout = undefined;
+				}, 5000);
 			}
 		}));
 
-		this._register(_copilotStateModel.onDidChange(() => {
+		this._register({
+			dispose: () => {
+				if (this._notificationClearTimeout) {
+					clearTimeout(this._notificationClearTimeout);
+					this._notificationClearTimeout = undefined;
+				}
+			}
+		});
+
+		this._register(_copilotStateModel.onDidChangeStates(() => {
 			if (_copilotStateModel.notifications.size > 0) {
 				this._view.badge = {
 					tooltip: _copilotStateModel.notifications.size === 1 ? vscode.l10n.t('Coding agent has 1 change to view') : vscode.l10n.t('Coding agent has {0} changes to view', _copilotStateModel.notifications.size),

src/view/treeNodes/categoryNode.ts

@@ -6,6 +6,7 @@
 import * as vscode from 'vscode';
 import { AuthenticationError } from '../../common/authentication';
 import { ITelemetry } from '../../common/telemetry';
+import { COPILOT_QUERY, Schemes } from '../../common/uri';
 import { formatError } from '../../common/utils';
 import { CopilotStateModel, isCopilotQuery } from '../../github/copilotPrWatcher';
 import { FolderRepositoryManager, ItemsResponseResult } from '../../github/folderRepositoryManager';
@@ -127,7 +128,7 @@ export class CategoryTreeNode extends TreeNode implements vscode.TreeItem {
 	public fetchNextPage: boolean = false;
 	public repositoryPageInformation: Map<string, PageInformation> = new Map<string, PageInformation>();
 	public contextValue: string;
-	public iconPath: vscode.ThemeIcon | undefined;
+	public resourceUri: vscode.Uri;
 
 	constructor(
 		parent: TreeNodeParent,
@@ -151,11 +152,6 @@ export class CategoryTreeNode extends TreeNode implements vscode.TreeItem {
 				this.label = vscode.l10n.t('All Open');
 				break;
 			case PRType.Query:
-				if (hasCopilotChanges) {
-					this.iconPath = new vscode.ThemeIcon('copilot');
-				} else {
-					this.iconPath = undefined;
-				}
 				this.label = _categoryLabel!;
 				break;
 			case PRType.LocalPullRequest:
@@ -168,8 +164,11 @@ export class CategoryTreeNode extends TreeNode implements vscode.TreeItem {
 
 		this.id = parent instanceof TreeNode ? `${parent.id ?? parent.label}/${this.label}` : this.label;
 
+		this.resourceUri = vscode.Uri.parse(Schemes.PRQuery);
+
 		if (hasCopilotChanges) {
 			this.collapsibleState = vscode.TreeItemCollapsibleState.Expanded;
+			this.resourceUri = COPILOT_QUERY;
 		} else if ((this._prsTreeModel.expandedQueries.size === 0) && (this.type === PRType.All)) {
 			this.collapsibleState = vscode.TreeItemCollapsibleState.Expanded;
 		} else {