@codingame/monaco-vscode-api 30.0.1 → 31.0.1

package/vscode/src/vs/platform/contextkey/browser/contextKeyService.js

@@ -425,9 +425,6 @@ class ScopedContextKeyService extends AbstractContextKeyService {
         return this._parent.createChildContext(parentContextId);
     }
     disposeContext(contextId) {
-        if (this._isDisposed) {
-            return;
-        }
         this._parent.disposeContext(contextId);
     }
     updateParent(parentContextKeyService) {
@@ -535,7 +532,7 @@ CommandsRegistry.registerCommand({
         return [...RawContextKey.all()].sort((a, b) => a.key.localeCompare(b.key));
     },
     metadata: {
-        description: ( localize(1814, "A command that returns information about context keys")),
+        description: ( localize(1815, "A command that returns information about context keys")),
         args: []
     }
 });

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

@@ -47,17 +47,17 @@ var ContextKeyExprType;
 const defaultConfig = {
     regexParsingWithErrorRecovery: true
 };
-const errorEmptyString = ( localize(1815, "Empty context key expression"));
+const errorEmptyString = ( localize(1816, "Empty context key expression"));
 const hintEmptyString = ( localize(
-    1816,
+    1817,
     "Did you forget to write an expression? You can also put 'false' or 'true' to always evaluate to false or true, respectively."
 ));
-const errorNoInAfterNot = ( localize(1817, "'in' after 'not'."));
-const errorClosingParenthesis = ( localize(1818, "closing parenthesis ')'"));
-const errorUnexpectedToken = ( localize(1819, "Unexpected token"));
-const hintUnexpectedToken = ( localize(1820, "Did you forget to put && or || before the token?"));
-const errorUnexpectedEOF = ( localize(1821, "Unexpected end of expression"));
-const hintUnexpectedEOF = ( localize(1822, "Did you forget to put a context key?"));
+const errorNoInAfterNot = ( localize(1818, "'in' after 'not'."));
+const errorClosingParenthesis = ( localize(1819, "closing parenthesis ')'"));
+const errorUnexpectedToken = ( localize(1820, "Unexpected token"));
+const hintUnexpectedToken = ( localize(1821, "Did you forget to put && or || before the token?"));
+const errorUnexpectedEOF = ( localize(1822, "Unexpected end of expression"));
+const hintUnexpectedEOF = ( localize(1823, "Did you forget to put a context key?"));
 class Parser {
     static {
         this._parseError = ( new Error());
@@ -391,7 +391,7 @@ class Parser {
         throw this._errExpectedButGot(message, this._peek());
     }
     _errExpectedButGot(expected, got, additionalInfo) {
-        const message = ( localize(1823, "Expected: {0}\nReceived: '{1}'.", expected, Scanner.getLexeme(got)));
+        const message = ( localize(1824, "Expected: {0}\nReceived: '{1}'.", expected, Scanner.getLexeme(got)));
         const offset = got.offset;
         const lexeme = Scanner.getLexeme(got);
         this._parsingErrors.push({
@@ -479,7 +479,7 @@ function validateWhenClauses(whenClauses) {
         parser.parse(whenClause);
         if (parser.lexingErrors.length > 0) {
             return (parser.lexingErrors.map(se => ({
-                errorMessage: se.additionalInfo ? ( localize(1824, "Unexpected token. Hint: {0}", se.additionalInfo)) : ( localize(1825, "Unexpected token.")),
+                errorMessage: se.additionalInfo ? ( localize(1825, "Unexpected token. Hint: {0}", se.additionalInfo)) : ( localize(1826, "Unexpected token.")),
                 offset: se.offset,
                 length: se.lexeme.length
             })));
@@ -494,17 +494,6 @@ function validateWhenClauses(whenClauses) {
         }
     }));
 }
-function expressionsAreEqualWithConstantSubstitution(a, b) {
-    const aExpr = a ? a.substituteConstants() : undefined;
-    const bExpr = b ? b.substituteConstants() : undefined;
-    if (!aExpr && !bExpr) {
-        return true;
-    }
-    if (!aExpr || !bExpr) {
-        return false;
-    }
-    return aExpr.equals(bExpr);
-}
 function cmp(a, b) {
     return a.cmp(b);
 }
@@ -1639,4 +1628,4 @@ function getTerminals(node) {
     return [node];
 }
 
-export { ContextKeyAndExpr, ContextKeyDefinedExpr, ContextKeyEqualsExpr, ContextKeyExpr, ContextKeyExprType, ContextKeyFalseExpr, ContextKeyGreaterEqualsExpr, ContextKeyGreaterExpr, ContextKeyInExpr, ContextKeyNotEqualsExpr, ContextKeyNotExpr, ContextKeyNotInExpr, ContextKeyNotRegexExpr, ContextKeyOrExpr, ContextKeyRegexExpr, ContextKeySmallerEqualsExpr, ContextKeySmallerExpr, ContextKeyTrueExpr, Parser, RawContextKey, expressionsAreEqualWithConstantSubstitution, implies, setConstant, validateWhenClauses };
+export { ContextKeyAndExpr, ContextKeyDefinedExpr, ContextKeyEqualsExpr, ContextKeyExpr, ContextKeyExprType, ContextKeyFalseExpr, ContextKeyGreaterEqualsExpr, ContextKeyGreaterExpr, ContextKeyInExpr, ContextKeyNotEqualsExpr, ContextKeyNotExpr, ContextKeyNotInExpr, ContextKeyNotRegexExpr, ContextKeyOrExpr, ContextKeyRegexExpr, ContextKeySmallerEqualsExpr, ContextKeySmallerExpr, ContextKeyTrueExpr, Parser, RawContextKey, implies, setConstant, validateWhenClauses };

package/vscode/src/vs/platform/contextkey/common/contextkeys.js

@@ -3,16 +3,16 @@ import { isMacintosh, isLinux, isWindows, isWeb, isIOS, isMobile } from '../../.
 import { localize } from '../../../nls.js';
 import { RawContextKey } from './contextkey.js';
 
-const IsMacContext = ( new RawContextKey("isMac", isMacintosh, ( localize(1826, "Whether the operating system is macOS"))));
-const IsLinuxContext = ( new RawContextKey("isLinux", isLinux, ( localize(1827, "Whether the operating system is Linux"))));
-const IsWindowsContext = ( new RawContextKey("isWindows", isWindows, ( localize(1828, "Whether the operating system is Windows"))));
-const IsWebContext = ( new RawContextKey("isWeb", isWeb, ( localize(1829, "Whether the platform is a web browser"))));
-const IsMacNativeContext = ( new RawContextKey("isMacNative", isMacintosh && !isWeb, ( localize(1830, "Whether the operating system is macOS on a non-browser platform"))));
-const IsIOSContext = ( new RawContextKey("isIOS", isIOS, ( localize(1831, "Whether the operating system is iOS"))));
-const IsMobileContext = ( new RawContextKey("isMobile", isMobile, ( localize(1832, "Whether the platform is a mobile web browser"))));
+const IsMacContext = ( new RawContextKey("isMac", isMacintosh, ( localize(1827, "Whether the operating system is macOS"))));
+const IsLinuxContext = ( new RawContextKey("isLinux", isLinux, ( localize(1828, "Whether the operating system is Linux"))));
+const IsWindowsContext = ( new RawContextKey("isWindows", isWindows, ( localize(1829, "Whether the operating system is Windows"))));
+const IsWebContext = ( new RawContextKey("isWeb", isWeb, ( localize(1830, "Whether the platform is a web browser"))));
+const IsMacNativeContext = ( new RawContextKey("isMacNative", isMacintosh && !isWeb, ( localize(1831, "Whether the operating system is macOS on a non-browser platform"))));
+const IsIOSContext = ( new RawContextKey("isIOS", isIOS, ( localize(1832, "Whether the operating system is iOS"))));
+const IsMobileContext = ( new RawContextKey("isMobile", isMobile, ( localize(1833, "Whether the platform is a mobile web browser"))));
 const IsDevelopmentContext = ( new RawContextKey("isDevelopment", false, true));
-const ProductQualityContext = ( new RawContextKey("productQualityType", "", ( localize(1833, "Quality type of VS Code"))));
+const ProductQualityContext = ( new RawContextKey("productQualityType", "", ( localize(1834, "Quality type of VS Code"))));
 const InputFocusedContextKey = "inputFocus";
-const InputFocusedContext = ( new RawContextKey(InputFocusedContextKey, false, ( localize(1834, "Whether keyboard focus is inside an input box"))));
+const InputFocusedContext = ( new RawContextKey(InputFocusedContextKey, false, ( localize(1835, "Whether keyboard focus is inside an input box"))));
 
 export { InputFocusedContext, InputFocusedContextKey, IsDevelopmentContext, IsIOSContext, IsLinuxContext, IsMacContext, IsMacNativeContext, IsMobileContext, IsWebContext, IsWindowsContext, ProductQualityContext };

package/vscode/src/vs/platform/contextkey/common/scanner.js

@@ -30,18 +30,18 @@ var TokenType;
 function hintDidYouMean(...meant) {
     switch (meant.length) {
     case 1:
-        return localize(1835, "Did you mean {0}?", meant[0]);
+        return localize(1836, "Did you mean {0}?", meant[0]);
     case 2:
-        return localize(1836, "Did you mean {0} or {1}?", meant[0], meant[1]);
+        return localize(1837, "Did you mean {0} or {1}?", meant[0], meant[1]);
     case 3:
-        return localize(1837, "Did you mean {0}, {1} or {2}?", meant[0], meant[1], meant[2]);
+        return localize(1838, "Did you mean {0}, {1} or {2}?", meant[0], meant[1], meant[2]);
     default:
         return undefined;
     }
 }
-const hintDidYouForgetToOpenOrCloseQuote = ( localize(1838, "Did you forget to open or close the quote?"));
+const hintDidYouForgetToOpenOrCloseQuote = ( localize(1839, "Did you forget to open or close the quote?"));
 const hintDidYouForgetToEscapeSlash = ( localize(
-    1839,
+    1840,
     "Did you forget to escape the '/' (slash) character? Put two backslashes before it to escape, e.g., '\\\\/'."
 ));
 class Scanner {

package/vscode/src/vs/platform/dataChannel/browser/forwardingTelemetryService.d.ts

@@ -20,6 +20,7 @@ export declare class InterceptingTelemetryService implements ITelemetryService {
     publicLogError(errorEventName: string, data?: ITelemetryData): void;
     publicLogError2<E extends ClassifiedEvent<OmitMetadata<T>> = never, T extends IGDPRProperty = never>(eventName: string, data?: StrictPropertyCheck<T, E>): void;
     setExperimentProperty(name: string, value: string): void;
+    setCommonProperty(name: string, value: string): void;
 }
 export interface IEditTelemetryData {
     eventName: string;

package/vscode/src/vs/platform/dataChannel/browser/forwardingTelemetryService.js

@@ -51,6 +51,9 @@ class InterceptingTelemetryService {
     setExperimentProperty(name, value) {
         this._baseService.setExperimentProperty(name, value);
     }
+    setCommonProperty(name, value) {
+        this._baseService.setCommonProperty(name, value);
+    }
 }
 let DataChannelForwardingTelemetryService = class DataChannelForwardingTelemetryService extends InterceptingTelemetryService {
     constructor(telemetryService, dataChannelService) {

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

@@ -8,7 +8,9 @@ export interface IDefaultAccountProvider {
     readonly copilotTokenInfo: ICopilotTokenInfo | null;
     readonly onDidChangeCopilotTokenInfo: Event<ICopilotTokenInfo | null>;
     getDefaultAccountAuthenticationProvider(): IDefaultAccountAuthenticationProvider;
-    refresh(): Promise<IDefaultAccount | null>;
+    refresh(options?: {
+        forceRefresh?: boolean;
+    }): Promise<IDefaultAccount | null>;
     signIn(options?: {
         additionalScopes?: readonly string[];
         [key: string]: unknown;

package/vscode/src/vs/platform/defaultAccount/common/defaultAccount.service.d.ts

@@ -12,7 +12,9 @@ export interface IDefaultAccountService {
     getDefaultAccount(): Promise<IDefaultAccount | null>;
     getDefaultAccountAuthenticationProvider(): IDefaultAccountAuthenticationProvider;
     setDefaultAccountProvider(provider: IDefaultAccountProvider): void;
-    refresh(): Promise<IDefaultAccount | null>;
+    refresh(options?: {
+        forceRefresh?: boolean;
+    }): Promise<IDefaultAccount | null>;
     signIn(options?: {
         additionalScopes?: readonly string[];
         [key: string]: unknown;

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

@@ -31,12 +31,12 @@ class AbstractDialogHandler {
                 if (confirmationDialog.primaryButton) {
                     buttons.push(confirmationDialog.primaryButton);
                 } else {
-                    buttons.push(( localize(1840, "&&Yes")));
+                    buttons.push(( localize(1841, "&&Yes")));
                 }
                 if (confirmationDialog.cancelButton) {
                     buttons.push(confirmationDialog.cancelButton);
                 } else {
-                    buttons.push(( localize(1841, "Cancel")));
+                    buttons.push(( localize(1842, "Cancel")));
                 }
                 break;
             }
@@ -48,19 +48,19 @@ class AbstractDialogHandler {
                 }
                 if (promptDialog.cancelButton) {
                     if (promptDialog.cancelButton === true) {
-                        buttons.push(( localize(1841, "Cancel")));
+                        buttons.push(( localize(1842, "Cancel")));
                     } else if (typeof promptDialog.cancelButton === "string") {
                         buttons.push(promptDialog.cancelButton);
                     } else {
                         if (promptDialog.cancelButton.label) {
                             buttons.push(promptDialog.cancelButton.label);
                         } else {
-                            buttons.push(( localize(1841, "Cancel")));
+                            buttons.push(( localize(1842, "Cancel")));
                         }
                     }
                 }
                 if (buttons.length === 0) {
-                    buttons.push(( localize(1842, "&&OK")));
+                    buttons.push(( localize(1843, "&&OK")));
                 }
                 break;
             }
@@ -70,12 +70,12 @@ class AbstractDialogHandler {
                 if (inputDialog.primaryButton) {
                     buttons.push(inputDialog.primaryButton);
                 } else {
-                    buttons.push(( localize(1842, "&&OK")));
+                    buttons.push(( localize(1843, "&&OK")));
                 }
                 if (inputDialog.cancelButton) {
                     buttons.push(inputDialog.cancelButton);
                 } else {
-                    buttons.push(( localize(1841, "Cancel")));
+                    buttons.push(( localize(1842, "Cancel")));
                 }
                 break;
             }
@@ -122,10 +122,10 @@ function getFileNamesMessage(fileNamesOrResources) {
     )));
     if (fileNamesOrResources.length > MAX_CONFIRM_FILES) {
         if (fileNamesOrResources.length - MAX_CONFIRM_FILES === 1) {
-            message.push(( localize(1843, "...1 additional file not shown")));
+            message.push(( localize(1844, "...1 additional file not shown")));
         } else {
             message.push(( localize(
-                1844,
+                1845,
                 "...{0} additional files not shown",
                 fileNamesOrResources.length - MAX_CONFIRM_FILES
             )));

package/vscode/src/vs/platform/dnd/browser/dnd.js

@@ -192,7 +192,7 @@ async function extractFileListData(accessor, files) {
         if (file) {
             if (file.size > 100 * ByteSize.MB) {
                 dialogService.warn(( localize(
-                    1845,
+                    1846,
                     "File is too large to open as untitled editor. Please upload it first into the file explorer and then try again."
                 )));
                 continue;

package/vscode/src/vs/platform/editor/common/editor.d.ts

@@ -297,12 +297,20 @@ export interface IModalEditorPartOptions {
      * opening and cannot currently be added, removed, or updated
      * after the modal editor is opened.
      */
-    readonly sidebar?: IModalEditorSidebarContent;
+    readonly sidebar?: IModalEditorSidebar;
 }
 /**
- * Content to render in the modal editor sidebar.
+ * Modal sidebar supports rendering custom content in a sidebar next to the main editor content.
  */
-export interface IModalEditorSidebarContent {
+export interface IModalEditorSidebar {
+    /**
+     * Sidebar width set by the user via resizing, if any.
+     */
+    readonly sidebarWidth?: number;
+    /**
+     * Whether the sidebar is hidden.
+     */
+    readonly sidebarHidden?: boolean;
     /**
      * Render the sidebar content into the given container.
      *

package/vscode/src/vs/platform/environment/common/argv.d.ts

@@ -44,7 +44,7 @@ export interface NativeParsedArgs {
     goto?: boolean;
     "new-window"?: boolean;
     "reuse-window"?: boolean;
-    "sessions"?: boolean;
+    "agents"?: boolean;
     locale?: string;
     "user-data-dir"?: string;
     "prof-startup"?: boolean;
@@ -105,6 +105,7 @@ export interface NativeParsedArgs {
     "install-source"?: string;
     "add-mcp"?: string[];
     "disable-updates"?: boolean;
+    "share-secrets-with-agents-app"?: boolean;
     "transient"?: boolean;
     "use-inmemory-secretstorage"?: boolean;
     "password-store"?: string;

package/vscode/src/vs/platform/environment/common/environment.service.d.ts

@@ -24,6 +24,7 @@ export interface IEnvironmentService {
     debugExtensionHost: IExtensionHostDebugParams;
     isExtensionDevelopment: boolean;
     disableExtensions: boolean | string[];
+    skipBuiltinExtensions?: readonly string[];
     enableExtensions?: readonly string[];
     extensionDevelopmentLocationURI?: URI[];
     extensionDevelopmentKind?: ExtensionKind[];

package/vscode/src/vs/platform/environment/common/environmentService.d.ts

@@ -53,6 +53,7 @@ export declare abstract class AbstractNativeEnvironmentService implements INativ
     get extensionDevelopmentKind(): ExtensionKind[] | undefined;
     get extensionTestsLocationURI(): URI | undefined;
     get disableExtensions(): boolean | string[];
+    get skipBuiltinExtensions(): readonly string[];
     get debugExtensionHost(): IExtensionHostDebugParams;
     get debugRenderer(): boolean;
     get isBuilt(): boolean;

package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.d.ts

@@ -139,6 +139,7 @@ export interface ILocalExtension extends IExtension {
     preRelease: boolean;
     updated: boolean;
     pinned: boolean;
+    forceAutoUpdate: boolean;
     source: InstallSource;
     size: number;
 }
@@ -224,6 +225,7 @@ export interface IExtensionInfo extends IExtensionIdentifier {
     version?: string;
     preRelease?: boolean;
     hasPreRelease?: boolean;
+    currentVersion?: string;
 }
 export interface IExtensionQueryOptions {
     targetPlatform?: TargetPlatform;

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

@@ -294,32 +294,32 @@ async function computeSize(location, fileService) {
     }
     return stat.size ?? 0;
 }
-const ExtensionsLocalizedLabel = ( localize2(1866, "Extensions"));
-const PreferencesLocalizedLabel = ( localize2(1867, "Preferences"));
+const ExtensionsLocalizedLabel = ( localize2(1867, "Extensions"));
+const PreferencesLocalizedLabel = ( localize2(1868, "Preferences"));
 const AllowedExtensionsConfigKey = "extensions.allowed";
 const VerifyExtensionSignatureConfigKey = "extensions.verifySignature";
 const ExtensionRequestsTimeoutConfigKey = "extensions.requestTimeout";
 ( Registry.as(Extensions.Configuration)).registerConfiguration({
     id: "extensions",
     order: 30,
-    title: ( localize(1868, "Extensions")),
+    title: ( localize(1869, "Extensions")),
     type: "object",
     properties: {
         [AllowedExtensionsConfigKey]: {
             type: "object",
             markdownDescription: ( localize(
-                1869,
+                1870,
                 "Specify a list of extensions that are allowed to use. This helps maintain a secure and consistent development environment by restricting the use of unauthorized extensions. For more information on how to configure this setting, please visit the [Configure Allowed Extensions](https://aka.ms/vscode/enterprise/extensions/allowed) section."
             )),
             default: "*",
             defaultSnippets: [{
                 body: {},
-                description: ( localize(1870, "No extensions are allowed."))
+                description: ( localize(1871, "No extensions are allowed."))
             }, {
                 body: {
                     "*": true
                 },
-                description: ( localize(1871, "All extensions are allowed."))
+                description: ( localize(1872, "All extensions are allowed."))
             }],
             scope: ConfigurationScope.APPLICATION,
             policy: {
@@ -330,7 +330,7 @@ const ExtensionRequestsTimeoutConfigKey = "extensions.requestTimeout";
                     description: {
                         key: "extensions.allowed.policy",
                         value: ( localize(
-                            1872,
+                            1873,
                             "Specify a list of extensions that are allowed to use. This helps maintain a secure and consistent development environment by restricting the use of unauthorized extensions. More information: https://aka.ms/vscode/enterprise/extensions/allowed"
                         ))
                     }
@@ -342,15 +342,15 @@ const ExtensionRequestsTimeoutConfigKey = "extensions.requestTimeout";
                     anyOf: [{
                         type: ["boolean", "string"],
                         enum: [true, false, "stable"],
-                        description: ( localize(1873, "Allow or disallow the extension.")),
-                        enumDescriptions: [( localize(1874, "Extension is allowed.")), ( localize(1875, "Extension is not allowed.")), ( localize(1876, "Allow only stable versions of the extension."))]
+                        description: ( localize(1874, "Allow or disallow the extension.")),
+                        enumDescriptions: [( localize(1875, "Extension is allowed.")), ( localize(1876, "Extension is not allowed.")), ( localize(1877, "Allow only stable versions of the extension."))]
                     }, {
                         type: "array",
                         items: {
                             type: "string"
                         },
                         description: ( localize(
-                            1877,
+                            1878,
                             "Allow or disallow specific versions of the extension. To specifcy a platform specific version, use the format `platform@1.2.3`, e.g. `win32-x64@1.2.3`. Supported platforms are `win32-x64`, `win32-arm64`, `linux-x64`, `linux-arm64`, `linux-armhf`, `alpine-x64`, `alpine-arm64`, `darwin-x64`, `darwin-arm64`"
                         ))
                     }]
@@ -358,14 +358,14 @@ const ExtensionRequestsTimeoutConfigKey = "extensions.requestTimeout";
                 "([a-z0-9A-Z][a-z0-9-A-Z]*)$": {
                     type: ["boolean", "string"],
                     enum: [true, false, "stable"],
-                    description: ( localize(1878, "Allow or disallow all extensions from the publisher.")),
-                    enumDescriptions: [( localize(1879, "All extensions from the publisher are allowed.")), ( localize(1880, "All extensions from the publisher are not allowed.")), ( localize(1881, "Allow only stable versions of the extensions from the publisher."))]
+                    description: ( localize(1879, "Allow or disallow all extensions from the publisher.")),
+                    enumDescriptions: [( localize(1880, "All extensions from the publisher are allowed.")), ( localize(1881, "All extensions from the publisher are not allowed.")), ( localize(1882, "Allow only stable versions of the extensions from the publisher."))]
                 },
                 "\\*": {
                     type: "boolean",
                     enum: [true, false],
-                    description: ( localize(1882, "Allow or disallow all extensions.")),
-                    enumDescriptions: [( localize(1883, "Allow all extensions.")), ( localize(1884, "Disallow all extensions."))]
+                    description: ( localize(1883, "Allow or disallow all extensions.")),
+                    enumDescriptions: [( localize(1884, "Allow all extensions.")), ( localize(1885, "Disallow all extensions."))]
                 }
             }
         }

package/vscode/src/vs/platform/extensionManagement/common/extensionNls.js

@@ -27,7 +27,7 @@ function replaceNLStrings(logger, extensionManifest, messages, originalMessages)
                 const originalMessage = typeof original === "string" ? original : original?.message;
                 if (!message) {
                     if (!originalMessage) {
-                        logger.warn(`[${extensionManifest.name}]: ${( localize(1916, "Couldn't find message for key {0}.", messageKey))}`);
+                        logger.warn(`[${extensionManifest.name}]: ${( localize(1918, "Couldn't find message for key {0}.", messageKey))}`);
                     }
                     return;
                 }

package/vscode/src/vs/platform/extensionManagement/common/extensionsScannerService.d.ts

@@ -38,6 +38,7 @@ interface IRelaxedScannedExtension {
         string
     ][];
     preRelease: boolean;
+    forceAutoUpdate: boolean;
 }
 export type IScannedExtension = Readonly<IRelaxedScannedExtension> & {
     manifest: IExtensionManifest;

package/vscode/src/vs/platform/extensionManagement/common/extensionsScannerService.js

@@ -58,6 +58,17 @@ var Translations;
     }
     Translations.equals = equals;
 })(Translations || (Translations = {}));
+function getProductBuiltInExtensionsEnabledWithAutoUpdates(productService, environmentService) {
+    const result = ( new Set());
+    for (const id of productService.builtInExtensionsEnabledWithAutoUpdates) {
+        const toLowerCaseId = id.toLowerCase();
+        if (environmentService.skipBuiltinExtensions?.some(skipId => skipId.toLowerCase() === toLowerCaseId)) {
+            continue;
+        }
+        result.add(toLowerCaseId);
+    }
+    return result;
+}
 let AbstractExtensionsScannerService = class AbstractExtensionsScannerService extends Disposable {
     constructor(
         systemExtensionsLocation,
@@ -124,13 +135,14 @@ let AbstractExtensionsScannerService = class AbstractExtensionsScannerService ex
             this.scanDevSystemExtensions(scanOptions.language, !!scanOptions.checkControlFile)
         );
         const [defaultSystemExtensions, devSystemExtensions] = await Promise.all(promises);
-        return this.applyScanOptions(
-            [...defaultSystemExtensions, ...devSystemExtensions],
-            ExtensionType.System,
-            {
-                pickLatest: false
-            }
-        );
+        let allSystemExtensions = [...defaultSystemExtensions, ...devSystemExtensions];
+        if (this.environmentService.skipBuiltinExtensions?.length) {
+            const skipSet = ( new Set(( this.environmentService.skipBuiltinExtensions.map(id => id.toLowerCase()))));
+            allSystemExtensions = allSystemExtensions.filter(ext => !( skipSet.has(ext.identifier.id.toLowerCase())));
+        }
+        return this.applyScanOptions(allSystemExtensions, ExtensionType.System, {
+            pickLatest: false
+        });
     }
     async scanUserExtensions(scanOptions) {
         this.logService.trace("Started scanning user extensions", scanOptions.profileLocation);
@@ -355,7 +367,7 @@ let AbstractExtensionsScannerService = class AbstractExtensionsScannerService ex
     }
     dedupExtensions(system, user, development, targetPlatform, pickLatest) {
         const pick = (existing, extension, isDevelopment) => {
-            if (!isDevelopment) {
+            if (!isDevelopment && !(existing.isBuiltin || extension.isBuiltin)) {
                 if (existing.metadata?.isApplicationScoped && !extension.metadata?.isApplicationScoped) {
                     return false;
                 }
@@ -406,12 +418,19 @@ let AbstractExtensionsScannerService = class AbstractExtensionsScannerService ex
                 result.set(extension.identifier.id, extension);
             }
         });
+        const productBuiltInExtensionsEnabledWithAutoUpdates = getProductBuiltInExtensionsEnabledWithAutoUpdates(this.productService, this.environmentService);
         user?.forEach(extension => {
             const existing = result.get(extension.identifier.id);
             if (!existing && system && extension.type === ExtensionType.System) {
                 this.logService.debug(`Skipping obsolete system extension ${extension.location.path}.`);
                 return;
             }
+            if (( productBuiltInExtensionsEnabledWithAutoUpdates.has(extension.identifier.id.toLowerCase())) && !extension.forceAutoUpdate) {
+                this.logService.info(
+                    `Skipping user installed builtin extension ${extension.identifier.id} with version ${extension.manifest.version} because it is not allowed to in the current product quality ${this.productService.quality}`
+                );
+                return;
+            }
             if (!existing || pick(existing, extension, false)) {
                 result.set(extension.identifier.id, extension);
             }
@@ -588,7 +607,7 @@ let ExtensionManifestTranslator = class ExtensionManifestTranslator extends Disp
         const reportErrors = (localized, errors) => {
             errors.forEach(error => {
                 this.logService.error(this.formatMessage(extensionLocation, ( localize(
-                    1917,
+                    1919,
                     "Failed to parse {0}: {1}.",
                     localized?.path,
                     getParseErrorMessage(error.error)
@@ -596,7 +615,7 @@ let ExtensionManifestTranslator = class ExtensionManifestTranslator extends Disp
             });
         };
         const reportInvalidFormat = localized => {
-            this.logService.error(this.formatMessage(extensionLocation, ( localize(1918, "Invalid format {0}: JSON object expected.", localized?.path))));
+            this.logService.error(this.formatMessage(extensionLocation, ( localize(1920, "Invalid format {0}: JSON object expected.", localized?.path))));
         };
         const translationId = `${extensionManifest.publisher}.${extensionManifest.name}`;
         const translationPath = nlsConfiguration.translations[translationId];
@@ -686,7 +705,7 @@ let ExtensionManifestTranslator = class ExtensionManifestTranslator extends Disp
                 if (errors.length > 0) {
                     errors.forEach(error => {
                         this.logService.error(this.formatMessage(extensionLocation, ( localize(
-                            1917,
+                            1919,
                             "Failed to parse {0}: {1}.",
                             localizedMessages.default?.path,
                             getParseErrorMessage(error.error)
@@ -695,7 +714,7 @@ let ExtensionManifestTranslator = class ExtensionManifestTranslator extends Disp
                     return extensionManifest;
                 } else if (getNodeType(localizedMessages) !== "object") {
                     this.logService.error(this.formatMessage(extensionLocation, ( localize(
-                        1918,
+                        1920,
                         "Invalid format {0}: JSON object expected.",
                         localizedMessages.default?.path
                     ))));
@@ -768,6 +787,8 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
         this.uriIdentityService = uriIdentityService;
         this.environmentService = environmentService;
         this.extensionsEnabledWithApiProposalVersion = productService.extensionsEnabledWithApiProposalVersion?.map(id => id.toLowerCase()) ?? [];
+        this.productQuality = productService.quality;
+        this.productBuiltInExtensionsEnabledWithAutoUpdates = getProductBuiltInExtensionsEnabledWithAutoUpdates(productService, environmentService);
     }
     async scanExtensions(input) {
         return input.profile ? this.scanExtensionsFromProfile(input) : this.scanExtensionsFromLocation(input);
@@ -936,7 +957,8 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
             metadata,
             isValid,
             validations,
-            preRelease: !!metadata?.preRelease
+            preRelease: !!metadata?.preRelease,
+            forceAutoUpdate: ( this.productBuiltInExtensionsEnabledWithAutoUpdates.has(id.toLowerCase())) && this.productQuality === "stable"
         };
         if (input.validate) {
             extension = this.validate(extension, input);
@@ -975,7 +997,7 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
             content = await this.extensionResourceLoaderService.readExtensionResource(manifestLocation);
         } catch (error) {
             if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
-                this.logService.error(this.formatMessage(extensionLocation, ( localize(1919, "Cannot read file {0}: {1}.", manifestLocation.path, error.message))));
+                this.logService.error(this.formatMessage(extensionLocation, ( localize(1921, "Cannot read file {0}: {1}.", manifestLocation.path, error.message))));
             }
             throw error;
         }
@@ -987,7 +1009,7 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
             parse(content, errors);
             for (const e of errors) {
                 this.logService.error(this.formatMessage(extensionLocation, ( localize(
-                    1920,
+                    1922,
                     "Failed to parse {0}: [{1}, {2}] {3}.",
                     manifestLocation.path,
                     e.offset,
@@ -999,7 +1021,7 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
         }
         if (getNodeType(manifest) !== "object") {
             const errorMessage = this.formatMessage(extensionLocation, ( localize(
-                1921,
+                1923,
                 "Invalid manifest file {0}: Not a JSON object.",
                 manifestLocation.path
             )));