From baf206d4d5e2afa4d79bdfafb96083f53912318f Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 26 Mar 2026 11:28:16 +0100
Subject: [PATCH 1/3] enhance session item toolbar visibility for pinned
 sessions

---
 .../contrib/sessions/browser/media/sessionsList.css  |  3 ++-
 .../contrib/sessions/browser/views/sessionsList.ts   | 12 ++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/vs/sessions/contrib/sessions/browser/media/sessionsList.css b/src/vs/sessions/contrib/sessions/browser/media/sessionsList.css
index e9560a694238ec..fc1b40565ac10b 100644
--- a/src/vs/sessions/contrib/sessions/browser/media/sessionsList.css
+++ b/src/vs/sessions/contrib/sessions/browser/media/sessionsList.css
@@ -55,7 +55,8 @@
 	}
 
 	.monaco-list-row:hover,
-	.monaco-list-row.focused:not(.selected) {
+	.monaco-list-row.focused:not(.selected),
+	.monaco-list-row:has(.session-item.pinned) {
 		.session-title-toolbar {
 			display: block;
 		}
diff --git a/src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts b/src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts
index 7591980eaa9b9d..b9f01129d1cac2 100644
--- a/src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts
+++ b/src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts
@@ -210,8 +210,12 @@ class SessionItemRenderer implements ITreeRenderer<SessionListItem, FuzzyScore,
 		template.titleToolbar.context = element;
 
 		// Context key: isPinned
-		IsSessionPinnedContext.bindTo(template.contextKeyService).set(this.options.isPinned(element));
+		const isPinned = this.options.isPinned(element);
+		IsSessionPinnedContext.bindTo(template.contextKeyService).set(isPinned);
 		IsSessionArchivedContext.bindTo(template.contextKeyService).set(element.isArchived.get());
+
+		// Pinned styling — show toolbar persistently for pinned sessions
+		template.container.classList.toggle('pinned', isPinned);
 		IsSessionReadContext.bindTo(template.contextKeyService).set(element.isRead.get());
 
 		// Archived styling — reactive
@@ -750,13 +754,13 @@ export class SessionsList extends Disposable implements ISessionsList {
 			filtered = filtered.filter(s => !this.excludedSessionTypes.has(s.sessionType));
 		}
 		if (this.excludedStatuses.size > 0) {
-			filtered = filtered.filter(s => !this.excludedStatuses.has(s.status.get()));
+			filtered = filtered.filter(s => !this.excludedStatuses.has(s.status.get()) || this.isSessionPinned(s));
 		}
 		if (this._excludeArchived) {
-			filtered = filtered.filter(s => !s.isArchived.get());
+			filtered = filtered.filter(s => !s.isArchived.get() || this.isSessionPinned(s));
 		}
 		if (this._excludeRead) {
-			filtered = filtered.filter(s => !s.isRead.get());
+			filtered = filtered.filter(s => !s.isRead.get() || this.isSessionPinned(s));
 		}
 
 		const sorted = this.sortSessions(filtered);

From cbb568960fc4460f303b43677d1edebd3e770c25 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 26 Mar 2026 14:53:54 +0100
Subject: [PATCH 2/3] add pinned indicator to session item toolbar for better
 visibility

---
 .../sessions/browser/media/sessionsList.css   | 20 +++++++++++++++++--
 .../sessions/browser/views/sessionsList.ts    |  9 ++++++---
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/vs/sessions/contrib/sessions/browser/media/sessionsList.css b/src/vs/sessions/contrib/sessions/browser/media/sessionsList.css
index fc1b40565ac10b..27a1c391413576 100644
--- a/src/vs/sessions/contrib/sessions/browser/media/sessionsList.css
+++ b/src/vs/sessions/contrib/sessions/browser/media/sessionsList.css
@@ -54,9 +54,25 @@
 		}
 	}
 
+	.monaco-list-row .session-pinned-indicator {
+		display: none;
+		height: 16px;
+		align-items: center;
+		color: var(--vscode-descriptionForeground);
+		font-size: 12px;
+		pointer-events: none;
+
+		&.visible {
+			display: flex;
+		}
+	}
+
 	.monaco-list-row:hover,
-	.monaco-list-row.focused:not(.selected),
-	.monaco-list-row:has(.session-item.pinned) {
+	.monaco-list-row.focused:not(.selected) {
+		.session-pinned-indicator {
+			display: none;
+		}
+
 		.session-title-toolbar {
 			display: block;
 		}
diff --git a/src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts b/src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts
index b9f01129d1cac2..2fb45233d1ab32 100644
--- a/src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts
+++ b/src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts
@@ -134,6 +134,7 @@ interface ISessionItemTemplate {
 	readonly container: HTMLElement;
 	readonly iconContainer: HTMLElement;
 	readonly title: HTMLElement;
+	readonly pinnedIndicator: HTMLElement;
 	readonly titleToolbar: MenuWorkbenchToolBar;
 	readonly detailsRow: HTMLElement;
 	readonly approvalRow: HTMLElement;
@@ -178,6 +179,7 @@ class SessionItemRenderer implements ITreeRenderer<SessionListItem, FuzzyScore,
 		const mainCol = DOM.append(container, $('.session-main'));
 		const titleRow = DOM.append(mainCol, $('.session-title-row'));
 		const title = DOM.append(titleRow, $('.session-title'));
+		const pinnedIndicator = DOM.append(titleRow, $('.session-pinned-indicator'));
 		const titleToolbarContainer = DOM.append(titleRow, $('.session-title-toolbar'));
 		const detailsRow = DOM.append(mainCol, $('.session-details-row'));
 
@@ -192,7 +194,7 @@ class SessionItemRenderer implements ITreeRenderer<SessionListItem, FuzzyScore,
 			menuOptions: { shouldForwardArgs: true },
 		}));
 
-		return { container, iconContainer, title, titleToolbar, detailsRow, approvalRow, approvalLabel, approvalButtonContainer, contextKeyService, disposables, elementDisposables };
+		return { container, iconContainer, title, pinnedIndicator, titleToolbar, detailsRow, approvalRow, approvalLabel, approvalButtonContainer, contextKeyService, disposables, elementDisposables };
 	}
 
 	renderElement(node: ITreeNode<SessionListItem, FuzzyScore>, _index: number, template: ISessionItemTemplate): void {
@@ -214,8 +216,9 @@ class SessionItemRenderer implements ITreeRenderer<SessionListItem, FuzzyScore,
 		IsSessionPinnedContext.bindTo(template.contextKeyService).set(isPinned);
 		IsSessionArchivedContext.bindTo(template.contextKeyService).set(element.isArchived.get());
 
-		// Pinned styling — show toolbar persistently for pinned sessions
-		template.container.classList.toggle('pinned', isPinned);
+		// Pinned indicator — inline pin icon, hidden on hover when toolbar shows
+		template.pinnedIndicator.className = 'session-pinned-indicator ' + ThemeIcon.asClassName(Codicon.pinned);
+		template.pinnedIndicator.classList.toggle('visible', isPinned);
 		IsSessionReadContext.bindTo(template.contextKeyService).set(element.isRead.get());
 
 		// Archived styling — reactive

From 6f81d9bdc7d85bd36574be7839b56c234b959fd4 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 26 Mar 2026 14:55:50 +0100
Subject: [PATCH 3/3] refactor: simplify session filtering logic by removing
 pinned session checks

---
 .../sessions/contrib/sessions/browser/views/sessionsList.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts b/src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts
index 2fb45233d1ab32..183577131217a2 100644
--- a/src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts
+++ b/src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts
@@ -757,13 +757,13 @@ export class SessionsList extends Disposable implements ISessionsList {
 			filtered = filtered.filter(s => !this.excludedSessionTypes.has(s.sessionType));
 		}
 		if (this.excludedStatuses.size > 0) {
-			filtered = filtered.filter(s => !this.excludedStatuses.has(s.status.get()) || this.isSessionPinned(s));
+			filtered = filtered.filter(s => !this.excludedStatuses.has(s.status.get()));
 		}
 		if (this._excludeArchived) {
-			filtered = filtered.filter(s => !s.isArchived.get() || this.isSessionPinned(s));
+			filtered = filtered.filter(s => !s.isArchived.get());
 		}
 		if (this._excludeRead) {
-			filtered = filtered.filter(s => !s.isRead.get() || this.isSessionPinned(s));
+			filtered = filtered.filter(s => !s.isRead.get());
 		}
 
 		const sorted = this.sortSessions(filtered);