Merge branch 'main' into copilot/fix-d26c41ec-2939-4f32-a432-2e2763bd6de8

Author: osortega

.github/commands.json

@@ -613,5 +613,15 @@
 		"action": "close",
 		"reason": "not_planned",
 		"comment": "Please look at the following meta issue: https://github.com/microsoft/vscode/issues/253134. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
+	},
+	{
+		"type": "label",
+		"name": "~spam",
+		"removeLabel": "~spam",
+		"addLabel": "spam",
+		"action": "close",
+		"reason": "not_planned",
+		"comment": "Thank you for your submission. This issue has been closed as it doesn't meet our community guidelines or appears to be spam.\n\n**If you believe this was closed in error:**\n- Please review our [Code of Conduct](https://opensource.microsoft.com/codeofconduct/)\n- Ensure your issue contains a clear description of the problem or feature request\n- Feel free to open a new issue with appropriate detail if this was a legitimate concern\n\n**For legitimate issues, please include:**\n- Clear description of the problem\n- Steps to reproduce (for bugs)\n- Expected vs actual behavior\n- VS Code version and environment details\n\nThank you for helping us maintain a welcoming and productive community."
 	}
+
 ]

src/vs/base/common/policy.ts

@@ -8,7 +8,8 @@ export type PolicyName = string;
 export enum PolicyTag {
 	Account = 'ACCOUNT',
 	MCP = 'MCP',
-	Preview = 'PREVIEW'
+	Preview = 'PREVIEW',
+	Agent = 'AGENT',
 }
 
 export interface IPolicy {

src/vs/platform/actions/browser/actionViewItemService.ts

@@ -3,39 +3,46 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IActionViewItemProvider } from '../../../base/browser/ui/actionbar/actionbar.js';
+import { IActionViewItem } from '../../../base/browser/ui/actionbar/actionbar.js';
+import { IActionViewItemOptions } from '../../../base/browser/ui/actionbar/actionViewItems.js';
+import { IAction } from '../../../base/common/actions.js';
 import { Emitter, Event } from '../../../base/common/event.js';
 import { Disposable, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
 import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
-import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { createDecorator, IInstantiationService } from '../../instantiation/common/instantiation.js';
 import { MenuId } from '../common/actions.js';
 
 
 export const IActionViewItemService = createDecorator<IActionViewItemService>('IActionViewItemService');
 
+
+export interface IActionViewItemFactory {
+	(action: IAction, options: IActionViewItemOptions, instaService: IInstantiationService): IActionViewItem | undefined;
+}
+
 export interface IActionViewItemService {
 
 	_serviceBrand: undefined;
 
 	onDidChange: Event<MenuId>;
 
-	register(menu: MenuId, submenu: MenuId, provider: IActionViewItemProvider, event?: Event<unknown>): IDisposable;
-	register(menu: MenuId, commandId: string, provider: IActionViewItemProvider, event?: Event<unknown>): IDisposable;
+	register(menu: MenuId, submenu: MenuId, provider: IActionViewItemFactory, event?: Event<unknown>): IDisposable;
+	register(menu: MenuId, commandId: string, provider: IActionViewItemFactory, event?: Event<unknown>): IDisposable;
 
-	lookUp(menu: MenuId, submenu: MenuId): IActionViewItemProvider | undefined;
-	lookUp(menu: MenuId, commandId: string): IActionViewItemProvider | undefined;
+	lookUp(menu: MenuId, submenu: MenuId): IActionViewItemFactory | undefined;
+	lookUp(menu: MenuId, commandId: string): IActionViewItemFactory | undefined;
 }
 
 export class NullActionViewItemService implements IActionViewItemService {
 	_serviceBrand: undefined;
 
 	onDidChange: Event<MenuId> = Event.None;
 
-	register(menu: MenuId, commandId: string | MenuId, provider: IActionViewItemProvider, event?: Event<unknown>): IDisposable {
+	register(menu: MenuId, commandId: string | MenuId, provider: IActionViewItemFactory, event?: Event<unknown>): IDisposable {
 		return Disposable.None;
 	}
 
-	lookUp(menu: MenuId, commandId: string | MenuId): IActionViewItemProvider | undefined {
+	lookUp(menu: MenuId, commandId: string | MenuId): IActionViewItemFactory | undefined {
 		return undefined;
 	}
 }
@@ -44,7 +51,7 @@ class ActionViewItemService implements IActionViewItemService {
 
 	declare _serviceBrand: undefined;
 
-	private readonly _providers = new Map<string, IActionViewItemProvider>();
+	private readonly _providers = new Map<string, IActionViewItemFactory>();
 
 	private readonly _onDidChange = new Emitter<MenuId>();
 	readonly onDidChange: Event<MenuId> = this._onDidChange.event;
@@ -53,7 +60,7 @@ class ActionViewItemService implements IActionViewItemService {
 		this._onDidChange.dispose();
 	}
 
-	register(menu: MenuId, commandOrSubmenuId: string | MenuId, provider: IActionViewItemProvider, event?: Event<unknown>): IDisposable {
+	register(menu: MenuId, commandOrSubmenuId: string | MenuId, provider: IActionViewItemFactory, event?: Event<unknown>): IDisposable {
 		const id = this._makeKey(menu, commandOrSubmenuId);
 		if (this._providers.has(id)) {
 			throw new Error(`A provider for the command ${commandOrSubmenuId} and menu ${menu} is already registered.`);
@@ -70,7 +77,7 @@ class ActionViewItemService implements IActionViewItemService {
 		});
 	}
 
-	lookUp(menu: MenuId, commandOrMenuId: string | MenuId): IActionViewItemProvider | undefined {
+	lookUp(menu: MenuId, commandOrMenuId: string | MenuId): IActionViewItemFactory | undefined {
 		return this._providers.get(this._makeKey(menu, commandOrMenuId));
 	}
 

src/vs/platform/actions/browser/toolbar.ts

@@ -358,7 +358,7 @@ export class MenuWorkbenchToolBar extends WorkbenchToolBar {
 				if (!provider) {
 					provider = options?.actionViewItemProvider;
 				}
-				const viewItem = provider?.(action, opts);
+				const viewItem = provider?.(action, opts, instaService);
 				if (viewItem) {
 					return viewItem;
 				}

src/vs/platform/observable/common/platformObservableUtils.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
-import { derivedOpts, IObservable, IReader, observableFromEventOpts } from '../../../base/common/observable.js';
+import { derivedOpts, IObservable, IReader, observableFromEvent, observableFromEventOpts } from '../../../base/common/observable.js';
 import { IConfigurationService } from '../../configuration/common/configuration.js';
 import { ContextKeyValue, IContextKeyService, RawContextKey } from '../../contextkey/common/contextkey.js';
 
@@ -40,3 +40,7 @@ export function bindContextKey<T extends ContextKeyValue>(key: RawContextKey<T>,
 	return compute_$show2FramesUp();
 }
 
+
+export function observableContextKey<T>(key: string, contextKeyService: IContextKeyService): IObservable<T | undefined> {
+	return observableFromEvent(contextKeyService.onDidChangeContext, () => contextKeyService.getContextKeyValue<T>(key));
+}

src/vs/platform/quickinput/common/quickInput.ts

@@ -1016,6 +1016,16 @@ export interface IQuickTree<T extends IQuickTreeItem> extends IQuickInput {
 	 */
 	activeItems: ReadonlyArray<T>;
 
+	/**
+	 * The validation message for the quick pick. This is rendered below the input.
+	 */
+	validationMessage: string | undefined;
+
+	/**
+	 * The severity of the validation message.
+	 */
+	severity: Severity;
+
 	/**
 	 * The items currently displayed in the quick tree.
 	 * @note modifications to this array directly will not cause updates.

src/vs/workbench/api/browser/mainThreadChatSessions.ts

@@ -51,10 +51,9 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 		this._proxy = this._extHostContext.getProxy(ExtHostContext.ExtHostChatSessions);
 	}
 
-	$registerChatSessionItemProvider(handle: number, chatSessionType: string, label: string): void {
+	$registerChatSessionItemProvider(handle: number, chatSessionType: string): void {
 		// Register the provider handle - this tracks that a provider exists
 		const provider: IChatSessionItemProvider = {
-			label,
 			chatSessionType,
 			provideChatSessionItems: (token) => this._provideChatSessionItems(handle, token)
 		};

src/vs/workbench/api/common/extHost.protocol.ts

@@ -3129,7 +3129,7 @@ export interface ChatSessionDto {
 
 
 export interface MainThreadChatSessionsShape extends IDisposable {
-	$registerChatSessionItemProvider(handle: number, chatSessionType: string, label: string): void;
+	$registerChatSessionItemProvider(handle: number, chatSessionType: string): void;
 	$unregisterChatSessionItemProvider(handle: number): void;
 	$onDidChangeChatSessionItems(chatSessionType: string): void;
 

src/vs/workbench/api/common/extHostChatSessions.ts

@@ -87,7 +87,7 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 		const disposables = new DisposableStore();
 
 		this._chatSessionItemProviders.set(handle, { provider, extension, disposable: disposables });
-		this._proxy.$registerChatSessionItemProvider(handle, chatSessionType, provider.label);
+		this._proxy.$registerChatSessionItemProvider(handle, chatSessionType);
 		if (provider.onDidChangeChatSessionItems) {
 			disposables.add(provider.onDidChangeChatSessionItems(() => {
 				this._proxy.$onDidChangeChatSessionItems(chatSessionType);

src/vs/workbench/contrib/chat/browser/actions/chatActions.ts

@@ -571,8 +571,8 @@ export function registerChatActions() {
 							const providerNSessions: { providerType: string; session: IChatSessionItem }[] = [];
 
 							for (const provider of providers) {
-								const sessions = await chatSessionsService.provideChatSessionItems(provider.id, cancellationToken.token);
-								providerNSessions.push(...sessions.map(session => ({ providerType: provider.id, session })));
+								const sessions = await chatSessionsService.provideChatSessionItems(provider.type, cancellationToken.token);
+								providerNSessions.push(...sessions.map(session => ({ providerType: provider.type, session })));
 							}
 
 							for (const session of providerNSessions) {