@codingame/monaco-vscode-extensions-service-override 15.0.3 → 16.0.1

package/index.js

@@ -127,6 +127,8 @@ import './vscode/src/vs/workbench/api/browser/mainThreadShare.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadProfileContentHandlers.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadAiRelatedInformation.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadAiEmbeddingVector.js';
+import './vscode/src/vs/workbench/api/browser/mainThreadMcp.js';
+import './vscode/src/vs/workbench/api/browser/mainThreadChatStatus.js';
 
 let localExtensionHost;
 function setLocalExtensionHost(_localExtensionHost) {
@@ -238,7 +240,7 @@ class ExtensionResourceLoaderServiceOverride extends ExtensionResourceLoaderServ
 }
 let iframeAlternateDomain;
 registerAssets({
-    'vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html': () => changeUrlDomain(new URL('./assets/webWorkerExtensionHostIframe.html', import.meta.url).href, iframeAlternateDomain)
+    'vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html': () => changeUrlDomain(new URL('./vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html', import.meta.url).href, iframeAlternateDomain)
 });
 function getServiceOverride(workerConfig, _iframeAlternateDomain) {
     if (_iframeAlternateDomain != null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "15.0.3",
+  "version": "16.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - extensions service-override",
   "keywords": [],
@@ -15,33 +15,37 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-0b087f42-a5a3-5eb9-9bfd-1eebc1bba163-common": "15.0.3",
-    "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common": "15.0.3",
-    "@codingame/monaco-vscode-168b98e5-dc20-5807-b1f9-798f1f92b37f-common": "15.0.3",
-    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "15.0.3",
-    "@codingame/monaco-vscode-3607c442-ae7a-594b-b840-038378c24fef-common": "15.0.3",
-    "@codingame/monaco-vscode-38f25ab8-ea30-5ba9-8a08-ae3308c297c0-common": "15.0.3",
-    "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "15.0.3",
-    "@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common": "15.0.3",
-    "@codingame/monaco-vscode-6845754f-e617-5ed9-8aaa-6ca3653a9532-common": "15.0.3",
-    "@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common": "15.0.3",
-    "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "15.0.3",
-    "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common": "15.0.3",
-    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "15.0.3",
-    "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common": "15.0.3",
-    "@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common": "15.0.3",
-    "@codingame/monaco-vscode-ad89fae6-94f0-5ac2-a185-22dea4b68ee0-common": "15.0.3",
-    "@codingame/monaco-vscode-aff8bc9b-c6f8-578f-9c8a-f70d14f9c13c-common": "15.0.3",
-    "@codingame/monaco-vscode-api": "15.0.3",
-    "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common": "15.0.3",
-    "@codingame/monaco-vscode-bd6ad8b7-9db3-51a8-9895-0046508c029d-common": "15.0.3",
-    "@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common": "15.0.3",
-    "@codingame/monaco-vscode-bf94ddb5-e436-506a-9763-5ab86b642508-common": "15.0.3",
-    "@codingame/monaco-vscode-d7f659f5-da33-5ea8-a3b8-9b94f2cf5f33-common": "15.0.3",
-    "@codingame/monaco-vscode-eb7d5efd-2e60-59f8-9ba4-9a8ae8cb2957-common": "15.0.3",
-    "@codingame/monaco-vscode-eba0b9b3-174c-5dae-9867-a37810ca1808-common": "15.0.3",
-    "@codingame/monaco-vscode-fdf643f9-94dd-5510-b97a-408abf26ad92-common": "15.0.3",
-    "@codingame/monaco-vscode-files-service-override": "15.0.3"
+    "@codingame/monaco-vscode-0b087f42-a5a3-5eb9-9bfd-1eebc1bba163-common": "16.0.1",
+    "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common": "16.0.1",
+    "@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common": "16.0.1",
+    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "16.0.1",
+    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": "16.0.1",
+    "@codingame/monaco-vscode-3607c442-ae7a-594b-b840-038378c24fef-common": "16.0.1",
+    "@codingame/monaco-vscode-38f25ab8-ea30-5ba9-8a08-ae3308c297c0-common": "16.0.1",
+    "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "16.0.1",
+    "@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common": "16.0.1",
+    "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common": "16.0.1",
+    "@codingame/monaco-vscode-6845754f-e617-5ed9-8aaa-6ca3653a9532-common": "16.0.1",
+    "@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common": "16.0.1",
+    "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "16.0.1",
+    "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common": "16.0.1",
+    "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common": "16.0.1",
+    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "16.0.1",
+    "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common": "16.0.1",
+    "@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common": "16.0.1",
+    "@codingame/monaco-vscode-ad89fae6-94f0-5ac2-a185-22dea4b68ee0-common": "16.0.1",
+    "@codingame/monaco-vscode-aff8bc9b-c6f8-578f-9c8a-f70d14f9c13c-common": "16.0.1",
+    "@codingame/monaco-vscode-api": "16.0.1",
+    "@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-common": "16.0.1",
+    "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common": "16.0.1",
+    "@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common": "16.0.1",
+    "@codingame/monaco-vscode-bf94ddb5-e436-506a-9763-5ab86b642508-common": "16.0.1",
+    "@codingame/monaco-vscode-d7f659f5-da33-5ea8-a3b8-9b94f2cf5f33-common": "16.0.1",
+    "@codingame/monaco-vscode-eb7d5efd-2e60-59f8-9ba4-9a8ae8cb2957-common": "16.0.1",
+    "@codingame/monaco-vscode-eba0b9b3-174c-5dae-9867-a37810ca1808-common": "16.0.1",
+    "@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common": "16.0.1",
+    "@codingame/monaco-vscode-fdf643f9-94dd-5510-b97a-408abf26ad92-common": "16.0.1",
+    "@codingame/monaco-vscode-files-service-override": "16.0.1"
   },
   "main": "index.js",
   "module": "index.js",
@@ -50,6 +54,9 @@
     ".": {
       "default": "./index.js"
     },
+    "./vscode/*.css": {
+      "default": "./vscode/src/*.css"
+    },
     "./vscode/*": {
       "types": "./vscode/src/*.d.ts",
       "default": "./vscode/src/*.js"

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

@@ -12,9 +12,9 @@ import { IExtensionManagementService, IExtensionGalleryService } from '@codingam
 import { getIdAndVersion, areSameExtensions, getGalleryExtensionId, getExtensionId } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { ExtensionType, EXTENSION_CATEGORIES } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 
-const notFound = (id) => ( localize(1736, "Extension '{0}' not found.", id));
+const notFound = (id) => ( localize(1771, "Extension '{0}' not found.", id));
 const useId = ( localize(
-    1737,
+    1772,
     "Make sure you use the full extension ID, including the publisher, e.g.: {0}",
     'ms-dotnettools.csharp'
 ));
@@ -51,7 +51,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             return;
         }
         if (this.location) {
-            this.logger.info(( localize(1738, "Extensions installed on {0}:", this.location)));
+            this.logger.info(( localize(1773, "Extensions installed on {0}:", this.location)));
         }
         extensions = extensions.sort((e1, e2) => e1.identifier.id.localeCompare(e2.identifier.id));
         let lastId = undefined;
@@ -66,7 +66,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         const failed = [];
         try {
             if (extensions.length) {
-                this.logger.info(this.location ? ( localize(1739, "Installing extensions on {0}...", this.location)) : ( localize(1740, "Installing extensions...")));
+                this.logger.info(this.location ? ( localize(1774, "Installing extensions on {0}...", this.location)) : ( localize(1775, "Installing extensions...")));
             }
             const installVSIXInfos = [];
             const installExtensionInfos = [];
@@ -109,11 +109,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         catch (error) {
-            this.logger.error(( localize(1741, "Error while installing extensions: {0}", getErrorMessage(error))));
+            this.logger.error(( localize(1776, "Error while installing extensions: {0}", getErrorMessage(error))));
             throw error;
         }
         if (failed.length) {
-            throw ( new Error(( localize(1742, "Failed Installing Extensions: {0}", failed.join(', ')))));
+            throw ( new Error(( localize(1777, "Failed Installing Extensions: {0}", failed.join(', ')))));
         }
     }
     async updateExtensions(profileLocation) {
@@ -125,7 +125,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         this.logger.trace(( localize(
-            1743,
+            1778,
             "Fetching latest versions for {0} extensions",
             installedExtensionsQuery.length
         )));
@@ -142,11 +142,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         if (!extensionsToUpdate.length) {
-            this.logger.info(( localize(1744, "No extension to update")));
+            this.logger.info(( localize(1779, "No extension to update")));
             return;
         }
         this.logger.info(( localize(
-            1745,
+            1780,
             "Updating extensions: {0}",
             ( extensionsToUpdate.map(ext => ext.extension.identifier.id)).join(', ')
         )));
@@ -154,7 +154,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         for (const extensionResult of installationResult) {
             if (extensionResult.error) {
                 this.logger.error(( localize(
-                    1746,
+                    1781,
                     "Error while updating extension {0}: {1}",
                     extensionResult.identifier.id,
                     getErrorMessage(extensionResult.error)
@@ -162,7 +162,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             else {
                 this.logger.info(( localize(
-                    1747,
+                    1782,
                     "Extension '{0}' v{1} was successfully updated.",
                     extensionResult.identifier.id,
                     extensionResult.local?.manifest.version
@@ -171,12 +171,13 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         }
     }
     async installGalleryExtensions(installExtensionInfos, installed, force) {
-        installExtensionInfos = installExtensionInfos.filter(({ id, version }) => {
+        installExtensionInfos = installExtensionInfos.filter(installExtensionInfo => {
+            const { id, version, installOptions } = installExtensionInfo;
             const installedExtension = installed.find(i => areSameExtensions(i.identifier, { id }));
             if (installedExtension) {
                 if (!force && (!version || (version === 'prerelease' && installedExtension.preRelease))) {
                     this.logger.info(( localize(
-                        1748,
+                        1783,
                         "Extension '{0}' v{1} is already installed. Use '--force' option to update to latest version or provide '@<version>' to install a specific version, for example: '{2}@1.2.3'.",
                         id,
                         installedExtension.manifest.version,
@@ -185,9 +186,12 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                     return false;
                 }
                 if (version && installedExtension.manifest.version === version) {
-                    this.logger.info(( localize(1749, "Extension '{0}' is already installed.", `${id}@${version}`)));
+                    this.logger.info(( localize(1784, "Extension '{0}' is already installed.", `${id}@${version}`)));
                     return false;
                 }
+                if (installedExtension.preRelease && version !== 'prerelease') {
+                    installOptions.preRelease = false;
+                }
             }
             return true;
         });
@@ -219,24 +223,24 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (installedExtension) {
                 if (gallery.version === installedExtension.manifest.version) {
                     this.logger.info(( localize(
-                        1749,
+                        1784,
                         "Extension '{0}' is already installed.",
                         version ? `${id}@${version}` : id
                     )));
                     return;
                 }
                 this.logger.info(( localize(
-                    1750,
+                    1785,
                     "Updating the extension '{0}' to the version {1}",
                     id,
                     gallery.version
                 )));
             }
             if (installOptions.isBuiltin) {
-                this.logger.info(version ? ( localize(1751, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(1752, "Installing builtin extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(1786, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(1787, "Installing builtin extension '{0}'...", id)));
             }
             else {
-                this.logger.info(version ? ( localize(1753, "Installing extension '{0}' v{1}...", id, version)) : ( localize(1754, "Installing extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(1788, "Installing extension '{0}' v{1}...", id, version)) : ( localize(1789, "Installing extension '{0}'...", id)));
             }
             extensionsToInstall.push({
                 extension: gallery,
@@ -248,7 +252,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             for (const extensionResult of installationResult) {
                 if (extensionResult.error) {
                     this.logger.error(( localize(
-                        1755,
+                        1790,
                         "Error while installing extension {0}: {1}",
                         extensionResult.identifier.id,
                         getErrorMessage(extensionResult.error)
@@ -257,7 +261,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                 }
                 else {
                     this.logger.info(( localize(
-                        1756,
+                        1791,
                         "Extension '{0}' v{1} was successfully installed.",
                         extensionResult.identifier.id,
                         extensionResult.local?.manifest.version
@@ -276,11 +280,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         if (valid) {
             try {
                 await this.extensionManagementService.install(vsix, { ...installOptions, installGivenVersion: true });
-                this.logger.info(( localize(1757, "Extension '{0}' was successfully installed.", basename(vsix))));
+                this.logger.info(( localize(1792, "Extension '{0}' was successfully installed.", basename(vsix))));
             }
             catch (error) {
                 if (isCancellationError(error)) {
-                    this.logger.info(( localize(1758, "Cancelled installing extension '{0}'.", basename(vsix))));
+                    this.logger.info(( localize(1793, "Cancelled installing extension '{0}'.", basename(vsix))));
                 }
                 else {
                     throw error;
@@ -315,7 +319,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             const newer = installedExtensions.find(local => areSameExtensions(extensionIdentifier, local.identifier) && semverExports.gt(local.manifest.version, manifest.version));
             if (newer) {
                 this.logger.info(( localize(
-                    1759,
+                    1794,
                     "A newer version of extension '{0}' v{1} is already installed. Use '--force' option to downgrade to older version.",
                     newer.identifier.id,
                     newer.manifest.version,
@@ -343,7 +347,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (( extensionsToUninstall.some(e => e.type === ExtensionType.System))) {
                 this.logger.info(( localize(
-                    1760,
+                    1795,
                     "Extension '{0}' is a Built-in extension and cannot be uninstalled",
                     id
                 )));
@@ -351,26 +355,26 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (!force && ( extensionsToUninstall.some(e => e.isBuiltin))) {
                 this.logger.info(( localize(
-                    1761,
+                    1796,
                     "Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.",
                     id
                 )));
                 return;
             }
-            this.logger.info(( localize(1762, "Uninstalling {0}...", id)));
+            this.logger.info(( localize(1797, "Uninstalling {0}...", id)));
             for (const extensionToUninstall of extensionsToUninstall) {
                 await this.extensionManagementService.uninstall(extensionToUninstall, { profileLocation });
             }
             if (this.location) {
                 this.logger.info(( localize(
-                    1763,
+                    1798,
                     "Extension '{0}' was successfully uninstalled from {1}!",
                     id,
                     this.location
                 )));
             }
             else {
-                this.logger.info(( localize(1764, "Extension '{0}' was successfully uninstalled!", id)));
+                this.logger.info(( localize(1799, "Extension '{0}' was successfully uninstalled!", id)));
             }
         }
     }
@@ -388,7 +392,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         });
     }
     notInstalled(id) {
-        return this.location ? ( localize(1765, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(1766, "Extension '{0}' is not installed.", id));
+        return this.location ? ( localize(1800, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(1801, "Extension '{0}' is not installed.", id));
     }
 };
 ExtensionManagementCLI = ( __decorate([

package/vscode/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.d.ts

@@ -6,9 +6,9 @@ import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/plat
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { AbstractExtensionResourceLoaderService } from "@codingame/monaco-vscode-d7f659f5-da33-5ea8-a3b8-9b94f2cf5f33-common/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader";
+import { IExtensionGalleryManifestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest.service";
 export declare class ExtensionResourceLoaderService extends AbstractExtensionResourceLoaderService {
-    private readonly _logService;
     readonly _serviceBrand: undefined;
-    constructor(fileService: IFileService, storageService: IStorageService, productService: IProductService, environmentService: IEnvironmentService, configurationService: IConfigurationService, _logService: ILogService);
+    constructor(fileService: IFileService, storageService: IStorageService, productService: IProductService, environmentService: IEnvironmentService, configurationService: IConfigurationService, extensionGalleryManifestService: IExtensionGalleryManifestService, logService: ILogService);
     readExtensionResource(uri: URI): Promise<string>;
 }

package/vscode/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.js

@@ -10,11 +10,11 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { AbstractExtensionResourceLoaderService } from '@codingame/monaco-vscode-d7f659f5-da33-5ea8-a3b8-9b94f2cf5f33-common/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { IExtensionGalleryManifestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest.service';
 
 let ExtensionResourceLoaderService = class ExtensionResourceLoaderService extends AbstractExtensionResourceLoaderService {
-    constructor(fileService, storageService, productService, environmentService, configurationService, _logService) {
-        super(fileService, storageService, productService, environmentService, configurationService);
-        this._logService = _logService;
+    constructor(fileService, storageService, productService, environmentService, configurationService, extensionGalleryManifestService, logService) {
+        super(fileService, storageService, productService, environmentService, configurationService, extensionGalleryManifestService, logService);
     }
     async readExtensionResource(uri) {
         uri = FileAccess.uriToBrowserUri(uri);
@@ -23,7 +23,7 @@ let ExtensionResourceLoaderService = class ExtensionResourceLoaderService extend
             return ( result.value.toString());
         }
         const requestInit = {};
-        if (this.isExtensionGalleryResource(uri)) {
+        if (await this.isExtensionGalleryResource(uri)) {
             requestInit.headers = await this.getExtensionGalleryRequestHeaders();
             requestInit.mode = 'cors';
         }
@@ -41,7 +41,8 @@ ExtensionResourceLoaderService = ( __decorate([
     ( __param(2, IProductService)),
     ( __param(3, IEnvironmentService)),
     ( __param(4, IConfigurationService)),
-    ( __param(5, ILogService))
+    ( __param(5, IExtensionGalleryManifestService)),
+    ( __param(6, ILogService))
 ], ExtensionResourceLoaderService));
 
 export { ExtensionResourceLoaderService };

package/vscode/src/vs/platform/remote/common/managedSocket.d.ts

@@ -1,7 +1,7 @@
 import { VSBuffer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buffer";
 import { Emitter, Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ISocket, SocketCloseEvent, SocketDiagnosticsEventType } from "@codingame/monaco-vscode-bd6ad8b7-9db3-51a8-9895-0046508c029d-common/vscode/vs/base/parts/ipc/common/ipc.net";
+import { ISocket, SocketCloseEvent, SocketDiagnosticsEventType } from "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common/vscode/vs/base/parts/ipc/common/ipc.net";
 export declare const makeRawSocketHeaders: (path: string, query: string, deubgLabel: string) => string;
 export declare const socketRawEndHeaderSequence: VSBuffer;
 export interface RemoteSocketHalf {

package/vscode/src/vs/platform/remote/common/managedSocket.js

@@ -2,7 +2,7 @@
 import { encodeBase64, VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { PauseableEmitter, Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { DisposableStore, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { SocketDiagnostics } from '@codingame/monaco-vscode-bd6ad8b7-9db3-51a8-9895-0046508c029d-common/vscode/vs/base/parts/ipc/common/ipc.net';
+import { SocketDiagnostics } from '@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common/vscode/vs/base/parts/ipc/common/ipc.net';
 
 const makeRawSocketHeaders = (path, query, deubgLabel) => {
     const buffer = ( new Uint8Array(16));

package/vscode/src/vs/workbench/api/browser/mainThreadAuthentication.js

@@ -39,7 +39,7 @@ class MainThreadAuthenticationProvider extends Disposable {
     }
     async removeSession(sessionId) {
         await this._proxy.$removeSession(this.id, sessionId);
-        this.notificationService.info(( localize(2324, "Successfully signed out.")));
+        this.notificationService.info(( localize(2363, "Successfully signed out.")));
     }
 }
 let MainThreadAuthentication = class MainThreadAuthentication extends Disposable {
@@ -106,7 +106,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         let message;
         if (provider.id.startsWith(INTERNAL_AUTH_PROVIDER_PREFIX)) {
             message = ( localize(
-                2325,
+                2364,
                 "The extension '{0}' wants to access the language models provided by {1}.",
                 extensionName,
                 provider.label
@@ -115,13 +115,13 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         else {
             message = recreatingSession
                 ? ( localize(
-                2326,
+                2365,
                 "The extension '{0}' wants you to sign in again using {1}.",
                 extensionName,
                 provider.label
             ))
                 : ( localize(
-                2327,
+                2366,
                 "The extension '{0}' wants to sign in using {1}.",
                 extensionName,
                 provider.label
@@ -129,7 +129,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         }
         const buttons = [
             {
-                label: ( localize(2328, "&&Allow")),
+                label: ( localize(2367, "&&Allow")),
                 run() {
                     return true;
                 },
@@ -137,7 +137,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         ];
         if (options?.learnMore) {
             buttons.push({
-                label: ( localize(2329, "Learn more")),
+                label: ( localize(2368, "Learn more")),
                 run: async () => {
                     const result = this.loginPrompt(provider, extensionName, recreatingSession, options);
                     await this.openerService.open(URI.revive(options.learnMore), { allowCommands: true });
@@ -156,9 +156,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2330, "Incorrect account detected")),
+            message: ( localize(2369, "Incorrect account detected")),
             detail: ( localize(
-                2331,
+                2370,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -167,11 +167,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             cancelButton: true,
             buttons: [
                 {
-                    label: ( localize(2332, 'Keep {0}', chosenAccountLabel)),
+                    label: ( localize(2371, 'Keep {0}', chosenAccountLabel)),
                     run: () => chosenAccountLabel
                 },
                 {
-                    label: ( localize(2333, 'Login with {0}', requestedAccountLabel)),
+                    label: ( localize(2372, 'Login with {0}', requestedAccountLabel)),
                     run: () => requestedAccountLabel
                 }
             ],

package/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.js

@@ -92,7 +92,7 @@ let RemoteExtensionManagementCLI = class RemoteExtensionManagementCLI extends Ex
         if (!this._extensionManifestPropertiesService.canExecuteOnWorkspace(manifest)
             && !(isWeb && this._extensionManifestPropertiesService.canExecuteOnWeb(manifest))) {
             this.logger.info(( localize(
-                2334,
+                2373,
                 "Cannot install the '{0}' extension because it is declared to not run in this setup.",
                 getExtensionId(manifest.publisher, manifest.name)
             )));

package/vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.js

@@ -16,7 +16,6 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatInputPart } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
-import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
 import { ChatRequestAgentPart } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
@@ -26,7 +25,8 @@ import { extHostNamedCustomer } from '../../services/extensions/common/extHostCu
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { NotebookDto } from './mainThreadNotebookDto.js';
-import { addDynamicVariableActionId } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariablesConstant';
+import { addDynamicVariableActionId } from '@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariablesConstant';
+import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 
 class MainThreadChatTask {
     get onDidAddProgress() { return this._onDidAddProgress.event; }
@@ -103,8 +103,8 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
         }
         const inputValue = widget?.inputEditor.getValue() ?? '';
         const location = widget.location;
-        const toolsAgentModeEnabled = this._chatAgentService.toolsAgentModeEnabled;
-        this._chatService.transferChatSession({ sessionId, inputValue, location, toolsAgentModeEnabled }, URI.revive(toWorkspace));
+        const mode = widget.input.currentMode;
+        this._chatService.transferChatSession({ sessionId, inputValue, location, mode }, URI.revive(toWorkspace));
     }
     async $registerAgent(handle, extension, id, metadata, dynamicProps) {
         await this._extensionService.whenInstalledExtensionsRegistered();
@@ -136,9 +136,6 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                 }
                 return this._proxy.$provideFollowups(request, handle, result, { history }, token);
             },
-            provideWelcomeMessage: (token) => {
-                return this._proxy.$provideWelcomeMessage(handle, token);
-            },
             provideChatTitle: (history, token) => {
                 return this._proxy.$provideChatTitle(handle, history, token);
             },

package/vscode/src/vs/workbench/api/browser/mainThreadChatStatus.d.ts

@@ -0,0 +1,10 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IChatStatusItemService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatStatusItemService.service";
+import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { ChatStatusItemDto, MainThreadChatStatusShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+export declare class MainThreadChatStatus extends Disposable implements MainThreadChatStatusShape {
+    private readonly _chatStatusItemService;
+    constructor(_extHostContext: IExtHostContext, _chatStatusItemService: IChatStatusItemService);
+    $setEntry(id: string, entry: ChatStatusItemDto): void;
+    $disposeEntry(id: string): void;
+}

package/vscode/src/vs/workbench/api/browser/mainThreadChatStatus.js

@@ -0,0 +1,30 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { IChatStatusItemService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatStatusItemService.service';
+import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
+
+let MainThreadChatStatus = class MainThreadChatStatus extends Disposable {
+    constructor(_extHostContext, _chatStatusItemService) {
+        super();
+        this._chatStatusItemService = _chatStatusItemService;
+    }
+    $setEntry(id, entry) {
+        this._chatStatusItemService.setOrUpdateEntry({
+            id,
+            label: entry.title,
+            description: entry.description,
+            detail: entry.detail,
+        });
+    }
+    $disposeEntry(id) {
+        this._chatStatusItemService.deleteEntry(id);
+    }
+};
+MainThreadChatStatus = __decorate([
+    extHostNamedCustomer(MainContext.MainThreadChatStatus),
+    ( __param(1, IChatStatusItemService))
+], MainThreadChatStatus);
+
+export { MainThreadChatStatus };

package/vscode/src/vs/workbench/api/browser/mainThreadComments.d.ts

@@ -150,7 +150,9 @@ export declare class MainThreadComments extends Disposable implements MainThread
     private _commentControllers;
     private _activeEditingCommentThread?;
     private readonly _activeEditingCommentThreadDisposables;
-    private _openViewListener;
+    private readonly _openViewListener;
+    private readonly _onChangeContainerListener;
+    private readonly _onChangeContainerLocationListener;
     constructor(extHostContext: IExtHostContext, _commentService: ICommentService, _viewsService: IViewsService, _viewDescriptorService: IViewDescriptorService, _uriIdentityService: IUriIdentityService, _editorService: IEditorService);
     $registerCommentController(handle: number, id: string, label: string, extensionId: string): void;
     $unregisterCommentController(handle: number): void;