@codingame/monaco-vscode-api 21.6.0 → 22.0.0

package/vscode/src/vs/platform/markers/common/markers.js

@@ -20,17 +20,17 @@ var MarkerSeverity;
     }
     MarkerSeverity.compare = compare;
     const _displayStrings = Object.create(null);
-    _displayStrings[MarkerSeverity.Error] = ( localize(1964, "Error"));
-    _displayStrings[MarkerSeverity.Warning] = ( localize(1965, "Warning"));
-    _displayStrings[MarkerSeverity.Info] = ( localize(1966, "Info"));
+    _displayStrings[MarkerSeverity.Error] = ( localize(1966, "Error"));
+    _displayStrings[MarkerSeverity.Warning] = ( localize(1967, "Warning"));
+    _displayStrings[MarkerSeverity.Info] = ( localize(1968, "Info"));
     function toString(a) {
         return _displayStrings[a] || '';
     }
     MarkerSeverity.toString = toString;
     const _displayStringsPlural = Object.create(null);
-    _displayStringsPlural[MarkerSeverity.Error] = ( localize(1967, "Errors"));
-    _displayStringsPlural[MarkerSeverity.Warning] = ( localize(1968, "Warnings"));
-    _displayStringsPlural[MarkerSeverity.Info] = ( localize(1969, "Infos"));
+    _displayStringsPlural[MarkerSeverity.Error] = ( localize(1969, "Errors"));
+    _displayStringsPlural[MarkerSeverity.Warning] = ( localize(1970, "Warnings"));
+    _displayStringsPlural[MarkerSeverity.Info] = ( localize(1971, "Infos"));
     function toStringPlural(a) {
         return _displayStringsPlural[a] || '';
     }

package/vscode/src/vs/platform/mcp/common/mcpGalleryManifest.d.ts

@@ -1,6 +1,14 @@
 export declare enum McpGalleryResourceType {
-    McpQueryService = "McpQueryService",
-    McpServerManifestUri = "McpServerManifestUriTemplate"
+    McpServersQueryService = "McpServersQueryService",
+    McpServersSearchService = "McpServersSearchService",
+    McpServerWebUri = "McpServerWebUriTemplate",
+    McpServerResourceUri = "McpServerResourceUriTemplate",
+    McpServerNamedResourceUri = "McpServerNamedResourceUriTemplate",
+    PublisherUriTemplate = "PublisherUriTemplate",
+    ContactSupportUri = "ContactSupportUri",
+    PrivacyPolicyUri = "PrivacyPolicyUri",
+    TermsOfServiceUri = "TermsOfServiceUri",
+    ReportUri = "ReportUri"
 }
 export type McpGalleryManifestResource = {
     readonly id: string;

package/vscode/src/vs/platform/mcp/common/mcpGalleryManifest.js

@@ -2,8 +2,16 @@
 
 var McpGalleryResourceType;
 (function (McpGalleryResourceType) {
-    McpGalleryResourceType["McpQueryService"] = "McpQueryService";
-    McpGalleryResourceType["McpServerManifestUri"] = "McpServerManifestUriTemplate";
+    McpGalleryResourceType["McpServersQueryService"] = "McpServersQueryService";
+    McpGalleryResourceType["McpServersSearchService"] = "McpServersSearchService";
+    McpGalleryResourceType["McpServerWebUri"] = "McpServerWebUriTemplate";
+    McpGalleryResourceType["McpServerResourceUri"] = "McpServerResourceUriTemplate";
+    McpGalleryResourceType["McpServerNamedResourceUri"] = "McpServerNamedResourceUriTemplate";
+    McpGalleryResourceType["PublisherUriTemplate"] = "PublisherUriTemplate";
+    McpGalleryResourceType["ContactSupportUri"] = "ContactSupportUri";
+    McpGalleryResourceType["PrivacyPolicyUri"] = "PrivacyPolicyUri";
+    McpGalleryResourceType["TermsOfServiceUri"] = "TermsOfServiceUri";
+    McpGalleryResourceType["ReportUri"] = "ReportUri";
 })(McpGalleryResourceType || (McpGalleryResourceType = {}));
 var McpGalleryManifestStatus;
 (function (McpGalleryManifestStatus) {

package/vscode/src/vs/platform/mcp/common/mcpManagement.service.d.ts

@@ -3,15 +3,15 @@ import { Event } from "../../../base/common/event.js";
 import { IMarkdownString } from "../../../base/common/htmlContent.js";
 import { IPager } from "@codingame/monaco-vscode-62190c26-af1c-5f7a-a364-e05a59cfb7c7-common/vscode/vs/base/common/paging";
 import { URI } from "../../../base/common/uri.js";
-import { IQueryOptions, IGalleryMcpServer, IGalleryMcpServerConfiguration, type DidUninstallMcpServerEvent, type IInstallableMcpServer, type ILocalMcpServer, type InstallMcpServerEvent, type InstallMcpServerResult, type InstallOptions, type RegistryType, type UninstallMcpServerEvent, type UninstallOptions } from "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement";
+import { IQueryOptions, IGalleryMcpServer, IGalleryMcpServerConfiguration, type DidUninstallMcpServerEvent, type IInstallableMcpServer, type ILocalMcpServer, type InstallMcpServerEvent, type InstallMcpServerResult, type InstallOptions, type McpServerConfigurationParseResult, type RegistryType, type UninstallMcpServerEvent, type UninstallOptions } from "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement";
 export declare const IMcpGalleryService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IMcpGalleryService>;
 export interface IMcpGalleryService {
     readonly _serviceBrand: undefined;
     isEnabled(): boolean;
     query(options?: IQueryOptions, token?: CancellationToken): Promise<IPager<IGalleryMcpServer>>;
-    getMcpServersFromVSCodeGallery(servers: string[]): Promise<IGalleryMcpServer[]>;
     getMcpServersFromGallery(urls: string[]): Promise<IGalleryMcpServer[]>;
     getMcpServer(url: string): Promise<IGalleryMcpServer | undefined>;
+    getMcpServerByName(name: string): Promise<IGalleryMcpServer | undefined>;
     getMcpServerConfiguration(extension: IGalleryMcpServer, token: CancellationToken): Promise<IGalleryMcpServerConfiguration>;
     getReadme(extension: IGalleryMcpServer, token: CancellationToken): Promise<string>;
 }
@@ -29,7 +29,7 @@ export interface IMcpManagementService {
     installFromGallery(server: IGalleryMcpServer, options?: InstallOptions): Promise<ILocalMcpServer>;
     updateMetadata(local: ILocalMcpServer, server: IGalleryMcpServer, profileLocation?: URI): Promise<ILocalMcpServer>;
     uninstall(server: ILocalMcpServer, options?: UninstallOptions): Promise<void>;
-    getMcpServerConfigurationFromManifest(manifest: IGalleryMcpServerConfiguration, packageType: RegistryType): Omit<IInstallableMcpServer, "name">;
+    getMcpServerConfigurationFromManifest(manifest: IGalleryMcpServerConfiguration, packageType: RegistryType): McpServerConfigurationParseResult;
 }
 export declare const IAllowedMcpServersService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IAllowedMcpServersService>;
 export interface IAllowedMcpServersService {

package/vscode/src/vs/platform/notification/common/notification.js

@@ -47,12 +47,12 @@ class NoOpProgress {
 }
 function withSeverityPrefix(label, severity) {
     if (severity === Severity$1.Error) {
-        return localize(1974, "Error: {0}", label);
+        return localize(1976, "Error: {0}", label);
     }
     if (severity === Severity$1.Warning) {
-        return localize(1975, "Warning: {0}", label);
+        return localize(1977, "Warning: {0}", label);
     }
-    return localize(1976, "Info: {0}", label);
+    return localize(1978, "Info: {0}", label);
 }
 
 export { NeverShowAgainScope, NoOpNotification, NoOpProgress, NotificationPriority, NotificationsFilter, Severity$1 as Severity, isNotificationSource, withSeverityPrefix };

package/vscode/src/vs/platform/product/common/product.js

@@ -4,9 +4,9 @@ import productJson from '../../../../../product.json.js';
 var product = {
   ...productJson,
   quality: 'stable',
-  version: '1.104.2',
-  commit: 'e3a5acfb517a443235981655413d566533107e92',
-  date: '2025-10-09T08:52:33.541Z',
+  version: '1.105.0',
+  commit: '03c265b1adee71ac88f833e065f7bb956b60550a',
+  date: '2025-10-10T15:45:11.487Z',
   ...(globalThis._VSCODE_PRODUCT_JSON ?? {})
 };
 

package/vscode/src/vs/platform/quickinput/browser/quickInput.d.ts

@@ -364,6 +364,7 @@ export declare class InputBox extends QuickInput implements IInputBox {
     readonly onDidChangeValue: Event<string>;
     readonly onDidAccept: Event<void>;
     show(): void;
+    accept(): void;
     protected update(): void;
 }
 export declare class QuickWidget extends QuickInput implements IQuickWidget {

package/vscode/src/vs/platform/quickinput/browser/quickInput.js

@@ -26,25 +26,25 @@ import { observableValue } from '../../../base/common/observableInternal/observa
 
 registerCss(quickInput);
 const inQuickInputContextKeyValue = 'inQuickInput';
-const InQuickInputContextKey = ( new RawContextKey(inQuickInputContextKeyValue, false, ( localize(1984, "Whether keyboard focus is inside the quick input control"))));
+const InQuickInputContextKey = ( new RawContextKey(inQuickInputContextKeyValue, false, ( localize(1986, "Whether keyboard focus is inside the quick input control"))));
 const inQuickInputContext = ( ContextKeyExpr.has(inQuickInputContextKeyValue));
 const quickInputAlignmentContextKeyValue = 'quickInputAlignment';
-const QuickInputAlignmentContextKey = ( new RawContextKey(quickInputAlignmentContextKeyValue, 'top', ( localize(1985, "The alignment of the quick input"))));
+const QuickInputAlignmentContextKey = ( new RawContextKey(quickInputAlignmentContextKeyValue, 'top', ( localize(1987, "The alignment of the quick input"))));
 const quickInputTypeContextKeyValue = 'quickInputType';
-const QuickInputTypeContextKey = ( new RawContextKey(quickInputTypeContextKeyValue, undefined, ( localize(1986, "The type of the currently visible quick input"))));
+const QuickInputTypeContextKey = ( new RawContextKey(quickInputTypeContextKeyValue, undefined, ( localize(1988, "The type of the currently visible quick input"))));
 const endOfQuickInputBoxContextKeyValue = 'cursorAtEndOfQuickInputBox';
 const EndOfQuickInputBoxContextKey = ( new RawContextKey(endOfQuickInputBoxContextKeyValue, false, ( localize(
-    1987,
+    1989,
     "Whether the cursor in the quick input is at the end of the input box"
 ))));
 const endOfQuickInputBoxContext = ( ContextKeyExpr.has(endOfQuickInputBoxContextKeyValue));
 const backButton = {
     iconClass: ThemeIcon.asClassName(Codicon.quickInputBack),
-    tooltip: ( localize(1988, "Back")),
+    tooltip: ( localize(1990, "Back")),
     handle: -1
 };
 class QuickInput extends Disposable {
-    static { this.noPromptMessage = ( localize(1989, "Press 'Enter' to confirm your input or 'Escape' to cancel")); }
+    static { this.noPromptMessage = ( localize(1991, "Press 'Enter' to confirm your input or 'Escape' to cancel")); }
     constructor(ui) {
         super();
         this.ui = ui;
@@ -324,7 +324,7 @@ class QuickInput extends Disposable {
     }
     getSteps() {
         if (this.step && this.totalSteps) {
-            return localize(1990, "{0}/{1}", this.step, this.totalSteps);
+            return localize(1992, "{0}/{1}", this.step, this.totalSteps);
         }
         if (this.step) {
             return String(this.step);
@@ -397,7 +397,7 @@ class QuickPick extends QuickInput {
         this.onDidTriggerItemButton = this.onDidTriggerItemButtonEmitter.event;
         this.onDidTriggerSeparatorButton = this.onDidTriggerSeparatorButtonEmitter.event;
     }
-    static { this.DEFAULT_ARIA_LABEL = ( localize(1991, "Type to narrow down results.")); }
+    static { this.DEFAULT_ARIA_LABEL = ( localize(1993, "Type to narrow down results.")); }
     get quickNavigate() {
         return this._quickNavigate;
     }
@@ -577,7 +577,7 @@ class QuickPick extends QuickInput {
         this.update();
     }
     get okLabel() {
-        return this._okLabel ?? ( localize(1992, "OK"));
+        return this._okLabel ?? ( localize(1994, "OK"));
     }
     set okLabel(okLabel) {
         this._okLabel = okLabel;
@@ -761,9 +761,14 @@ class QuickPick extends QuickInput {
         }
         let ariaLabel = this.ariaLabel;
         if (!ariaLabel && visibilities.inputBox) {
-            ariaLabel = this.placeholder || QuickPick.DEFAULT_ARIA_LABEL;
+            ariaLabel = this.placeholder;
             if (this.title) {
-                ariaLabel += ` - ${this.title}`;
+                ariaLabel = ariaLabel
+                    ? `${ariaLabel} - ${this.title}`
+                    : this.title;
+            }
+            if (!ariaLabel) {
+                ariaLabel = QuickPick.DEFAULT_ARIA_LABEL;
             }
         }
         if (this.ui.list.ariaLabel !== ariaLabel) {
@@ -853,11 +858,11 @@ class QuickPick extends QuickInput {
         if (inBackground && !this._canAcceptInBackground) {
             return;
         }
-        if (this.activeItems[0]) {
+        if (this.activeItems[0] && !this._canSelectMany) {
             this._selectedItems = [this.activeItems[0]];
             this.onDidChangeSelectionEmitter.fire(this.selectedItems);
-            this.handleAccept(inBackground ?? false);
         }
+        this.handleAccept(inBackground ?? false);
     }
 }
 class InputBox extends QuickInput {
@@ -918,7 +923,7 @@ class InputBox extends QuickInput {
     set prompt(prompt) {
         this._prompt = prompt;
         this.noValidationMessage = prompt
-            ? ( localize(1993, "{0} (Press 'Enter' to confirm or 'Escape' to cancel)", prompt))
+            ? ( localize(1995, "{0} (Press 'Enter' to confirm or 'Escape' to cancel)", prompt))
             : QuickInput.noPromptMessage;
         this.update();
     }
@@ -936,6 +941,9 @@ class InputBox extends QuickInput {
         }
         super.show();
     }
+    accept() {
+        this.onDidAcceptEmitter.fire();
+    }
     update() {
         if (!this.visible) {
             return;
@@ -997,7 +1005,7 @@ class QuickWidget extends QuickInput {
 }
 let QuickInputHoverDelegate = class QuickInputHoverDelegate extends WorkbenchHoverDelegate {
     constructor(configurationService, hoverService) {
-        super('element', undefined, (options) => this.getOverrideOptions(options), configurationService, hoverService);
+        super('mouse', undefined, (options) => this.getOverrideOptions(options), configurationService, hoverService);
     }
     getOverrideOptions(options) {
         const showHoverHint = (isHTMLElement(options.content)

package/vscode/src/vs/platform/quickinput/browser/quickInputActions.js

@@ -4,22 +4,32 @@ import { isMacintosh } from '../../../base/common/platform.js';
 import { localize } from '../../../nls.js';
 import { ContextKeyExpr } from '../../contextkey/common/contextkey.js';
 import { InputFocusedContext } from '../../contextkey/common/contextkeys.js';
-import { KeybindingWeight, KeybindingsRegistry } from '../../keybinding/common/keybindingsRegistry.js';
-import { quickInputTypeContextKeyValue, inQuickInputContext, endOfQuickInputBoxContext } from './quickInput.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../keybinding/common/keybindingsRegistry.js';
+import { inQuickInputContext, quickInputTypeContextKeyValue, endOfQuickInputBoxContext } from './quickInput.js';
 import { QuickInputType, QuickPickFocus } from '../common/quickInput.js';
 import { IQuickInputService } from '../common/quickInput.service.js';
 
-const defaultCommandAndKeybindingRule = {
-    weight: KeybindingWeight.WorkbenchContrib,
-    when: ( ContextKeyExpr.and(( ContextKeyExpr.or(( ContextKeyExpr.equals(quickInputTypeContextKeyValue, QuickInputType.QuickPick)), ( ContextKeyExpr.equals(quickInputTypeContextKeyValue, QuickInputType.QuickTree)))), inQuickInputContext)),
-    metadata: { description: ( localize(
-        1994,
-        "Used while in the context of the quick pick. If you change one keybinding for this command, you should change all of the other keybindings (modifier variants) of this command as well."
-    )) }
-};
+function registerQuickInputCommandAndKeybindingRule(rule, options = {}) {
+    KeybindingsRegistry.registerCommandAndKeybindingRule({
+        weight: KeybindingWeight.WorkbenchContrib,
+        when: inQuickInputContext,
+        metadata: { description: ( localize(
+            1996,
+            "Used while in the context of any kind of quick input. If you change one keybinding for this command, you should change all of the other keybindings (modifier variants) of this command as well."
+        )) },
+        ...rule,
+        secondary: getSecondary(rule.primary, rule.secondary ?? [], options)
+    });
+}
 function registerQuickPickCommandAndKeybindingRule(rule, options = {}) {
     KeybindingsRegistry.registerCommandAndKeybindingRule({
-        ...defaultCommandAndKeybindingRule,
+        weight: KeybindingWeight.WorkbenchContrib,
+        when: ( ContextKeyExpr.and(( ContextKeyExpr.or((
+        ContextKeyExpr.equals(quickInputTypeContextKeyValue, QuickInputType.QuickPick)), ( ContextKeyExpr.equals(quickInputTypeContextKeyValue, QuickInputType.QuickTree)))), inQuickInputContext)),
+        metadata: { description: ( localize(
+            1997,
+            "Used while in the context of the quick pick. If you change one keybinding for this command, you should change all of the other keybindings (modifier variants) of this command as well."
+        )) },
         ...rule,
         secondary: getSecondary(rule.primary, rule.secondary ?? [], options)
     });
@@ -68,11 +78,11 @@ registerQuickPickCommandAndKeybindingRule({ id: 'quickInput.last', primary: ctrl
 registerQuickPickCommandAndKeybindingRule({ id: 'quickInput.next', primary: KeyCode.DownArrow, handler: focusHandler(QuickPickFocus.Next) }, { withCtrlMod: true });
 registerQuickPickCommandAndKeybindingRule({ id: 'quickInput.previous', primary: KeyCode.UpArrow, handler: focusHandler(QuickPickFocus.Previous) }, { withCtrlMod: true });
 const nextSeparatorFallbackDesc = ( localize(
-    1995,
+    1998,
     "If we're in quick access mode, this will navigate to the next item. If we are not in quick access mode, this will navigate to the next separator."
 ));
 const prevSeparatorFallbackDesc = ( localize(
-    1996,
+    1999,
     "If we're in quick access mode, this will navigate to the previous item. If we are not in quick access mode, this will navigate to the previous separator."
 ));
 if (isMacintosh) {
@@ -125,6 +135,22 @@ else {
         handler: focusHandler(QuickPickFocus.PreviousSeparator)
     });
 }
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'quickInput.accept',
+    primary: KeyCode.Enter,
+    weight: KeybindingWeight.WorkbenchContrib,
+    when: ( ContextKeyExpr.and((
+    ContextKeyExpr.notEquals(quickInputTypeContextKeyValue, QuickInputType.QuickWidget)), inQuickInputContext)),
+    metadata: { description: ( localize(
+        2000,
+        "Used while in the context of some quick input. If you change one keybinding for this command, you should change all of the other keybindings (modifier variants) of this command as well."
+    )) },
+    handler: (accessor) => {
+        const currentQuickPick = accessor.get(IQuickInputService).currentQuickInput;
+        currentQuickPick?.accept();
+    },
+    secondary: getSecondary(KeyCode.Enter, [], { withAltMod: true, withCtrlMod: true, withCmdMod: true })
+});
 registerQuickPickCommandAndKeybindingRule({
     id: 'quickInput.acceptInBackground',
     when: ( ContextKeyExpr.and(inQuickInputContext, ( ContextKeyExpr.equals(quickInputTypeContextKeyValue, QuickInputType.QuickPick)), ( ContextKeyExpr.or(( InputFocusedContext.negate()), endOfQuickInputBoxContext)))),
@@ -135,6 +161,14 @@ registerQuickPickCommandAndKeybindingRule({
         currentQuickPick?.accept(true);
     },
 }, { withAltMod: true, withCtrlMod: true, withCmdMod: true });
+registerQuickInputCommandAndKeybindingRule({
+    id: 'quickInput.hide',
+    primary: KeyCode.Escape,
+    handler: (accessor) => {
+        const currentQuickPick = accessor.get(IQuickInputService).currentQuickInput;
+        currentQuickPick?.hide();
+    }
+}, { withAltMod: true, withCtrlMod: true, withCmdMod: true });
 registerQuickPickCommandAndKeybindingRule({
     id: 'quickInput.toggleHover',
     primary: ctrlKeyMod | KeyCode.Space,

package/vscode/src/vs/platform/quickinput/browser/quickInputController.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { $ as $$1, onDidRegisterWindow, onWillUnregisterWindow, getWindow, EventType, addDisposableListener, append, trackFocus, isAncestor, isHTMLElement, addStandardDisposableListener, EventHelper, reset, isAncestorOfActiveElement, addDisposableGenericMouseUpListener, addDisposableGenericMouseDownListener, addDisposableGenericMouseMoveListener, getActiveWindow } from '../../../base/browser/dom.js';
+import { $ as $$1, onDidRegisterWindow, onWillUnregisterWindow, getWindow, EventType, addDisposableListener, append, trackFocus, isAncestor, isHTMLElement, reset, isAncestorOfActiveElement, addDisposableGenericMouseUpListener, addDisposableGenericMouseDownListener, addDisposableGenericMouseMoveListener, getActiveWindow } from '../../../base/browser/dom.js';
 import { createStyleSheet } from '../../../base/browser/domStylesheets.js';
 import { ActionBar } from '../../../base/browser/ui/actionbar/actionbar.js';
 import { Button } from '../../../base/browser/ui/button/button.js';
@@ -8,7 +8,6 @@ import { CountBadge } from '../../../base/browser/ui/countBadge/countBadge.js';
 import { ProgressBar } from '../../../base/browser/ui/progressbar/progressbar.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { Emitter, Event } from '../../../base/common/event.js';
-import { KeyCode } from '../../../base/common/keyCodes.js';
 import { Disposable, dispose } from '../../../base/common/lifecycle.js';
 import Severity$1 from '../../../base/common/severity.js';
 import { isString } from '../../../base/common/types.js';
@@ -110,7 +109,7 @@ let QuickInputController = class QuickInputController extends Disposable {
         const rightActionBar = this._register(( new ActionBar(titleBar, { hoverDelegate: this.options.hoverDelegate })));
         rightActionBar.domNode.classList.add('quick-input-right-action-bar');
         const headerContainer = append(container, $('.quick-input-header'));
-        const checkAll = this._register(( new TriStateCheckbox(( localize(1997, "Toggle all checkboxes")), false, { ...defaultCheckboxStyles, size: 15 })));
+        const checkAll = this._register(( new TriStateCheckbox(( localize(2001, "Toggle all checkboxes")), false, { ...defaultCheckboxStyles, size: 15 })));
         append(headerContainer, checkAll.domNode);
         this._register(checkAll.onChange(() => {
             const checked = checkAll.checked;
@@ -129,21 +128,21 @@ let QuickInputController = class QuickInputController extends Disposable {
         const visibleCountContainer = append(filterContainer, $('.quick-input-visible-count'));
         visibleCountContainer.setAttribute('aria-live', 'polite');
         visibleCountContainer.setAttribute('aria-atomic', 'true');
-        const visibleCount = this._register(( new CountBadge(visibleCountContainer, { countFormat: ( localize(1998, "{0} Results")) }, this.styles.countBadge)));
+        const visibleCount = this._register(( new CountBadge(visibleCountContainer, { countFormat: ( localize(2002, "{0} Results")) }, this.styles.countBadge)));
         const countContainer = append(filterContainer, $('.quick-input-count'));
         countContainer.setAttribute('aria-live', 'polite');
-        const count = this._register(( new CountBadge(countContainer, { countFormat: ( localize(1999, "{0} Selected")) }, this.styles.countBadge)));
+        const count = this._register(( new CountBadge(countContainer, { countFormat: ( localize(2003, "{0} Selected")) }, this.styles.countBadge)));
         const inlineActionBar = this._register(( new ActionBar(headerContainer, { hoverDelegate: this.options.hoverDelegate })));
         inlineActionBar.domNode.classList.add('quick-input-inline-action-bar');
         const okContainer = append(headerContainer, $('.quick-input-action'));
         const ok = this._register(( new Button(okContainer, this.styles.button)));
-        ok.label = ( localize(2000, "OK"));
+        ok.label = ( localize(2004, "OK"));
         this._register(ok.onDidClick(e => {
             this.onDidAcceptEmitter.fire();
         }));
         const customButtonContainer = append(headerContainer, $('.quick-input-action'));
         const customButton = this._register(( new Button(customButtonContainer, { ...this.styles.button, supportIcons: true })));
-        customButton.label = ( localize(2001, "Custom"));
+        customButton.label = ( localize(2005, "Custom"));
         this._register(customButton.onDidClick(e => {
             this.onDidCustomEmitter.fire();
         }));
@@ -196,6 +195,9 @@ let QuickInputController = class QuickInputController extends Disposable {
                 tree.tree.setFocus([]);
             }, 0);
         }));
+        this._register(tree.onDidAccept(() => {
+            this.onDidAcceptEmitter.fire();
+        }));
         this._register(tree.tree.onDidChangeContentHeight(() => this.updateLayout()));
         const focusTracker = trackFocus(container);
         this._register(focusTracker);
@@ -231,59 +233,6 @@ let QuickInputController = class QuickInputController extends Disposable {
         this._register(addDisposableListener(container, EventType.FOCUS, (e) => {
             inputBox.setFocus();
         }));
-        this._register(addStandardDisposableListener(container, EventType.KEY_DOWN, (event) => {
-            if (isAncestor(event.target, widget)) {
-                return;
-            }
-            switch (event.keyCode) {
-                case KeyCode.Enter:
-                    EventHelper.stop(event, true);
-                    if (this.enabled) {
-                        this.onDidAcceptEmitter.fire();
-                    }
-                    break;
-                case KeyCode.Escape:
-                    EventHelper.stop(event, true);
-                    this.hide(QuickInputHideReason.Gesture);
-                    break;
-                case KeyCode.Tab:
-                    if (!event.altKey && !event.ctrlKey && !event.metaKey) {
-                        const selectors = [
-                            '.quick-input-list .monaco-action-bar .always-visible',
-                            '.quick-input-list-entry:hover .monaco-action-bar',
-                            '.monaco-list-row.focused .monaco-action-bar'
-                        ];
-                        if (container.classList.contains('show-checkboxes')) {
-                            selectors.push('input');
-                        }
-                        else {
-                            selectors.push('input[type=text]');
-                        }
-                        if (this.getUI().list.displayed) {
-                            selectors.push('.monaco-list');
-                        }
-                        if (this.getUI().message) {
-                            selectors.push('.quick-input-message a');
-                        }
-                        if (this.getUI().widget) {
-                            if (isAncestor(event.target, this.getUI().widget)) {
-                                break;
-                            }
-                            selectors.push('.quick-input-html-widget');
-                        }
-                        const stops = container.querySelectorAll(selectors.join(', '));
-                        if (!event.shiftKey && isAncestor(event.target, stops[stops.length - 1])) {
-                            EventHelper.stop(event, true);
-                            stops[0].focus();
-                        }
-                        if (event.shiftKey && isAncestor(event.target, stops[0])) {
-                            EventHelper.stop(event, true);
-                            stops[stops.length - 1].focus();
-                        }
-                    }
-                    break;
-            }
-        }));
         this.dndController = this._register(this.instantiationService.createInstance(QuickInputDragAndDropController, this._container, container, [
             {
                 node: titleBar,
@@ -595,7 +544,7 @@ let QuickInputController = class QuickInputController extends Disposable {
         ui.ignoreFocusOut = false;
         ui.inputBox.toggles = undefined;
         const backKeybindingLabel = this.options.backKeybindingLabel();
-        backButton.tooltip = backKeybindingLabel ? ( localize(2002, "Back ({0})", backKeybindingLabel)) : ( localize(2003, "Back"));
+        backButton.tooltip = backKeybindingLabel ? ( localize(2006, "Back ({0})", backKeybindingLabel)) : ( localize(2007, "Back"));
         ui.container.style.display = '';
         this.updateLayout();
         this.dndController?.layoutContainer();

package/vscode/src/vs/platform/quickinput/browser/quickInputList.js

@@ -190,7 +190,7 @@ class QuickInputItemDelegate {
 }
 class QuickInputAccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(2004, "Quick Input");
+        return localize(2008, "Quick Input");
     }
     getAriaLabel(element) {
         return element.separator?.label

package/vscode/src/vs/platform/quickinput/browser/quickInputUtils.js

@@ -60,7 +60,7 @@ function renderQuickInputDescription(description, container, actionHandler) {
             let title = node.title;
             if (!title && node.href.startsWith('command:')) {
                 title = ( localize(
-                    2005,
+                    2009,
                     "Click to execute command '{0}'",
                     node.href.substring('command:'.length)
                 ));

package/vscode/src/vs/platform/quickinput/browser/tree/quickInputTreeAccessibilityProvider.js

@@ -8,7 +8,7 @@ class QuickTreeAccessibilityProvider {
         this.onCheckedEvent = onCheckedEvent;
     }
     getWidgetAriaLabel() {
-        return localize(2009, "Quick Tree");
+        return localize(2013, "Quick Tree");
     }
     getAriaLabel(element) {
         return element.ariaLabel || ( [element.label, element.description]

package/vscode/src/vs/platform/quickinput/browser/tree/quickInputTreeController.d.ts

@@ -22,6 +22,11 @@ export declare class QuickInputTreeController extends Disposable {
      * Event that is fired when the tree would no longer have focus.
     */
     readonly onLeave: Event<void>;
+    private readonly _onDidAccept;
+    /**
+     * Event that is fired when a non-pickable item is clicked, indicating acceptance.
+     */
+    readonly onDidAccept: Event<void>;
     private readonly _container;
     constructor(container: HTMLElement, hoverDelegate: IHoverDelegate | undefined, instantiationService: IInstantiationService);
     get tree(): WorkbenchObjectTree<IQuickTreeItem, IQuickTreeFilterData>;
@@ -39,6 +44,7 @@ export declare class QuickInputTreeController extends Disposable {
     focus(what: QuickPickFocus): void;
     registerOnOpenListener(): void;
     getCheckedLeafItems(): IQuickTreeItem[];
+    getActiveItems(): readonly IQuickTreeItem[];
     check(element: IQuickTreeItem, checked: boolean | "partial"): void;
     checkAll(checked: boolean | "partial"): void;
 }

package/vscode/src/vs/platform/quickinput/browser/tree/quickInputTreeController.js

@@ -27,6 +27,8 @@ let QuickInputTreeController = class QuickInputTreeController extends Disposable
         this.onDidChangeCheckedLeafItems = this._onDidCheckedLeafItemsChange.event;
         this._onLeave = ( new Emitter());
         this.onLeave = this._onLeave.event;
+        this._onDidAccept = this._register(( new Emitter()));
+        this.onDidAccept = this._onDidAccept.event;
         this._container = append(container, $('.quick-input-tree'));
         this._renderer = this._register(this.instantiationService.createInstance(QuickInputTreeRenderer, hoverDelegate, this._onDidTriggerButton, this.onDidChangeCheckboxState));
         this._filter = this.instantiationService.createInstance(QuickInputTreeFilter);
@@ -193,6 +195,11 @@ let QuickInputTreeController = class QuickInputTreeController extends Disposable
             if (item.disabled) {
                 return;
             }
+            if (item.pickable === false) {
+                this._tree.setFocus([item]);
+                this._onDidAccept.fire();
+                return;
+            }
             const newState = item.checked !== true;
             if ((item.checked ?? false) === newState) {
                 return;
@@ -248,6 +255,9 @@ let QuickInputTreeController = class QuickInputTreeController extends Disposable
         }
         return checkedItems;
     }
+    getActiveItems() {
+        return this._tree.getFocus().filter((item) => item !== null);
+    }
     check(element, checked) {
         if (element.checked === checked) {
             return;

package/vscode/src/vs/platform/quickinput/browser/tree/quickInputTreeRenderer.js

@@ -60,11 +60,16 @@ let QuickInputTreeRenderer = class QuickInputTreeRenderer extends Disposable {
     renderElement(node, index, templateData, _details) {
         const store = templateData.toDisposeElement;
         const quickTreeItem = node.element;
-        templateData.checkbox.domNode.style.display = '';
-        templateData.checkbox.checked = quickTreeItem.checked ?? false;
-        store.add(Event.filter(this.onCheckedEvent, e => e.item === quickTreeItem)(e => templateData.checkbox.checked = e.checked));
-        if (quickTreeItem.disabled) {
-            templateData.checkbox.disable();
+        if (quickTreeItem.pickable === false) {
+            templateData.checkbox.domNode.style.display = 'none';
+        }
+        else {
+            templateData.checkbox.domNode.style.display = '';
+            templateData.checkbox.checked = quickTreeItem.checked ?? false;
+            store.add(Event.filter(this.onCheckedEvent, e => e.item === quickTreeItem)(e => templateData.checkbox.checked = e.checked));
+            if (quickTreeItem.disabled) {
+                templateData.checkbox.disable();
+            }
         }
         if (quickTreeItem.iconPath) {
             const icon = isDark(this._themeService.getColorTheme().type) ? quickTreeItem.iconPath.dark : (quickTreeItem.iconPath.light ?? quickTreeItem.iconPath.dark);

package/vscode/src/vs/platform/quickinput/browser/tree/quickTree.js

@@ -9,7 +9,7 @@ import { observableValue } from '../../../../base/common/observableInternal/obse
 import { autorun } from '../../../../base/common/observableInternal/reactions/autorun.js';
 
 class QuickTree extends QuickInput {
-    static { this.DEFAULT_ARIA_LABEL = ( localize(2010, "Type to narrow down results.")); }
+    static { this.DEFAULT_ARIA_LABEL = ( localize(2014, "Type to narrow down results.")); }
     constructor(ui) {
         super(ui);
         this.type = QuickInputType.QuickTree;
@@ -27,6 +27,9 @@ class QuickTree extends QuickInput {
         this.onDidAccept = ui.onDidAccept;
         this._registerAutoruns();
         this._register(ui.tree.onDidChangeCheckedLeafItems(e => this._onDidChangeCheckedLeafItems.fire(e)));
+        this._register(ui.tree.tree.onDidChangeFocus(e => {
+            this._activeItems.set(ui.tree.getActiveItems(), undefined);
+        }));
     }
     get value() { return this._value.get(); }
     set value(value) { this._value.set(value, undefined); }

package/vscode/src/vs/platform/quickinput/common/quickInput.d.ts

@@ -1,6 +1,6 @@
 import { Event } from "../../../base/common/event.js";
 import { IMatch } from "../../../base/common/filters.js";
-import { IItemAccessor } from "@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common/vscode/vs/base/common/fuzzyScorer";
+import { IItemAccessor } from "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/base/common/fuzzyScorer";
 import { ResolvedKeybinding } from "../../../base/common/keybindings.js";
 import { IDisposable } from "../../../base/common/lifecycle.js";
 import Severity from "../../../base/common/severity.js";
@@ -648,6 +648,10 @@ export interface IInputBox extends IQuickInput {
      * Severity of the input validation message.
      */
     severity: Severity;
+    /**
+     * Programmatically accepts an item. Used internally for keyboard navigation.
+     */
+    accept(): void;
 }
 export declare enum QuickInputButtonLocation {
     /**
@@ -879,6 +883,11 @@ export interface IQuickTreeItem extends IQuickItem {
      * The children of this tree item.
      */
     children?: readonly IQuickTreeItem[];
+    /**
+     * Defaults to true, can be false to disable picks for a single item.
+     * When false, the item is not selectable and does not respond to mouse/keyboard activation.
+     */
+    pickable?: boolean;
 }
 /**
  * Represents an event that occurs when the checkbox state of a tree item changes.