Merge pull request microsoft#257883 from microsoft/copilot/fix-d26c41ec-2939-4f32-a432-2e2763bd6de8

Add progress indicator to chat sessions async data provider using IProgressService

Author: osortega

src/vs/workbench/contrib/chat/browser/chatSessions.ts

@@ -10,6 +10,7 @@ import { IContextMenuService } from '../../../../platform/contextview/browser/co
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProgressService } from '../../../../platform/progress/common/progress.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
@@ -552,7 +553,8 @@ class SessionsRenderer extends Disposable implements ITreeRenderer<IChatSessionI
 
 	constructor(
 		private readonly labels: ResourceLabels,
-		@IThemeService private readonly themeService: IThemeService
+		@IThemeService private readonly themeService: IThemeService,
+		@ILogService private readonly logService: ILogService,
 	) {
 		super();
 
@@ -600,7 +602,7 @@ class SessionsRenderer extends Disposable implements ITreeRenderer<IChatSessionI
 
 			this.appliedIconColorStyles.add(styleKey);
 		} else {
-			console.log('No color found for colorId:', colorId);
+			this.logService.debug('No color found for colorId:', colorId);
 		}
 	}
 
@@ -686,14 +688,16 @@ class SessionsViewPane extends ViewPane {
 		@IHoverService hoverService: IHoverService,
 		@IEditorService private readonly editorService: IEditorService,
 		@IViewsService private readonly viewsService: IViewsService,
+		@ILogService private readonly logService: ILogService,
+		@IProgressService private readonly progressService: IProgressService,
 	) {
 		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 
 		// Listen for changes in the provider if it's a LocalChatSessionsProvider
 		if (provider instanceof LocalChatSessionsProvider) {
 			this._register(provider.onDidChange(() => {
 				if (this.tree && this.isBodyVisible()) {
-					this.tree.updateChildren(this.provider);
+					this.refreshTreeWithProgress();
 				}
 			}));
 		}
@@ -705,7 +709,57 @@ class SessionsViewPane extends ViewPane {
 
 	public refreshTree(): void {
 		if (this.tree && this.isBodyVisible()) {
-			this.tree.updateChildren(this.provider);
+			this.refreshTreeWithProgress();
+		}
+	}
+
+	/**
+	 * Refreshes the tree data with progress indication.
+	 * Shows a progress indicator while the tree updates its children from the provider.
+	 */
+	private async refreshTreeWithProgress(): Promise<void> {
+		if (!this.tree) {
+			return;
+		}
+
+		try {
+			await this.progressService.withProgress(
+				{
+					location: this.id, // Use the view ID as the progress location
+					title: nls.localize('chatSessions.refreshing', 'Refreshing chat sessions...'),
+				},
+				async () => {
+					await this.tree!.updateChildren(this.provider);
+				}
+			);
+		} catch (error) {
+			// Log error but don't throw to avoid breaking the UI
+			this.logService.error('Error refreshing chat sessions tree:', error);
+		}
+	}
+
+	/**
+	 * Loads initial tree data with progress indication.
+	 * Shows a progress indicator while the tree loads data from the provider.
+	 */
+	private async loadDataWithProgress(): Promise<void> {
+		if (!this.tree) {
+			return;
+		}
+
+		try {
+			await this.progressService.withProgress(
+				{
+					location: this.id, // Use the view ID as the progress location
+					title: nls.localize('chatSessions.loading', 'Loading chat sessions...'),
+				},
+				async () => {
+					await this.tree!.setInput(this.provider);
+				}
+			);
+		} catch (error) {
+			// Log error but don't throw to avoid breaking the UI
+			this.logService.error('Error loading chat sessions data:', error);
 		}
 	}
 
@@ -721,7 +775,7 @@ class SessionsViewPane extends ViewPane {
 		this.dataSource = new SessionsDataSource(this.provider);
 
 		const delegate = new SessionsDelegate();
-		const renderer = new SessionsRenderer(this.labels, this.themeService);
+		const renderer = new SessionsRenderer(this.labels, this.themeService, this.logService);
 		this._register(renderer);
 
 		this.tree = this.instantiationService.createInstance(
@@ -747,6 +801,7 @@ class SessionsViewPane extends ViewPane {
 			}
 		) as WorkbenchAsyncDataTree<IChatSessionItemProvider, IChatSessionItem, FuzzyScore>;
 
+		this.logService.debug('Tree created with hideTwistiesOfChildlessElements: true');
 		this._register(this.tree);
 
 		// Handle double-click and keyboard selection to open editors
@@ -773,13 +828,13 @@ class SessionsViewPane extends ViewPane {
 		// Handle visibility changes to load data
 		this._register(this.onDidChangeBodyVisibility(async visible => {
 			if (visible && this.tree) {
-				await this.tree.setInput(this.provider);
+				await this.loadDataWithProgress();
 			}
 		}));
 
 		// Initially load data if visible
 		if (this.isBodyVisible() && this.tree) {
-			this.tree.setInput(this.provider);
+			this.loadDataWithProgress();
 		}
 	}