@codingame/monaco-vscode-extensions-service-override 30.0.1 → 31.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "30.0.1",
+  "version": "31.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - extensions service-override",
   "keywords": [],
@@ -15,8 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "30.0.1",
-    "@codingame/monaco-vscode-files-service-override": "30.0.1"
+    "@codingame/monaco-vscode-api": "31.0.0",
+    "@codingame/monaco-vscode-files-service-override": "31.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -24,4 +24,5 @@ export declare class ExtensionManagementCLI {
     uninstallExtensions(extensions: (string | URI)[], force: boolean, profileLocation?: URI): Promise<void>;
     locateExtension(extensions: string[]): Promise<void>;
     private notInstalled;
+    private validateBuiltinExtensionEnabledWithAutoUpdates;
 }

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

@@ -13,9 +13,9 @@ import { getIdAndVersion, areSameExtensions, getGalleryExtensionId, getExtension
 import { ExtensionType, EXTENSION_CATEGORIES } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 
-const notFound = id => ( localize(1885, "Extension '{0}' not found.", id));
+const notFound = id => ( localize(1886, "Extension '{0}' not found.", id));
 const useId = ( localize(
-    1886,
+    1887,
     "Make sure you use the full extension ID, including the publisher, e.g.: {0}",
     "ms-dotnettools.csharp"
 ));
@@ -62,7 +62,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             return;
         }
         if (this.location) {
-            this.logger.info(( localize(1887, "Extensions installed on {0}:", this.location)));
+            this.logger.info(( localize(1888, "Extensions installed on {0}:", this.location)));
         }
         extensions = extensions.sort((e1, e2) => e1.identifier.id.localeCompare(e2.identifier.id));
         let lastId = undefined;
@@ -77,7 +77,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         const failed = [];
         try {
             if (extensions.length) {
-                this.logger.info(this.location ? ( localize(1888, "Installing extensions on {0}...", this.location)) : ( localize(1889, "Installing extensions...")));
+                this.logger.info(this.location ? ( localize(1889, "Installing extensions on {0}...", this.location)) : ( localize(1890, "Installing extensions...")));
             }
             const installVSIXInfos = [];
             const installExtensionInfos = [];
@@ -142,11 +142,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                 failed.push(...failedGalleryExtensions);
             }
         } catch (error) {
-            this.logger.error(( localize(1890, "Error while installing extensions: {0}", getErrorMessage(error))));
+            this.logger.error(( localize(1891, "Error while installing extensions: {0}", getErrorMessage(error))));
             throw error;
         }
         if (failed.length) {
-            throw ( new Error(( localize(1891, "Failed Installing Extensions: {0}", failed.join(", ")))));
+            throw ( new Error(( localize(1892, "Failed Installing Extensions: {0}", failed.join(", ")))));
         }
     }
     async updateExtensions(profileLocation) {
@@ -161,7 +161,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         this.logger.trace(( localize(
-            1892,
+            1893,
             "Fetching latest versions for {0} extensions",
             installedExtensionsQuery.length
         )));
@@ -185,11 +185,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         if (!extensionsToUpdate.length) {
-            this.logger.info(( localize(1893, "No extension to update")));
+            this.logger.info(( localize(1894, "No extension to update")));
             return;
         }
         this.logger.info(( localize(
-            1894,
+            1895,
             "Updating extensions: {0}",
             ( extensionsToUpdate.map(ext => ext.extension.identifier.id)).join(", ")
         )));
@@ -197,14 +197,14 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         for (const extensionResult of installationResult) {
             if (extensionResult.error) {
                 this.logger.error(( localize(
-                    1895,
+                    1896,
                     "Error while updating extension {0}: {1}",
                     extensionResult.identifier.id,
                     getErrorMessage(extensionResult.error)
                 )));
             } else {
                 this.logger.info(( localize(
-                    1896,
+                    1897,
                     "Extension '{0}' v{1} was successfully updated.",
                     extensionResult.identifier.id,
                     extensionResult.local?.manifest.version
@@ -223,9 +223,14 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                 id
             }));
             if (installedExtension) {
+                const builtinAutoUpdateMessage = this.validateBuiltinExtensionEnabledWithAutoUpdates(installedExtension);
+                if (builtinAutoUpdateMessage) {
+                    this.logger.info(builtinAutoUpdateMessage);
+                    return false;
+                }
                 if (!force && (!version || (version === "prerelease" && installedExtension.preRelease))) {
                     this.logger.info(( localize(
-                        1897,
+                        1898,
                         "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,
@@ -234,7 +239,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                     return false;
                 }
                 if (version && installedExtension.manifest.version === version) {
-                    this.logger.info(( localize(1898, "Extension '{0}' is already installed.", `${id}@${version}`)));
+                    this.logger.info(( localize(1899, "Extension '{0}' is already installed.", `${id}@${version}`)));
                     return false;
                 }
                 if (installedExtension.preRelease && version !== "prerelease") {
@@ -276,23 +281,23 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (installedExtension) {
                 if (gallery.version === installedExtension.manifest.version) {
                     this.logger.info(( localize(
-                        1898,
+                        1899,
                         "Extension '{0}' is already installed.",
                         version ? `${id}@${version}` : id
                     )));
                     return;
                 }
                 this.logger.info(( localize(
-                    1899,
+                    1900,
                     "Updating the extension '{0}' to the version {1}",
                     id,
                     gallery.version
                 )));
             }
             if (installOptions.isBuiltin) {
-                this.logger.info(version ? ( localize(1900, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(1901, "Installing builtin extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(1901, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(1902, "Installing builtin extension '{0}'...", id)));
             } else {
-                this.logger.info(version ? ( localize(1902, "Installing extension '{0}' v{1}...", id, version)) : ( localize(1903, "Installing extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(1903, "Installing extension '{0}' v{1}...", id, version)) : ( localize(1904, "Installing extension '{0}'...", id)));
             }
             extensionsToInstall.push({
                 extension: gallery,
@@ -308,7 +313,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             for (const extensionResult of installationResult) {
                 if (extensionResult.error) {
                     this.logger.error(( localize(
-                        1904,
+                        1905,
                         "Error while installing extension {0}: {1}",
                         extensionResult.identifier.id,
                         getErrorMessage(extensionResult.error)
@@ -316,7 +321,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                     failed.push(extensionResult.identifier.id);
                 } else {
                     this.logger.info(( localize(
-                        1905,
+                        1906,
                         "Extension '{0}' v{1} was successfully installed.",
                         extensionResult.identifier.id,
                         extensionResult.local?.manifest.version
@@ -338,10 +343,10 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                     ...installOptions,
                     installGivenVersion: true
                 });
-                this.logger.info(( localize(1906, "Extension '{0}' was successfully installed.", basename(vsix))));
+                this.logger.info(( localize(1907, "Extension '{0}' was successfully installed.", basename(vsix))));
             } catch (error) {
                 if (isCancellationError(error)) {
-                    this.logger.info(( localize(1907, "Cancelled installing extension '{0}'.", basename(vsix))));
+                    this.logger.info(( localize(1908, "Cancelled installing extension '{0}'.", basename(vsix))));
                 } else {
                     throw error;
                 }
@@ -375,23 +380,28 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         return true;
     }
     async validateVSIX(manifest, force, profileLocation, installedExtensions) {
-        if (!force) {
-            const extensionIdentifier = {
-                id: getGalleryExtensionId(manifest.publisher, manifest.name)
-            };
-            const newer = installedExtensions.find(
-                local => areSameExtensions(extensionIdentifier, local.identifier) && semverExports.gt(local.manifest.version, manifest.version)
-            );
-            if (newer) {
-                this.logger.info(( localize(
-                    1908,
-                    "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,
-                    manifest.version
-                )));
+        const extensionIdentifier = {
+            id: getGalleryExtensionId(manifest.publisher, manifest.name)
+        };
+        const existingExtension = installedExtensions.find(local => areSameExtensions(extensionIdentifier, local.identifier));
+        if (existingExtension) {
+            const builtinAutoUpdateMessage = this.validateBuiltinExtensionEnabledWithAutoUpdates(existingExtension);
+            if (builtinAutoUpdateMessage) {
+                this.logger.info(builtinAutoUpdateMessage);
                 return false;
             }
+            if (!force) {
+                if (semverExports.gt(existingExtension.manifest.version, manifest.version)) {
+                    this.logger.info(( localize(
+                        1909,
+                        "A newer version of extension '{0}' v{1} is already installed. Use '--force' option to downgrade to older version.",
+                        existingExtension.identifier.id,
+                        existingExtension.manifest.version,
+                        manifest.version
+                    )));
+                    return false;
+                }
+            }
         }
         return this.validateExtensionKind(manifest);
     }
@@ -414,7 +424,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (( extensionsToUninstall.some(e => e.type === ExtensionType.System))) {
                 this.logger.info(( localize(
-                    1909,
+                    1910,
                     "Extension '{0}' is a Built-in extension and cannot be uninstalled",
                     id
                 )));
@@ -422,13 +432,13 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (!force && ( extensionsToUninstall.some(e => e.isBuiltin))) {
                 this.logger.info(( localize(
-                    1910,
+                    1911,
                     "Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.",
                     id
                 )));
                 return;
             }
-            this.logger.info(( localize(1911, "Uninstalling {0}...", id)));
+            this.logger.info(( localize(1912, "Uninstalling {0}...", id)));
             for (const extensionToUninstall of extensionsToUninstall) {
                 await this.extensionManagementService.uninstall(extensionToUninstall, {
                     profileLocation
@@ -436,13 +446,13 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (this.location) {
                 this.logger.info(( localize(
-                    1912,
+                    1913,
                     "Extension '{0}' was successfully uninstalled from {1}!",
                     id,
                     this.location
                 )));
             } else {
-                this.logger.info(( localize(1913, "Extension '{0}' was successfully uninstalled!", id)));
+                this.logger.info(( localize(1914, "Extension '{0}' was successfully uninstalled!", id)));
             }
         }
     }
@@ -460,7 +470,18 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         });
     }
     notInstalled(id) {
-        return this.location ? ( localize(1914, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(1915, "Extension '{0}' is not installed.", id));
+        return this.location ? ( localize(1915, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(1916, "Extension '{0}' is not installed.", id));
+    }
+    validateBuiltinExtensionEnabledWithAutoUpdates(extension) {
+        if (extension.isBuiltin && ( this.productService.builtInExtensionsEnabledWithAutoUpdates.some(e => e.toLowerCase() === extension.identifier.id.toLowerCase())) && !extension.forceAutoUpdate) {
+            return localize(
+                1917,
+                "Extension '{0}' is a built-in extension and not allowed to be updated in the current product quality '{1}'.",
+                extension.identifier.id,
+                this.productService.quality
+            );
+        }
+        return undefined;
     }
 };
 ExtensionManagementCLI = ( __decorate([( __param(2, IExtensionManagementService)), ( __param(3, IExtensionGalleryService)), ( __param(4, IProductService))], ExtensionManagementCLI));

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

@@ -141,11 +141,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         }));
         this._register(authenticationService.registerAuthenticationProviderHostDelegate({
             priority: extHostContext.extensionHostKind === ExtensionHostKind.LocalWebWorker ? 0 : 1,
-            create: async (authorizationServer, serverMetadata, resource) => {
+            create: async (authorizationServer, serverMetadata, resource, overrideClientId) => {
                 const authProviderId = resource ? `${( authorizationServer.toString(true))} ${resource.resource}` : ( authorizationServer.toString(true));
                 const clientDetails = await this.dynamicAuthProviderStorageService.getClientRegistration(authProviderId);
-                let clientId = clientDetails?.clientId;
-                const clientSecret = clientDetails?.clientSecret;
+                let clientId = overrideClientId ?? clientDetails?.clientId;
+                const clientSecret = overrideClientId ? undefined : clientDetails?.clientSecret;
                 let initialTokens = undefined;
                 if (clientId) {
                     initialTokens = await this.dynamicAuthProviderStorageService.getSessionsForDynamicAuthProvider(authProviderId, clientId);
@@ -245,8 +245,8 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         return await deferredPromise.p;
     }
     $showContinueNotification(message) {
-        const yes = ( localize(2528, "Yes"));
-        const no = ( localize(2529, "No"));
+        const yes = ( localize(2523, "Yes"));
+        const no = ( localize(2524, "No"));
         const deferredPromise = ( new DeferredPromise());
         let result = false;
         const handle = this.notificationService.prompt(Severity.Warning, message, [{
@@ -302,26 +302,26 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             message = customMessage;
         } else {
             message = recreatingSession ? ( localize(
-                2530,
+                2525,
                 "The extension '{0}' wants you to sign in again using {1}.",
                 extensionName,
                 provider.label
             )) : ( localize(
-                2531,
+                2526,
                 "The extension '{0}' wants to sign in using {1}.",
                 extensionName,
                 provider.label
             ));
         }
         const buttons = [{
-            label: ( localize(2532, "&&Allow")),
+            label: ( localize(2527, "&&Allow")),
             run() {
                 return true;
             }
         }];
         if (options?.learnMore) {
             buttons.push({
-                label: ( localize(2533, "Learn more")),
+                label: ( localize(2528, "Learn more")),
                 run: async () => {
                     const result = this.loginPrompt(provider, extensionName, recreatingSession, options);
                     await this.openerService.open(URI.revive(options.learnMore), {
@@ -344,9 +344,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2534, "Incorrect account detected")),
+            message: ( localize(2529, "Incorrect account detected")),
             detail: ( localize(
-                2535,
+                2530,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -354,10 +354,10 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             type: Severity.Warning,
             cancelButton: true,
             buttons: [{
-                label: ( localize(2536, "Keep {0}", chosenAccountLabel)),
+                label: ( localize(2531, "Keep {0}", chosenAccountLabel)),
                 run: () => chosenAccountLabel
             }, {
-                label: ( localize(2537, "Login with {0}", requestedAccountLabel)),
+                label: ( localize(2532, "Login with {0}", requestedAccountLabel)),
                 run: () => requestedAccountLabel
             }]
         });
@@ -510,15 +510,15 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             result
         } = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(2538, "Device Code Authentication")),
+            message: ( localize(2533, "Device Code Authentication")),
             detail: ( localize(
-                2539,
+                2534,
                 "Your code: {0}\n\nTo complete authentication, navigate to {1} and enter the code above.",
                 userCode,
                 verificationUri
             )),
             buttons: [{
-                label: ( localize(2540, "Copy & Continue")),
+                label: ( localize(2535, "Copy & Continue")),
                 run: () => true
             }],
             cancelButton: true
@@ -528,7 +528,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                 await this.clipboardService.writeText(userCode);
                 return await this.openerService.open(( URI.parse(verificationUri)));
             } catch (error) {
-                this.notificationService.error(( localize(2541, "Failed to open {0}", verificationUri)));
+                this.notificationService.error(( localize(2536, "Failed to open {0}", verificationUri)));
             }
         }
         return false;
@@ -537,44 +537,44 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         const redirectUrls = "http://127.0.0.1:33418\nhttps://vscode.dev/redirect";
         const result = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(2542, "Dynamic Client Registration not supported")),
+            message: ( localize(2537, "Dynamic Client Registration not supported")),
             detail: ( localize(
-                2543,
+                2538,
                 "The authorization server '{0}' does not support automatic client registration. Do you want to proceed by manually providing a client registration (client ID)?\n\nNote: When registering your OAuth application, make sure to include these redirect URIs:\n{1}",
                 authorizationServerUrl,
                 redirectUrls
             )),
             buttons: [{
-                label: ( localize(2544, "Copy URIs & Proceed")),
+                label: ( localize(2539, "Copy URIs & Proceed")),
                 run: async () => {
                     try {
                         await this.clipboardService.writeText(redirectUrls);
                     } catch (error) {
-                        this.notificationService.error(( localize(2545, "Failed to copy redirect URIs to clipboard.")));
+                        this.notificationService.error(( localize(2540, "Failed to copy redirect URIs to clipboard.")));
                     }
                     return true;
                 }
             }],
             cancelButton: {
-                label: ( localize(2546, "Cancel")),
+                label: ( localize(2541, "Cancel")),
                 run: () => false
             }
         });
         if (!result) {
             return undefined;
         }
-        const sharedTitle = ( localize(2547, "Add Client Registration Details"));
+        const sharedTitle = ( localize(2542, "Add Client Registration Details"));
         const clientId = await this.quickInputService.input({
             title: sharedTitle,
             prompt: ( localize(
-                2548,
+                2543,
                 "Enter an existing client ID that has been registered with the following redirect URIs: http://127.0.0.1:33418, https://vscode.dev/redirect"
             )),
-            placeHolder: ( localize(2549, "OAuth client ID (azye39d...)")),
+            placeHolder: ( localize(2544, "OAuth client ID (azye39d...)")),
             ignoreFocusLost: true,
             validateInput: async value => {
                 if (!value || value.trim().length === 0) {
-                    return localize(2550, "Client ID is required");
+                    return localize(2545, "Client ID is required");
                 }
                 return undefined;
             }
@@ -585,11 +585,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         const clientSecret = await this.quickInputService.input({
             title: sharedTitle,
             prompt: ( localize(
-                2551,
+                2546,
                 "(optional) Enter an existing client secret associated with the client id '{0}' or leave this field blank",
                 clientId
             )),
-            placeHolder: ( localize(2552, "OAuth client secret (wer32o50f...) or leave it blank")),
+            placeHolder: ( localize(2547, "OAuth client secret (wer32o50f...) or leave it blank")),
             password: true,
             ignoreFocusLost: true
         });

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

@@ -5,12 +5,12 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { IBrowserViewCDPService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/browserView/common/browserView.service';
-import { BrowserViewUri } from '../../../platform/browserView/common/browserViewUri.js';
+import { BrowserViewUri } from '@codingame/monaco-vscode-api/vscode/vs/platform/browserView/common/browserViewUri';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { columnToEditorGroup } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { BrowserEditorInput } from '../../contrib/browserView/common/browserEditorInput.js';
+import { BrowserEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/browserView/common/browserEditorInput';
 
 let MainThreadBrowsers = class MainThreadBrowsers extends Disposable {
     constructor(

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

@@ -108,7 +108,7 @@ let RemoteExtensionManagementCLI = class RemoteExtensionManagementCLI extends Ex
         if (
         !this._extensionManifestPropertiesService.canExecuteOnWorkspace(manifest) && !(isWeb && this._extensionManifestPropertiesService.canExecuteOnWeb(manifest))) {
             this.logger.info(( localize(
-                2553,
+                2548,
                 "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.d.ts

@@ -1,4 +1,5 @@
 import { DeferredPromise } from "@codingame/monaco-vscode-api/vscode/vs/base/common/async";
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
@@ -7,6 +8,7 @@ import { ILanguageFeaturesService } from "@codingame/monaco-vscode-api/vscode/vs
 import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service";
@@ -18,9 +20,10 @@ import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { Dto } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier";
-import { IChatSessionCustomizationProviderMetadataDto, IChatProgressDto, IDynamicChatAgentProps, IExtensionChatAgentMetadata, MainThreadChatAgentsShape2 } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+import { IChatSessionCustomizationProviderMetadataDto, IChatProgressDto, ICustomAgentDto, IDynamicChatAgentProps, IExtensionChatAgentMetadata, IHookDto, IInstructionDto, IPluginDto, ISkillDto, ISlashCommandDto, MainThreadChatAgentsShape2 } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { ICustomizationHarnessService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService.service";
-import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IAgentPluginService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service";
+import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 export declare class MainThreadChatTask implements IChatTask {
     content: IMarkdownString;
     readonly kind = "progressTask";
@@ -48,7 +51,9 @@ export declare class MainThreadChatAgents2 extends Disposable implements MainThr
     private readonly _promptsService;
     private readonly _languageModelToolsService;
     private readonly _customizationHarnessService;
-    private readonly _configurationService;
+    private readonly _telemetryService;
+    private readonly _agentPluginService;
+    private readonly _environmentService;
     private readonly _agents;
     private readonly _agentCompletionProviders;
     private readonly _agentIdsToCompletionProviders;
@@ -62,11 +67,21 @@ export declare class MainThreadChatAgents2 extends Disposable implements MainThr
     private readonly _proxy;
     private readonly _activeTasks;
     private readonly _unresolvedAnchors;
-    constructor(extHostContext: IExtHostContext, _chatAgentService: IChatAgentService, _chatSessionService: IChatSessionsService, _chatService: IChatService, _languageFeaturesService: ILanguageFeaturesService, _chatWidgetService: IChatWidgetService, _instantiationService: IInstantiationService, _logService: ILogService, _extensionService: IExtensionService, _uriIdentityService: IUriIdentityService, _promptsService: IPromptsService, _languageModelToolsService: ILanguageModelToolsService, _customizationHarnessService: ICustomizationHarnessService, _configurationService: IConfigurationService);
+    constructor(extHostContext: IExtHostContext, _chatAgentService: IChatAgentService, _chatSessionService: IChatSessionsService, _chatService: IChatService, _languageFeaturesService: ILanguageFeaturesService, _chatWidgetService: IChatWidgetService, _instantiationService: IInstantiationService, _logService: ILogService, _extensionService: IExtensionService, _uriIdentityService: IUriIdentityService, _promptsService: IPromptsService, _languageModelToolsService: ILanguageModelToolsService, _customizationHarnessService: ICustomizationHarnessService, _telemetryService: ITelemetryService, _agentPluginService: IAgentPluginService, _environmentService: IWorkbenchEnvironmentService);
     private _acceptActiveChatSession;
-    private _pushCustomAgents;
-    private _pushInstructions;
-    private _pushSkills;
+    private _toChatResourceSource;
+    private _toCustomAgentDto;
+    private _toInstructionDto;
+    private _toSkillDto;
+    private _toSlashCommandDto;
+    private _toHookDto;
+    private _toPluginDto;
+    $provideCustomAgents(token: CancellationToken): Promise<ICustomAgentDto[]>;
+    $provideInstructions(token: CancellationToken): Promise<IInstructionDto[]>;
+    $provideSkills(token: CancellationToken): Promise<ISkillDto[]>;
+    $provideSlashCommands(token: CancellationToken): Promise<ISlashCommandDto[]>;
+    $provideHooks(token: CancellationToken): Promise<IHookDto[]>;
+    $providePlugins(_token: CancellationToken): Promise<IPluginDto[]>;
     $unregisterAgent(handle: number): void;
     $transferActiveChatSession(toWorkspace: UriComponents): Promise<void>;
     $registerAgent(handle: number, extension: ExtensionIdentifier, id: string, metadata: IExtensionChatAgentMetadata, dynamicProps: IDynamicChatAgentProps | undefined): Promise<void>;