From c3e98889d9c3f489d1046f82f165db38e73eac69 Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Thu, 20 Nov 2025 20:30:17 -0800
Subject: [PATCH] support theme icon for ChatSessionProviderOptionItem

---
 .../chatSessionPickerActionItem.ts            | 11 ++++--
 .../chatSessions/media/chatSessionAction.css  | 34 +++++++++++++++++++
 .../chat/common/chatSessionsService.ts        |  1 +
 .../vscode.proposed.chatSessionsProvider.d.ts |  5 +++
 4 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 src/vs/workbench/contrib/chat/browser/chatSessions/media/chatSessionAction.css

diff --git a/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionPickerActionItem.ts b/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionPickerActionItem.ts
index 71c7f701d22..5fd5de4cbc3 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionPickerActionItem.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionPickerActionItem.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import './media/chatSessionAction.css';
 import { IAction } from '../../../../../base/common/actions.js';
 import { Event } from '../../../../../base/common/event.js';
 import * as dom from '../../../../../base/browser/dom.js';
@@ -16,7 +17,7 @@ import { IChatEntitlementService } from '../../../../services/chat/common/chatEn
 import { ActionWidgetDropdownActionViewItem } from '../../../../../platform/actions/browser/actionWidgetDropdownActionViewItem.js';
 import { IChatSessionProviderOptionGroup, IChatSessionProviderOptionItem } from '../../common/chatSessionsService.js';
 import { IDisposable } from '../../../../../base/common/lifecycle.js';
-import { renderLabelWithIcons } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { renderLabelWithIcons, renderIcon } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { localize } from '../../../../../nls.js';
 
 
@@ -61,7 +62,7 @@ export class ChatSessionPickerActionItem extends ActionWidgetDropdownActionViewI
 						return [{
 							id: currentOption.id,
 							enabled: false,
-							icon: undefined,
+							icon: currentOption.icon,
 							checked: true,
 							class: undefined,
 							description: undefined,
@@ -75,7 +76,7 @@ export class ChatSessionPickerActionItem extends ActionWidgetDropdownActionViewI
 							return {
 								id: optionItem.id,
 								enabled: true,
-								icon: undefined,
+								icon: optionItem.icon,
 								checked: isCurrent,
 								class: undefined,
 								description: undefined,
@@ -104,6 +105,10 @@ export class ChatSessionPickerActionItem extends ActionWidgetDropdownActionViewI
 	}
 	protected override renderLabel(element: HTMLElement): IDisposable | null {
 		const domChildren = [];
+		element.classList.add('chat-session-option-picker');
+		if (this.currentOption?.icon) {
+			domChildren.push(renderIcon(this.currentOption.icon));
+		}
 		domChildren.push(dom.$('span.chat-session-option-label', undefined, this.currentOption?.name ?? localize('chat.sessionPicker.label', "Pick Option")));
 		domChildren.push(...renderLabelWithIcons(`$(chevron-down)`));
 		dom.reset(element, ...domChildren);
diff --git a/src/vs/workbench/contrib/chat/browser/chatSessions/media/chatSessionAction.css b/src/vs/workbench/contrib/chat/browser/chatSessions/media/chatSessionAction.css
new file mode 100644
index 00000000000..3aeddc1489e
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatSessions/media/chatSessionAction.css
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/* .chat-session-option-picker {
+	align-items: center;
+} */
+
+/* .chat-session-option-picker .chat-session-option-label {
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.chat-session-option-picker */
+
+.monaco-action-bar .action-item .chat-session-option-picker {
+	align-items: center;
+
+	.chat-session-option-label {
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	span.codicon {
+		font-size: 12px;
+		margin-left: 2px;
+	}
+
+	span.codicon.codicon-chevron-down {
+		font-size: 12px;
+		margin-left: 2px;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatSessionsService.ts b/src/vs/workbench/contrib/chat/common/chatSessionsService.ts
index b9e810aac6c..0ec017a6d7d 100644
--- a/src/vs/workbench/contrib/chat/common/chatSessionsService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatSessionsService.ts
@@ -33,6 +33,7 @@ export interface IChatSessionProviderOptionItem {
 	id: string;
 	name: string;
 	locked?: boolean;
+	icon?: ThemeIcon;
 	// [key: string]: any;
 }
 
diff --git a/src/vscode-dts/vscode.proposed.chatSessionsProvider.d.ts b/src/vscode-dts/vscode.proposed.chatSessionsProvider.d.ts
index aab1337d500..6fe0311c5d8 100644
--- a/src/vscode-dts/vscode.proposed.chatSessionsProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatSessionsProvider.d.ts
@@ -281,6 +281,11 @@ declare module 'vscode' {
 		 * Use this when an option is set but cannot be hot-swapped (e.g., model already initialized).
 		 */
 		readonly locked?: boolean;
+
+		/**
+		 * An icon for the option item shown in UI.
+		 */
+		readonly icon?: ThemeIcon;
 	}
 
 	/**