[pull] main from microsoft:main

extensions/vscode-api-tests/package.json

@@ -26,6 +26,7 @@
     "fsChunks",
     "interactive",
     "languageStatusText",
+    "mcpServerDefinitions",
     "nativeWindowHandle",
     "notebookDeprecated",
     "notebookLiveShare",

src/vs/base/browser/dom.ts

@@ -2064,12 +2064,9 @@ export class DisposableResizeObserver extends Disposable {
 		this._register(toDisposable(() => this.observer.disconnect()));
 	}
 
-	observe(target: Element, options?: ResizeObserverOptions): void {
+	observe(target: Element, options?: ResizeObserverOptions): IDisposable {
 		this.observer.observe(target, options);
-	}
-
-	unobserve(target: Element): void {
-		this.observer.unobserve(target);
+		return toDisposable(() => this.observer.unobserve(target));
 	}
 }
 

src/vs/base/browser/markdownRenderer.ts

@@ -600,6 +600,7 @@ function getDomSanitizerConfig(mdStrConfig: MdStrConfig, options: MarkdownSaniti
 		Schemas.vscodeRemote,
 		Schemas.vscodeRemoteResource,
 		Schemas.vscodeNotebookCell,
+		Schemas.vscodeChatPrompt,
 		// For links that are handled entirely by the action handler
 		Schemas.internal,
 	];

src/vs/editor/contrib/floatingMenu/browser/floatingMenu.css

@@ -4,41 +4,48 @@
  *--------------------------------------------------------------------------------------------*/
 
 .floating-menu-overlay-widget {
-	padding: 0px;
-	color: var(--vscode-button-foreground);
-	background-color: var(--vscode-button-background);
-	border-radius: 2px;
+	padding: 2px 4px;
+	color: var(--vscode-foreground);
+	background-color: var(--vscode-editorWidget-background);
+	border-radius: 6px;
 	border: 1px solid var(--vscode-contrastBorder);
 	display: flex;
 	align-items: center;
+	justify-content: center;
+	gap: 4px;
 	z-index: 10;
 	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
 	overflow: hidden;
 
-	.action-item > .action-label {
-		padding: 5px;
-		font-size: 12px;
-		border-radius: 2px;
+	.actions-container {
+		gap: 4px;
 	}
 
-	.action-item > .action-label.codicon, .action-item .codicon {
-		color: var(--vscode-button-foreground);
+	.action-item > .action-label {
+		padding: 4px 6px;
+		font-size: 11px;
+		line-height: 14px;
+		border-radius: 4px;
 	}
 
 	.action-item > .action-label.codicon:not(.separator) {
-		padding-top: 6px;
-		padding-bottom: 6px;
+		color: var(--vscode-foreground);
+		width: 22px;
+		height: 22px;
+		padding: 0;
+		font-size: 16px;
+		line-height: 22px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 	}
 
-	.action-item:first-child > .action-label {
-		padding-left: 7px;
-	}
-
-	.action-item:last-child > .action-label {
-		padding-right: 7px;
+	.action-item.primary > .action-label {
+		background-color: var(--vscode-button-background);
+		color: var(--vscode-button-foreground);
 	}
 
-	.action-item .action-label.separator {
-		background-color: var(--vscode-button-separator);
+	.action-item.primary > .action-label:hover {
+		background-color: var(--vscode-button-hoverBackground) !important;
 	}
 }

src/vs/editor/contrib/floatingMenu/browser/floatingMenu.ts

@@ -5,7 +5,7 @@
 
 import { h } from '../../../../base/browser/dom.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { autorun, constObservable, observableFromEvent } from '../../../../base/common/observable.js';
+import { autorun, constObservable, derived, observableFromEvent } from '../../../../base/common/observable.js';
 import { MenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { HiddenItemStrategy, MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
 import { IMenuService, MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
@@ -29,19 +29,43 @@ export class FloatingEditorToolbar extends Disposable implements IEditorContribu
 		const editorObs = this._register(observableCodeEditor(editor));
 
 		const menu = this._register(menuService.createMenu(MenuId.EditorContent, editor.contextKeyService));
-		const menuIsEmptyObs = observableFromEvent(this, menu.onDidChange, () => menu.getActions().length === 0);
+		const menuActionsObs = observableFromEvent(this, menu.onDidChange, () => menu.getActions());
+		const menuPrimaryActionIdObs = derived(reader => {
+			const menuActions = menuActionsObs.read(reader);
+			if (menuActions.length === 0) {
+				return undefined;
+			}
+
+			// Navigation group
+			const navigationGroup = menuActions
+				.find((group) => group[0] === 'navigation');
+
+			// First action in navigation group
+			if (navigationGroup && navigationGroup[1].length > 0) {
+				return navigationGroup[1][0].id;
+			}
+
+			// Fallback to first group/action
+			for (const [, actions] of menuActions) {
+				if (actions.length > 0) {
+					return actions[0].id;
+				}
+			}
+
+			return undefined;
+		});
 
 		this._register(autorun(reader => {
-			const menuIsEmpty = menuIsEmptyObs.read(reader);
-			if (menuIsEmpty) {
+			const menuPrimaryActionId = menuPrimaryActionIdObs.read(reader);
+			if (!menuPrimaryActionId) {
 				return;
 			}
 
 			const container = h('div.floating-menu-overlay-widget');
 
 			// Set height explicitly to ensure that the floating menu element
 			// is rendered in the lower right corner at the correct position.
-			container.root.style.height = '28px';
+			container.root.style.height = '26px';
 
 			// Toolbar
 			const toolbar = instantiationService.createInstance(MenuWorkbenchToolBar, container.root, MenuId.EditorContent, {
@@ -50,15 +74,24 @@ export class FloatingEditorToolbar extends Disposable implements IEditorContribu
 						return undefined;
 					}
 
-					const keybinding = keybindingService.lookupKeybinding(action.id);
-					if (!keybinding) {
-						return undefined;
-					}
-
 					return instantiationService.createInstance(class extends MenuEntryActionViewItem {
+						override render(container: HTMLElement): void {
+							super.render(container);
+
+							// Highlight primary action
+							if (action.id === menuPrimaryActionId) {
+								this.element?.classList.add('primary');
+							}
+						}
+
 						protected override updateLabel(): void {
+							const keybinding = keybindingService.lookupKeybinding(action.id);
+							const keybindingLabel = keybinding ? keybinding.getLabel() : undefined;
+
 							if (this.options.label && this.label) {
-								this.label.textContent = `${this._commandAction.label} (${keybinding.getLabel()})`;
+								this.label.textContent = keybindingLabel
+									? `${this._commandAction.label} (${keybindingLabel})`
+									: this._commandAction.label;
 							}
 						}
 					}, action, { ...options, keybindingNotRenderedWithLabel: true });

src/vs/platform/actionWidget/browser/actionList.ts

@@ -9,7 +9,7 @@ import { IListAccessibilityProvider, List } from '../../../base/browser/ui/list/
 import { CancellationToken, CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { Codicon } from '../../../base/common/codicons.js';
 import { ResolvedKeybinding } from '../../../base/common/keybindings.js';
-import { Disposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { Disposable, MutableDisposable } from '../../../base/common/lifecycle.js';
 import { OS } from '../../../base/common/platform.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 import './actionWidget.css';
@@ -246,7 +246,7 @@ export class ActionList<T> extends Disposable {
 
 	private readonly cts = this._register(new CancellationTokenSource());
 
-	private hover: { index: number; hover: IHoverWidget } | undefined;
+	private _hover = this._register(new MutableDisposable<IHoverWidget>());
 
 	constructor(
 		user: string,
@@ -322,9 +322,6 @@ export class ActionList<T> extends Disposable {
 		this._register(this._list.onDidChangeFocus(() => this.onFocus()));
 		this._register(this._list.onDidChangeSelection(e => this.onListSelection(e)));
 
-		// Ensure hover is hidden when ActionList is disposed
-		this._register(toDisposable(() => this.hideHover()));
-
 		this._allMenuItems = items;
 		this._list.splice(0, this._list.length, this._allMenuItems);
 
@@ -340,7 +337,7 @@ export class ActionList<T> extends Disposable {
 	hide(didCancel?: boolean): void {
 		this._delegate.onHide(didCancel);
 		this.cts.cancel();
-		this.hideHover();
+		this._hover.clear();
 		this._contextViewService.hideContextView();
 	}
 
@@ -420,15 +417,6 @@ export class ActionList<T> extends Disposable {
 		}
 	}
 
-	private hideHover() {
-		if (this.hover) {
-			if (!this.hover.hover.isDisposed) {
-				this.hover.hover.dispose();
-			}
-			this.hover = undefined;
-		}
-	}
-
 	private onFocus() {
 		const focused = this._list.getFocus();
 		if (focused.length === 0) {
@@ -448,13 +436,7 @@ export class ActionList<T> extends Disposable {
 	}
 
 	private _showHoverForElement(element: IActionListItem<T>, index: number): void {
-		// Hide any existing hover when moving to a different item
-		if (this.hover) {
-			if (this.hover.index === index && !this.hover.hover.isDisposed) {
-				return;
-			}
-			this.hideHover();
-		}
+		let newHover: IHoverWidget | undefined;
 
 		// Show hover if the element has hover content
 		if (element.hover?.content && this.focusCondition(element)) {
@@ -463,7 +445,7 @@ export class ActionList<T> extends Disposable {
 			const rowElement = this._getRowElement(index);
 			if (rowElement) {
 				const markdown = element.hover.content ? new MarkdownString(element.hover.content) : undefined;
-				const hover = this._hoverService.showInstantHover({
+				newHover = this._hoverService.showDelayedHover({
 					content: markdown ?? '',
 					target: rowElement,
 					additionalClasses: ['action-widget-hover'],
@@ -474,10 +456,11 @@ export class ActionList<T> extends Disposable {
 					appearance: {
 						showPointer: true,
 					},
-				});
-				this.hover = hover ? { index, hover } : undefined;
+				}, { groupId: `actionListHover` });
 			}
 		}
+
+		this._hover.value = newHover;
 	}
 
 	private async onListHover(e: IListMouseEvent<IActionListItem<T>>) {

src/vs/platform/extensions/common/extensionsApiProposals.ts

@@ -290,6 +290,9 @@ const _allApiProposals = {
 	markdownAlertSyntax: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.markdownAlertSyntax.d.ts',
 	},
+	mcpServerDefinitions: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.mcpServerDefinitions.d.ts',
+	},
 	mcpToolDefinitions: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.mcpToolDefinitions.d.ts',
 	},

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

@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { mapFindFirst } from '../../../base/common/arraysFind.js';
-import { disposableTimeout } from '../../../base/common/async.js';
+import { disposableTimeout, RunOnceScheduler } from '../../../base/common/async.js';
 import { CancellationError } from '../../../base/common/errors.js';
 import { Emitter } from '../../../base/common/event.js';
 import { Disposable, DisposableMap, DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
-import { ISettableObservable, observableValue } from '../../../base/common/observable.js';
+import { autorun, ISettableObservable, observableValue } from '../../../base/common/observable.js';
 import Severity from '../../../base/common/severity.js';
 import { URI } from '../../../base/common/uri.js';
 import * as nls from '../../../nls.js';
@@ -98,6 +98,36 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 				return launch;
 			},
 		}));
+
+		// Subscribe to MCP server definition changes and notify ext host
+		const onDidChangeMcpServerDefinitionsTrigger = this._register(new RunOnceScheduler(() => this._publishServerDefinitions(), 500));
+		this._register(autorun(reader => {
+			const collections = this._mcpRegistry.collections.read(reader);
+			// Read all server definitions to track changes
+			for (const collection of collections) {
+				collection.serverDefinitions.read(reader);
+			}
+			// Notify ext host that definitions changed (it will re-fetch if needed)
+			if (!onDidChangeMcpServerDefinitionsTrigger.isScheduled()) {
+				onDidChangeMcpServerDefinitionsTrigger.schedule();
+			}
+		}));
+
+		onDidChangeMcpServerDefinitionsTrigger.schedule();
+	}
+
+	private _publishServerDefinitions() {
+		const collections = this._mcpRegistry.collections.get();
+		const allServers: McpServerDefinition.Serialized[] = [];
+
+		for (const collection of collections) {
+			const servers = collection.serverDefinitions.get();
+			for (const server of servers) {
+				allServers.push(McpServerDefinition.toSerialized(server));
+			}
+		}
+
+		this._proxy.$onDidChangeMcpServerDefinitions(allServers);
 	}
 
 	$upsertMcpCollection(collection: McpCollectionDefinition.FromExtHost, serversDto: McpServerDefinition.Serialized[]): void {

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

@@ -1630,6 +1630,14 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			registerMcpServerDefinitionProvider(id, provider) {
 				return extHostMcp.registerMcpConfigurationProvider(extension, id, provider);
 			},
+			onDidChangeMcpServerDefinitions: (...args) => {
+				checkProposedApiEnabled(extension, 'mcpServerDefinitions');
+				return _asExtensionEvent(extHostMcp.onDidChangeMcpServerDefinitions)(...args);
+			},
+			get mcpServerDefinitions() {
+				checkProposedApiEnabled(extension, 'mcpServerDefinitions');
+				return extHostMcp.mcpServerDefinitions;
+			},
 			onDidChangeChatRequestTools(...args) {
 				checkProposedApiEnabled(extension, 'chatParticipantAdditions');
 				return _asExtensionEvent(extHostChatAgents2.onDidChangeChatRequestTools)(...args);

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

@@ -3163,13 +3163,16 @@ export interface IStartMcpOptions {
 	errorOnUserInteraction?: boolean;
 }
 
+
+
 export interface ExtHostMcpShape {
 	$substituteVariables(workspaceFolder: UriComponents | undefined, value: McpServerLaunch.Serialized): Promise<McpServerLaunch.Serialized>;
 	$resolveMcpLaunch(collectionId: string, label: string): Promise<McpServerLaunch.Serialized | undefined>;
 	$startMcp(id: number, opts: IStartMcpOptions): void;
 	$stopMcp(id: number): void;
 	$sendMessage(id: number, message: string): void;
 	$waitForInitialCollectionProviders(): Promise<void>;
+	$onDidChangeMcpServerDefinitions(servers: McpServerDefinition.Serialized[]): void;
 }
 
 export interface IMcpAuthenticationDetails {

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

@@ -6,7 +6,7 @@
 import { isFalsyOrEmpty } from '../../../base/common/arrays.js';
 import { VSBuffer } from '../../../base/common/buffer.js';
 import { Schemas, matchesSomeScheme } from '../../../base/common/network.js';
-import { URI, UriComponents } from '../../../base/common/uri.js';
+import { URI } from '../../../base/common/uri.js';
 import { IPosition } from '../../../editor/common/core/position.js';
 import { IRange } from '../../../editor/common/core/range.js';
 import { ISelection } from '../../../editor/common/core/selection.js';
@@ -23,6 +23,7 @@ import { TransientCellMetadata, TransientDocumentMetadata } from '../../contrib/
 import * as search from '../../contrib/search/common/search.js';
 import type * as vscode from 'vscode';
 import { PromptsType } from '../../contrib/chat/common/promptSyntax/promptTypes.js';
+import type { IExtensionPromptFileResult } from '../../contrib/chat/common/promptSyntax/chatPromptFilesContribution.js';
 
 //#region --- NEW world
 
@@ -560,7 +561,7 @@ const newCommands: ApiCommand[] = [
 	new ApiCommand(
 		'vscode.extensionPromptFileProvider', '_listExtensionPromptFiles', 'Get all extension-contributed prompt files (custom agents, instructions, and prompt files).',
 		[],
-		new ApiCommandResult<{ uri: UriComponents; type: PromptsType }[], { uri: vscode.Uri; type: PromptsType }[]>(
+		new ApiCommandResult<IExtensionPromptFileResult[], { uri: vscode.Uri; type: PromptsType }[]>(
 			'A promise that resolves to an array of objects containing uri and type.',
 			(value) => {
 				if (!value) {