Ability to filter sessions (fix #281349) (#281718)

* Ability to search, sort, and filter `Recent Sessions` (fix #281349)

* fix visibility regression

Author: bpasero

src/vs/platform/actions/common/actions.ts

@@ -283,7 +283,7 @@ export class MenuId {
 	static readonly MultiDiffEditorFileToolbar = new MenuId('MultiDiffEditorFileToolbar');
 	static readonly DiffEditorHunkToolbar = new MenuId('DiffEditorHunkToolbar');
 	static readonly DiffEditorSelectionToolbar = new MenuId('DiffEditorSelectionToolbar');
-	static readonly AgentSessionsFilterSubMenu = new MenuId('AgentSessionsFilterSubMenu');
+	static readonly AgentSessionsViewerFilterSubMenu = new MenuId('AgentSessionsViewerFilterSubMenu');
 	static readonly AgentSessionsInstallMenu = new MenuId('AgentSessionsInstallMenu');
 	static readonly AgentSessionsContext = new MenuId('AgentSessionsContext');
 	static readonly AgentSessionsCreateSubMenu = new MenuId('AgentSessionsCreateSubMenu');
@@ -295,6 +295,7 @@ export class MenuId {
 	 * @deprecated TODO@bpasero remove
 	*/
 	static readonly AgentSessionsViewTitle = new MenuId('AgentSessionsViewTitle');
+	static readonly AgentSessionsFilterSubMenu = new MenuId('AgentSessionsFilterSubMenu');
 
 	/**
 	 * Create or reuse a `MenuId` with the given identifier

src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.contribution.ts

@@ -83,6 +83,15 @@ MenuRegistry.appendMenuItem(MenuId.AgentSessionsViewTitle, {
 	icon: Codicon.filter
 } satisfies ISubmenuItem);
 
+MenuRegistry.appendMenuItem(MenuId.AgentSessionsToolbar, {
+	submenu: MenuId.AgentSessionsViewerFilterSubMenu,
+	title: localize2('filterAgentSessions', "Filter Agent Sessions"),
+	group: 'navigation',
+	order: 3,
+	icon: Codicon.filter,
+	when: ChatContextKeys.agentSessionsViewerExpanded
+} satisfies ISubmenuItem);
+
 MenuRegistry.appendMenuItem(MenuId.AgentSessionsToolbar, {
 	command: {
 		id: ShowAgentSessionsSidebar.ID,

src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsFilter.ts

@@ -12,9 +12,16 @@ import { IStorageService, StorageScope, StorageTarget } from '../../../../../pla
 import { ChatSessionStatus, IChatSessionsService } from '../../common/chatSessionsService.js';
 import { AgentSessionProviders, getAgentSessionProviderName } from './agentSessions.js';
 import { IAgentSession } from './agentSessionsModel.js';
+import { IAgentSessionsFilter } from './agentSessionsViewer.js';
+
+export interface IAgentSessionsFilterOptions extends Partial<IAgentSessionsFilter> {
 
-export interface IAgentSessionsFilterOptions {
 	readonly filterMenuId: MenuId;
+
+	readonly limitResults?: () => number | undefined;
+	notifyResults?(count: number): void;
+
+	overrideExclude?(session: IAgentSession): boolean | undefined;
 }
 
 interface IAgentSessionsViewExcludes {
@@ -29,16 +36,18 @@ const DEFAULT_EXCLUDES: IAgentSessionsViewExcludes = Object.freeze({
 	archived: true as const,
 });
 
-export class AgentSessionsFilter extends Disposable {
+export class AgentSessionsFilter extends Disposable implements Required<IAgentSessionsFilter> {
 
 	private readonly STORAGE_KEY: string;
 
 	private readonly _onDidChange = this._register(new Emitter<void>());
 	readonly onDidChange = this._onDidChange.event;
 
+	readonly limitResults = () => this.options.limitResults?.();
+
 	private excludes = DEFAULT_EXCLUDES;
 
-	private actionDisposables = this._register(new DisposableStore());
+	private readonly actionDisposables = this._register(new DisposableStore());
 
 	constructor(
 		private readonly options: IAgentSessionsFilterOptions,
@@ -225,6 +234,11 @@ export class AgentSessionsFilter extends Disposable {
 	}
 
 	exclude(session: IAgentSession): boolean {
+		const overrideExclude = this.options?.overrideExclude?.(session);
+		if (typeof overrideExclude === 'boolean') {
+			return overrideExclude;
+		}
+
 		if (this.excludes.archived && session.isArchived()) {
 			return true;
 		}
@@ -239,4 +253,8 @@ export class AgentSessionsFilter extends Disposable {
 
 		return false;
 	}
+
+	notifyResults(count: number): void {
+		this.options.notifyResults?.(count);
+	}
 }

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

@@ -53,6 +53,7 @@ import { Link } from '../../../../platform/opener/browser/link.js';
 import { IProgressService } from '../../../../platform/progress/common/progress.js';
 import { ChatViewId } from './chat.js';
 import { disposableTimeout } from '../../../../base/common/async.js';
+import { AgentSessionsFilter } from './agentSessions/agentSessionsFilter.js';
 
 interface IChatViewPaneState extends Partial<IChatModelInputState> {
 	sessionId?: string;
@@ -348,26 +349,34 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 			menuOptions: { shouldForwardArgs: true }
 		}));
 
-		// Sessions Control
-		this.sessionsControlContainer = append(sessionsContainer, $('.agent-sessions-control-container'));
-		this.sessionsControl = this._register(this.instantiationService.createInstance(AgentSessionsControl, this.sessionsControlContainer, {
-			allowOpenSessionsInPanel: true,
-			filter: {
-				limitResults: () => {
-					return that.sessionsViewerLimited ? ChatViewPane.SESSIONS_LIMIT : undefined;
-				},
-				exclude(session) {
-					if (that.sessionsViewerLimited && session.isArchived()) {
+		// Sessions Filter
+		const sessionsFilter = this._register(this.instantiationService.createInstance(AgentSessionsFilter, {
+			filterMenuId: MenuId.AgentSessionsViewerFilterSubMenu,
+			limitResults: () => {
+				return that.sessionsViewerLimited ? ChatViewPane.SESSIONS_LIMIT : undefined;
+			},
+			overrideExclude(session) {
+				if (that.sessionsViewerLimited) {
+					if (session.isArchived()) {
 						return true; // exclude archived sessions when limited
 					}
 
 					return false;
-				},
-				notifyResults(count: number) {
-					that.notifySessionsControlChanged(count);
 				}
+
+				return undefined; // leave up to the filter settings
+			},
+			notifyResults(count: number) {
+				that.notifySessionsControlChanged(count);
 			}
 		}));
+
+		// Sessions Control
+		this.sessionsControlContainer = append(sessionsContainer, $('.agent-sessions-control-container'));
+		this.sessionsControl = this._register(this.instantiationService.createInstance(AgentSessionsControl, this.sessionsControlContainer, {
+			allowOpenSessionsInPanel: true,
+			filter: sessionsFilter
+		}));
 		this._register(this.onDidChangeBodyVisibility(visible => this.sessionsControl?.setVisible(visible)));
 
 		toolbar.context = this.sessionsControl;
@@ -422,12 +431,12 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 			newSessionsContainerVisible = false; // disabled in settings
 		} else {
 
-			// Sessions control: stacked, compact
+			// Sessions control: stacked
 			if (this.sessionsViewerOrientation === AgentSessionsViewerOrientation.Stacked) {
 				newSessionsContainerVisible =
-					(!this._widget || this._widget?.isEmpty()) &&		// chat widget empty
-					!this.welcomeController?.isShowingWelcome.get() &&	// welcome not showing
-					this.sessionsCount > 0;								// has sessions
+					(!this._widget || this._widget?.isEmpty()) &&				// chat widget empty
+					!this.welcomeController?.isShowingWelcome.get() &&			// welcome not showing
+					(this.sessionsCount > 0 || !this.sessionsViewerLimited);	// has sessions or is showing all sessions
 			}
 
 			// Sessions control: sidebar
@@ -636,7 +645,7 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 			widthReduction = this.sessionsContainer.offsetWidth;
 		}
 
-		// Show compact (grows with the number of items displayed)
+		// Show stacked (grows with the number of items displayed)
 		else {
 			let sessionsHeight: number;
 			if (this.sessionsViewerLimited) {
@@ -650,7 +659,7 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 			this.sessionsControl.layout(sessionsHeight, width);
 
 			heightReduction = this.sessionsContainer.offsetHeight;
-			widthReduction = 0; // compact on top of the chat widget
+			widthReduction = 0; // stacked on top of the chat widget
 		}
 
 		return { heightReduction, widthReduction };