@codingame/monaco-vscode-extensions-service-override 33.0.9 → 34.0.0

package/index.js

@@ -145,6 +145,7 @@ import './vscode/src/vs/workbench/api/browser/mainThreadMcp.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadChatContext.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadChatDebug.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadChatStatus.js';
+import './vscode/src/vs/workbench/api/browser/mainThreadChatQuota.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadChatInputNotification.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadChatOutputRenderer.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadChatSessions.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "33.0.9",
+  "version": "34.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": "33.0.9",
-    "@codingame/monaco-vscode-files-service-override": "33.0.9"
+    "@codingame/monaco-vscode-api": "34.0.0",
+    "@codingame/monaco-vscode-files-service-override": "34.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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(1920, "Extension '{0}' not found.", id));
+const notFound = id => ( localize(1950, "Extension '{0}' not found.", id));
 const useId = ( localize(
-    1921,
+    1951,
     "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(1922, "Extensions installed on {0}:", this.location)));
+            this.logger.info(( localize(1952, "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(1923, "Installing extensions on {0}...", this.location)) : ( localize(1924, "Installing extensions...")));
+                this.logger.info(this.location ? ( localize(1953, "Installing extensions on {0}...", this.location)) : ( localize(1954, "Installing extensions...")));
             }
             const installVSIXInfos = [];
             const installExtensionInfos = [];
@@ -142,11 +142,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                 failed.push(...failedGalleryExtensions);
             }
         } catch (error) {
-            this.logger.error(( localize(1925, "Error while installing extensions: {0}", getErrorMessage(error))));
+            this.logger.error(( localize(1955, "Error while installing extensions: {0}", getErrorMessage(error))));
             throw error;
         }
         if (failed.length) {
-            throw ( new Error(( localize(1926, "Failed Installing Extensions: {0}", failed.join(", ")))));
+            throw ( new Error(( localize(1956, "Failed Installing Extensions: {0}", failed.join(", ")))));
         }
     }
     async updateExtensions(profileLocation) {
@@ -161,7 +161,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         this.logger.trace(( localize(
-            1927,
+            1957,
             "Fetching latest versions for {0} extensions",
             installedExtensionsQuery.length
         )));
@@ -185,11 +185,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         if (!extensionsToUpdate.length) {
-            this.logger.info(( localize(1928, "No extension to update")));
+            this.logger.info(( localize(1958, "No extension to update")));
             return;
         }
         this.logger.info(( localize(
-            1929,
+            1959,
             "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(
-                    1930,
+                    1960,
                     "Error while updating extension {0}: {1}",
                     extensionResult.identifier.id,
                     getErrorMessage(extensionResult.error)
                 )));
             } else {
                 this.logger.info(( localize(
-                    1931,
+                    1961,
                     "Extension '{0}' v{1} was successfully updated.",
                     extensionResult.identifier.id,
                     extensionResult.local?.manifest.version
@@ -230,7 +230,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                 }
                 if (!force && (!version || (version === "prerelease" && installedExtension.preRelease))) {
                     this.logger.info(( localize(
-                        1932,
+                        1962,
                         "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,
@@ -239,7 +239,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                     return false;
                 }
                 if (version && installedExtension.manifest.version === version) {
-                    this.logger.info(( localize(1933, "Extension '{0}' is already installed.", `${id}@${version}`)));
+                    this.logger.info(( localize(1963, "Extension '{0}' is already installed.", `${id}@${version}`)));
                     return false;
                 }
                 if (installedExtension.preRelease && version !== "prerelease") {
@@ -281,23 +281,23 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (installedExtension) {
                 if (gallery.version === installedExtension.manifest.version) {
                     this.logger.info(( localize(
-                        1933,
+                        1963,
                         "Extension '{0}' is already installed.",
                         version ? `${id}@${version}` : id
                     )));
                     return;
                 }
                 this.logger.info(( localize(
-                    1934,
+                    1964,
                     "Updating the extension '{0}' to the version {1}",
                     id,
                     gallery.version
                 )));
             }
             if (installOptions.isBuiltin) {
-                this.logger.info(version ? ( localize(1935, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(1936, "Installing builtin extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(1965, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(1966, "Installing builtin extension '{0}'...", id)));
             } else {
-                this.logger.info(version ? ( localize(1937, "Installing extension '{0}' v{1}...", id, version)) : ( localize(1938, "Installing extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(1967, "Installing extension '{0}' v{1}...", id, version)) : ( localize(1968, "Installing extension '{0}'...", id)));
             }
             extensionsToInstall.push({
                 extension: gallery,
@@ -313,7 +313,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             for (const extensionResult of installationResult) {
                 if (extensionResult.error) {
                     this.logger.error(( localize(
-                        1939,
+                        1969,
                         "Error while installing extension {0}: {1}",
                         extensionResult.identifier.id,
                         getErrorMessage(extensionResult.error)
@@ -321,7 +321,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                     failed.push(extensionResult.identifier.id);
                 } else {
                     this.logger.info(( localize(
-                        1940,
+                        1970,
                         "Extension '{0}' v{1} was successfully installed.",
                         extensionResult.identifier.id,
                         extensionResult.local?.manifest.version
@@ -343,10 +343,10 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                     ...installOptions,
                     installGivenVersion: true
                 });
-                this.logger.info(( localize(1941, "Extension '{0}' was successfully installed.", basename(vsix))));
+                this.logger.info(( localize(1971, "Extension '{0}' was successfully installed.", basename(vsix))));
             } catch (error) {
                 if (isCancellationError(error)) {
-                    this.logger.info(( localize(1942, "Cancelled installing extension '{0}'.", basename(vsix))));
+                    this.logger.info(( localize(1972, "Cancelled installing extension '{0}'.", basename(vsix))));
                 } else {
                     throw error;
                 }
@@ -393,7 +393,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (!force) {
                 if (semverExports.gt(existingExtension.manifest.version, manifest.version)) {
                     this.logger.info(( localize(
-                        1943,
+                        1973,
                         "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,
@@ -424,7 +424,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (( extensionsToUninstall.some(e => e.type === ExtensionType.System))) {
                 this.logger.info(( localize(
-                    1944,
+                    1974,
                     "Extension '{0}' is a Built-in extension and cannot be uninstalled",
                     id
                 )));
@@ -432,13 +432,13 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (!force && ( extensionsToUninstall.some(e => e.isBuiltin))) {
                 this.logger.info(( localize(
-                    1945,
+                    1975,
                     "Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.",
                     id
                 )));
                 return;
             }
-            this.logger.info(( localize(1946, "Uninstalling {0}...", id)));
+            this.logger.info(( localize(1976, "Uninstalling {0}...", id)));
             for (const extensionToUninstall of extensionsToUninstall) {
                 await this.extensionManagementService.uninstall(extensionToUninstall, {
                     profileLocation
@@ -446,13 +446,13 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (this.location) {
                 this.logger.info(( localize(
-                    1947,
+                    1977,
                     "Extension '{0}' was successfully uninstalled from {1}!",
                     id,
                     this.location
                 )));
             } else {
-                this.logger.info(( localize(1948, "Extension '{0}' was successfully uninstalled!", id)));
+                this.logger.info(( localize(1978, "Extension '{0}' was successfully uninstalled!", id)));
             }
         }
     }
@@ -470,12 +470,12 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         });
     }
     notInstalled(id) {
-        return this.location ? ( localize(1949, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(1950, "Extension '{0}' is not installed.", id));
+        return this.location ? ( localize(1979, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(1980, "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(
-                1951,
+                1981,
                 "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

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

@@ -18,7 +18,9 @@ import { IAuthorizationTokenResponse } from "@codingame/monaco-vscode-api/vscode
 import { IDynamicAuthenticationProviderStorageService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/dynamicAuthenticationProviderStorage.service";
 import { IClipboardService } from "@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service";
 import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
+import { ISecretStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/secrets/common/secrets.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 export interface AuthenticationInteractiveOptions {
     detail?: string;
     learnMore?: UriComponents;
@@ -48,11 +50,13 @@ export declare class MainThreadAuthentication extends Disposable implements Main
     private readonly dynamicAuthProviderStorageService;
     private readonly clipboardService;
     private readonly quickInputService;
+    private readonly configurationService;
+    private readonly secretStorageService;
     private readonly _proxy;
     private readonly _registrations;
     private _sentProviderUsageEvents;
     private _suppressUnregisterEvent;
-    constructor(extHostContext: IExtHostContext, productService: IProductService, authenticationService: IAuthenticationService, authenticationExtensionsService: IAuthenticationExtensionsService, authenticationAccessService: IAuthenticationAccessService, authenticationUsageService: IAuthenticationUsageService, dialogService: IDialogService, notificationService: INotificationService, extensionService: IExtensionService, telemetryService: ITelemetryService, openerService: IOpenerService, logService: ILogService, urlService: IURLService, dynamicAuthProviderStorageService: IDynamicAuthenticationProviderStorageService, clipboardService: IClipboardService, quickInputService: IQuickInputService);
+    constructor(extHostContext: IExtHostContext, productService: IProductService, authenticationService: IAuthenticationService, authenticationExtensionsService: IAuthenticationExtensionsService, authenticationAccessService: IAuthenticationAccessService, authenticationUsageService: IAuthenticationUsageService, dialogService: IDialogService, notificationService: INotificationService, extensionService: IExtensionService, telemetryService: ITelemetryService, openerService: IOpenerService, logService: ILogService, urlService: IURLService, dynamicAuthProviderStorageService: IDynamicAuthenticationProviderStorageService, clipboardService: IClipboardService, quickInputService: IQuickInputService, configurationService: IConfigurationService, secretStorageService: ISecretStorageService);
     $registerAuthenticationProvider({ id, label, supportsMultipleAccounts, resourceServer, supportedAuthorizationServers, supportsChallenges }: IRegisterAuthenticationProviderDetails): Promise<void>;
     $unregisterAuthenticationProvider(id: string): Promise<void>;
     $ensureProvider(id: string): Promise<void>;
@@ -85,4 +89,5 @@ export declare class MainThreadAuthentication extends Disposable implements Main
         clientId: string;
         clientSecret?: string;
     } | undefined>;
+    $promptForResourceClientSecret(resourceClientId: string, resource: string): Promise<string | undefined>;
 }

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

@@ -23,10 +23,15 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { ExtensionHostKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostKind';
 import { IURLService } from '@codingame/monaco-vscode-api/vscode/vs/platform/url/common/url.service';
 import { DeferredPromise, raceTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { fetchAuthorizationServerMetadata } from '@codingame/monaco-vscode-api/vscode/vs/base/common/oauth';
 import { IDynamicAuthenticationProviderStorageService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/dynamicAuthenticationProviderStorage.service';
 import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
+import { ISecretStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/secrets/common/secrets.service';
+import { mcpOAuthClientSecretStorageKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { mcpEnterpriseManagedAuthIdpSection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 
 class MainThreadAuthenticationProvider extends Disposable {
     constructor(
@@ -101,7 +106,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         urlService,
         dynamicAuthProviderStorageService,
         clipboardService,
-        quickInputService
+        quickInputService,
+        configurationService,
+        secretStorageService
     ) {
         super();
         this.productService = productService;
@@ -119,6 +126,8 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         this.dynamicAuthProviderStorageService = dynamicAuthProviderStorageService;
         this.clipboardService = clipboardService;
         this.quickInputService = quickInputService;
+        this.configurationService = configurationService;
+        this.secretStorageService = secretStorageService;
         this._registrations = this._register(( new DisposableMap()));
         this._sentProviderUsageEvents = ( new Set());
         this._suppressUnregisterEvent = false;
@@ -141,11 +150,17 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         }));
         this._register(authenticationService.registerAuthenticationProviderHostDelegate({
             priority: extHostContext.extensionHostKind === ExtensionHostKind.LocalWebWorker ? 0 : 1,
-            create: async (authorizationServer, serverMetadata, resource, overrideClientId) => {
+            create: async (
+                authorizationServer,
+                serverMetadata,
+                resource,
+                overrideClientId,
+                overrideClientSecret
+            ) => {
                 const authProviderId = resource ? `${( authorizationServer.toString(true))} ${resource.resource}` : ( authorizationServer.toString(true));
                 const clientDetails = await this.dynamicAuthProviderStorageService.getClientRegistration(authProviderId);
                 let clientId = overrideClientId ?? clientDetails?.clientId;
-                const clientSecret = overrideClientId ? undefined : clientDetails?.clientSecret;
+                const clientSecret = overrideClientId ? overrideClientSecret : (overrideClientSecret ?? clientDetails?.clientSecret);
                 let initialTokens = undefined;
                 if (clientId) {
                     initialTokens = await this.dynamicAuthProviderStorageService.getSessionsForDynamicAuthProvider(authProviderId, clientId);
@@ -160,6 +175,23 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                     clientSecret,
                     initialTokens
                 );
+            },
+            createXaa: async issuer => {
+                const authProviderId = `xaa:${( issuer.toString(true))}`;
+                const {
+                    metadata: serverMetadata
+                } = await fetchAuthorizationServerMetadata(( issuer.toString(true)));
+                const configuredIdp = this.configurationService.getValue(mcpEnterpriseManagedAuthIdpSection) ?? {};
+                const configuredClientId = configuredIdp.clientId?.trim() || undefined;
+                const configuredClientSecret = configuredIdp.clientSecret?.trim() || undefined;
+                const cached = await this.dynamicAuthProviderStorageService.getClientRegistration(authProviderId);
+                const clientId = configuredClientId ?? cached?.clientId;
+                const clientSecret = configuredClientSecret ?? cached?.clientSecret;
+                let initialTokens = undefined;
+                if (clientId) {
+                    initialTokens = await this.dynamicAuthProviderStorageService.getSessionsForDynamicAuthProvider(authProviderId, clientId);
+                }
+                return await this._proxy.$registerXaaAuthProvider(issuer, serverMetadata, clientId, clientSecret, initialTokens);
             }
         }));
     }
@@ -245,8 +277,8 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         return await deferredPromise.p;
     }
     $showContinueNotification(message) {
-        const yes = ( localize(2584, "Yes"));
-        const no = ( localize(2585, "No"));
+        const yes = ( localize(2633, "Yes"));
+        const no = ( localize(2634, "No"));
         const deferredPromise = ( new DeferredPromise());
         let result = false;
         const handle = this.notificationService.prompt(Severity.Warning, message, [{
@@ -302,26 +334,26 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             message = customMessage;
         } else {
             message = recreatingSession ? ( localize(
-                2586,
+                2635,
                 "The extension '{0}' wants you to sign in again using {1}.",
                 extensionName,
                 provider.label
             )) : ( localize(
-                2587,
+                2636,
                 "The extension '{0}' wants to sign in using {1}.",
                 extensionName,
                 provider.label
             ));
         }
         const buttons = [{
-            label: ( localize(2588, "&&Allow")),
+            label: ( localize(2637, "&&Allow")),
             run() {
                 return true;
             }
         }];
         if (options?.learnMore) {
             buttons.push({
-                label: ( localize(2589, "Learn more")),
+                label: ( localize(2638, "Learn more")),
                 run: async () => {
                     const result = this.loginPrompt(provider, extensionName, recreatingSession, options);
                     await this.openerService.open(URI.revive(options.learnMore), {
@@ -344,9 +376,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2590, "Incorrect account detected")),
+            message: ( localize(2639, "Incorrect account detected")),
             detail: ( localize(
-                2591,
+                2640,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -354,10 +386,10 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             type: Severity.Warning,
             cancelButton: true,
             buttons: [{
-                label: ( localize(2592, "Keep {0}", chosenAccountLabel)),
+                label: ( localize(2641, "Keep {0}", chosenAccountLabel)),
                 run: () => chosenAccountLabel
             }, {
-                label: ( localize(2593, "Login with {0}", requestedAccountLabel)),
+                label: ( localize(2642, "Login with {0}", requestedAccountLabel)),
                 run: () => requestedAccountLabel
             }]
         });
@@ -510,15 +542,15 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             result
         } = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(2594, "Device Code Authentication")),
+            message: ( localize(2643, "Device Code Authentication")),
             detail: ( localize(
-                2595,
+                2644,
                 "Your code: {0}\n\nTo complete authentication, navigate to {1} and enter the code above.",
                 userCode,
                 verificationUri
             )),
             buttons: [{
-                label: ( localize(2596, "Copy & Continue")),
+                label: ( localize(2645, "Copy & Continue")),
                 run: () => true
             }],
             cancelButton: true
@@ -528,7 +560,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(2597, "Failed to open {0}", verificationUri)));
+                this.notificationService.error(( localize(2646, "Failed to open {0}", verificationUri)));
             }
         }
         return false;
@@ -537,44 +569,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(2598, "Dynamic Client Registration not supported")),
+            message: ( localize(2647, "Dynamic Client Registration not supported")),
             detail: ( localize(
-                2599,
+                2648,
                 "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(2600, "Copy URIs & Proceed")),
+                label: ( localize(2649, "Copy URIs & Proceed")),
                 run: async () => {
                     try {
                         await this.clipboardService.writeText(redirectUrls);
                     } catch (error) {
-                        this.notificationService.error(( localize(2601, "Failed to copy redirect URIs to clipboard.")));
+                        this.notificationService.error(( localize(2650, "Failed to copy redirect URIs to clipboard.")));
                     }
                     return true;
                 }
             }],
             cancelButton: {
-                label: ( localize(2602, "Cancel")),
+                label: ( localize(2651, "Cancel")),
                 run: () => false
             }
         });
         if (!result) {
             return undefined;
         }
-        const sharedTitle = ( localize(2603, "Add Client Registration Details"));
+        const sharedTitle = ( localize(2652, "Add Client Registration Details"));
         const clientId = await this.quickInputService.input({
             title: sharedTitle,
             prompt: ( localize(
-                2604,
+                2653,
                 "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(2605, "OAuth client ID (azye39d...)")),
+            placeHolder: ( localize(2654, "OAuth client ID (azye39d...)")),
             ignoreFocusLost: true,
             validateInput: async value => {
                 if (!value || value.trim().length === 0) {
-                    return localize(2606, "Client ID is required");
+                    return localize(2655, "Client ID is required");
                 }
                 return undefined;
             }
@@ -585,11 +617,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         const clientSecret = await this.quickInputService.input({
             title: sharedTitle,
             prompt: ( localize(
-                2607,
+                2656,
                 "(optional) Enter an existing client secret associated with the client id '{0}' or leave this field blank",
                 clientId
             )),
-            placeHolder: ( localize(2608, "OAuth client secret (wer32o50f...) or leave it blank")),
+            placeHolder: ( localize(2657, "OAuth client secret (wer32o50f...) or leave it blank")),
             password: true,
             ignoreFocusLost: true
         });
@@ -598,9 +630,40 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             clientSecret: clientSecret?.trim() || undefined
         };
     }
+    async $promptForResourceClientSecret(resourceClientId, resource) {
+        const value = await this.quickInputService.input({
+            title: ( localize(2658, "Resource Client Secret Required")),
+            prompt: ( localize(
+                2659,
+                "The resource at '{0}' uses a per-resource client identifier '{1}'. Enter the matching client secret (leave blank if none). The value is saved in OS secret storage; manage it later via the 'Set Client Secret' code lens in mcp.json.",
+                resource,
+                resourceClientId
+            )),
+            placeHolder: ( localize(2660, "Resource client secret")),
+            password: true,
+            ignoreFocusLost: true
+        });
+        if (value === undefined) {
+            return undefined;
+        }
+        const trimmed = value.trim();
+        const key = mcpOAuthClientSecretStorageKey(resource, resourceClientId);
+        try {
+            if (trimmed.length === 0) {
+                await this.secretStorageService.delete(key);
+            } else {
+                await this.secretStorageService.set(key, trimmed);
+            }
+        } catch (err) {
+            this.logService.warn(
+                `[XAA] Failed to persist resource client secret for ${resource} / ${resourceClientId}: ${err.message}`
+            );
+        }
+        return trimmed;
+    }
 };
 MainThreadAuthentication = __decorate(
-    [extHostNamedCustomer(MainContext.MainThreadAuthentication), ( __param(1, IProductService)), ( __param(2, IAuthenticationService)), ( __param(3, IAuthenticationExtensionsService)), ( __param(4, IAuthenticationAccessService)), ( __param(5, IAuthenticationUsageService)), ( __param(6, IDialogService)), ( __param(7, INotificationService)), ( __param(8, IExtensionService)), ( __param(9, ITelemetryService)), ( __param(10, IOpenerService)), ( __param(11, ILogService)), ( __param(12, IURLService)), ( __param(13, IDynamicAuthenticationProviderStorageService)), ( __param(14, IClipboardService)), ( __param(15, IQuickInputService))],
+    [extHostNamedCustomer(MainContext.MainThreadAuthentication), ( __param(1, IProductService)), ( __param(2, IAuthenticationService)), ( __param(3, IAuthenticationExtensionsService)), ( __param(4, IAuthenticationAccessService)), ( __param(5, IAuthenticationUsageService)), ( __param(6, IDialogService)), ( __param(7, INotificationService)), ( __param(8, IExtensionService)), ( __param(9, ITelemetryService)), ( __param(10, IOpenerService)), ( __param(11, ILogService)), ( __param(12, IURLService)), ( __param(13, IDynamicAuthenticationProviderStorageService)), ( __param(14, IClipboardService)), ( __param(15, IQuickInputService)), ( __param(16, IConfigurationService)), ( __param(17, ISecretStorageService))],
     MainThreadAuthentication
 );
 

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(
-                2609,
+                2661,
                 "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

@@ -39,7 +39,7 @@ import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode
 import { NotebookDto } from './mainThreadNotebookDto.js';
 import { isUntitledChatSession, getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { ICustomizationHarnessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService.service';
-import { AICustomizationManagementSection, BUILTIN_STORAGE } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
+import { AICustomizationManagementSection, AICustomizationSources } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
 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';
 import { getAgentSessionProvider, AgentSessionProviders } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
@@ -654,6 +654,10 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                 }
                 return ( contributions.map(c => {
                     return {
+                        name: c.name,
+                        description: c.description,
+                        sessionTypes: c.sessionTypes,
+                        when: c.when,
                         uri: URI.revive(c.uri)
                     };
                 }));
@@ -687,8 +691,8 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
         this._customizationProviderEmitters.set(handle, emitter);
         const itemProvider = {
             onDidChange: emitter.event,
-            provideChatSessionCustomizations: async token => {
-                const items = await this._proxy.$provideChatSessionCustomizations(handle, token);
+            provideChatSessionCustomizations: async (sessionResource, token) => {
+                const items = await this._proxy.$provideChatSessionCustomizations(handle, sessionResource, token);
                 if (!items) {
                     return undefined;
                 }
@@ -696,6 +700,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                     uri: URI.revive(item.uri),
                     type: item.type,
                     name: item.name,
+                    source: item.source,
                     description: item.description,
                     groupKey: item.groupKey,
                     badge: item.badge,
@@ -731,13 +736,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
             icon: metadata.iconId ? ThemeIcon.fromId(metadata.iconId) : ThemeIcon.fromId(Codicon.extensions.id),
             hiddenSections,
             getStorageSourceFilter: () => ({
-                sources: [
-                    PromptsStorage.local,
-                    PromptsStorage.user,
-                    PromptsStorage.plugin,
-                    PromptsStorage.extension,
-                    BUILTIN_STORAGE
-                ]
+                sources: AICustomizationSources.all
             }),
             itemProvider
         };

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

@@ -0,0 +1,9 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
+import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { IQuotaSnapshotsDto, MainThreadChatQuotaShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+export declare class MainThreadChatQuota extends Disposable implements MainThreadChatQuotaShape {
+    private readonly _chatEntitlementService;
+    constructor(extHostContext: IExtHostContext, _chatEntitlementService: IChatEntitlementService);
+    $updateQuotas(quotas: IQuotaSnapshotsDto): void;
+}