monaco-editor 0.56.0-dev-20260119 → 0.56.0-dev-20260121

package/esm/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;
 	}
 }

package/esm/vs/editor/contrib/floatingMenu/browser/floatingMenu.js

@@ -8,6 +8,7 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { observableCodeEditor } from '../../../browser/observableCodeEditor.js';
 import { observableFromEvent } from '../../../../base/common/observableInternal/observables/observableFromEvent.js';
+import { derived } from '../../../../base/common/observableInternal/observables/derived.js';
 import { autorun } from '../../../../base/common/observableInternal/reactions/autorun.js';
 import { constObservable } from '../../../../base/common/observableInternal/observables/constObservable.js';
 
@@ -30,30 +31,57 @@ let FloatingEditorToolbar = class FloatingEditorToolbar extends Disposable {
         super();
         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, {
                 actionViewItemProvider: (action, options) => {
                     if (!(action instanceof MenuItemAction)) {
                         return undefined;
                     }
-                    const keybinding = keybindingService.lookupKeybinding(action.id);
-                    if (!keybinding) {
-                        return undefined;
-                    }
                     return instantiationService.createInstance(class extends MenuEntryActionViewItem {
+                        render(container) {
+                            super.render(container);
+                            // Highlight primary action
+                            if (action.id === menuPrimaryActionId) {
+                                this.element?.classList.add('primary');
+                            }
+                        }
                         updateLabel() {
+                            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 });

package/esm/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.js

@@ -1095,8 +1095,8 @@ function isSuggestionInViewport(editor, suggestion, reader = undefined) {
     return viewportRange.containsRange(targetRange);
 }
 function skuFromAccount(account) {
-    if (account?.access_type_sku && account?.copilot_plan) {
-        return { type: account.access_type_sku, plan: account.copilot_plan };
+    if (account?.entitlementsData?.access_type_sku && account?.entitlementsData?.copilot_plan) {
+        return { type: account.entitlementsData.access_type_sku, plan: account.entitlementsData.copilot_plan };
     }
     return undefined;
 }

package/esm/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.css

@@ -64,6 +64,13 @@
 	border-bottom: 4px double var(--vscode-editorWarning-border);
 }
 
+.monaco-editor .ghost-text-decoration.short-text,
+.monaco-editor .ghost-text-decoration-preview.short-text,
+.monaco-editor .suggest-preview-text .ghost-text.short-text {
+	text-decoration: underline dotted var(--vscode-editorGhostText-foreground);
+	text-underline-position: under;
+}
+
 .ghost-text-view-warning-widget-icon {
 	.codicon {
 		color: var(--vscode-editorWarning-foreground) !important;

package/esm/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.js

@@ -77,14 +77,27 @@ let GhostTextView = class GhostTextView extends Disposable {
         });
         this._onDidClick = this._register(new Emitter());
         this.onDidClick = this._onDidClick.event;
+        this._nonWhitespaceCount = derived(this, reader => {
+            const data = this._data.read(reader);
+            if (!data) {
+                return undefined;
+            }
+            const ghostText = data.ghostText;
+            const allText = ghostText.parts.map(p => p.lines.map(l => l.line).join('')).join('');
+            return allText.replace(/\s/g, '').length;
+        });
         this._extraClassNames = derived(this, reader => {
             const extraClasses = this._extraClasses.slice();
-            if (this._useSyntaxHighlighting.read(reader)) {
-                extraClasses.push('syntax-highlighted');
-            }
             if (this._warningState.read(reader)) {
                 extraClasses.push('warning');
             }
+            const nonWhitespaceCount = this._nonWhitespaceCount.read(reader);
+            if (this._highlightShortText && nonWhitespaceCount && nonWhitespaceCount < 3) {
+                extraClasses.push('short-text');
+            }
+            else if (this._useSyntaxHighlighting.read(reader)) {
+                extraClasses.push('syntax-highlighted');
+            }
             const extraClassNames = extraClasses.map(c => ` ${c}`).join('');
             return extraClassNames;
         });
@@ -156,6 +169,10 @@ let GhostTextView = class GhostTextView extends Disposable {
                 });
             }
             for (const p of uiState.inlineTexts) {
+                let inlineExtraClassNames = '';
+                if (this._highlightShortText && p.text.length < 5) {
+                    inlineExtraClassNames += ' short-text';
+                }
                 decorations.push({
                     range: Range.fromPositions(new Position(uiState.lineNumber, p.column)),
                     options: {
@@ -166,6 +183,7 @@ let GhostTextView = class GhostTextView extends Disposable {
                             inlineClassName: (p.preview ? 'ghost-text-decoration-preview' : 'ghost-text-decoration')
                                 + (this._isClickable ? ' clickable' : '')
                                 + extraClassNames
+                                + inlineExtraClassNames
                                 + p.lineDecorations.map(d => ' ' + d.className).join(' '), // TODO: take the ranges into account for line decorations
                             cursorStops: InjectedTextCursorStops.Left,
                             attachedData: new GhostTextAttachedData(this),
@@ -191,6 +209,7 @@ let GhostTextView = class GhostTextView extends Disposable {
         this._shouldKeepCursorStable = options.shouldKeepCursorStable ?? false;
         this._minReservedLineCount = options.minReservedLineCount ?? constObservable(0);
         this._useSyntaxHighlighting = options.useSyntaxHighlighting ?? constObservable(true);
+        this._highlightShortText = options.highlightShortSuggestions ?? false;
         this._editorObs = observableCodeEditor(this._editor);
         this._additionalLinesWidget = this._register(new AdditionalLinesWidget(this._editor, derivedOpts({ owner: this, equalsFn: equalsIfDefinedC(thisEqualsC()) }, reader => {
             /** @description lines */

package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.js

@@ -22,8 +22,8 @@ import { asCssVariable } from '../../../../../../../platform/theme/common/colorU
 import { debouncedObservable } from '../../../../../../../base/common/observableInternal/utils/utils.js';
 import { observableFromEvent } from '../../../../../../../base/common/observableInternal/observables/observableFromEvent.js';
 import { derived } from '../../../../../../../base/common/observableInternal/observables/derived.js';
-import { observableValue } from '../../../../../../../base/common/observableInternal/observables/observableValue.js';
 import { constObservable } from '../../../../../../../base/common/observableInternal/observables/constObservable.js';
+import { observableValue } from '../../../../../../../base/common/observableInternal/observables/observableValue.js';
 import { runOnChange } from '../../../../../../../base/common/observableInternal/utils/runOnChange.js';
 import { autorun } from '../../../../../../../base/common/observableInternal/reactions/autorun.js';
 
@@ -41,11 +41,12 @@ var __param = (undefined && undefined.__param) || function (paramIndex, decorato
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 class InlineEditsGutterIndicatorData {
-    constructor(gutterMenuData, originalRange, model, altAction) {
+    constructor(gutterMenuData, originalRange, model, altAction, customization) {
         this.gutterMenuData = gutterMenuData;
         this.originalRange = originalRange;
         this.model = model;
         this.altAction = altAction;
+        this.customization = customization;
     }
 }
 class InlineSuggestionGutterMenuData {
@@ -224,18 +225,23 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
             const pillFullyDockedRect = gutterEditArea.withHeight(pillHeight).translateY(pillOffset);
             const pillIsFullyDocked = gutterViewPortWithoutStickyScrollWithoutPaddingTop.containsRect(pillFullyDockedRect);
             // The icon which will be rendered in the pill
-            const iconNoneDocked = this._tabAction.map(action => action === InlineEditTabAction.Accept ? Codicon.keyboardTab : Codicon.arrowRight);
-            const iconDocked = derived(this, reader => {
-                if (this._isHoveredOverIconDebounced.read(reader) || this._isHoveredOverInlineEditDebounced.read(reader)) {
-                    return Codicon.check;
-                }
-                if (this._tabAction.read(reader) === InlineEditTabAction.Accept) {
-                    return Codicon.keyboardTab;
-                }
-                const cursorLineNumber = this._editorObs.cursorLineNumber.read(reader) ?? 0;
-                const editStartLineNumber = s.range.read(reader).startLineNumber;
-                return cursorLineNumber <= editStartLineNumber ? Codicon.keyboardTabAbove : Codicon.keyboardTabBelow;
-            });
+            const customIcon = this._data.read(reader)?.customization?.icon;
+            const iconNoneDocked = customIcon
+                ? constObservable(customIcon)
+                : this._tabAction.map(action => action === InlineEditTabAction.Accept ? Codicon.keyboardTab : Codicon.arrowRight);
+            const iconDocked = customIcon
+                ? constObservable(customIcon)
+                : derived(this, reader => {
+                    if (this._isHoveredOverIconDebounced.read(reader) || this._isHoveredOverInlineEditDebounced.read(reader)) {
+                        return Codicon.check;
+                    }
+                    if (this._tabAction.read(reader) === InlineEditTabAction.Accept) {
+                        return Codicon.keyboardTab;
+                    }
+                    const cursorLineNumber = this._editorObs.cursorLineNumber.read(reader) ?? 0;
+                    const editStartLineNumber = s.range.read(reader).startLineNumber;
+                    return cursorLineNumber <= editStartLineNumber ? Codicon.keyboardTabAbove : Codicon.keyboardTabBelow;
+                });
             const idealIconAreaWidth = 22;
             const iconWidth = (pillRect) => {
                 const availableIconAreaWidth = this._availableWidthForIcon.read(undefined)(pillRect.bottom + this._editorObs.editor.getScrollTop()) - gutterViewPortPaddingLeft;

package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineSuggestionsView.js

@@ -153,6 +153,7 @@ let InlineSuggestionsView = class InlineSuggestionsView extends Disposable {
             };
         }), {
             useSyntaxHighlighting: this._editorObs.getOption(71 /* EditorOption.inlineSuggest */).map(v => v.syntaxHighlightingEnabled),
+            highlightShortSuggestions: true,
         });
     }
     shouldShowHoverAtViewZone(viewZoneId) {

package/esm/vs/editor/editor.api.d.ts

@@ -1745,7 +1745,7 @@ declare namespace editor {
 		 */
 		glyphMargin?: IModelDecorationGlyphMarginOptions | null;
 		/**
-		 * If set, the decoration will override the line height of the lines it spans. Maximum value is 300px.
+		 * If set, the decoration will override the line height of the lines it spans. This value is a multiplier to the default line height.
 		 */
 		lineHeight?: number | null;
 		/**
@@ -6387,6 +6387,10 @@ declare namespace editor {
 		 * Force an editor render now.
 		 */
 		render(forceRedraw?: boolean): void;
+		/**
+		 * Render the editor at the next animation frame.
+		 */
+		renderAsync(forceRedraw?: boolean): void;
 		/**
 		 * Get the hit test target at coordinates `clientX` and `clientY`.
 		 * The coordinates are relative to the top-left of the viewport.

package/esm/vs/nls/lang/cs.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.56.0-dev-20260119(3f26219a3c6e5b21b6b5725327da71fbf25fbf12)
+ * Version: 0.56.0-dev-20260121(fe9dd23f49a64c1b2811d9eeec98f38876f93511)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/vs/nls/lang/de.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.56.0-dev-20260119(3f26219a3c6e5b21b6b5725327da71fbf25fbf12)
+ * Version: 0.56.0-dev-20260121(fe9dd23f49a64c1b2811d9eeec98f38876f93511)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/vs/nls/lang/es.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.56.0-dev-20260119(3f26219a3c6e5b21b6b5725327da71fbf25fbf12)
+ * Version: 0.56.0-dev-20260121(fe9dd23f49a64c1b2811d9eeec98f38876f93511)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/vs/nls/lang/fr.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.56.0-dev-20260119(3f26219a3c6e5b21b6b5725327da71fbf25fbf12)
+ * Version: 0.56.0-dev-20260121(fe9dd23f49a64c1b2811d9eeec98f38876f93511)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/vs/nls/lang/it.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.56.0-dev-20260119(3f26219a3c6e5b21b6b5725327da71fbf25fbf12)
+ * Version: 0.56.0-dev-20260121(fe9dd23f49a64c1b2811d9eeec98f38876f93511)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/vs/nls/lang/ja.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.56.0-dev-20260119(3f26219a3c6e5b21b6b5725327da71fbf25fbf12)
+ * Version: 0.56.0-dev-20260121(fe9dd23f49a64c1b2811d9eeec98f38876f93511)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/vs/nls/lang/ko.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.56.0-dev-20260119(3f26219a3c6e5b21b6b5725327da71fbf25fbf12)
+ * Version: 0.56.0-dev-20260121(fe9dd23f49a64c1b2811d9eeec98f38876f93511)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/vs/nls/lang/pl.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.56.0-dev-20260119(3f26219a3c6e5b21b6b5725327da71fbf25fbf12)
+ * Version: 0.56.0-dev-20260121(fe9dd23f49a64c1b2811d9eeec98f38876f93511)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/vs/nls/lang/pt-br.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.56.0-dev-20260119(3f26219a3c6e5b21b6b5725327da71fbf25fbf12)
+ * Version: 0.56.0-dev-20260121(fe9dd23f49a64c1b2811d9eeec98f38876f93511)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/vs/nls/lang/ru.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.56.0-dev-20260119(3f26219a3c6e5b21b6b5725327da71fbf25fbf12)
+ * Version: 0.56.0-dev-20260121(fe9dd23f49a64c1b2811d9eeec98f38876f93511)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/vs/nls/lang/tr.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.56.0-dev-20260119(3f26219a3c6e5b21b6b5725327da71fbf25fbf12)
+ * Version: 0.56.0-dev-20260121(fe9dd23f49a64c1b2811d9eeec98f38876f93511)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/vs/nls/lang/zh-cn.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.56.0-dev-20260119(3f26219a3c6e5b21b6b5725327da71fbf25fbf12)
+ * Version: 0.56.0-dev-20260121(fe9dd23f49a64c1b2811d9eeec98f38876f93511)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/vs/nls/lang/zh-tw.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.56.0-dev-20260119(3f26219a3c6e5b21b6b5725327da71fbf25fbf12)
+ * Version: 0.56.0-dev-20260121(fe9dd23f49a64c1b2811d9eeec98f38876f93511)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/vs/platform/actionWidget/browser/actionList.js

@@ -3,7 +3,7 @@ import { KeybindingLabel } from '../../../base/browser/ui/keybindingLabel/keybin
 import { List } from '../../../base/browser/ui/list/listWidget.js';
 import { CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { Codicon } from '../../../base/common/codicons.js';
-import { Disposable } 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';
@@ -23,6 +23,8 @@ import '../../theme/common/colors/miscColors.js';
 import '../../theme/common/colors/quickpickColors.js';
 import '../../theme/common/colors/searchColors.js';
 import { ILayoutService } from '../../layout/browser/layoutService.js';
+import { IHoverService } from '../../hover/browser/hover.js';
+import { MarkdownString } from '../../../base/common/htmlContent.js';
 
 var __decorate = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -124,6 +126,10 @@ let ActionItemRenderer = class ActionItemRenderer {
         else if (element.disabled) {
             data.container.title = element.label;
         }
+        else if (element.hover?.content) {
+            // Don't show tooltip when hover content is configured - the rich hover will show instead
+            data.container.title = '';
+        }
         else if (actionTitle && previewTitle) {
             if (this._supportsPreview && element.canPreview) {
                 data.container.title = localize(1668, "{0} to Apply, {1} to Preview", actionTitle, previewTitle);
@@ -157,16 +163,18 @@ function getKeyboardNavigationLabel(item) {
     return undefined;
 }
 let ActionList = class ActionList extends Disposable {
-    constructor(user, preview, items, _delegate, accessibilityProvider, _contextViewService, _keybindingService, _layoutService) {
+    constructor(user, preview, items, _delegate, accessibilityProvider, _contextViewService, _keybindingService, _layoutService, _hoverService) {
         super();
         this._delegate = _delegate;
         this._contextViewService = _contextViewService;
         this._keybindingService = _keybindingService;
         this._layoutService = _layoutService;
+        this._hoverService = _hoverService;
         this._actionLineHeight = 28;
         this._headerLineHeight = 28;
         this._separatorLineHeight = 8;
         this.cts = this._register(new CancellationTokenSource());
+        this._hover = this._register(new MutableDisposable());
         this.domNode = document.createElement('div');
         this.domNode.classList.add('actionList');
         const virtualDelegate = {
@@ -236,6 +244,7 @@ let ActionList = class ActionList extends Disposable {
     hide(didCancel) {
         this._delegate.onHide(didCancel);
         this.cts.cancel();
+        this._hover.clear();
         this._contextViewService.hideContextView();
     }
     layout(minWidth) {
@@ -253,8 +262,7 @@ let ActionList = class ActionList extends Disposable {
         else {
             // For finding width dynamically (not using resize observer)
             const itemWidths = this._allMenuItems.map((_, index) => {
-                // eslint-disable-next-line no-restricted-syntax
-                const element = this.domNode.ownerDocument.getElementById(this._list.getElementID(index));
+                const element = this._getRowElement(index);
                 if (element) {
                     element.style.width = 'auto';
                     const width = element.getBoundingClientRect().width;
@@ -312,6 +320,37 @@ let ActionList = class ActionList extends Disposable {
         const focusIndex = focused[0];
         const element = this._list.element(focusIndex);
         this._delegate.onFocus?.(element.item);
+        // Show hover on focus change
+        this._showHoverForElement(element, focusIndex);
+    }
+    _getRowElement(index) {
+        // eslint-disable-next-line no-restricted-syntax
+        return this.domNode.ownerDocument.getElementById(this._list.getElementID(index));
+    }
+    _showHoverForElement(element, index) {
+        let newHover;
+        // Show hover if the element has hover content
+        if (element.hover?.content && this.focusCondition(element)) {
+            // The List widget separates data models from DOM elements, so we need to
+            // look up the actual DOM node to use as the hover target.
+            const rowElement = this._getRowElement(index);
+            if (rowElement) {
+                const markdown = element.hover.content ? new MarkdownString(element.hover.content) : undefined;
+                newHover = this._hoverService.showDelayedHover({
+                    content: markdown ?? '',
+                    target: rowElement,
+                    additionalClasses: ['action-widget-hover'],
+                    position: {
+                        hoverPosition: 0 /* HoverPosition.LEFT */,
+                        forcePosition: false,
+                    },
+                    appearance: {
+                        showPointer: true,
+                    },
+                }, { groupId: `actionListHover` });
+            }
+        }
+        this._hover.value = newHover;
     }
     async onListHover(e) {
         const element = e.element;
@@ -323,8 +362,8 @@ let ActionList = class ActionList extends Disposable {
             if (e.index) {
                 this._list.splice(e.index, 1, [element]);
             }
+            this._list.setFocus(typeof e.index === 'number' ? [e.index] : []);
         }
-        this._list.setFocus(typeof e.index === 'number' ? [e.index] : []);
     }
     onListClick(e) {
         if (e.element && this.focusCondition(e.element)) {
@@ -335,7 +374,8 @@ let ActionList = class ActionList extends Disposable {
 ActionList = __decorate([
     __param(5, IContextViewService),
     __param(6, IKeybindingService),
-    __param(7, ILayoutService)
+    __param(7, ILayoutService),
+    __param(8, IHoverService)
 ], ActionList);
 function stripNewlines(str) {
     return str.replace(/\r\n|\r|\n/g, ' ');

package/esm/vs/platform/actionWidget/browser/actionWidget.js

@@ -1,4 +1,4 @@
-import { addDisposableListener, EventType, trackFocus, $ } from '../../../base/browser/dom.js';
+import { addDisposableListener, EventType, trackFocus, getActiveElement, $ } from '../../../base/browser/dom.js';
 import { ActionBar } from '../../../base/browser/ui/actionbar/actionbar.js';
 import { Disposable, MutableDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
 import './actionWidget.css';
@@ -111,7 +111,14 @@ let ActionWidgetService = class ActionWidgetService extends Disposable {
         const width = this._list.value?.layout(actionBarWidth);
         widget.style.width = `${width}px`;
         const focusTracker = renderDisposables.add(trackFocus(element));
-        renderDisposables.add(focusTracker.onDidBlur(() => this.hide(true)));
+        renderDisposables.add(focusTracker.onDidBlur(() => {
+            // Don't hide if focus moved to a hover that belongs to this action widget
+            const activeElement = getActiveElement();
+            if (activeElement?.closest('.action-widget-hover')) {
+                return;
+            }
+            this.hide(true);
+        }));
         return renderDisposables;
     }
     _createActionBar(className, actions) {

package/esm/vs/platform/actions/common/actions.js

@@ -240,6 +240,7 @@ class MenuId {
     static { this.ChatToolOutputResourceContext = new MenuId('ChatToolOutputResourceContext'); }
     static { this.ChatMultiDiffContext = new MenuId('ChatMultiDiffContext'); }
     static { this.ChatConfirmationMenu = new MenuId('ChatConfirmationMenu'); }
+    static { this.ChatEditorInlineGutter = new MenuId('ChatEditorInlineGutter'); }
     static { this.ChatEditorInlineExecute = new MenuId('ChatEditorInputExecute'); }
     static { this.ChatEditorInlineInputSide = new MenuId('ChatEditorInputSide'); }
     static { this.AccessibleView = new MenuId('AccessibleView'); }
@@ -256,7 +257,7 @@ class MenuId {
     static { this.AgentSessionsToolbar = new MenuId('AgentSessionsToolbar'); }
     static { this.AgentSessionItemToolbar = new MenuId('AgentSessionItemToolbar'); }
     static { this.AgentSessionSectionToolbar = new MenuId('AgentSessionSectionToolbar'); }
-    static { this.AgentsControlMenu = new MenuId('AgentsControlMenu'); }
+    static { this.AgentsTitleBarControlMenu = new MenuId('AgentsTitleBarControlMenu'); }
     static { this.ChatViewSessionTitleNavigationToolbar = new MenuId('ChatViewSessionTitleNavigationToolbar'); }
     static { this.ChatViewSessionTitleToolbar = new MenuId('ChatViewSessionTitleToolbar'); }
     /**

package/esm/vs/platform/hover/browser/hoverService.js

@@ -256,6 +256,7 @@ let HoverService = class HoverService extends Disposable {
     }
     _showHover(hover, options, focus) {
         this._contextViewHandler.showContextView(new HoverContextViewDelegate(hover, focus), options.container);
+        options.onDidShow?.();
     }
     hideHover(force) {
         if ((!force && this._currentHover?.isLocked) || !this._currentHoverOptions) {

package/esm/vs/platform/product/common/product.js

@@ -61,7 +61,22 @@ else {
             reportIssueUrl: 'https://github.com/microsoft/vscode/issues/new',
             licenseName: 'MIT',
             licenseUrl: 'https://github.com/microsoft/vscode/blob/main/LICENSE.txt',
-            serverLicenseUrl: 'https://github.com/microsoft/vscode/blob/main/LICENSE.txt'
+            serverLicenseUrl: 'https://github.com/microsoft/vscode/blob/main/LICENSE.txt',
+            defaultChatAgent: {
+                extensionId: 'GitHub.copilot',
+                chatExtensionId: 'GitHub.copilot-chat',
+                provider: {
+                    default: {
+                        id: 'github',
+                        name: 'GitHub',
+                    },
+                    enterprise: {
+                        id: 'github-enterprise',
+                        name: 'GitHub Enterprise',
+                    }
+                },
+                providerScopes: []
+            }
         });
     }
 }