@codingame/monaco-vscode-extensions-service-override 36.2.7 → 37.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "36.2.7",
+  "version": "37.1.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": "36.2.7",
-    "@codingame/monaco-vscode-files-service-override": "36.2.7"
+    "@codingame/monaco-vscode-api": "37.1.0",
+    "@codingame/monaco-vscode-files-service-override": "37.1.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(2026, "Extension '{0}' not found.", id));
+const notFound = id => ( localize(2244, "Extension '{0}' not found.", id));
 const useId = ( localize(
-    2027,
+    2245,
     "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(2028, "Extensions installed on {0}:", this.location)));
+            this.logger.info(( localize(2246, "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(2029, "Installing extensions on {0}...", this.location)) : ( localize(2030, "Installing extensions...")));
+                this.logger.info(this.location ? ( localize(2247, "Installing extensions on {0}...", this.location)) : ( localize(2248, "Installing extensions...")));
             }
             const installVSIXInfos = [];
             const installExtensionInfos = [];
@@ -142,11 +142,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                 failed.push(...failedGalleryExtensions);
             }
         } catch (error) {
-            this.logger.error(( localize(2031, "Error while installing extensions: {0}", getErrorMessage(error))));
+            this.logger.error(( localize(2249, "Error while installing extensions: {0}", getErrorMessage(error))));
             throw error;
         }
         if (failed.length) {
-            throw ( new Error(( localize(2032, "Failed Installing Extensions: {0}", failed.join(", ")))));
+            throw ( new Error(( localize(2250, "Failed Installing Extensions: {0}", failed.join(", ")))));
         }
     }
     async updateExtensions(profileLocation) {
@@ -161,7 +161,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         this.logger.trace(( localize(
-            2033,
+            2251,
             "Fetching latest versions for {0} extensions",
             installedExtensionsQuery.length
         )));
@@ -185,11 +185,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         if (!extensionsToUpdate.length) {
-            this.logger.info(( localize(2034, "No extension to update")));
+            this.logger.info(( localize(2252, "No extension to update")));
             return;
         }
         this.logger.info(( localize(
-            2035,
+            2253,
             "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(
-                    2036,
+                    2254,
                     "Error while updating extension {0}: {1}",
                     extensionResult.identifier.id,
                     getErrorMessage(extensionResult.error)
                 )));
             } else {
                 this.logger.info(( localize(
-                    2037,
+                    2255,
                     "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(
-                        2038,
+                        2256,
                         "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(2039, "Extension '{0}' is already installed.", `${id}@${version}`)));
+                    this.logger.info(( localize(2257, "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(
-                        2039,
+                        2257,
                         "Extension '{0}' is already installed.",
                         version ? `${id}@${version}` : id
                     )));
                     return;
                 }
                 this.logger.info(( localize(
-                    2040,
+                    2258,
                     "Updating the extension '{0}' to the version {1}",
                     id,
                     gallery.version
                 )));
             }
             if (installOptions.isBuiltin) {
-                this.logger.info(version ? ( localize(2041, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(2042, "Installing builtin extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(2259, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(2260, "Installing builtin extension '{0}'...", id)));
             } else {
-                this.logger.info(version ? ( localize(2043, "Installing extension '{0}' v{1}...", id, version)) : ( localize(2044, "Installing extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(2261, "Installing extension '{0}' v{1}...", id, version)) : ( localize(2262, "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(
-                        2045,
+                        2263,
                         "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(
-                        2046,
+                        2264,
                         "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(2047, "Extension '{0}' was successfully installed.", basename(vsix))));
+                this.logger.info(( localize(2265, "Extension '{0}' was successfully installed.", basename(vsix))));
             } catch (error) {
                 if (isCancellationError(error)) {
-                    this.logger.info(( localize(2048, "Cancelled installing extension '{0}'.", basename(vsix))));
+                    this.logger.info(( localize(2266, "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(
-                        2049,
+                        2267,
                         "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(
-                    2050,
+                    2268,
                     "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(
-                    2051,
+                    2269,
                     "Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.",
                     id
                 )));
                 return;
             }
-            this.logger.info(( localize(2052, "Uninstalling {0}...", id)));
+            this.logger.info(( localize(2270, "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(
-                    2053,
+                    2271,
                     "Extension '{0}' was successfully uninstalled from {1}!",
                     id,
                     this.location
                 )));
             } else {
-                this.logger.info(( localize(2054, "Extension '{0}' was successfully uninstalled!", id)));
+                this.logger.info(( localize(2272, "Extension '{0}' was successfully uninstalled!", id)));
             }
         }
     }
@@ -470,12 +470,12 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         });
     }
     notInstalled(id) {
-        return this.location ? ( localize(2055, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(2056, "Extension '{0}' is not installed.", id));
+        return this.location ? ( localize(2273, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(2274, "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(
-                2057,
+                2275,
                 "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/platform/telemetry/common/assignmentContext.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Validates an experiment assignment context before it is trusted onto telemetry events.
+ */
+export declare function isValidAssignmentContext(value: string): boolean;

package/vscode/src/vs/platform/telemetry/common/assignmentContext.js

@@ -0,0 +1,13 @@
+
+
+const MAX_ASSIGNMENT_CONTEXT_LENGTH = 8 * 1024;
+const ASSIGNMENT_CONTEXT_ENTRY_PATTERN = /^[^:;\s\x00-\x1F\x7F]+:[^;\x00-\x1F\x7F]+$/;
+function isValidAssignmentContext(value) {
+    if (value.length === 0 || value.length > MAX_ASSIGNMENT_CONTEXT_LENGTH) {
+        return false;
+    }
+    const entries = value.endsWith(';') ? value.slice(0, -1).split(';') : value.split(';');
+    return entries.length > 0 && entries.every(entry => ASSIGNMENT_CONTEXT_ENTRY_PATTERN.test(entry));
+}
+
+export { isValidAssignmentContext };

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

@@ -19,6 +19,7 @@ export declare class MainThreadAgentEditorComments implements MainThreadAgentEdi
     constructor(extHostContext: IExtHostContext, _bridge: IAgentEditorCommentsBridge);
     $createAgentEditorComments(handle: number, uri: UriComponents): Promise<void>;
     $addComment(handle: number, range: IRange, body: string): Promise<void>;
+    $deleteComment(handle: number, id: string): Promise<void>;
     $disposeAgentEditorComments(handle: number): Promise<void>;
     private _sendComments;
     dispose(): void;

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

@@ -1,6 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { DisposableMap, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IAgentEditorCommentsBridge } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/agentEditorComments/common/agentEditorComments.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
@@ -18,6 +19,11 @@ let MainThreadAgentEditorComments = class MainThreadAgentEditorComments {
         this._resources.set(handle, resource);
         const store = ( new DisposableStore());
         store.add(this._bridge.onDidChangeComments(() => this._sendComments(handle)));
+        store.add(this._bridge.onDidRevealComment(event => {
+            if (isEqual(event.resource, resource)) {
+                this._proxy.$revealAgentEditorComment(handle, event.id);
+            }
+        }));
         this._disposables.set(handle, store);
         this._sendComments(handle);
     }
@@ -28,6 +34,13 @@ let MainThreadAgentEditorComments = class MainThreadAgentEditorComments {
         }
         this._bridge.addComment(resource, range, body);
     }
+    async $deleteComment(handle, id) {
+        const resource = this._resources.get(handle);
+        if (!resource) {
+            return;
+        }
+        this._bridge.deleteComment(resource, id);
+    }
     async $disposeAgentEditorComments(handle) {
         this._resources.delete(handle);
         this._disposables.deleteAndDispose(handle);
@@ -42,7 +55,7 @@ let MainThreadAgentEditorComments = class MainThreadAgentEditorComments {
             range: comment.range,
             body: comment.body
         })));
-        this._proxy.$acceptAgentEditorComments(handle, comments);
+        this._proxy.$acceptAgentEditorComments(handle, comments, this._bridge.acceptsComments(resource));
     }
     dispose() {
         this._disposables.dispose();

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

@@ -13,6 +13,7 @@ import { IAuthenticationUsageService } from "@codingame/monaco-vscode-api/vscode
 import { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { Dto } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier";
 import { IURLService } from "@codingame/monaco-vscode-api/vscode/vs/platform/url/common/url.service";
 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";
@@ -34,6 +35,11 @@ export interface AuthenticationGetSessionOptions {
     account?: AuthenticationSessionAccount;
     authorizationServer?: UriComponents;
 }
+/**
+ * The account icon is a {@link URI} that does not survive being sent over the RPC boundary,
+ * so it needs to be revived when sessions are received from the extension host.
+ */
+export declare function reviveSessionAccountIcon(session: Dto<AuthenticationSession>): AuthenticationSession;
 export declare class MainThreadAuthentication extends Disposable implements MainThreadAuthenticationShape {
     private readonly productService;
     private readonly authenticationService;
@@ -60,7 +66,7 @@ export declare class MainThreadAuthentication extends Disposable implements Main
     $registerAuthenticationProvider({ id, label, supportsMultipleAccounts, resourceServer, supportedAuthorizationServers, supportsChallenges }: IRegisterAuthenticationProviderDetails): Promise<void>;
     $unregisterAuthenticationProvider(id: string): Promise<void>;
     $ensureProvider(id: string): Promise<void>;
-    $sendDidChangeSessions(providerId: string, event: AuthenticationSessionsChangeEvent): Promise<void>;
+    $sendDidChangeSessions(providerId: string, event: Dto<AuthenticationSessionsChangeEvent>): Promise<void>;
     $removeSession(providerId: string, sessionId: string): Promise<void>;
     $waitForUriHandler(expectedUri: UriComponents): Promise<UriComponents>;
     $showContinueNotification(message: string): Promise<boolean>;
@@ -78,8 +84,8 @@ export declare class MainThreadAuthentication extends Disposable implements Main
     private loginPrompt;
     private continueWithIncorrectAccountPrompt;
     private doGetSession;
-    $getSession(providerId: string, scopeListOrRequest: ReadonlyArray<string> | IAuthenticationWwwAuthenticateRequest, extensionId: string, extensionName: string, options: AuthenticationGetSessionOptions): Promise<AuthenticationSession | undefined>;
-    $getAccounts(providerId: string): Promise<ReadonlyArray<AuthenticationSessionAccount>>;
+    $getSession(providerId: string, scopeListOrRequest: ReadonlyArray<string> | IAuthenticationWwwAuthenticateRequest, extensionId: string, extensionName: string, options: AuthenticationGetSessionOptions): Promise<Dto<AuthenticationSession> | undefined>;
+    $getAccounts(providerId: string): Promise<ReadonlyArray<Dto<AuthenticationSessionAccount>>>;
     private _sentClientIdUsageEvents;
     private sendClientIdUsageTelemetry;
     private sendProviderUsageTelemetry;

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { isAuthenticationWwwAuthenticateRequest } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication';
+import { getDynamicAuthenticationProviderId, isAuthenticationWwwAuthenticateRequest } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication';
 import { IAuthenticationService, IAuthenticationExtensionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
@@ -33,6 +33,15 @@ import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 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';
 
+function reviveSessionAccountIcon(session) {
+    return {
+        ...session,
+        account: {
+            ...session.account,
+            icon: URI.revive(session.account.icon)
+        }
+    };
+}
 class MainThreadAuthenticationProvider extends Disposable {
     constructor(
         _proxy,
@@ -53,10 +62,11 @@ class MainThreadAuthenticationProvider extends Disposable {
         this.onDidChangeSessions = onDidChangeSessionsEmitter.event;
     }
     async getSessions(scopes, options) {
-        return this._proxy.$getSessions(this.id, scopes, options);
+        const sessions = await this._proxy.$getSessions(this.id, scopes, options);
+        return ( sessions.map(reviveSessionAccountIcon));
     }
-    createSession(scopes, options) {
-        return this._proxy.$createSession(this.id, scopes, options);
+    async createSession(scopes, options) {
+        return reviveSessionAccountIcon(await this._proxy.$createSession(this.id, scopes, options));
     }
     async removeSession(sessionId) {
         await this._proxy.$removeSession(this.id, sessionId);
@@ -82,11 +92,14 @@ class MainThreadAuthenticationProviderWithChallenges extends MainThreadAuthentic
             onDidChangeSessionsEmitter
         );
     }
-    getSessionsFromChallenges(constraint, options) {
-        return this._proxy.$getSessionsFromChallenges(this.id, constraint, options);
+    async getSessionsFromChallenges(constraint, options) {
+        const sessions = await this._proxy.$getSessionsFromChallenges(this.id, constraint, options);
+        return ( sessions.map(reviveSessionAccountIcon));
     }
-    createSessionFromChallenges(constraint, options) {
-        return this._proxy.$createSessionFromChallenges(this.id, constraint, options);
+    async createSessionFromChallenges(constraint, options) {
+        return reviveSessionAccountIcon(
+            await this._proxy.$createSessionFromChallenges(this.id, constraint, options)
+        );
     }
 }
 let MainThreadAuthentication = class MainThreadAuthentication extends Disposable {
@@ -157,7 +170,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                 overrideClientId,
                 overrideClientSecret
             ) => {
-                const authProviderId = resource ? `${( authorizationServer.toString(true))} ${resource.resource}` : ( authorizationServer.toString(true));
+                const authProviderId = getDynamicAuthenticationProviderId(authorizationServer, resource);
                 const clientDetails = await this.dynamicAuthProviderStorageService.getClientRegistration(authProviderId);
                 let clientId = overrideClientId ?? clientDetails?.clientId;
                 const clientSecret = overrideClientId ? overrideClientSecret : (overrideClientSecret ?? clientDetails?.clientSecret);
@@ -252,7 +265,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     async $sendDidChangeSessions(providerId, event) {
         const obj = this._registrations.get(providerId);
         if (obj instanceof Emitter) {
-            obj.fire(event);
+            obj.fire({
+                added: event.added?.map(reviveSessionAccountIcon),
+                removed: event.removed?.map(reviveSessionAccountIcon),
+                changed: event.changed?.map(reviveSessionAccountIcon)
+            });
         }
     }
     $removeSession(providerId, sessionId) {
@@ -277,8 +294,8 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         return await deferredPromise.p;
     }
     $showContinueNotification(message) {
-        const yes = ( localize(2709, "Yes"));
-        const no = ( localize(2710, "No"));
+        const yes = ( localize(2944, "Yes"));
+        const no = ( localize(2945, "No"));
         const deferredPromise = ( new DeferredPromise());
         let result = false;
         const handle = this.notificationService.prompt(Severity.Warning, message, [{
@@ -334,26 +351,26 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             message = customMessage;
         } else {
             message = recreatingSession ? ( localize(
-                2711,
+                2946,
                 "The extension '{0}' wants you to sign in again using {1}.",
                 extensionName,
                 provider.label
             )) : ( localize(
-                2712,
+                2947,
                 "The extension '{0}' wants to sign in using {1}.",
                 extensionName,
                 provider.label
             ));
         }
         const buttons = [{
-            label: ( localize(2713, "&&Allow")),
+            label: ( localize(2948, "&&Allow")),
             run() {
                 return true;
             }
         }];
         if (options?.learnMore) {
             buttons.push({
-                label: ( localize(2714, "Learn more")),
+                label: ( localize(2949, "Learn more")),
                 run: async () => {
                     const result = this.loginPrompt(provider, extensionName, recreatingSession, options);
                     await this.openerService.open(URI.revive(options.learnMore), {
@@ -376,9 +393,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2715, "Incorrect account detected")),
+            message: ( localize(2950, "Incorrect account detected")),
             detail: ( localize(
-                2716,
+                2951,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -386,10 +403,10 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             type: Severity.Warning,
             cancelButton: true,
             buttons: [{
-                label: ( localize(2717, "Keep {0}", chosenAccountLabel)),
+                label: ( localize(2952, "Keep {0}", chosenAccountLabel)),
                 run: () => chosenAccountLabel
             }, {
-                label: ( localize(2718, "Login with {0}", requestedAccountLabel)),
+                label: ( localize(2953, "Login with {0}", requestedAccountLabel)),
                 run: () => requestedAccountLabel
             }]
         });
@@ -542,15 +559,15 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             result
         } = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(2719, "Device Code Authentication")),
+            message: ( localize(2954, "Device Code Authentication")),
             detail: ( localize(
-                2720,
+                2955,
                 "Your code: {0}\n\nTo complete authentication, navigate to {1} and enter the code above.",
                 userCode,
                 verificationUri
             )),
             buttons: [{
-                label: ( localize(2721, "Copy & Continue")),
+                label: ( localize(2956, "Copy & Continue")),
                 run: () => true
             }],
             cancelButton: true
@@ -560,7 +577,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(2722, "Failed to open {0}", verificationUri)));
+                this.notificationService.error(( localize(2957, "Failed to open {0}", verificationUri)));
             }
         }
         return false;
@@ -569,44 +586,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(2723, "Dynamic Client Registration not supported")),
+            message: ( localize(2958, "Dynamic Client Registration not supported")),
             detail: ( localize(
-                2724,
+                2959,
                 "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(2725, "Copy URIs & Proceed")),
+                label: ( localize(2960, "Copy URIs & Proceed")),
                 run: async () => {
                     try {
                         await this.clipboardService.writeText(redirectUrls);
                     } catch (error) {
-                        this.notificationService.error(( localize(2726, "Failed to copy redirect URIs to clipboard.")));
+                        this.notificationService.error(( localize(2961, "Failed to copy redirect URIs to clipboard.")));
                     }
                     return true;
                 }
             }],
             cancelButton: {
-                label: ( localize(2727, "Cancel")),
+                label: ( localize(2962, "Cancel")),
                 run: () => false
             }
         });
         if (!result) {
             return undefined;
         }
-        const sharedTitle = ( localize(2728, "Add Client Registration Details"));
+        const sharedTitle = ( localize(2963, "Add Client Registration Details"));
         const clientId = await this.quickInputService.input({
             title: sharedTitle,
             prompt: ( localize(
-                2729,
+                2964,
                 "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(2730, "OAuth client ID (azye39d...)")),
+            placeHolder: ( localize(2965, "OAuth client ID (azye39d...)")),
             ignoreFocusLost: true,
             validateInput: async value => {
                 if (!value || value.trim().length === 0) {
-                    return localize(2731, "Client ID is required");
+                    return localize(2966, "Client ID is required");
                 }
                 return undefined;
             }
@@ -617,11 +634,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         const clientSecret = await this.quickInputService.input({
             title: sharedTitle,
             prompt: ( localize(
-                2732,
+                2967,
                 "(optional) Enter an existing client secret associated with the client id '{0}' or leave this field blank",
                 clientId
             )),
-            placeHolder: ( localize(2733, "OAuth client secret (wer32o50f...) or leave it blank")),
+            placeHolder: ( localize(2968, "OAuth client secret (wer32o50f...) or leave it blank")),
             password: true,
             ignoreFocusLost: true
         });
@@ -632,14 +649,14 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async $promptForResourceClientSecret(resourceClientId, resource) {
         const value = await this.quickInputService.input({
-            title: ( localize(2734, "Resource Client Secret Required")),
+            title: ( localize(2969, "Resource Client Secret Required")),
             prompt: ( localize(
-                2735,
+                2970,
                 "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(2736, "Resource client secret")),
+            placeHolder: ( localize(2971, "Resource client secret")),
             password: true,
             ignoreFocusLost: true
         });
@@ -667,4 +684,4 @@ MainThreadAuthentication = __decorate(
     MainThreadAuthentication
 );
 
-export { MainThreadAuthentication };
+export { MainThreadAuthentication, reviveSessionAccountIcon };

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(
-                2737,
+                2972,
                 "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

@@ -27,12 +27,12 @@ import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscod
 export declare class MainThreadChatTask implements IChatTask {
     content: IMarkdownString;
     readonly kind = "progressTask";
-    readonly deferred: DeferredPromise<string | void>;
+    readonly deferred: DeferredPromise<void | string>;
     private readonly _onDidAddProgress;
     get onDidAddProgress(): Event<IChatWarningMessage | IChatContentReference>;
     readonly progress: (IChatWarningMessage | IChatContentReference)[];
     constructor(content: IMarkdownString);
-    task(): Promise<string | void>;
+    task(): Promise<void | string>;
     isSettled(): boolean;
     complete(v: string | void): void;
     add(progress: IChatWarningMessage | IChatContentReference): void;