@codingame/monaco-vscode-extensions-service-override 19.1.3 → 20.0.0

package/index.js

@@ -130,6 +130,9 @@ import './vscode/src/vs/workbench/api/browser/mainThreadAiEmbeddingVector.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadAiSettingsSearch.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadMcp.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadChatStatus.js';
+import './vscode/src/vs/workbench/api/browser/mainThreadChatOutputRenderer.js';
+import './vscode/src/vs/workbench/api/browser/mainThreadChatSessions.js';
+import './vscode/src/vs/workbench/api/browser/mainThreadDataChannels.js';
 
 let localExtensionHost;
 function setLocalExtensionHost(_localExtensionHost) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "19.1.3",
+  "version": "20.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - extensions service-override",
   "keywords": [],
@@ -15,32 +15,32 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common": "19.1.3",
-    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "19.1.3",
-    "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common": "19.1.3",
-    "@codingame/monaco-vscode-2726569c-a06b-5f25-b851-14311bef12fa-common": "19.1.3",
-    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": "19.1.3",
-    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "19.1.3",
-    "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common": "19.1.3",
-    "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common": "19.1.3",
-    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "19.1.3",
-    "@codingame/monaco-vscode-6845754f-e617-5ed9-8aaa-6ca3653a9532-common": "19.1.3",
-    "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common": "19.1.3",
-    "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "19.1.3",
-    "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common": "19.1.3",
-    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "19.1.3",
-    "@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common": "19.1.3",
-    "@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common": "19.1.3",
-    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "19.1.3",
-    "@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common": "19.1.3",
-    "@codingame/monaco-vscode-api": "19.1.3",
-    "@codingame/monaco-vscode-bf94ddb5-e436-506a-9763-5ab86b642508-common": "19.1.3",
-    "@codingame/monaco-vscode-ca445022-b812-53ca-a041-e46c7e0b13de-common": "19.1.3",
-    "@codingame/monaco-vscode-caf773dd-ab1d-5936-941d-a2fe9e896ffc-common": "19.1.3",
-    "@codingame/monaco-vscode-eb7d5efd-2e60-59f8-9ba4-9a8ae8cb2957-common": "19.1.3",
-    "@codingame/monaco-vscode-eba0b9b3-174c-5dae-9867-a37810ca1808-common": "19.1.3",
-    "@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common": "19.1.3",
-    "@codingame/monaco-vscode-files-service-override": "19.1.3"
+    "@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common": "20.0.0",
+    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "20.0.0",
+    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": "20.0.0",
+    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "20.0.0",
+    "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common": "20.0.0",
+    "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common": "20.0.0",
+    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "20.0.0",
+    "@codingame/monaco-vscode-622c0cca-d5fa-59b6-b730-0715afcf93ee-common": "20.0.0",
+    "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common": "20.0.0",
+    "@codingame/monaco-vscode-6845754f-e617-5ed9-8aaa-6ca3653a9532-common": "20.0.0",
+    "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common": "20.0.0",
+    "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "20.0.0",
+    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "20.0.0",
+    "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common": "20.0.0",
+    "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common": "20.0.0",
+    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "20.0.0",
+    "@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common": "20.0.0",
+    "@codingame/monaco-vscode-api": "20.0.0",
+    "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common": "20.0.0",
+    "@codingame/monaco-vscode-bf94ddb5-e436-506a-9763-5ab86b642508-common": "20.0.0",
+    "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common": "20.0.0",
+    "@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common": "20.0.0",
+    "@codingame/monaco-vscode-eb7d5efd-2e60-59f8-9ba4-9a8ae8cb2957-common": "20.0.0",
+    "@codingame/monaco-vscode-eba0b9b3-174c-5dae-9867-a37810ca1808-common": "20.0.0",
+    "@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common": "20.0.0",
+    "@codingame/monaco-vscode-files-service-override": "20.0.0"
   },
   "main": "index.js",
   "module": "index.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(1804, "Extension '{0}' not found.", id));
+const notFound = (id) => ( localize(1816, "Extension '{0}' not found.", id));
 const useId = ( localize(
-    1805,
+    1817,
     "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(1806, "Extensions installed on {0}:", this.location)));
+            this.logger.info(( localize(1818, "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(1807, "Installing extensions on {0}...", this.location)) : ( localize(1808, "Installing extensions...")));
+                this.logger.info(this.location ? ( localize(1819, "Installing extensions on {0}...", this.location)) : ( localize(1820, "Installing extensions...")));
             }
             const installVSIXInfos = [];
             const installExtensionInfos = [];
@@ -109,11 +109,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         catch (error) {
-            this.logger.error(( localize(1809, "Error while installing extensions: {0}", getErrorMessage(error))));
+            this.logger.error(( localize(1821, "Error while installing extensions: {0}", getErrorMessage(error))));
             throw error;
         }
         if (failed.length) {
-            throw ( new Error(( localize(1810, "Failed Installing Extensions: {0}", failed.join(', ')))));
+            throw ( new Error(( localize(1822, "Failed Installing Extensions: {0}", failed.join(', ')))));
         }
     }
     async updateExtensions(profileLocation) {
@@ -125,7 +125,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         this.logger.trace(( localize(
-            1811,
+            1823,
             "Fetching latest versions for {0} extensions",
             installedExtensionsQuery.length
         )));
@@ -142,11 +142,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         if (!extensionsToUpdate.length) {
-            this.logger.info(( localize(1812, "No extension to update")));
+            this.logger.info(( localize(1824, "No extension to update")));
             return;
         }
         this.logger.info(( localize(
-            1813,
+            1825,
             "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(
-                    1814,
+                    1826,
                     "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(
-                    1815,
+                    1827,
                     "Extension '{0}' v{1} was successfully updated.",
                     extensionResult.identifier.id,
                     extensionResult.local?.manifest.version
@@ -177,7 +177,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (installedExtension) {
                 if (!force && (!version || (version === 'prerelease' && installedExtension.preRelease))) {
                     this.logger.info(( localize(
-                        1816,
+                        1828,
                         "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,
@@ -186,7 +186,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                     return false;
                 }
                 if (version && installedExtension.manifest.version === version) {
-                    this.logger.info(( localize(1817, "Extension '{0}' is already installed.", `${id}@${version}`)));
+                    this.logger.info(( localize(1829, "Extension '{0}' is already installed.", `${id}@${version}`)));
                     return false;
                 }
                 if (installedExtension.preRelease && version !== 'prerelease') {
@@ -223,24 +223,24 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (installedExtension) {
                 if (gallery.version === installedExtension.manifest.version) {
                     this.logger.info(( localize(
-                        1817,
+                        1829,
                         "Extension '{0}' is already installed.",
                         version ? `${id}@${version}` : id
                     )));
                     return;
                 }
                 this.logger.info(( localize(
-                    1818,
+                    1830,
                     "Updating the extension '{0}' to the version {1}",
                     id,
                     gallery.version
                 )));
             }
             if (installOptions.isBuiltin) {
-                this.logger.info(version ? ( localize(1819, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(1820, "Installing builtin extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(1831, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(1832, "Installing builtin extension '{0}'...", id)));
             }
             else {
-                this.logger.info(version ? ( localize(1821, "Installing extension '{0}' v{1}...", id, version)) : ( localize(1822, "Installing extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(1833, "Installing extension '{0}' v{1}...", id, version)) : ( localize(1834, "Installing extension '{0}'...", id)));
             }
             extensionsToInstall.push({
                 extension: gallery,
@@ -252,7 +252,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             for (const extensionResult of installationResult) {
                 if (extensionResult.error) {
                     this.logger.error(( localize(
-                        1823,
+                        1835,
                         "Error while installing extension {0}: {1}",
                         extensionResult.identifier.id,
                         getErrorMessage(extensionResult.error)
@@ -261,7 +261,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                 }
                 else {
                     this.logger.info(( localize(
-                        1824,
+                        1836,
                         "Extension '{0}' v{1} was successfully installed.",
                         extensionResult.identifier.id,
                         extensionResult.local?.manifest.version
@@ -280,11 +280,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         if (valid) {
             try {
                 await this.extensionManagementService.install(vsix, { ...installOptions, installGivenVersion: true });
-                this.logger.info(( localize(1825, "Extension '{0}' was successfully installed.", basename(vsix))));
+                this.logger.info(( localize(1837, "Extension '{0}' was successfully installed.", basename(vsix))));
             }
             catch (error) {
                 if (isCancellationError(error)) {
-                    this.logger.info(( localize(1826, "Cancelled installing extension '{0}'.", basename(vsix))));
+                    this.logger.info(( localize(1838, "Cancelled installing extension '{0}'.", basename(vsix))));
                 }
                 else {
                     throw error;
@@ -319,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(
-                    1827,
+                    1839,
                     "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,
@@ -347,7 +347,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (( extensionsToUninstall.some(e => e.type === ExtensionType.System))) {
                 this.logger.info(( localize(
-                    1828,
+                    1840,
                     "Extension '{0}' is a Built-in extension and cannot be uninstalled",
                     id
                 )));
@@ -355,26 +355,26 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (!force && ( extensionsToUninstall.some(e => e.isBuiltin))) {
                 this.logger.info(( localize(
-                    1829,
+                    1841,
                     "Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.",
                     id
                 )));
                 return;
             }
-            this.logger.info(( localize(1830, "Uninstalling {0}...", id)));
+            this.logger.info(( localize(1842, "Uninstalling {0}...", id)));
             for (const extensionToUninstall of extensionsToUninstall) {
                 await this.extensionManagementService.uninstall(extensionToUninstall, { profileLocation });
             }
             if (this.location) {
                 this.logger.info(( localize(
-                    1831,
+                    1843,
                     "Extension '{0}' was successfully uninstalled from {1}!",
                     id,
                     this.location
                 )));
             }
             else {
-                this.logger.info(( localize(1832, "Extension '{0}' was successfully uninstalled!", id)));
+                this.logger.info(( localize(1844, "Extension '{0}' was successfully uninstalled!", id)));
             }
         }
     }
@@ -392,7 +392,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         });
     }
     notInstalled(id) {
-        return this.location ? ( localize(1833, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(1834, "Extension '{0}' is not installed.", id));
+        return this.location ? ( localize(1845, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(1846, "Extension '{0}' is not installed.", id));
     }
 };
 ExtensionManagementCLI = ( __decorate([

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

@@ -18,6 +18,7 @@ import { IURLService } from "@codingame/monaco-vscode-api/vscode/vs/platform/url
 import { IAuthorizationTokenResponse } 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";
 export interface AuthenticationInteractiveOptions {
     detail?: string;
     learnMore?: UriComponents;
@@ -57,11 +58,12 @@ export declare class MainThreadAuthentication extends Disposable implements Main
     private readonly urlService;
     private readonly dynamicAuthProviderStorageService;
     private readonly clipboardService;
+    private readonly quickInputService;
     private readonly _proxy;
     private readonly _registrations;
     private _sentProviderUsageEvents;
     private _suppressUnregisterEvent;
-    constructor(extHostContext: IExtHostContext, 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);
+    constructor(extHostContext: IExtHostContext, 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);
     $registerAuthenticationProvider(id: string, label: string, supportsMultipleAccounts: boolean, supportedAuthorizationServer?: UriComponents[]): Promise<void>;
     $unregisterAuthenticationProvider(id: string): Promise<void>;
     $ensureProvider(id: string): Promise<void>;
@@ -69,15 +71,16 @@ export declare class MainThreadAuthentication extends Disposable implements Main
     $removeSession(providerId: string, sessionId: string): Promise<void>;
     $waitForUriHandler(expectedUri: UriComponents): Promise<UriComponents>;
     $showContinueNotification(message: string): Promise<boolean>;
-    $registerDynamicAuthenticationProvider(id: string, label: string, authorizationServer: UriComponents, clientId: string): Promise<void>;
+    $registerDynamicAuthenticationProvider(id: string, label: string, authorizationServer: UriComponents, clientId: string, clientSecret?: string): Promise<void>;
     $setSessionsForDynamicAuthProvider(authProviderId: string, clientId: string, sessions: (IAuthorizationTokenResponse & {
         created_at: number;
     })[]): Promise<void>;
-    $sendDidChangeDynamicProviderInfo({ providerId, clientId, authorizationServer, label }: Partial<{
+    $sendDidChangeDynamicProviderInfo({ providerId, clientId, authorizationServer, label, clientSecret }: Partial<{
         providerId: string;
         clientId: string;
         authorizationServer: UriComponents;
         label: string;
+        clientSecret: string;
     }>): Promise<void>;
     private loginPrompt;
     private continueWithIncorrectAccountPrompt;
@@ -91,4 +94,8 @@ export declare class MainThreadAuthentication extends Disposable implements Main
     private _updateAccountPreference;
     private _removeAccountPreference;
     $showDeviceCodeModal(userCode: string, verificationUri: string): Promise<boolean>;
+    $promptForClientRegistration(authorizationServerUrl: string): Promise<{
+        clientId: string;
+        clientSecret?: string;
+    } | undefined>;
 }

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

@@ -24,6 +24,7 @@ import { IURLService } from '@codingame/monaco-vscode-api/vscode/vs/platform/url
 import { DeferredPromise, raceTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 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';
 
 class MainThreadAuthenticationProvider extends Disposable {
     constructor(_proxy, id, label, supportsMultipleAccounts, authorizationServers, onDidChangeSessionsEmitter) {
@@ -46,7 +47,7 @@ class MainThreadAuthenticationProvider extends Disposable {
     }
 }
 let MainThreadAuthentication = class MainThreadAuthentication extends Disposable {
-    constructor(extHostContext, authenticationService, authenticationExtensionsService, authenticationAccessService, authenticationUsageService, dialogService, notificationService, extensionService, telemetryService, openerService, logService, urlService, dynamicAuthProviderStorageService, clipboardService) {
+    constructor(extHostContext, authenticationService, authenticationExtensionsService, authenticationAccessService, authenticationUsageService, dialogService, notificationService, extensionService, telemetryService, openerService, logService, urlService, dynamicAuthProviderStorageService, clipboardService, quickInputService) {
         super();
         this.authenticationService = authenticationService;
         this.authenticationExtensionsService = authenticationExtensionsService;
@@ -61,6 +62,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         this.urlService = urlService;
         this.dynamicAuthProviderStorageService = dynamicAuthProviderStorageService;
         this.clipboardService = clipboardService;
+        this.quickInputService = quickInputService;
         this._registrations = this._register(( new DisposableMap()));
         this._sentProviderUsageEvents = ( new Set());
         this._suppressUnregisterEvent = false;
@@ -83,12 +85,14 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             priority: extHostContext.extensionHostKind === ExtensionHostKind.LocalWebWorker ? 0 : 1,
             create: async (authorizationServer, serverMetadata, resource) => {
                 const authProviderId = resource ? `${( authorizationServer.toString(true))} ${resource.resource}` : ( authorizationServer.toString(true));
-                const clientId = this.dynamicAuthProviderStorageService.getClientId(authProviderId);
+                const clientDetails = await this.dynamicAuthProviderStorageService.getClientRegistration(authProviderId);
+                const clientId = clientDetails?.clientId;
+                const clientSecret = clientDetails?.clientSecret;
                 let initialTokens = undefined;
                 if (clientId) {
                     initialTokens = await this.dynamicAuthProviderStorageService.getSessionsForDynamicAuthProvider(authProviderId, clientId);
                 }
-                return await this._proxy.$registerDynamicAuthProvider(authorizationServer, serverMetadata, resource, clientId, initialTokens);
+                return await this._proxy.$registerDynamicAuthProvider(authorizationServer, serverMetadata, resource, clientId, clientSecret, initialTokens);
             }
         }));
     }
@@ -153,8 +157,8 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         return await deferredPromise.p;
     }
     $showContinueNotification(message) {
-        const yes = ( localize(2404, "Yes"));
-        const no = ( localize(2405, "No"));
+        const yes = ( localize(2420, "Yes"));
+        const no = ( localize(2421, "No"));
         const deferredPromise = ( new DeferredPromise());
         let result = false;
         const handle = this.notificationService.prompt(Severity.Warning, message, [{
@@ -170,14 +174,14 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         });
         return deferredPromise.p;
     }
-    async $registerDynamicAuthenticationProvider(id, label, authorizationServer, clientId) {
+    async $registerDynamicAuthenticationProvider(id, label, authorizationServer, clientId, clientSecret) {
         await this.$registerAuthenticationProvider(id, label, true, [authorizationServer]);
-        this.dynamicAuthProviderStorageService.storeClientId(id, ( URI.revive(authorizationServer).toString(true)), clientId, label);
+        await this.dynamicAuthProviderStorageService.storeClientRegistration(id, ( URI.revive(authorizationServer).toString(true)), clientId, clientSecret, label);
     }
     async $setSessionsForDynamicAuthProvider(authProviderId, clientId, sessions) {
         await this.dynamicAuthProviderStorageService.setSessionsForDynamicAuthProvider(authProviderId, clientId, sessions);
     }
-    async $sendDidChangeDynamicProviderInfo({ providerId, clientId, authorizationServer, label }) {
+    async $sendDidChangeDynamicProviderInfo({ providerId, clientId, authorizationServer, label, clientSecret }) {
         this.logService.info(`Client ID for authentication provider ${providerId} changed to ${clientId}`);
         const existing = this.dynamicAuthProviderStorageService.getInteractedProviders().find(p => p.providerId === providerId);
         if (!existing) {
@@ -185,7 +189,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                 `Dynamic authentication provider ${providerId} not found. Has it been registered?`
             ));
         }
-        this.dynamicAuthProviderStorageService.storeClientId(providerId || existing.providerId, authorizationServer ? ( URI.revive(authorizationServer).toString(true)) : existing.authorizationServer, clientId || existing.clientId, label || existing.label);
+        await this.dynamicAuthProviderStorageService.storeClientRegistration(providerId || existing.providerId, authorizationServer ? ( URI.revive(authorizationServer).toString(true)) : existing.authorizationServer, clientId || existing.clientId, clientSecret, label || existing.label);
     }
     async loginPrompt(provider, extensionName, recreatingSession, options) {
         let message;
@@ -196,13 +200,13 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         else {
             message = recreatingSession
                 ? ( localize(
-                2406,
+                2422,
                 "The extension '{0}' wants you to sign in again using {1}.",
                 extensionName,
                 provider.label
             ))
                 : ( localize(
-                2407,
+                2423,
                 "The extension '{0}' wants to sign in using {1}.",
                 extensionName,
                 provider.label
@@ -210,7 +214,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         }
         const buttons = [
             {
-                label: ( localize(2408, "&&Allow")),
+                label: ( localize(2424, "&&Allow")),
                 run() {
                     return true;
                 },
@@ -218,7 +222,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         ];
         if (options?.learnMore) {
             buttons.push({
-                label: ( localize(2409, "Learn more")),
+                label: ( localize(2425, "Learn more")),
                 run: async () => {
                     const result = this.loginPrompt(provider, extensionName, recreatingSession, options);
                     await this.openerService.open(URI.revive(options.learnMore), { allowCommands: true });
@@ -237,9 +241,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2410, "Incorrect account detected")),
+            message: ( localize(2426, "Incorrect account detected")),
             detail: ( localize(
-                2411,
+                2427,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -248,11 +252,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             cancelButton: true,
             buttons: [
                 {
-                    label: ( localize(2412, 'Keep {0}', chosenAccountLabel)),
+                    label: ( localize(2428, 'Keep {0}', chosenAccountLabel)),
                     run: () => chosenAccountLabel
                 },
                 {
-                    label: ( localize(2413, 'Login with {0}', requestedAccountLabel)),
+                    label: ( localize(2429, 'Login with {0}', requestedAccountLabel)),
                     run: () => requestedAccountLabel
                 }
             ],
@@ -406,16 +410,16 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     async $showDeviceCodeModal(userCode, verificationUri) {
         const { result } = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(2414, "Device Code Authentication")),
+            message: ( localize(2430, "Device Code Authentication")),
             detail: ( localize(
-                2415,
+                2431,
                 "Your code: {0}\n\nTo complete authentication, navigate to {1} and enter the code above.",
                 userCode,
                 verificationUri
             )),
             buttons: [
                 {
-                    label: ( localize(2416, "Copy & Continue")),
+                    label: ( localize(2432, "Copy & Continue")),
                     run: () => true
                 }
             ],
@@ -427,11 +431,69 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                 return await this.openerService.open(( URI.parse(verificationUri)));
             }
             catch (error) {
-                this.notificationService.error(( localize(2417, "Failed to open {0}", verificationUri)));
+                this.notificationService.error(( localize(2433, "Failed to open {0}", verificationUri)));
             }
         }
         return false;
     }
+    async $promptForClientRegistration(authorizationServerUrl) {
+        const result = await this.dialogService.prompt({
+            type: Severity.Info,
+            message: ( localize(2434, "Dynamic Client Registration not supported")),
+            detail: ( localize(
+                2435,
+                "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:\nhttp://127.0.0.1:33418\nhttps://vscode.dev/redirect",
+                authorizationServerUrl
+            )),
+            buttons: [
+                {
+                    label: ( localize(2436, "Proceed")),
+                    run: () => true
+                }
+            ],
+            cancelButton: {
+                label: ( localize(2437, "Cancel")),
+                run: () => false
+            }
+        });
+        if (!result) {
+            return undefined;
+        }
+        const sharedTitle = ( localize(2438, "Add Client Registration Details"));
+        const clientId = await this.quickInputService.input({
+            title: sharedTitle,
+            prompt: ( localize(
+                2439,
+                "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(2440, "OAuth client ID (azye39d...)")),
+            ignoreFocusLost: true,
+            validateInput: async (value) => {
+                if (!value || value.trim().length === 0) {
+                    return localize(2441, "Client ID is required");
+                }
+                return undefined;
+            }
+        });
+        if (!clientId || clientId.trim().length === 0) {
+            return undefined;
+        }
+        const clientSecret = await this.quickInputService.input({
+            title: sharedTitle,
+            prompt: ( localize(
+                2442,
+                "(optional) Enter an existing client secret associated with the client id '{0}' or leave this field blank",
+                clientId
+            )),
+            placeHolder: ( localize(2443, "OAuth client secret (wer32o50f...) or leave it blank")),
+            password: true,
+            ignoreFocusLost: true
+        });
+        return {
+            clientId: clientId.trim(),
+            clientSecret: clientSecret?.trim() || undefined
+        };
+    }
 };
 MainThreadAuthentication = __decorate([
     extHostNamedCustomer(MainContext.MainThreadAuthentication),
@@ -447,7 +509,8 @@ MainThreadAuthentication = __decorate([
     ( __param(10, ILogService)),
     ( __param(11, IURLService)),
     ( __param(12, IDynamicAuthenticationProviderStorageService)),
-    ( __param(13, IClipboardService))
+    ( __param(13, IClipboardService)),
+    ( __param(14, IQuickInputService))
 ], MainThreadAuthentication);
 
 export { MainThreadAuthentication, MainThreadAuthenticationProvider };

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

@@ -7,7 +7,7 @@ import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
+import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
 import { CellEditType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 

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(
-                2418,
+                2444,
                 "Cannot install the '{0}' extension because it is declared to not run in this setup.",
                 getExtensionId(manifest.publisher, manifest.name)
             )));