@codingame/monaco-vscode-api 33.0.8 → 34.0.0

package/vscode/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.js

@@ -44,7 +44,7 @@ class HighlightedLabel extends Disposable {
             if (pos < highlight.start) {
                 const substring = this.text.substring(pos, highlight.start);
                 if (supportIcons) {
-                    children.push(...renderLabelWithIcons(substring));
+                    children.push(...renderLabelWithIcons(substring, true));
                 }
                 else {
                     children.push(substring);
@@ -52,7 +52,7 @@ class HighlightedLabel extends Disposable {
                 pos = highlight.start;
             }
             const substring = this.text.substring(pos, highlight.end);
-            const element = $('span.highlight', undefined, ...supportIcons ? renderLabelWithIcons(substring) : [substring]);
+            const element = $('span.highlight', undefined, ...supportIcons ? renderLabelWithIcons(substring, true) : [substring]);
             if (highlight.extraClasses) {
                 element.classList.add(...highlight.extraClasses);
             }
@@ -62,7 +62,7 @@ class HighlightedLabel extends Disposable {
         if (pos < this.text.length) {
             const substring = this.text.substring(pos);
             if (supportIcons) {
-                children.push(...renderLabelWithIcons(substring));
+                children.push(...renderLabelWithIcons(substring, true));
             }
             else {
                 children.push(substring);

package/vscode/src/vs/base/browser/ui/hover/hoverWidget.css

@@ -126,6 +126,7 @@
 	display: flex;
 	padding: 0px 8px;
 	width: 100%;
+	box-sizing: border-box;
 }
 
 .monaco-hover .hover-row.status-bar .actions .action-container {

package/vscode/src/vs/base/browser/ui/iconLabel/iconLabels.d.ts

@@ -1,3 +1,3 @@
 import { ThemeIcon } from "../../../common/themables.js";
-export declare function renderLabelWithIcons(text: string): Array<HTMLSpanElement | string>;
-export declare function renderIcon(icon: ThemeIcon): HTMLSpanElement;
+export declare function renderLabelWithIcons(text: string, renderIconsInDefaultColor?: boolean): Array<HTMLSpanElement | string>;
+export declare function renderIcon(icon: ThemeIcon, renderDefaultColor?: boolean): HTMLSpanElement;

package/vscode/src/vs/base/browser/ui/iconLabel/iconLabels.js

@@ -6,7 +6,7 @@ const labelWithIconsRegex = ( new RegExp(
     `(\\\\)?\\$\\((${ThemeIcon.iconNameExpression}(?:${ThemeIcon.iconModifierExpression})?)\\)`,
     "g"
 ));
-function renderLabelWithIcons(text) {
+function renderLabelWithIcons(text, renderIconsInDefaultColor) {
     const elements = ( new Array());
     let match;
     let textStart = 0, textStop = 0;
@@ -19,16 +19,20 @@ function renderLabelWithIcons(text) {
         const [, escaped, codicon] = match;
         elements.push(escaped ? `$(${codicon})` : renderIcon({
             id: codicon
-        }));
+        }, renderIconsInDefaultColor));
     }
     if (textStart < text.length) {
         elements.push(text.substring(textStart));
     }
     return elements;
 }
-function renderIcon(icon) {
+function renderIcon(icon, renderDefaultColor) {
     const node = $(`span`);
-    node.classList.add(...ThemeIcon.asClassNameArray(icon));
+    const classes = ThemeIcon.asClassNameArray(icon);
+    if (renderDefaultColor) {
+        classes.push("codicon-colored");
+    }
+    node.classList.add(...classes);
     return node;
 }
 

package/vscode/src/vs/base/browser/ui/inputbox/inputBox.d.ts

@@ -80,6 +80,7 @@ export declare class InputBox extends Widget {
     get onDidHeightChange(): Event<number>;
     constructor(container: HTMLElement, contextViewProvider: IContextViewProvider | undefined, options: IInputOptions);
     setActions(actions: ReadonlyArray<IAction> | undefined, actionViewItemProvider?: IActionViewItemProvider): void;
+    get actionsWidth(): number;
     protected onBlur(): void;
     protected onFocus(): void;
     setPlaceHolder(placeHolder: string): void;

package/vscode/src/vs/base/browser/ui/inputbox/inputBox.js

@@ -148,6 +148,9 @@ class InputBox extends Widget {
             });
         }
     }
+    get actionsWidth() {
+        return this.actionbar?.getContainer().offsetWidth ?? 0;
+    }
     onBlur() {
         this._hideMessage();
         if (this.options.showPlaceholderOnFocus) {

package/vscode/src/vs/base/browser/ui/menu/menu.js

@@ -1016,6 +1016,21 @@ ${formatRule(Codicon.menuSubmenu)}
     background: none;
 }
 
+/* Show the menu item selection border only for keyboard navigation. Pointer-driven focus typically does not set :focus-visible, so suppress the border in that case. */
+.monaco-menu .monaco-action-bar.vertical .action-menu-item:focus:not(:focus-visible) {
+    outline: none !important;
+    outline-offset: 0 !important;
+}
+
+/* High contrast themes always show the selection border to indicate the focused item, regardless of input modality. The duplicated .monaco-menu raises specificity above the keyboard-only suppression rule above so this wins independent of declaration order. */
+.hc-black .monaco-menu.monaco-menu .monaco-action-bar.vertical .action-item.focused .action-menu-item,
+.hc-light .monaco-menu.monaco-menu .monaco-action-bar.vertical .action-item.focused .action-menu-item,
+:host-context(.hc-black) .monaco-menu.monaco-menu .monaco-action-bar.vertical .action-item.focused .action-menu-item,
+:host-context(.hc-light) .monaco-menu.monaco-menu .monaco-action-bar.vertical .action-item.focused .action-menu-item {
+    outline: 1px solid var(--vscode-menu-selectionBorder) !important;
+    outline-offset: -1px !important;
+}
+
 /* Vertical Action Bar Styles */
 
 .monaco-menu .monaco-action-bar.vertical {

package/vscode/src/vs/base/browser/ui/toggle/toggle.css

@@ -22,6 +22,12 @@
 	background-color: var(--vscode-inputOption-hoverBackground);
 }
 
+.monaco-custom-toggle.disabled {
+	opacity: 0.4;
+	cursor: default;
+	pointer-events: none;
+}
+
 .hc-black .monaco-custom-toggle:hover,
 .hc-light .monaco-custom-toggle:hover {
 	border: 1px dashed var(--vscode-focusBorder);

package/vscode/src/vs/base/browser/ui/toggle/toggle.js

@@ -170,10 +170,16 @@ class Toggle extends Widget {
     enable() {
         this.domNode.setAttribute("aria-disabled", String(false));
         this.domNode.classList.remove("disabled");
+        if (!this._opts.notFocusable) {
+            this.domNode.tabIndex = 0;
+        }
     }
     disable() {
         this.domNode.setAttribute("aria-disabled", String(true));
         this.domNode.classList.add("disabled");
+        if (!this._opts.notFocusable) {
+            this.domNode.tabIndex = -1;
+        }
     }
     setTitle(newTitle) {
         this._title = newTitle;

package/vscode/src/vs/base/browser/ui/toolbar/toolbar.d.ts

@@ -12,6 +12,8 @@ export interface IToolBarResponsiveBehaviorOptions {
     readonly minItems?: number;
     readonly actionMinWidth?: number;
     readonly getActionMinWidth?: (action: IAction) => number | undefined;
+    readonly observedElement?: HTMLElement;
+    readonly getAvailableWidth?: () => number;
 }
 export interface IToolBarOptions {
     orientation?: ActionsOrientation;
@@ -89,6 +91,7 @@ export declare class ToolBar extends Disposable {
     private getKeybindingLabel;
     private getConfiguredActionMinWidth;
     private getActionMinWidth;
+    private getAvailableWidth;
     private applyResponsiveActionMinWidths;
     private updateActions;
     private updateOverflowClassName;

package/vscode/src/vs/base/browser/ui/toolbar/toolbar.js

@@ -101,9 +101,9 @@ class ToolBar extends Disposable {
             this.element.classList.toggle("responsive-last", this.options.responsiveBehavior.kind === "last");
             this.element.style.setProperty(ACTION_MIN_WIDTH_VAR, `${this.getConfiguredActionMinWidth()}px`);
             const observer = this._store.add(( new DisposableResizeObserver("Toolbar.actionsUpdate", () => {
-                this.updateActions(this.element.getBoundingClientRect().width);
+                this.updateActions(this.getAvailableWidth());
             })));
-            observer.observe(this.element);
+            observer.observe(this.options.responsiveBehavior?.observedElement ?? this.element);
         }
     }
     set actionRunner(actionRunner) {
@@ -146,7 +146,7 @@ class ToolBar extends Disposable {
     }
     relayout() {
         if (this.options.responsiveBehavior?.enabled) {
-            const width = this.element.getBoundingClientRect().width;
+            const width = this.getAvailableWidth();
             this.updateActions(width);
         }
     }
@@ -188,7 +188,7 @@ class ToolBar extends Disposable {
                 this.container.style.minWidth = `${minimumActionWidth}px`;
                 this.element.style.minWidth = `${minimumActionWidth}px`;
             }
-            this.updateActions(this.element.getBoundingClientRect().width);
+            this.updateActions(this.getAvailableWidth());
         }
     }
     isEmpty() {
@@ -207,6 +207,12 @@ class ToolBar extends Disposable {
     getActionMinWidth(action) {
         return this.getConfiguredActionMinWidth(action) + ACTION_PADDING;
     }
+    getAvailableWidth() {
+        if (this.options.responsiveBehavior?.getAvailableWidth) {
+            return this.options.responsiveBehavior.getAvailableWidth();
+        }
+        return this.element.getBoundingClientRect().width;
+    }
     applyResponsiveActionMinWidths() {
         if (!this.options.responsiveBehavior?.enabled) {
             return;

package/vscode/src/vs/base/browser/ui/tree/asyncDataTree.js

@@ -670,7 +670,14 @@ class AsyncDataTree {
         this.tree.resort(this.getDataNode(element), recursive);
     }
     hasNode(element) {
-        return element === this.root.element || ( this.nodes.has(element));
+        if (element === this.root.element) {
+            return true;
+        }
+        const node = this.nodes.get(element);
+        if (!node) {
+            return false;
+        }
+        return this.tree.hasElement(node);
     }
     rerender(element) {
         if (element === undefined || element === this.root.element) {

package/vscode/src/vs/base/common/codicons.d.ts

@@ -726,4 +726,62 @@ export declare const Codicon: {
     readonly newSession: ThemeIcon;
     readonly terminalSecure: ThemeIcon;
     readonly shareWindow: ThemeIcon;
+    readonly circleSlashCompact: ThemeIcon;
+    readonly copilotCompact: ThemeIcon;
+    readonly folderOpenedCompact: ThemeIcon;
+    readonly folderCompact: ThemeIcon;
+    readonly gearCompact: ThemeIcon;
+    readonly gitBranchCompact: ThemeIcon;
+    readonly libraryCompact: ThemeIcon;
+    readonly recordKeysCompact: ThemeIcon;
+    readonly remoteCompact: ThemeIcon;
+    readonly repoForkedCompact: ThemeIcon;
+    readonly repoCompact: ThemeIcon;
+    readonly shieldCompact: ThemeIcon;
+    readonly sparkleCompact: ThemeIcon;
+    readonly symbolColorCompact: ThemeIcon;
+    readonly windowCompact: ThemeIcon;
+    readonly errorCompact: ThemeIcon;
+    readonly warningCompact: ThemeIcon;
+    readonly passCompact: ThemeIcon;
+    readonly important: ThemeIcon;
+    readonly importantCompact: ThemeIcon;
+    readonly rocketCompact: ThemeIcon;
+    readonly unpin: ThemeIcon;
+    readonly addCompact: ThemeIcon;
+    readonly attachCompact: ThemeIcon;
+    readonly beakerCompact: ThemeIcon;
+    readonly checkCompact: ThemeIcon;
+    readonly checklistCompact: ThemeIcon;
+    readonly chevronDownCompact: ThemeIcon;
+    readonly chevronLeftCompact: ThemeIcon;
+    readonly chevronRightCompact: ThemeIcon;
+    readonly chevronUpCompact: ThemeIcon;
+    readonly circleFilledCompact: ThemeIcon;
+    readonly circleSmallFilledCompact: ThemeIcon;
+    readonly closeCompact: ThemeIcon;
+    readonly collapseAllCompact: ThemeIcon;
+    readonly commentCompact: ThemeIcon;
+    readonly commentUnresolvedCompact: ThemeIcon;
+    readonly debugConnectedCompact: ThemeIcon;
+    readonly debugDisconnectCompact: ThemeIcon;
+    readonly editCompact: ThemeIcon;
+    readonly fileMediaCompact: ThemeIcon;
+    readonly lightbulbCompact: ThemeIcon;
+    readonly loadingCompact: ThemeIcon;
+    readonly passFilledCompact: ThemeIcon;
+    readonly projectCompact: ThemeIcon;
+    readonly refreshCompact: ThemeIcon;
+    readonly searchCompact: ThemeIcon;
+    readonly sessionInProgressCompact: ThemeIcon;
+    readonly syncCompact: ThemeIcon;
+    readonly terminalCompact: ThemeIcon;
+    readonly vmPending: ThemeIcon;
+    readonly worktreeCompact: ThemeIcon;
+    readonly developerTools: ThemeIcon;
+    readonly cloudCompact: ThemeIcon;
+    readonly agentCompact: ThemeIcon;
+    readonly askCompact: ThemeIcon;
+    readonly settingsCompact: ThemeIcon;
+    readonly vmCompact: ThemeIcon;
 };

package/vscode/src/vs/base/common/codiconsLibrary.d.ts

@@ -650,4 +650,63 @@ export declare const codiconsLibrary: {
     readonly chatImport: import("./themables.js").ThemeIcon;
     readonly chatExport: import("./themables.js").ThemeIcon;
     readonly shareWindow: import("./themables.js").ThemeIcon;
+    readonly circleSlashCompact: import("./themables.js").ThemeIcon;
+    readonly copilotCompact: import("./themables.js").ThemeIcon;
+    readonly folderOpenedCompact: import("./themables.js").ThemeIcon;
+    readonly folderCompact: import("./themables.js").ThemeIcon;
+    readonly gearCompact: import("./themables.js").ThemeIcon;
+    readonly gitBranchCompact: import("./themables.js").ThemeIcon;
+    readonly libraryCompact: import("./themables.js").ThemeIcon;
+    readonly recordKeysCompact: import("./themables.js").ThemeIcon;
+    readonly remoteCompact: import("./themables.js").ThemeIcon;
+    readonly repoForkedCompact: import("./themables.js").ThemeIcon;
+    readonly repoCompact: import("./themables.js").ThemeIcon;
+    readonly shieldCompact: import("./themables.js").ThemeIcon;
+    readonly sparkleCompact: import("./themables.js").ThemeIcon;
+    readonly symbolColorCompact: import("./themables.js").ThemeIcon;
+    readonly windowCompact: import("./themables.js").ThemeIcon;
+    readonly errorCompact: import("./themables.js").ThemeIcon;
+    readonly warningCompact: import("./themables.js").ThemeIcon;
+    readonly passCompact: import("./themables.js").ThemeIcon;
+    readonly important: import("./themables.js").ThemeIcon;
+    readonly importantCompact: import("./themables.js").ThemeIcon;
+    readonly rocketCompact: import("./themables.js").ThemeIcon;
+    readonly unpin: import("./themables.js").ThemeIcon;
+    readonly addCompact: import("./themables.js").ThemeIcon;
+    readonly attachCompact: import("./themables.js").ThemeIcon;
+    readonly beakerCompact: import("./themables.js").ThemeIcon;
+    readonly checkCompact: import("./themables.js").ThemeIcon;
+    readonly checklistCompact: import("./themables.js").ThemeIcon;
+    readonly chevronDownCompact: import("./themables.js").ThemeIcon;
+    readonly chevronLeftCompact: import("./themables.js").ThemeIcon;
+    readonly chevronRightCompact: import("./themables.js").ThemeIcon;
+    readonly chevronUpCompact: import("./themables.js").ThemeIcon;
+    readonly circleFilledCompact: import("./themables.js").ThemeIcon;
+    readonly circleSmallFilledCompact: import("./themables.js").ThemeIcon;
+    readonly closeCompact: import("./themables.js").ThemeIcon;
+    readonly collapseAllCompact: import("./themables.js").ThemeIcon;
+    readonly commentCompact: import("./themables.js").ThemeIcon;
+    readonly commentUnresolvedCompact: import("./themables.js").ThemeIcon;
+    readonly debugConnectedCompact: import("./themables.js").ThemeIcon;
+    readonly debugDisconnectCompact: import("./themables.js").ThemeIcon;
+    readonly editCompact: import("./themables.js").ThemeIcon;
+    readonly fileMediaCompact: import("./themables.js").ThemeIcon;
+    readonly gitFetch: import("./themables.js").ThemeIcon;
+    readonly lightbulbCompact: import("./themables.js").ThemeIcon;
+    readonly loadingCompact: import("./themables.js").ThemeIcon;
+    readonly passFilledCompact: import("./themables.js").ThemeIcon;
+    readonly projectCompact: import("./themables.js").ThemeIcon;
+    readonly refreshCompact: import("./themables.js").ThemeIcon;
+    readonly searchCompact: import("./themables.js").ThemeIcon;
+    readonly sessionInProgressCompact: import("./themables.js").ThemeIcon;
+    readonly syncCompact: import("./themables.js").ThemeIcon;
+    readonly terminalCompact: import("./themables.js").ThemeIcon;
+    readonly vmPending: import("./themables.js").ThemeIcon;
+    readonly worktreeCompact: import("./themables.js").ThemeIcon;
+    readonly developerTools: import("./themables.js").ThemeIcon;
+    readonly cloudCompact: import("./themables.js").ThemeIcon;
+    readonly agentCompact: import("./themables.js").ThemeIcon;
+    readonly askCompact: import("./themables.js").ThemeIcon;
+    readonly settingsCompact: import("./themables.js").ThemeIcon;
+    readonly vmCompact: import("./themables.js").ThemeIcon;
 };

package/vscode/src/vs/base/common/codiconsLibrary.js

@@ -653,6 +653,65 @@ const codiconsLibrary = {
     chatImport: register('chat-import', 0xec86),
     chatExport: register('chat-export', 0xec87),
     shareWindow: register('share-window', 0xec88),
+    circleSlashCompact: register('circle-slash-compact', 0xec89),
+    copilotCompact: register('copilot-compact', 0xec8a),
+    folderOpenedCompact: register('folder-opened-compact', 0xec8b),
+    folderCompact: register('folder-compact', 0xec8c),
+    gearCompact: register('gear-compact', 0xec8d),
+    gitBranchCompact: register('git-branch-compact', 0xec8e),
+    libraryCompact: register('library-compact', 0xec8f),
+    recordKeysCompact: register('record-keys-compact', 0xec90),
+    remoteCompact: register('remote-compact', 0xec91),
+    repoForkedCompact: register('repo-forked-compact', 0xec92),
+    repoCompact: register('repo-compact', 0xec93),
+    shieldCompact: register('shield-compact', 0xec94),
+    sparkleCompact: register('sparkle-compact', 0xec95),
+    symbolColorCompact: register('symbol-color-compact', 0xec96),
+    windowCompact: register('window-compact', 0xec97),
+    errorCompact: register('error-compact', 0xec98),
+    warningCompact: register('warning-compact', 0xec99),
+    passCompact: register('pass-compact', 0xec9a),
+    important: register('important', 0xec9b),
+    importantCompact: register('important-compact', 0xec9c),
+    rocketCompact: register('rocket-compact', 0xec9d),
+    unpin: register('unpin', 0xec9e),
+    addCompact: register('add-compact', 0xec9f),
+    attachCompact: register('attach-compact', 0xeca0),
+    beakerCompact: register('beaker-compact', 0xeca1),
+    checkCompact: register('check-compact', 0xeca2),
+    checklistCompact: register('checklist-compact', 0xeca3),
+    chevronDownCompact: register('chevron-down-compact', 0xeca4),
+    chevronLeftCompact: register('chevron-left-compact', 0xeca5),
+    chevronRightCompact: register('chevron-right-compact', 0xeca6),
+    chevronUpCompact: register('chevron-up-compact', 0xeca7),
+    circleFilledCompact: register('circle-filled-compact', 0xeca8),
+    circleSmallFilledCompact: register('circle-small-filled-compact', 0xeca9),
+    closeCompact: register('close-compact', 0xecaa),
+    collapseAllCompact: register('collapse-all-compact', 0xecab),
+    commentCompact: register('comment-compact', 0xecac),
+    commentUnresolvedCompact: register('comment-unresolved-compact', 0xecad),
+    debugConnectedCompact: register('debug-connected-compact', 0xecae),
+    debugDisconnectCompact: register('debug-disconnect-compact', 0xecaf),
+    editCompact: register('edit-compact', 0xecb0),
+    fileMediaCompact: register('file-media-compact', 0xecb1),
+    gitFetch: register('git-fetch', 0xecb2),
+    lightbulbCompact: register('lightbulb-compact', 0xecb3),
+    loadingCompact: register('loading-compact', 0xecb4),
+    passFilledCompact: register('pass-filled-compact', 0xecb5),
+    projectCompact: register('project-compact', 0xecb6),
+    refreshCompact: register('refresh-compact', 0xecb7),
+    searchCompact: register('search-compact', 0xecb8),
+    sessionInProgressCompact: register('session-in-progress-compact', 0xecb9),
+    syncCompact: register('sync-compact', 0xecba),
+    terminalCompact: register('terminal-compact', 0xecbb),
+    vmPending: register('vm-pending', 0xecbc),
+    worktreeCompact: register('worktree-compact', 0xecbd),
+    developerTools: register('developer-tools', 0xecbe),
+    cloudCompact: register('cloud-compact', 0xecbf),
+    agentCompact: register('agent-compact', 0xecc0),
+    askCompact: register('ask-compact', 0xecc1),
+    settingsCompact: register('settings-compact', 0xecc2),
+    vmCompact: register('vm-compact', 0xecc3),
 };
 
 export { codiconsLibrary };

package/vscode/src/vs/base/common/collections.d.ts

@@ -18,6 +18,14 @@ export declare function diffSets<T>(before: ReadonlySet<T>, after: ReadonlySet<T
     removed: T[];
     added: T[];
 };
+/**
+ * Checks whether two sets contain exactly the same elements.
+ *
+ * @param a - The first set.
+ * @param b - The second set.
+ * @returns `true` if both sets have the same size and every element of `a` is also in `b`.
+ */
+export declare function equalSets<T>(a: ReadonlySet<T>, b: ReadonlySet<T>): boolean;
 export declare function diffMaps<K, V>(before: Map<K, V>, after: Map<K, V>): {
     removed: V[];
     added: V[];
@@ -38,14 +46,14 @@ export declare class SetWithKey<T> implements Set<T> {
     add(value: T): this;
     delete(value: T): boolean;
     has(value: T): boolean;
-    entries(): IterableIterator<[
+    entries(): SetIterator<[
         T,
         T
     ]>;
-    keys(): IterableIterator<T>;
-    values(): IterableIterator<T>;
+    keys(): SetIterator<T>;
+    values(): SetIterator<T>;
     clear(): void;
     forEach(callbackfn: (value: T, value2: T, set: Set<T>) => void, thisArg?: unknown): void;
-    [Symbol.iterator](): IterableIterator<T>;
+    [Symbol.iterator](): SetIterator<T>;
     [Symbol.toStringTag]: string;
 }

package/vscode/src/vs/base/common/collections.js

@@ -44,6 +44,20 @@ function diffSets(before, after) {
         added
     };
 }
+function equalSets(a, b) {
+    if (a === b) {
+        return true;
+    }
+    if (a.size !== b.size) {
+        return false;
+    }
+    for (const element of a) {
+        if (!( b.has(element))) {
+            return false;
+        }
+    }
+    return true;
+}
 function diffMaps(before, after) {
     const removed = [];
     const added = [];
@@ -121,4 +135,4 @@ class SetWithKey {
     }
 }
 
-export { SetWithKey, diffMaps, diffSets, groupBy, groupByMap, intersection };
+export { SetWithKey, diffMaps, diffSets, equalSets, groupBy, groupByMap, intersection };

package/vscode/src/vs/base/common/defaultAccount.d.ts

@@ -1,3 +1,4 @@
+import { IExtraKnownMarketplaceEntry } from "./managedSettings.js";
 export interface IQuotaSnapshotData {
     readonly overage_count: number;
     readonly overage_permitted: boolean;
@@ -6,6 +7,7 @@ export interface IQuotaSnapshotData {
     readonly quota_reset_at?: number;
     readonly token_based_billing?: boolean;
     readonly entitlement?: string;
+    readonly quota_remaining?: number;
     readonly has_quota?: boolean;
 }
 export interface ILegacyQuotaSnapshotData {
@@ -31,6 +33,7 @@ export interface IEntitlementsData extends ILegacyQuotaSnapshotData {
     readonly quota_reset_date_utc?: string;
     readonly token_based_billing?: boolean;
     readonly can_upgrade_plan?: boolean;
+    readonly cloud_session_storage_enabled?: boolean;
     readonly quota_snapshots?: {
         chat?: IQuotaSnapshotData;
         completions?: IQuotaSnapshotData;
@@ -44,6 +47,27 @@ export interface IPolicyData {
     readonly cloud_session_storage_enabled?: boolean;
     readonly mcpRegistryUrl?: string;
     readonly mcpAccess?: "allow_all" | "registry_only";
+    /**
+     * Enterprise-managed plugin enablement, delivered via the Copilot
+     * `managed_settings` API. Keys are plugin IDs in `<plugin>@<marketplace>`
+     * form; values are explicit enable/disable. Consumers that read
+     * `chat.pluginLocations` should merge these with user-supplied path-keyed
+     * entries via `IConfigurationService.inspect()`.
+     */
+    readonly enabledPlugins?: Readonly<Record<string, boolean>>;
+    /**
+     * Enterprise-managed marketplace references, delivered via the Copilot
+     * `managed_settings` API. Each entry preserves the marketplace `name`
+     * (used as `displayLabel` so that `enabledPlugins["plugin@<name>"]` keys
+     * resolve) plus the original `source` discriminator. Legacy string entries
+     * are still accepted for forward/backward compatibility.
+     */
+    readonly extraKnownMarketplaces?: readonly (string | IExtraKnownMarketplaceEntry)[];
+    /**
+     * Enterprise-managed strict-marketplace flag. When true, only marketplaces
+     * listed in `extraKnownMarketplaces` (plus the user's own) are trusted.
+     */
+    readonly strictKnownMarketplaces?: boolean;
 }
 export interface ICopilotTokenInfo {
     readonly sn?: string;

package/vscode/src/vs/base/common/extpath.d.ts

@@ -40,7 +40,7 @@ export declare function isEqual(pathA: string, pathB: string, ignoreCase?: boole
  * you are in a context without services, consider to pass down the `extUri` from the
  * outside, or use `extUriBiasedIgnorePathCase` if you know what you are doing.
  */
-export declare function isEqualOrParent(base: string, parentCandidate: string, ignoreCase?: boolean, separator?: "/" | "\\"): boolean;
+export declare function isEqualOrParent(base: string, parentCandidate: string, ignoreCase?: boolean, forcePosixSemantics?: boolean): boolean;
 export declare function isWindowsDriveLetter(char0: number): boolean;
 export declare function sanitizeFilePath(candidate: string, cwd: string): string;
 export declare function removeTrailingPathSeparator(candidate: string): string;

package/vscode/src/vs/base/common/extpath.js

@@ -1,6 +1,6 @@
 
 import { CharCode } from './charCode.js';
-import { posix, sep } from './path.js';
+import { posix, sep, normalize } from './path.js';
 import { isWindows } from './platform.js';
 import { equalsIgnoreCase, startsWithIgnoreCase } from './strings.js';
 import { isNumber } from './types.js';
@@ -140,13 +140,18 @@ function isEqual(pathA, pathB, ignoreCase) {
     }
     return equalsIgnoreCase(pathA, pathB);
 }
-function isEqualOrParent(base, parentCandidate, ignoreCase, separator = sep) {
+function isEqualOrParent(base, parentCandidate, ignoreCase, forcePosixSemantics = false) {
+    const separator = forcePosixSemantics ? posix.sep : sep;
     if (base === parentCandidate) {
         return true;
     }
     if (!base || !parentCandidate) {
         return false;
     }
+    if (base.indexOf("..") >= 0 || parentCandidate.indexOf("..") >= 0) {
+        base = forcePosixSemantics ? posix.normalize(base) : normalize(base);
+        parentCandidate = forcePosixSemantics ? posix.normalize(parentCandidate) : normalize(parentCandidate);
+    }
     if (parentCandidate.length > base.length) {
         return false;
     }

package/vscode/src/vs/base/common/htmlContent.js

@@ -100,7 +100,9 @@ function markdownStringEqual(a, b) {
     }
 }
 function escapeMarkdownSyntaxTokens(text) {
-    return text.replace(/[\\`*_{}[\]()#+\-!~]/g, "\\$&");
+    return (
+        text.replace(/[\\`*_{}[\]()#+!~]/g, "\\$&").replace(/^([ \t]*)-/gm, "$1\\-")
+    );
 }
 function appendEscapedMarkdownCodeBlockFence(code, langId) {
     const longestFenceLength = code.match(/^`+/gm)?.reduce((a, b) => (a.length > b.length ? a : b)).length ?? 0;

package/vscode/src/vs/base/common/managedSettings.d.ts

@@ -0,0 +1,19 @@
+/**
+ * A single enterprise-managed marketplace entry, preserving the marketplace
+ * name (used as `displayLabel`) and the original `source` discriminator.
+ */
+export type IExtraKnownMarketplaceEntry = {
+    readonly name: string;
+    readonly source: {
+        readonly source: "github";
+        readonly repo: string;
+        readonly ref?: string;
+    };
+} | {
+    readonly name: string;
+    readonly source: {
+        readonly source: "git";
+        readonly url: string;
+        readonly ref?: string;
+    };
+};