@codingame/monaco-vscode-api 19.1.3 → 20.0.0

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

@@ -1,9 +1,10 @@
 import { Event } from "../../../base/common/event.js";
-import { IExtensionGalleryManifest } from "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest";
+import { ExtensionGalleryManifestStatus, IExtensionGalleryManifest } from "./extensionGalleryManifest.js";
 export declare const IExtensionGalleryManifestService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IExtensionGalleryManifestService>;
 export interface IExtensionGalleryManifestService {
     readonly _serviceBrand: undefined;
+    readonly extensionGalleryManifestStatus: ExtensionGalleryManifestStatus;
+    readonly onDidChangeExtensionGalleryManifestStatus: Event<ExtensionGalleryManifestStatus>;
     readonly onDidChangeExtensionGalleryManifest: Event<IExtensionGalleryManifest | null>;
-    isEnabled(): boolean;
     getExtensionGalleryManifest(): Promise<IExtensionGalleryManifest | null>;
 }

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

@@ -4,7 +4,7 @@ import { Platform } from "../../../base/common/platform.js";
 import { URI } from "../../../base/common/uri.js";
 import { IExtension, TargetPlatform } from "../../extensions/common/extensions.js";
 import { IFileService } from "../../files/common/files.service.js";
-import { IExtensionGalleryManifest } from "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest";
+import { IExtensionGalleryManifest } from "./extensionGalleryManifest.js";
 export declare const EXTENSION_IDENTIFIER_PATTERN = "^([a-z0-9A-Z][a-z0-9-A-Z]*)\\.([a-z0-9A-Z][a-z0-9-A-Z]*)$";
 export declare const EXTENSION_IDENTIFIER_REGEX: RegExp;
 export declare const WEB_EXTENSION_TAG = "__web_extension";
@@ -66,6 +66,7 @@ export interface IGalleryExtensionVersion {
     version: string;
     date: string;
     isPreReleaseVersion: boolean;
+    targetPlatforms: TargetPlatform[];
 }
 export interface IGalleryExtension {
     type: "gallery";
@@ -229,7 +230,6 @@ export interface IExtensionQueryOptions {
     compatible?: boolean;
     queryAllVersions?: boolean;
     source?: string;
-    updateCheck?: boolean;
 }
 export interface IExtensionGalleryCapabilities {
     readonly query: {

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

@@ -266,39 +266,39 @@ async function computeSize(location, fileService) {
     }
     return stat.size ?? 0;
 }
-const ExtensionsLocalizedLabel = ( localize2(1785, "Extensions"));
-const PreferencesLocalizedLabel = ( localize2(1786, 'Preferences'));
+const ExtensionsLocalizedLabel = ( localize2(1797, "Extensions"));
+const PreferencesLocalizedLabel = ( localize2(1798, 'Preferences'));
 const AllowedExtensionsConfigKey = 'extensions.allowed';
 const VerifyExtensionSignatureConfigKey = 'extensions.verifySignature';
 ( Registry.as(Extensions.Configuration))
     .registerConfiguration({
     id: 'extensions',
     order: 30,
-    title: ( localize(1787, "Extensions")),
+    title: ( localize(1799, "Extensions")),
     type: 'object',
     properties: {
         [AllowedExtensionsConfigKey]: {
             type: 'object',
             markdownDescription: ( localize(
-                1788,
+                1800,
                 "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://code.visualstudio.com/docs/setup/enterprise#_configure-allowed-extensions) section."
             )),
             default: '*',
             defaultSnippets: [{
                     body: {},
-                    description: ( localize(1789, "No extensions are allowed.")),
+                    description: ( localize(1801, "No extensions are allowed.")),
                 }, {
                     body: {
                         '*': true
                     },
-                    description: ( localize(1790, "All extensions are allowed.")),
+                    description: ( localize(1802, "All extensions are allowed.")),
                 }],
             scope: ConfigurationScope.APPLICATION,
             policy: {
                 name: 'AllowedExtensions',
                 minimumVersion: '1.96',
                 description: ( localize(
-                    1791,
+                    1803,
                     "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://code.visualstudio.com/docs/setup/enterprise#_configure-allowed-extensions"
                 )),
             },
@@ -309,11 +309,11 @@ const VerifyExtensionSignatureConfigKey = 'extensions.verifySignature';
                         {
                             type: ['boolean', 'string'],
                             enum: [true, false, 'stable'],
-                            description: ( localize(1792, "Allow or disallow the extension.")),
+                            description: ( localize(1804, "Allow or disallow the extension.")),
                             enumDescriptions: [
-                                ( localize(1793, "Extension is allowed.")),
-                                ( localize(1794, "Extension is not allowed.")),
-                                ( localize(1795, "Allow only stable versions of the extension.")),
+                                ( localize(1805, "Extension is allowed.")),
+                                ( localize(1806, "Extension is not allowed.")),
+                                ( localize(1807, "Allow only stable versions of the extension.")),
                             ],
                         },
                         {
@@ -322,7 +322,7 @@ const VerifyExtensionSignatureConfigKey = 'extensions.verifySignature';
                                 type: 'string',
                             },
                             description: ( localize(
-                                1796,
+                                1808,
                                 "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`"
                             )),
                         },
@@ -331,20 +331,20 @@ const VerifyExtensionSignatureConfigKey = 'extensions.verifySignature';
                 '([a-z0-9A-Z][a-z0-9-A-Z]*)$': {
                     type: ['boolean', 'string'],
                     enum: [true, false, 'stable'],
-                    description: ( localize(1797, "Allow or disallow all extensions from the publisher.")),
+                    description: ( localize(1809, "Allow or disallow all extensions from the publisher.")),
                     enumDescriptions: [
-                        ( localize(1798, "All extensions from the publisher are allowed.")),
-                        ( localize(1799, "All extensions from the publisher are not allowed.")),
-                        ( localize(1800, "Allow only stable versions of the extensions from the publisher.")),
+                        ( localize(1810, "All extensions from the publisher are allowed.")),
+                        ( localize(1811, "All extensions from the publisher are not allowed.")),
+                        ( localize(1812, "Allow only stable versions of the extensions from the publisher.")),
                     ],
                 },
                 '\\*': {
                     type: 'boolean',
                     enum: [true, false],
-                    description: ( localize(1801, "Allow or disallow all extensions.")),
+                    description: ( localize(1813, "Allow or disallow all extensions.")),
                     enumDescriptions: [
-                        ( localize(1802, "Allow all extensions.")),
-                        ( localize(1803, "Disallow all extensions."))
+                        ( localize(1814, "Allow all extensions.")),
+                        ( localize(1815, "Disallow all extensions."))
                     ],
                 }
             }

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

@@ -1,7 +1,7 @@
 import { CancellationToken } from "../../../base/common/cancellation.js";
 import { Event } from "../../../base/common/event.js";
 import { IMarkdownString } from "../../../base/common/htmlContent.js";
-import { IPager } from "@codingame/monaco-vscode-9ed6fe06-a052-57c2-a234-5d9b94d2e7e0-common/vscode/vs/base/common/paging";
+import { IPager } from "@codingame/monaco-vscode-62190c26-af1c-5f7a-a364-e05a59cfb7c7-common/vscode/vs/base/common/paging";
 import { URI } from "../../../base/common/uri.js";
 import { TargetPlatform, IExtensionManifest, type ExtensionType, type IExtension } from "../../extensions/common/extensions.js";
 import { IQueryOptions, IGalleryExtension, IExtensionInfo, IExtensionQueryOptions, IProductVersion, IExtensionIdentifier, IGalleryExtensionVersion, InstallOperation, StatisticType, ITranslation, IExtensionsControlManifest, type DidUninstallExtensionEvent, type DidUpdateExtensionMetadata, type IExtensionManagementParticipant, type ILocalExtension, type InstallExtensionEvent, type InstallExtensionInfo, type InstallExtensionResult, type InstallOptions, type Metadata, type UninstallExtensionEvent, type UninstallExtensionInfo, type UninstallOptions, type IConfigBasedExtensionTip, type IExecutableBasedExtensionTip, type AllowedExtensionsConfigValueType } from "./extensionManagement.js";

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

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

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

@@ -448,7 +448,7 @@ let ExtensionManifestTranslator = class ExtensionManifestTranslator extends Disp
         const reportErrors = (localized, errors) => {
             errors.forEach((error) => {
                 this.logService.error(this.formatMessage(extensionLocation, ( localize(
-                    1836,
+                    1848,
                     "Failed to parse {0}: {1}.",
                     localized?.path,
                     getParseErrorMessage(error.error)
@@ -456,7 +456,7 @@ let ExtensionManifestTranslator = class ExtensionManifestTranslator extends Disp
             });
         };
         const reportInvalidFormat = (localized) => {
-            this.logService.error(this.formatMessage(extensionLocation, ( localize(1837, "Invalid format {0}: JSON object expected.", localized?.path))));
+            this.logService.error(this.formatMessage(extensionLocation, ( localize(1849, "Invalid format {0}: JSON object expected.", localized?.path))));
         };
         const translationId = `${extensionManifest.publisher}.${extensionManifest.name}`;
         const translationPath = nlsConfiguration.translations[translationId];
@@ -526,7 +526,7 @@ let ExtensionManifestTranslator = class ExtensionManifestTranslator extends Disp
                 if (errors.length > 0) {
                     errors.forEach((error) => {
                         this.logService.error(this.formatMessage(extensionLocation, ( localize(
-                            1836,
+                            1848,
                             "Failed to parse {0}: {1}.",
                             localizedMessages.default?.path,
                             getParseErrorMessage(error.error)
@@ -536,7 +536,7 @@ let ExtensionManifestTranslator = class ExtensionManifestTranslator extends Disp
                 }
                 else if (getNodeType(localizedMessages) !== 'object') {
                     this.logService.error(this.formatMessage(extensionLocation, ( localize(
-                        1837,
+                        1849,
                         "Invalid format {0}: JSON object expected.",
                         localizedMessages.default?.path
                     ))));
@@ -790,7 +790,7 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
         }
         catch (error) {
             if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
-                this.logService.error(this.formatMessage(extensionLocation, ( localize(1838, "Cannot read file {0}: {1}.", manifestLocation.path, error.message))));
+                this.logService.error(this.formatMessage(extensionLocation, ( localize(1850, "Cannot read file {0}: {1}.", manifestLocation.path, error.message))));
             }
             throw error;
         }
@@ -803,7 +803,7 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
             parse(content, errors);
             for (const e of errors) {
                 this.logService.error(this.formatMessage(extensionLocation, ( localize(
-                    1839,
+                    1851,
                     "Failed to parse {0}: [{1}, {2}] {3}.",
                     manifestLocation.path,
                     e.offset,
@@ -815,7 +815,7 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
         }
         if (getNodeType(manifest) !== 'object') {
             const errorMessage = this.formatMessage(extensionLocation, ( localize(
-                1840,
+                1852,
                 "Invalid manifest file {0}: Not a JSON object.",
                 manifestLocation.path
             )));

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

@@ -171,16 +171,16 @@ function isValidVersion(_inputVersion, _inputDate, _desiredVersion) {
 function validateExtensionManifest(productVersion, productDate, extensionLocation, extensionManifest, extensionIsBuiltin, validateApiVersion) {
     const validations = [];
     if (typeof extensionManifest.publisher !== 'undefined' && typeof extensionManifest.publisher !== 'string') {
-        validations.push([Severity$1.Error, ( localize(1841, "property publisher must be of type `string`."))]);
+        validations.push([Severity$1.Error, ( localize(1853, "property publisher must be of type `string`."))]);
         return validations;
     }
     if (typeof extensionManifest.name !== 'string') {
-        validations.push([Severity$1.Error, ( localize(1842, "property `{0}` is mandatory and must be of type `string`", 'name'))]);
+        validations.push([Severity$1.Error, ( localize(1854, "property `{0}` is mandatory and must be of type `string`", 'name'))]);
         return validations;
     }
     if (typeof extensionManifest.version !== 'string') {
         validations.push([Severity$1.Error, ( localize(
-            1843,
+            1855,
             "property `{0}` is mandatory and must be of type `string`",
             'version'
         ))]);
@@ -188,7 +188,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     }
     if (!extensionManifest.engines) {
         validations.push([Severity$1.Error, ( localize(
-            1844,
+            1856,
             "property `{0}` is mandatory and must be of type `object`",
             'engines'
         ))]);
@@ -196,7 +196,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     }
     if (typeof extensionManifest.engines.vscode !== 'string') {
         validations.push([Severity$1.Error, ( localize(
-            1845,
+            1857,
             "property `{0}` is mandatory and must be of type `string`",
             'engines.vscode'
         ))]);
@@ -205,7 +205,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     if (typeof extensionManifest.extensionDependencies !== 'undefined') {
         if (!isStringArray(extensionManifest.extensionDependencies)) {
             validations.push([Severity$1.Error, ( localize(
-                1846,
+                1858,
                 "property `{0}` can be omitted or must be of type `string[]`",
                 'extensionDependencies'
             ))]);
@@ -215,7 +215,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     if (typeof extensionManifest.activationEvents !== 'undefined') {
         if (!isStringArray(extensionManifest.activationEvents)) {
             validations.push([Severity$1.Error, ( localize(
-                1847,
+                1859,
                 "property `{0}` can be omitted or must be of type `string[]`",
                 'activationEvents'
             ))]);
@@ -223,7 +223,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
         }
         if (typeof extensionManifest.main === 'undefined' && typeof extensionManifest.browser === 'undefined') {
             validations.push([Severity$1.Error, ( localize(
-                1848,
+                1860,
                 "property `{0}` should be omitted if the extension doesn't have a `{1}` or `{2}` property.",
                 'activationEvents',
                 'main',
@@ -235,7 +235,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     if (typeof extensionManifest.extensionKind !== 'undefined') {
         if (typeof extensionManifest.main === 'undefined') {
             validations.push([Severity$1.Warning, ( localize(
-                1849,
+                1861,
                 "property `{0}` can be defined only if property `main` is also defined.",
                 'extensionKind'
             ))]);
@@ -243,14 +243,14 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     }
     if (typeof extensionManifest.main !== 'undefined') {
         if (typeof extensionManifest.main !== 'string') {
-            validations.push([Severity$1.Error, ( localize(1850, "property `{0}` can be omitted or must be of type `string`", 'main'))]);
+            validations.push([Severity$1.Error, ( localize(1862, "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(
-                    1851,
+                    1863,
                     "Expected `main` ({0}) to be included inside extension's folder ({1}). This might make the extension non-portable.",
                     mainLocation.path,
                     extensionLocation.path
@@ -261,7 +261,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
     if (typeof extensionManifest.browser !== 'undefined') {
         if (typeof extensionManifest.browser !== 'string') {
             validations.push([Severity$1.Error, ( localize(
-                1852,
+                1864,
                 "property `{0}` can be omitted or must be of type `string`",
                 'browser'
             ))]);
@@ -271,7 +271,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
             const browserLocation = joinPath(extensionLocation, extensionManifest.browser);
             if (!isEqualOrParent(browserLocation, extensionLocation)) {
                 validations.push([Severity$1.Warning, ( localize(
-                    1853,
+                    1865,
                     "Expected `browser` ({0}) to be included inside extension's folder ({1}). This might make the extension non-portable.",
                     browserLocation.path,
                     extensionLocation.path
@@ -280,7 +280,7 @@ function validateExtensionManifest(productVersion, productDate, extensionLocatio
         }
     }
     if (!semverExports.valid(extensionManifest.version)) {
-        validations.push([Severity$1.Error, ( localize(1854, "Extension version is not semver compatible."))]);
+        validations.push([Severity$1.Error, ( localize(1866, "Extension version is not semver compatible."))]);
         return validations;
     }
     const notices = [];
@@ -330,14 +330,14 @@ function areApiProposalsCompatible(apiProposals, arg1) {
         if (notices) {
             if (incompatibleProposals.length === 1) {
                 notices.push(( localize(
-                    1855,
+                    1867,
                     "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(
-                    1856,
+                    1868,
                     "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]
@@ -352,7 +352,7 @@ function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
     const desiredVersion = normalizeVersion(parseVersion(requestedVersion));
     if (!desiredVersion) {
         notices.push(( localize(
-            1857,
+            1869,
             "Could not parse `engines.vscode` value {0}. Please use, for example: ^1.22.0, ^1.22.x, etc.",
             requestedVersion
         )));
@@ -361,7 +361,7 @@ function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
     if (desiredVersion.majorBase === 0) {
         if (!desiredVersion.majorMustEqual || !desiredVersion.minorMustEqual) {
             notices.push(( localize(
-                1858,
+                1870,
                 "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
             )));
@@ -371,7 +371,7 @@ function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
     else {
         if (!desiredVersion.majorMustEqual) {
             notices.push(( localize(
-                1859,
+                1871,
                 "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
             )));
@@ -380,7 +380,7 @@ function isVersionValid(currentVersion, date, requestedVersion, notices = []) {
     }
     if (!isValidVersion(currentVersion, date, desiredVersion)) {
         notices.push(( localize(
-            1860,
+            1872,
             "Extension is not compatible with Code {0}. Extension requires: {1}.",
             currentVersion,
             requestedVersion

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

@@ -30,6 +30,9 @@ declare const _allApiProposals: {
     chatEditing: {
         proposal: string;
     };
+    chatOutputRenderer: {
+        proposal: string;
+    };
     chatParticipantAdditions: {
         proposal: string;
     };
@@ -46,6 +49,9 @@ declare const _allApiProposals: {
     chatReferenceDiagnostic: {
         proposal: string;
     };
+    chatSessionsProvider: {
+        proposal: string;
+    };
     chatStatusItem: {
         proposal: string;
     };
@@ -154,6 +160,9 @@ declare const _allApiProposals: {
     customEditorMove: {
         proposal: string;
     };
+    dataChannels: {
+        proposal: string;
+    };
     debugVisualization: {
         proposal: string;
     };
@@ -235,6 +244,9 @@ declare const _allApiProposals: {
     languageModelSystem: {
         proposal: string;
     };
+    languageModelToolResultAudience: {
+        proposal: string;
+    };
     languageStatusText: {
         proposal: string;
     };
@@ -313,6 +325,9 @@ declare const _allApiProposals: {
     scmMultiDiffEditor: {
         proposal: string;
     };
+    scmProviderOptions: {
+        proposal: string;
+    };
     scmSelectedProvider: {
         proposal: string;
     };
@@ -322,6 +337,9 @@ declare const _allApiProposals: {
     scmValidation: {
         proposal: string;
     };
+    secretStorageKeys: {
+        proposal: string;
+    };
     shareProvider: {
         proposal: string;
     };
@@ -337,6 +355,9 @@ declare const _allApiProposals: {
     tabInputTextMerge: {
         proposal: string;
     };
+    taskExecutionTerminal: {
+        proposal: string;
+    };
     taskPresentationGroup: {
         proposal: string;
     };

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

@@ -32,6 +32,9 @@ const _allApiProposals = {
     chatEditing: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatEditing.d.ts',
     },
+    chatOutputRenderer: {
+        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',
     },
@@ -48,6 +51,9 @@ const _allApiProposals = {
     chatReferenceDiagnostic: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatReferenceDiagnostic.d.ts',
     },
+    chatSessionsProvider: {
+        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',
     },
@@ -156,6 +162,9 @@ const _allApiProposals = {
     customEditorMove: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.customEditorMove.d.ts',
     },
+    dataChannels: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.dataChannels.d.ts',
+    },
     debugVisualization: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.debugVisualization.d.ts',
     },
@@ -237,6 +246,9 @@ const _allApiProposals = {
     languageModelSystem: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageModelSystem.d.ts',
     },
+    languageModelToolResultAudience: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageModelToolResultAudience.d.ts',
+    },
     languageStatusText: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageStatusText.d.ts',
     },
@@ -315,6 +327,9 @@ const _allApiProposals = {
     scmMultiDiffEditor: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmMultiDiffEditor.d.ts',
     },
+    scmProviderOptions: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmProviderOptions.d.ts',
+    },
     scmSelectedProvider: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmSelectedProvider.d.ts',
     },
@@ -324,6 +339,9 @@ const _allApiProposals = {
     scmValidation: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmValidation.d.ts',
     },
+    secretStorageKeys: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.secretStorageKeys.d.ts',
+    },
     shareProvider: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.shareProvider.d.ts',
     },
@@ -339,6 +357,9 @@ const _allApiProposals = {
     tabInputTextMerge: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tabInputTextMerge.d.ts',
     },
+    taskExecutionTerminal: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.taskExecutionTerminal.d.ts',
+    },
     taskPresentationGroup: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.taskPresentationGroup.d.ts',
     },

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

@@ -206,7 +206,7 @@ class HTMLFileSystemProvider extends Disposable {
                 await this.delete(from, { recursive: false, useTrash: false, atomic: false });
             }
             else {
-                throw this.createFileSystemProviderError(from, ( localize(1861, "Rename is only supported for files.")), FileSystemProviderErrorCode.Unavailable);
+                throw this.createFileSystemProviderError(from, ( localize(1873, "Rename is only supported for files.")), FileSystemProviderErrorCode.Unavailable);
             }
         }
         catch (error) {
@@ -382,7 +382,7 @@ class HTMLFileSystemProvider extends Disposable {
         }
         let code = FileSystemProviderErrorCode.Unknown;
         if (error.name === 'NotAllowedError') {
-            error = ( new Error(( localize(1862, "Insufficient permissions. Please retry and allow the operation."))));
+            error = ( new Error(( localize(1874, "Insufficient permissions. Please retry and allow the operation."))));
             code = FileSystemProviderErrorCode.Unavailable;
         }
         return createFileSystemProviderError(error, code);

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

@@ -109,7 +109,7 @@ function createFileSystemProviderError(error, code) {
 }
 function ensureFileSystemProviderError(error) {
     if (!error) {
-        return createFileSystemProviderError(( localize(1895, "Unknown Error")), FileSystemProviderErrorCode.Unknown);
+        return createFileSystemProviderError(( localize(1907, "Unknown Error")), FileSystemProviderErrorCode.Unknown);
     }
     return error;
 }
@@ -378,18 +378,18 @@ class ByteSize {
             size = 0;
         }
         if (size < ByteSize.KB) {
-            return localize(1896, "{0}B", size.toFixed(0));
+            return localize(1908, "{0}B", size.toFixed(0));
         }
         if (size < ByteSize.MB) {
-            return localize(1897, "{0}KB", (size / ByteSize.KB).toFixed(2));
+            return localize(1909, "{0}KB", (size / ByteSize.KB).toFixed(2));
         }
         if (size < ByteSize.GB) {
-            return localize(1898, "{0}MB", (size / ByteSize.MB).toFixed(2));
+            return localize(1910, "{0}MB", (size / ByteSize.MB).toFixed(2));
         }
         if (size < ByteSize.TB) {
-            return localize(1899, "{0}GB", (size / ByteSize.GB).toFixed(2));
+            return localize(1911, "{0}GB", (size / ByteSize.GB).toFixed(2));
         }
-        return localize(1900, "{0}TB", (size / ByteSize.TB).toFixed(2));
+        return localize(1912, "{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(1902, "Whether suggestion are visible"))));
+const historyNavigationVisible = ( new RawContextKey('suggestWidgetVisible', false, ( localize(1914, "Whether suggestion are visible"))));
 const HistoryNavigationWidgetFocusContext = 'historyNavigationWidgetFocus';
 const HistoryNavigationForwardsEnablementContext = 'historyNavigationForwardsEnabled';
 const HistoryNavigationBackwardsEnablementContext = 'historyNavigationBackwardsEnabled';

package/vscode/src/vs/platform/imageResize/common/imageResizeService.service.d.ts

@@ -0,0 +1,5 @@
+export declare const IImageResizeService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IImageResizeService>;
+export interface IImageResizeService {
+    readonly _serviceBrand: undefined;
+    resizeImage(data: Uint8Array | string, mimeType?: string): Promise<Uint8Array>;
+}

package/vscode/src/vs/platform/imageResize/common/imageResizeService.service.js

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+
+const IImageResizeService = ( createDecorator('imageResizeMainService'));
+
+export { IImageResizeService };

package/vscode/src/vs/platform/keybinding/common/abstractKeybindingService.js

@@ -109,7 +109,7 @@ class AbstractKeybindingService extends Disposable {
                 throw illegalState('impossible');
             case 1:
                 this._currentChordStatusMessage = this._notificationService.status(( localize(
-                    1903,
+                    1915,
                     "({0}) was pressed. Waiting for second key of chord...",
                     keypressLabel
                 )));
@@ -117,7 +117,7 @@ class AbstractKeybindingService extends Disposable {
             default: {
                 const fullKeypressLabel = ( this._currentChords.map(({ label }) => label)).join(', ');
                 this._currentChordStatusMessage = this._notificationService.status(( localize(
-                    1904,
+                    1916,
                     "({0}) was pressed. Waiting for next key of chord...",
                     fullKeypressLabel
                 )));
@@ -222,7 +222,7 @@ class AbstractKeybindingService extends Disposable {
                     const currentChordsLabel = ( this._currentChords.map(({ label }) => label)).join(', ');
                     this._log(`+ Leaving multi-chord mode: Nothing bound to "${currentChordsLabel}, ${keypressLabel}".`);
                     this._notificationService.status(( localize(
-                        1905,
+                        1917,
                         "The key combination ({0}, {1}) is not a command.",
                         currentChordsLabel,
                         keypressLabel
@@ -246,7 +246,7 @@ class AbstractKeybindingService extends Disposable {
                         const currentChordsLabel = ( this._currentChords.map(({ label }) => label)).join(', ');
                         this._log(`+ Leaving chord mode: Nothing bound to "${currentChordsLabel}, ${keypressLabel}".`);
                         this._notificationService.status(( localize(
-                            1905,
+                            1917,
                             "The key combination ({0}, {1}) is not a command.",
                             currentChordsLabel,
                             keypressLabel