@codingame/monaco-vscode-api 34.1.3 → 35.0.1

package/vscode/src/vs/platform/extensions/common/extensionValidator.js

@@ -3,8 +3,6 @@ import { joinPath, isEqualOrParent } from '../../../base/common/resources.js';
 import Severity$1 from '../../../base/common/severity.js';
 import { localize } from '../../../nls.js';
 import { semverExports } from '../../../../../../_virtual/semver.js';
-import { parseApiProposals } from './extensions.js';
-import { allApiProposals } from './extensionsApiProposals.js';
 
 const VERSION_REGEXP = /^(\^|>=)?((\d+)|x)\.((\d+)|x)\.((\d+)|x)(\-.*)?$/;
 const NOT_BEFORE_REGEXP = /^-(\d{4})(\d{2})(\d{2})(\d{2})?(\d{2})?$/;
@@ -175,21 +173,20 @@ function validateExtensionManifest(
     productDate,
     extensionLocation,
     extensionManifest,
-    extensionIsBuiltin,
-    validateApiVersion
+    extensionIsBuiltin
 ) {
     const validations = [];
     if (typeof extensionManifest.publisher !== "undefined" && typeof extensionManifest.publisher !== "string") {
-        validations.push([Severity$1.Error, ( localize(1988, "property publisher must be of type `string`."))]);
+        validations.push([Severity$1.Error, ( localize(2064, "property publisher must be of type `string`."))]);
         return validations;
     }
     if (typeof extensionManifest.name !== "string") {
-        validations.push([Severity$1.Error, ( localize(1989, "property `{0}` is mandatory and must be of type `string`", "name"))]);
+        validations.push([Severity$1.Error, ( localize(2065, "property `{0}` is mandatory and must be of type `string`", "name"))]);
         return validations;
     }
     if (typeof extensionManifest.version !== "string") {
         validations.push([Severity$1.Error, ( localize(
-            1990,
+            2066,
             "property `{0}` is mandatory and must be of type `string`",
             "version"
         ))]);
@@ -197,7 +194,7 @@ function validateExtensionManifest(
     }
     if (!extensionManifest.engines) {
         validations.push([Severity$1.Error, ( localize(
-            1991,
+            2067,
             "property `{0}` is mandatory and must be of type `object`",
             "engines"
         ))]);
@@ -205,7 +202,7 @@ function validateExtensionManifest(
     }
     if (typeof extensionManifest.engines.vscode !== "string") {
         validations.push([Severity$1.Error, ( localize(
-            1992,
+            2068,
             "property `{0}` is mandatory and must be of type `string`",
             "engines.vscode"
         ))]);
@@ -214,7 +211,7 @@ function validateExtensionManifest(
     if (typeof extensionManifest.extensionDependencies !== "undefined") {
         if (!isStringArray(extensionManifest.extensionDependencies)) {
             validations.push([Severity$1.Error, ( localize(
-                1993,
+                2069,
                 "property `{0}` can be omitted or must be of type `string[]`",
                 "extensionDependencies"
             ))]);
@@ -224,7 +221,7 @@ function validateExtensionManifest(
     if (typeof extensionManifest.extensionAffinity !== "undefined") {
         if (!isStringArray(extensionManifest.extensionAffinity)) {
             validations.push([Severity$1.Error, ( localize(
-                1994,
+                2070,
                 "property `{0}` can be omitted or must be of type `string[]`",
                 "extensionAffinity"
             ))]);
@@ -234,7 +231,7 @@ function validateExtensionManifest(
     if (typeof extensionManifest.activationEvents !== "undefined") {
         if (!isStringArray(extensionManifest.activationEvents)) {
             validations.push([Severity$1.Error, ( localize(
-                1995,
+                2071,
                 "property `{0}` can be omitted or must be of type `string[]`",
                 "activationEvents"
             ))]);
@@ -242,7 +239,7 @@ function validateExtensionManifest(
         }
         if (typeof extensionManifest.main === "undefined" && typeof extensionManifest.browser === "undefined") {
             validations.push([Severity$1.Error, ( localize(
-                1996,
+                2072,
                 "property `{0}` should be omitted if the extension doesn't have a `{1}` or `{2}` property.",
                 "activationEvents",
                 "main",
@@ -254,7 +251,7 @@ function validateExtensionManifest(
     if (typeof extensionManifest.extensionKind !== "undefined") {
         if (typeof extensionManifest.main === "undefined") {
             validations.push([Severity$1.Warning, ( localize(
-                1997,
+                2073,
                 "property `{0}` can be defined only if property `main` is also defined.",
                 "extensionKind"
             ))]);
@@ -262,13 +259,13 @@ function validateExtensionManifest(
     }
     if (typeof extensionManifest.main !== "undefined") {
         if (typeof extensionManifest.main !== "string") {
-            validations.push([Severity$1.Error, ( localize(1998, "property `{0}` can be omitted or must be of type `string`", "main"))]);
+            validations.push([Severity$1.Error, ( localize(2074, "property `{0}` can be omitted or must be of type `string`", "main"))]);
             return validations;
         } else {
             const mainLocation = joinPath(extensionLocation, extensionManifest.main);
             if (!isEqualOrParent(mainLocation, extensionLocation)) {
                 validations.push([Severity$1.Warning, ( localize(
-                    1999,
+                    2075,
                     "Expected `main` ({0}) to be included inside extension's folder ({1}). This might make the extension non-portable.",
                     mainLocation.path,
                     extensionLocation.path
@@ -279,7 +276,7 @@ function validateExtensionManifest(
     if (typeof extensionManifest.browser !== "undefined") {
         if (typeof extensionManifest.browser !== "string") {
             validations.push([Severity$1.Error, ( localize(
-                2000,
+                2076,
                 "property `{0}` can be omitted or must be of type `string`",
                 "browser"
             ))]);
@@ -288,7 +285,7 @@ function validateExtensionManifest(
             const browserLocation = joinPath(extensionLocation, extensionManifest.browser);
             if (!isEqualOrParent(browserLocation, extensionLocation)) {
                 validations.push([Severity$1.Warning, ( localize(
-                    2001,
+                    2077,
                     "Expected `browser` ({0}) to be included inside extension's folder ({1}). This might make the extension non-portable.",
                     browserLocation.path,
                     extensionLocation.path
@@ -297,7 +294,7 @@ function validateExtensionManifest(
         }
     }
     if (!semverExports.valid(extensionManifest.version)) {
-        validations.push([Severity$1.Error, ( localize(2002, "Extension version is not semver compatible."))]);
+        validations.push([Severity$1.Error, ( localize(2078, "Extension version is not semver compatible."))]);
         return validations;
     }
     const notices = [];
@@ -313,14 +310,6 @@ function validateExtensionManifest(
             validations.push([Severity$1.Error, notice]);
         }
     }
-    if (validateApiVersion && extensionManifest.enabledApiProposals?.length) {
-        const incompatibleNotices = [];
-        if (!areApiProposalsCompatible([...extensionManifest.enabledApiProposals], incompatibleNotices)) {
-            for (const notice of incompatibleNotices) {
-                validations.push([Severity$1.Error, notice]);
-            }
-        }
-    }
     return validations;
 }
 function isValidExtensionVersion(
@@ -338,52 +327,11 @@ function isValidExtensionVersion(
 function isEngineValid(engine, version, date) {
     return engine === "*" || isVersionValid(version, date, engine);
 }
-function areApiProposalsCompatible(apiProposals, arg1) {
-    if (apiProposals.length === 0) {
-        return true;
-    }
-    const notices = Array.isArray(arg1) ? arg1 : undefined;
-    const productApiProposals = (Array.isArray(arg1) ? undefined : arg1) ?? allApiProposals;
-    const incompatibleProposals = [];
-    const parsedProposals = parseApiProposals(apiProposals);
-    for (const {
-        proposalName,
-        version
-    } of parsedProposals) {
-        if (!version) {
-            continue;
-        }
-        const existingProposal = productApiProposals[proposalName];
-        if (existingProposal?.version !== version) {
-            incompatibleProposals.push(proposalName);
-        }
-    }
-    if (incompatibleProposals.length) {
-        if (notices) {
-            if (incompatibleProposals.length === 1) {
-                notices.push(( localize(
-                    2003,
-                    "This extension is using the API proposal '{0}' that is not compatible with the current version of VS Code.",
-                    incompatibleProposals[0]
-                )));
-            } else {
-                notices.push(( localize(
-                    2004,
-                    "This extension is using the API proposals {0} and '{1}' that are not compatible with the current version of VS Code.",
-                    ( incompatibleProposals.slice(0, incompatibleProposals.length - 1).map(p => `'${p}'`)).join(", "),
-                    incompatibleProposals[incompatibleProposals.length - 1]
-                )));
-            }
-        }
-        return false;
-    }
-    return true;
-}
 function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
     const desiredVersion = normalizeVersion(parseVersion(requestedVersion));
     if (!desiredVersion) {
         notices.push(( localize(
-            2005,
+            2079,
             "Could not parse `engines.vscode` value {0}. Please use, for example: ^1.22.0, ^1.22.x, etc.",
             requestedVersion
         )));
@@ -392,7 +340,7 @@ function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
     if (desiredVersion.majorBase === 0) {
         if (!desiredVersion.majorMustEqual || !desiredVersion.minorMustEqual) {
             notices.push(( localize(
-                2006,
+                2080,
                 "Version specified in `engines.vscode` ({0}) is not specific enough. For vscode versions before 1.0.0, please define at a minimum the major and minor desired version. E.g. ^0.10.0, 0.10.x, 0.11.0, etc.",
                 requestedVersion
             )));
@@ -401,7 +349,7 @@ function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
     } else {
         if (!desiredVersion.majorMustEqual) {
             notices.push(( localize(
-                2007,
+                2081,
                 "Version specified in `engines.vscode` ({0}) is not specific enough. For vscode versions after 1.0.0, please define at a minimum the major desired version. E.g. ^1.10.0, 1.10.x, 1.x.x, 2.x.x, etc.",
                 requestedVersion
             )));
@@ -410,7 +358,7 @@ function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
     }
     if (!isValidVersion(currentVersion, date, desiredVersion)) {
         notices.push(( localize(
-            2008,
+            2082,
             "Extension is not compatible with Code {0}. Extension requires: {1}.",
             currentVersion,
             requestedVersion
@@ -431,4 +379,4 @@ function isStringArray(arr) {
     return true;
 }
 
-export { areApiProposalsCompatible, isEngineValid, isValidExtensionVersion, isValidVersion, isValidVersionStr, normalizeVersion, parseVersion, validateExtensionManifest };
+export { isEngineValid, isValidExtensionVersion, isValidVersion, isValidVersionStr, normalizeVersion, parseVersion, validateExtensionManifest };

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

@@ -1697,9 +1697,5 @@ export declare function isApplicationScopedExtension(manifest: IExtensionManifes
 export declare function isLanguagePackExtension(manifest: IExtensionManifest): boolean;
 export declare function isAuthenticationProviderExtension(manifest: IExtensionManifest): boolean;
 export declare function isResolverExtension(manifest: IExtensionManifest, remoteAuthority: string | undefined): boolean;
-export declare function parseApiProposals(enabledApiProposals: string[]): {
-    proposalName: string;
-    version?: number;
-}[];
 export declare function parseEnabledApiProposalNames(enabledApiProposals: string[]): string[];
 export {};

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

@@ -136,14 +136,18 @@ class ExtensionIdentifierMap {
 }
 class ExtensionError extends Error {
     constructor(extensionIdentifier, cause, message) {
+        const detail = message && cause?.message ? `${message}: ${cause.message}` : (message ?? cause?.message);
         super(
-            `Error in extension ${ExtensionIdentifier.toKey(extensionIdentifier)}: ${message ?? cause.message}`,
+            `Error in extension ${ExtensionIdentifier.toKey(extensionIdentifier)}: ${detail}`,
             {
                 cause
             }
         );
         this.name = "ExtensionError";
         this.extension = extensionIdentifier;
+        if (cause?.stack) {
+            this.stack = cause.stack;
+        }
     }
 }
 function isApplicationScopedExtension(manifest) {
@@ -162,17 +166,8 @@ function isResolverExtension(manifest, remoteAuthority) {
     }
     return false;
 }
-function parseApiProposals(enabledApiProposals) {
-    return ( enabledApiProposals.map(proposal => {
-        const [proposalName, version] = proposal.split("@");
-        return {
-            proposalName,
-            version: version ? parseInt(version) : undefined
-        };
-    }));
-}
 function parseEnabledApiProposalNames(enabledApiProposals) {
     return ( enabledApiProposals.map(proposal => proposal.split("@")[0]));
 }
 
-export { ALL_EXTENSION_KINDS, BUILTIN_MANIFEST_CACHE_FILE, EXTENSION_CATEGORIES, ExtensionError, ExtensionIdentifier, ExtensionIdentifierMap, ExtensionIdentifierSet, ExtensionType, TargetPlatform, UNDEFINED_PUBLISHER, USER_MANIFEST_CACHE_FILE, getWorkspaceSupportTypeMessage, isApplicationScopedExtension, isAuthenticationProviderExtension, isLanguagePackExtension, isResolverExtension, parseApiProposals, parseEnabledApiProposalNames };
+export { ALL_EXTENSION_KINDS, BUILTIN_MANIFEST_CACHE_FILE, EXTENSION_CATEGORIES, ExtensionError, ExtensionIdentifier, ExtensionIdentifierMap, ExtensionIdentifierSet, ExtensionType, TargetPlatform, UNDEFINED_PUBLISHER, USER_MANIFEST_CACHE_FILE, getWorkspaceSupportTypeMessage, isApplicationScopedExtension, isAuthenticationProviderExtension, isLanguagePackExtension, isResolverExtension, parseEnabledApiProposalNames };

package/vscode/src/vs/platform/extensions/common/extensionsApiProposals.d.ts

@@ -2,6 +2,9 @@ declare const _allApiProposals: {
     activeComment: {
         proposal: string;
     };
+    agentEditorComments: {
+        proposal: string;
+    };
     agentSessionsWorkspace: {
         proposal: string;
     };
@@ -16,7 +19,6 @@ declare const _allApiProposals: {
     };
     aiTextSearchProvider: {
         proposal: string;
-        version: number;
     };
     authIssuers: {
         proposal: string;
@@ -47,11 +49,9 @@ declare const _allApiProposals: {
     };
     chatDebug: {
         proposal: string;
-        version: number;
     };
     chatHooks: {
         proposal: string;
-        version: number;
     };
     chatInputNotification: {
         proposal: string;
@@ -61,19 +61,15 @@ declare const _allApiProposals: {
     };
     chatParticipantAdditions: {
         proposal: string;
-        version: number;
     };
     chatParticipantPrivate: {
         proposal: string;
-        version: number;
     };
     chatPromptFiles: {
         proposal: string;
-        version: number;
     };
     chatProvider: {
         proposal: string;
-        version: number;
     };
     chatReferenceBinaryData: {
         proposal: string;
@@ -86,7 +82,6 @@ declare const _allApiProposals: {
     };
     chatSessionsProvider: {
         proposal: string;
-        version: number;
     };
     chatStatusItem: {
         proposal: string;
@@ -222,7 +217,6 @@ declare const _allApiProposals: {
     };
     defaultChatParticipant: {
         proposal: string;
-        version: number;
     };
     devDeviceId: {
         proposal: string;
@@ -239,6 +233,9 @@ declare const _allApiProposals: {
     documentFiltersExclusive: {
         proposal: string;
     };
+    documentSyntaxHighlighting: {
+        proposal: string;
+    };
     editSessionIdentityProvider: {
         proposal: string;
     };
@@ -277,7 +274,6 @@ declare const _allApiProposals: {
     };
     findFiles2: {
         proposal: string;
-        version: number;
     };
     findTextInFiles: {
         proposal: string;
@@ -314,14 +310,12 @@ declare const _allApiProposals: {
     };
     languageModelThinkingPart: {
         proposal: string;
-        version: number;
     };
     languageModelToolResultAudience: {
         proposal: string;
     };
     languageModelToolSupportsModel: {
         proposal: string;
-        version: number;
     };
     languageStatusText: {
         proposal: string;
@@ -334,7 +328,6 @@ declare const _allApiProposals: {
     };
     mcpServerDefinitions: {
         proposal: string;
-        version: number;
     };
     mcpToolDefinitions: {
         proposal: string;
@@ -538,7 +531,6 @@ declare const _allApiProposals: {
 export declare const allApiProposals: Readonly<{
     [proposalName: string]: Readonly<{
         proposal: string;
-        version?: number;
     }>;
 }>;
 export type ApiProposalName = keyof typeof _allApiProposals;

package/vscode/src/vs/platform/extensions/common/extensionsApiProposals.js

@@ -4,6 +4,9 @@ const _allApiProposals = {
     activeComment: {
         proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.activeComment.d.ts"
     },
+    agentEditorComments: {
+        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.agentEditorComments.d.ts"
+    },
     agentSessionsWorkspace: {
         proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.agentSessionsWorkspace.d.ts"
     },
@@ -17,8 +20,7 @@ const _allApiProposals = {
         proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.aiSettingsSearch.d.ts"
     },
     aiTextSearchProvider: {
-        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.aiTextSearchProvider.d.ts",
-        version: 2
+        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.aiTextSearchProvider.d.ts"
     },
     authIssuers: {
         proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authIssuers.d.ts"
@@ -48,12 +50,10 @@ const _allApiProposals = {
         proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatContextProvider.d.ts"
     },
     chatDebug: {
-        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatDebug.d.ts",
-        version: 4
+        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatDebug.d.ts"
     },
     chatHooks: {
-        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatHooks.d.ts",
-        version: 6
+        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatHooks.d.ts"
     },
     chatInputNotification: {
         proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatInputNotification.d.ts"
@@ -62,20 +62,16 @@ const _allApiProposals = {
         proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatOutputRenderer.d.ts"
     },
     chatParticipantAdditions: {
-        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts",
-        version: 3
+        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts"
     },
     chatParticipantPrivate: {
-        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts",
-        version: 15
+        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts"
     },
     chatPromptFiles: {
-        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatPromptFiles.d.ts",
-        version: 2
+        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatPromptFiles.d.ts"
     },
     chatProvider: {
-        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatProvider.d.ts",
-        version: 5
+        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatProvider.d.ts"
     },
     chatReferenceBinaryData: {
         proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatReferenceBinaryData.d.ts"
@@ -87,8 +83,7 @@ const _allApiProposals = {
         proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatSessionCustomizationProvider.d.ts"
     },
     chatSessionsProvider: {
-        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatSessionsProvider.d.ts",
-        version: 3
+        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatSessionsProvider.d.ts"
     },
     chatStatusItem: {
         proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatStatusItem.d.ts"
@@ -223,8 +218,7 @@ const _allApiProposals = {
         proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.debugVisualization.d.ts"
     },
     defaultChatParticipant: {
-        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts",
-        version: 4
+        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts"
     },
     devDeviceId: {
         proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.devDeviceId.d.ts"
@@ -241,6 +235,9 @@ const _allApiProposals = {
     documentFiltersExclusive: {
         proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.documentFiltersExclusive.d.ts"
     },
+    documentSyntaxHighlighting: {
+        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.documentSyntaxHighlighting.d.ts"
+    },
     editSessionIdentityProvider: {
         proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.editSessionIdentityProvider.d.ts"
     },
@@ -278,8 +275,7 @@ const _allApiProposals = {
         proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.fileSearchProvider2.d.ts"
     },
     findFiles2: {
-        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.findFiles2.d.ts",
-        version: 2
+        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.findFiles2.d.ts"
     },
     findTextInFiles: {
         proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.findTextInFiles.d.ts"
@@ -315,15 +311,13 @@ const _allApiProposals = {
         proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageModelSystem.d.ts"
     },
     languageModelThinkingPart: {
-        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageModelThinkingPart.d.ts",
-        version: 1
+        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageModelThinkingPart.d.ts"
     },
     languageModelToolResultAudience: {
         proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageModelToolResultAudience.d.ts"
     },
     languageModelToolSupportsModel: {
-        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageModelToolSupportsModel.d.ts",
-        version: 1
+        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageModelToolSupportsModel.d.ts"
     },
     languageStatusText: {
         proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageStatusText.d.ts"
@@ -335,8 +329,7 @@ const _allApiProposals = {
         proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.markdownAlertSyntax.d.ts"
     },
     mcpServerDefinitions: {
-        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.mcpServerDefinitions.d.ts",
-        version: 1
+        proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.mcpServerDefinitions.d.ts"
     },
     mcpToolDefinitions: {
         proposal: "https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.mcpToolDefinitions.d.ts"

package/vscode/src/vs/platform/files/browser/htmlFileSystemProvider.js

@@ -254,7 +254,7 @@ class HTMLFileSystemProvider extends Disposable {
                 });
             }
             else {
-                throw this.createFileSystemProviderError(from, ( localize(2009, "Rename is only supported for files.")), FileSystemProviderErrorCode.Unavailable);
+                throw this.createFileSystemProviderError(from, ( localize(2083, "Rename is only supported for files.")), FileSystemProviderErrorCode.Unavailable);
             }
         } catch (error) {
             throw this.toFileSystemProviderError(error);
@@ -443,7 +443,7 @@ class HTMLFileSystemProvider extends Disposable {
         }
         let code = FileSystemProviderErrorCode.Unknown;
         if (error.name === "NotAllowedError") {
-            error = ( new Error(( localize(2010, "Insufficient permissions. Please retry and allow the operation."))));
+            error = ( new Error(( localize(2084, "Insufficient permissions. Please retry and allow the operation."))));
             code = FileSystemProviderErrorCode.Unavailable;
         }
         return createFileSystemProviderError(error, code);

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

@@ -117,7 +117,7 @@ function createFileSystemProviderError(error, code) {
 }
 function ensureFileSystemProviderError(error) {
     if (!error) {
-        return createFileSystemProviderError(( localize(2044, "Unknown Error")), FileSystemProviderErrorCode.Unknown);
+        return createFileSystemProviderError(( localize(2118, "Unknown Error")), FileSystemProviderErrorCode.Unknown);
     }
     return error;
 }
@@ -408,18 +408,18 @@ class ByteSize {
             size = 0;
         }
         if (size < ByteSize.KB) {
-            return localize(2045, "{0}B", size.toFixed(0));
+            return localize(2119, "{0}B", size.toFixed(0));
         }
         if (size < ByteSize.MB) {
-            return localize(2046, "{0}KB", (size / ByteSize.KB).toFixed(2));
+            return localize(2120, "{0}KB", (size / ByteSize.KB).toFixed(2));
         }
         if (size < ByteSize.GB) {
-            return localize(2047, "{0}MB", (size / ByteSize.MB).toFixed(2));
+            return localize(2121, "{0}MB", (size / ByteSize.MB).toFixed(2));
         }
         if (size < ByteSize.TB) {
-            return localize(2048, "{0}GB", (size / ByteSize.GB).toFixed(2));
+            return localize(2122, "{0}GB", (size / ByteSize.GB).toFixed(2));
         }
-        return localize(2049, "{0}TB", (size / ByteSize.TB).toFixed(2));
+        return localize(2123, "{0}TB", (size / ByteSize.TB).toFixed(2));
     }
 }
 function getLargeFileConfirmationLimit(arg) {

package/vscode/src/vs/platform/history/browser/contextScopedHistoryWidget.js

@@ -11,7 +11,7 @@ import { localize } from '../../../nls.js';
 import { DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
 import { isActiveElement } from '../../../base/browser/dom.js';
 
-const historyNavigationVisible = ( new RawContextKey("suggestWidgetVisible", false, ( localize(2051, "Whether suggestion are visible"))));
+const historyNavigationVisible = ( new RawContextKey("suggestWidgetVisible", false, ( localize(2125, "Whether suggestion are visible"))));
 const HistoryNavigationWidgetFocusContext = "historyNavigationWidgetFocus";
 const HistoryNavigationForwardsEnablementContext = "historyNavigationForwardsEnabled";
 const HistoryNavigationBackwardsEnablementContext = "historyNavigationBackwardsEnabled";

package/vscode/src/vs/platform/hover/browser/hoverService.js

@@ -339,6 +339,10 @@ let HoverService = class HoverService extends Disposable {
                 addDisposableListener(targetWindow, EventType.RESIZE, () => contextView.layout())
             );
         }
+        if (options.onDidHide) {
+            const onDidHide = options.onDidHide;
+            store.add(toDisposable(() => onDidHide()));
+        }
         options.onDidShow?.();
     }
     _hideHoverAndDescendants(hover) {

package/vscode/src/vs/platform/hover/browser/hoverWidget.js

@@ -215,7 +215,7 @@ let HoverWidget = class HoverWidget extends Widget {
         if (options.appearance?.showHoverHint) {
             const statusBarElement = $("div.hover-row.status-bar");
             const infoElement = $("div.info");
-            infoElement.textContent = ( localize(2052, "Hold {0} key to mouse over", isMacintosh ? "Option" : "Alt"));
+            infoElement.textContent = ( localize(2126, "Hold {0} key to mouse over", isMacintosh ? "Option" : "Alt"));
             statusBarElement.appendChild(infoElement);
             this._hover.containerDomNode.appendChild(statusBarElement);
         }

package/vscode/src/vs/platform/hover/browser/updatableHoverWidget.js

@@ -45,7 +45,7 @@ class ManagedHoverWidget {
             }
             if (managedContent instanceof Promise) {
                 if (!this._hoverWidget) {
-                    this.show(( localize(2053, "Loading...")), focus, options);
+                    this.show(( localize(2127, "Loading...")), focus, options);
                 }
                 resolvedContent = await managedContent;
             } else {