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

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

@@ -19,3 +19,22 @@ export declare class MainThreadTelemetry extends Disposable implements MainThrea
     $publicLog(eventName: string, data?: ITelemetryData): void;
     $publicLog2<E extends ClassifiedEvent<OmitMetadata<T>> = never, T extends IGDPRProperty = never>(eventName: string, data?: StrictPropertyCheck<T, E>): void;
 }
+/**
+ * The core telemetry property under which the Copilot CAPI flight assignment
+ * context is surfaced. It mirrors the scope of `abexp.assignmentcontext`.
+ */
+export declare const CAPI_ASSIGNMENT_CONTEXT_PROPERTY = "capi.assignmentcontext";
+/**
+ * The private command Copilot invokes to forward its CAPI flight assignments
+ * into core telemetry. Not part of the public API.
+ */
+export declare const SET_CAPI_ASSIGNMENT_CONTEXT_COMMAND = "_telemetry.setCapiAssignmentContext";
+/**
+ * Validates a CAPI assignment-context string before it is trusted onto every
+ * core telemetry event. Because {@link ITelemetryService.setExperimentProperty}
+ * wraps the value in a `TelemetryTrustedValue` (bypassing PII cleaning), the
+ * value must be strictly shaped: a non-empty, size-capped list of `key:value`
+ * entries separated by `;`, with no whitespace or control characters. Any
+ * malformed input is rejected outright.
+ */
+export declare function isValidCapiAssignmentContext(value: string): boolean;

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

@@ -2,8 +2,10 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
+import { isValidAssignmentContext } from '../../../platform/telemetry/common/assignmentContext.js';
 import { TELEMETRY_SETTING_ID, TELEMETRY_OLD_SETTING_ID, TelemetryLevel } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { supportsTelemetry } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetryUtils';
@@ -59,5 +61,16 @@ let MainThreadTelemetry = class MainThreadTelemetry extends Disposable {
     }
 };
 MainThreadTelemetry = MainThreadTelemetry_1 = __decorate([extHostNamedCustomer(MainContext.MainThreadTelemetry), ( __param(1, ITelemetryService)), ( __param(2, IConfigurationService)), ( __param(3, IEnvironmentService)), ( __param(4, IProductService))], MainThreadTelemetry);
+const CAPI_ASSIGNMENT_CONTEXT_PROPERTY = "capi.assignmentcontext";
+const SET_CAPI_ASSIGNMENT_CONTEXT_COMMAND = "_telemetry.setCapiAssignmentContext";
+function isValidCapiAssignmentContext(value) {
+    return isValidAssignmentContext(value);
+}
+CommandsRegistry.registerCommand(SET_CAPI_ASSIGNMENT_CONTEXT_COMMAND, function(accessor, value) {
+    if (typeof value !== "string" || !isValidCapiAssignmentContext(value)) {
+        return;
+    }
+    accessor.get(ITelemetryService).setExperimentProperty(CAPI_ASSIGNMENT_CONTEXT_PROPERTY, value);
+});
 
-export { MainThreadTelemetry };
+export { CAPI_ASSIGNMENT_CONTEXT_PROPERTY, MainThreadTelemetry, SET_CAPI_ASSIGNMENT_CONTEXT_COMMAND, isValidCapiAssignmentContext };

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

@@ -6,7 +6,7 @@ import { extHostNamedCustomer } from '../../services/extensions/common/extHostCu
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { TerminalLocation, TerminalExitReason, ProcessPropertyType } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal';
+import { remoteResolverTerminal, TerminalLocation, TerminalExitReason, ProcessPropertyType } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal';
 import { TerminalDataBufferer } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminalDataBuffering';
 import { ITerminalService, ITerminalGroupService, ITerminalEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { TerminalProcessExtHostProxy } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy';
@@ -161,6 +161,7 @@ let MainThreadTerminalService = class MainThreadTerminalService extends Disposab
             extHostTerminalId,
             forceShellIntegration: launchConfig.forceShellIntegration,
             isFeatureTerminal: launchConfig.isFeatureTerminal,
+            [remoteResolverTerminal]: launchConfig.isRemoteResolverTerminal || undefined,
             isExtensionOwnedTerminal: launchConfig.isExtensionOwnedTerminal,
             useShellEnvironment: launchConfig.useShellEnvironment,
             isTransient: launchConfig.isTransient,
@@ -170,6 +171,7 @@ let MainThreadTerminalService = class MainThreadTerminalService extends Disposab
         const terminal = Promises.withAsyncBody(async r => {
             const terminal = await this._terminalService.createTerminal({
                 config: shellLaunchConfig,
+                cwd: launchConfig.isRemoteResolverTerminal ? shellLaunchConfig.cwd : undefined,
                 location: await this._deserializeParentTerminal(launchConfig.location)
             });
             r(terminal);
@@ -491,6 +493,7 @@ let TerminalDataEventTracker = class TerminalDataEventTracker extends Disposable
         super();
         this._callback = _callback;
         this._terminalService = _terminalService;
+        this._instanceListeners = this._register(( new DisposableMap()));
         this._register(this._bufferer = ( new TerminalDataBufferer(this._callback)));
         for (const instance of this._terminalService.instances) {
             this._registerInstance(instance);
@@ -498,12 +501,16 @@ let TerminalDataEventTracker = class TerminalDataEventTracker extends Disposable
         this._register(
             this._terminalService.onDidCreateInstance(instance => this._registerInstance(instance))
         );
-        this._register(
-            this._terminalService.onDidDisposeInstance(instance => this._bufferer.stopBuffering(instance.instanceId))
-        );
+        this._register(this._terminalService.onDidDisposeInstance(instance => {
+            this._bufferer.stopBuffering(instance.instanceId);
+            this._instanceListeners.deleteAndDispose(instance.instanceId);
+        }));
     }
     _registerInstance(instance) {
-        this._register(this._bufferer.startBuffering(instance.instanceId, instance.onData));
+        this._instanceListeners.set(
+            instance.instanceId,
+            this._bufferer.startBuffering(instance.instanceId, instance.onData)
+        );
     }
 };
 TerminalDataEventTracker = ( __decorate([( __param(1, ITerminalService))], TerminalDataEventTracker));

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

@@ -116,13 +116,13 @@ let MainThreadTunnelService = class MainThreadTunnelService extends Disposable {
     }
     async elevationPrompt(tunnelOptions, tunnel, source) {
         return this.notificationService.prompt(Severity.Info, ( localize(
-            2799,
+            3038,
             "The extension {0} has forwarded port {1}. You'll need to run as superuser to use port {2} locally.",
             source,
             tunnelOptions.remoteAddress.port,
             tunnelOptions.localAddressPort
         )), [{
-            label: ( localize(2800, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
+            label: ( localize(3039, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
             run: async () => {
                 this.elevateionRetry = true;
                 await this.remoteExplorerService.close({

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

@@ -10,7 +10,9 @@ import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/pla
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { defaultExternalUriOpenerId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/externalUriOpener/common/configuration';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/common/configuration';
+import { defaultExternalUriOpenerId } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener';
 import { ContributedExternalUriOpenersStore } from '../../contrib/externalUriOpener/common/contributedOpeners.js';
 import { IExternalUriOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
@@ -61,7 +63,7 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                     }, token);
                 } catch (e) {
                     if (!isCancellationError(e)) {
-                        const openDefaultAction = ( new Action("default", ( localize(2801, "Open using default opener")), undefined, undefined, async () => {
+                        const openDefaultAction = ( new Action("default", ( localize(3040, "Open using default opener")), undefined, undefined, async () => {
                             await this.openerService.open(uri, {
                                 allowTunneling: false,
                                 allowContributedOpeners: defaultExternalUriOpenerId
@@ -70,7 +72,7 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                         openDefaultAction.tooltip = ( uri.toString());
                         this.notificationService.notify({
                             severity: Severity.Error,
-                            message: ( localize(2802, "Could not open uri with '{0}': {1}", id, (e.toString()))),
+                            message: ( localize(3041, "Could not open uri with '{0}': {1}", id, (e.toString()))),
                             actions: {
                                 primary: [openDefaultAction]
                             }

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

@@ -1,6 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { WebviewInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput";
 import { IWebviewWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
@@ -14,13 +15,15 @@ export declare class MainThreadWebviewPanels extends Disposable implements extHo
     private readonly _configurationService;
     private readonly _editorGroupService;
     private readonly _editorService;
+    private readonly _extensionService;
     private readonly _webviewWorkbenchService;
+    private readonly _uriIdentityService;
     private readonly webviewPanelViewType;
     private readonly _proxy;
     private readonly _webviewInputs;
     private readonly _revivers;
     private readonly webviewOriginStore;
-    constructor(context: IExtHostContext, _mainThreadWebviews: MainThreadWebviews, _configurationService: IConfigurationService, _editorGroupService: IEditorGroupsService, _editorService: IEditorService, extensionService: IExtensionService, storageService: IStorageService, _webviewWorkbenchService: IWebviewWorkbenchService);
+    constructor(context: IExtHostContext, _mainThreadWebviews: MainThreadWebviews, _configurationService: IConfigurationService, _editorGroupService: IEditorGroupsService, _editorService: IEditorService, _extensionService: IExtensionService, storageService: IStorageService, _webviewWorkbenchService: IWebviewWorkbenchService, _uriIdentityService: IUriIdentityService);
     get webviewInputs(): Iterable<WebviewInput>;
     addWebviewInput(handle: extHostProtocol.WebviewHandle, input: WebviewInput, options: {
         serializeBuffersForPostMessage: boolean;
@@ -34,6 +37,7 @@ export declare class MainThreadWebviewPanels extends Disposable implements extHo
     $registerSerializer(viewType: string, options: {
         serializeBuffersForPostMessage: boolean;
     }): void;
+    private updateExtensionLocation;
     $unregisterSerializer(viewType: string): void;
     private updateWebviewViewStates;
     private tryGetWebviewInput;

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

@@ -7,6 +7,7 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
+import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { DiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/diffEditorInput';
 import { ExtensionKeyedWebviewOriginStore } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview';
 import { WebviewInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
@@ -68,16 +69,19 @@ let MainThreadWebviewPanels = class MainThreadWebviewPanels extends Disposable {
         _configurationService,
         _editorGroupService,
         _editorService,
-        extensionService,
+        _extensionService,
         storageService,
-        _webviewWorkbenchService
+        _webviewWorkbenchService,
+        _uriIdentityService
     ) {
         super();
         this._mainThreadWebviews = _mainThreadWebviews;
         this._configurationService = _configurationService;
         this._editorGroupService = _editorGroupService;
         this._editorService = _editorService;
+        this._extensionService = _extensionService;
         this._webviewWorkbenchService = _webviewWorkbenchService;
+        this._uriIdentityService = _uriIdentityService;
         this.webviewPanelViewType = ( new WebviewViewTypeTransformer("mainThreadWebview-"));
         this._webviewInputs = ( new WebviewInputStore());
         this._revivers = this._register(( new DisposableMap()));
@@ -99,7 +103,7 @@ let MainThreadWebviewPanels = class MainThreadWebviewPanels extends Disposable {
             canResolve: webview => {
                 const viewType = this.webviewPanelViewType.toExternal(webview.viewType);
                 if (typeof viewType === "string") {
-                    extensionService.activateByEvent(`onWebviewPanel:${viewType}`);
+                    this._extensionService.activateByEvent(`onWebviewPanel:${viewType}`);
                 }
                 return false;
             },
@@ -214,6 +218,7 @@ let MainThreadWebviewPanels = class MainThreadWebviewPanels extends Disposable {
                     }
                 }
                 try {
+                    await this.updateExtensionLocation(webviewInput);
                     await this._proxy.$deserializeWebviewPanel(handle, viewType, {
                         title: webviewInput.getTitle(),
                         state,
@@ -228,6 +233,36 @@ let MainThreadWebviewPanels = class MainThreadWebviewPanels extends Disposable {
             }
         }));
     }
+    async updateExtensionLocation(webviewInput) {
+        const oldExtension = webviewInput.extension;
+        if (!oldExtension?.location) {
+            return;
+        }
+        const extension = await this._extensionService.getExtension(oldExtension.id.value);
+        const extUri = this._uriIdentityService.extUri;
+        if (!extension || extUri.isEqual(oldExtension.location, extension.extensionLocation)) {
+            return;
+        }
+        const webview = webviewInput.webview;
+        const oldLocation = extUri.removeTrailingPathSeparator(extUri.normalizePath(oldExtension.location));
+        webview.contentOptions = {
+            ...webview.contentOptions,
+            localResourceRoots: webview.contentOptions.localResourceRoots?.map(root => {
+                const normalizedRoot = extUri.normalizePath(root);
+                if (!extUri.isEqualOrParent(normalizedRoot, oldLocation)) {
+                    return root;
+                }
+                return URI.joinPath(
+                    extension.extensionLocation,
+                    normalizedRoot.path.slice(oldLocation.path.length)
+                );
+            })
+        };
+        webview.extension = {
+            id: extension.identifier,
+            location: extension.extensionLocation
+        };
+    }
     $unregisterSerializer(viewType) {
         if (!( this._revivers.has(viewType))) {
             throw ( new Error(`No reviver for ${viewType} registered`));
@@ -271,7 +306,7 @@ let MainThreadWebviewPanels = class MainThreadWebviewPanels extends Disposable {
         return this._webviewInputs.getInputForHandle(handle);
     }
 };
-MainThreadWebviewPanels = ( __decorate([( __param(2, IConfigurationService)), ( __param(3, IEditorGroupsService)), ( __param(4, IEditorService)), ( __param(5, IExtensionService)), ( __param(6, IStorageService)), ( __param(7, IWebviewWorkbenchService))], MainThreadWebviewPanels));
+MainThreadWebviewPanels = ( __decorate([( __param(2, IConfigurationService)), ( __param(3, IEditorGroupsService)), ( __param(4, IEditorService)), ( __param(5, IExtensionService)), ( __param(6, IStorageService)), ( __param(7, IWebviewWorkbenchService)), ( __param(8, IUriIdentityService))], MainThreadWebviewPanels));
 function reviveWebviewIcon(value) {
     if (!value) {
         return undefined;

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

@@ -118,7 +118,7 @@ let MainThreadWebviews = class MainThreadWebviews extends Disposable {
                 <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
                 <meta http-equiv="Content-Security-Policy" content="default-src 'none';">
             </head>
-            <body>${( localize(2803, "An error occurred while loading view: {0}", escape(viewType)))}</body>
+            <body>${( localize(3042, "An error occurred while loading view: {0}", escape(viewType)))}</body>
         </html>`;
     }
 };

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

@@ -114,10 +114,10 @@ let MainThreadWorkspace = class MainThreadWorkspace extends Disposable {
         const wantsToDelete = removeCount > 0;
         if (wantsToAdd && !wantsToDelete) {
             if (addCount === 1) {
-                message = ( localize(2804, "Extension '{0}' added 1 folder to the workspace", extensionName));
+                message = ( localize(3043, "Extension '{0}' added 1 folder to the workspace", extensionName));
             } else {
                 message = ( localize(
-                    2805,
+                    3044,
                     "Extension '{0}' added {1} folders to the workspace",
                     extensionName,
                     addCount
@@ -126,10 +126,10 @@ let MainThreadWorkspace = class MainThreadWorkspace extends Disposable {
         }
         else if (wantsToDelete && !wantsToAdd) {
             if (removeCount === 1) {
-                message = ( localize(2806, "Extension '{0}' removed 1 folder from the workspace", extensionName));
+                message = ( localize(3045, "Extension '{0}' removed 1 folder from the workspace", extensionName));
             } else {
                 message = ( localize(
-                    2807,
+                    3046,
                     "Extension '{0}' removed {1} folders from the workspace",
                     extensionName,
                     removeCount
@@ -137,7 +137,7 @@ let MainThreadWorkspace = class MainThreadWorkspace extends Disposable {
             }
         }
         else {
-            message = ( localize(2808, "Extension '{0}' changed folders of the workspace", extensionName));
+            message = ( localize(3047, "Extension '{0}' changed folders of the workspace", extensionName));
         }
         return message;
     }

package/vscode/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.js

@@ -60,7 +60,7 @@ let CustomTextEditorModel = CustomTextEditorModel_1 = class CustomTextEditorMode
         }));
         this._register(extensionService.onWillStop(e => {
             e.veto(true, ( localize(
-                9348,
+                11284,
                 "An extension provided text editor for '{0}' is still open that would close otherwise.",
                 this.name
             )));

package/vscode/src/vs/workbench/services/extensionManagement/browser/extensionBisect.js

@@ -169,11 +169,11 @@ let ExtensionBisectUi = class ExtensionBisectUi {
     }
     _showBisectPrompt() {
         const goodPrompt = {
-            label: ( localize(17540, "I can't reproduce")),
+            label: ( localize(19615, "I can't reproduce")),
             run: () => this._commandService.executeCommand("extension.bisect.next", false)
         };
         const badPrompt = {
-            label: ( localize(17541, "I can reproduce")),
+            label: ( localize(19616, "I can reproduce")),
             run: () => this._commandService.executeCommand("extension.bisect.next", true)
         };
         const stop = {
@@ -181,10 +181,10 @@ let ExtensionBisectUi = class ExtensionBisectUi {
             run: () => this._commandService.executeCommand("extension.bisect.stop")
         };
         const message = this._extensionBisectService.disabledCount === 1 ? ( localize(
-            17542,
+            19617,
             "Extension Bisect is active and has disabled 1 extension. Check if you can still reproduce the problem and proceed by selecting from these options."
         )) : ( localize(
-            17543,
+            19618,
             "Extension Bisect is active and has disabled {0} extensions. Check if you can still reproduce the problem and proceed by selecting from these options.",
             this._extensionBisectService.disabledCount
         ));
@@ -200,7 +200,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "extension.bisect.start",
-            title: ( localize2(17544, "Start Extension Bisect")),
+            title: ( localize2(19619, "Start Extension Bisect")),
             category: Categories.Help,
             f1: true,
             precondition: ( ExtensionBisectUi.ctxIsBisectActive.negate()),
@@ -220,13 +220,13 @@ registerAction2(class extends Action2 {
         const extensionsBisect = accessor.get(IExtensionBisectService);
         const extensions = (await extensionManagement.getInstalled(ExtensionType.User)).filter(ext => extensionEnablementService.isEnabled(ext));
         const res = await dialogService.confirm({
-            message: ( localize(17545, "Extension Bisect")),
+            message: ( localize(19620, "Extension Bisect")),
             detail: ( localize(
-                17546,
+                19621,
                 "Extension Bisect will use binary search to find an extension that causes a problem. During the process the window reloads repeatedly (~{0} times). Each time you must confirm if you are still seeing problems.",
                 2 + Math.log2(extensions.length) | 0
             )),
-            primaryButton: ( localize(17547, "&&Start Extension Bisect"))
+            primaryButton: ( localize(19622, "&&Start Extension Bisect"))
         });
         if (res.confirmed) {
             await extensionsBisect.start(extensions);
@@ -238,7 +238,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "extension.bisect.next",
-            title: ( localize2(17548, "Continue Extension Bisect")),
+            title: ( localize2(19623, "Continue Extension Bisect")),
             category: Categories.Help,
             f1: true,
             precondition: ExtensionBisectUi.ctxIsBisectActive
@@ -272,24 +272,24 @@ registerAction2(class extends Action2 {
             return;
         }
         if (done.bad) {
-            await dialogService.info(( localize(17549, "Extension Bisect")), ( localize(
-                17550,
+            await dialogService.info(( localize(19624, "Extension Bisect")), ( localize(
+                19625,
                 "Extension Bisect is done but no extension has been identified. This might be a problem with {0}.",
                 productService.nameShort
             )));
         } else {
             const res = await dialogService.confirm({
                 type: Severity.Info,
-                message: ( localize(17549, "Extension Bisect")),
-                primaryButton: ( localize(17551, "&&Report Issue & Continue")),
-                cancelButton: ( localize(17552, "Continue")),
+                message: ( localize(19624, "Extension Bisect")),
+                primaryButton: ( localize(19626, "&&Report Issue & Continue")),
+                cancelButton: ( localize(19627, "Continue")),
                 detail: ( localize(
-                    17553,
+                    19628,
                     "Extension Bisect is done and has identified {0} as the extension causing the problem.",
                     done.id
                 )),
                 checkbox: {
-                    label: ( localize(17554, "Keep this extension disabled")),
+                    label: ( localize(19629, "Keep this extension disabled")),
                     checked: true
                 }
             });
@@ -310,24 +310,24 @@ registerAction2(class extends Action2 {
             result
         } = await dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(17555, "Extension Bisect")),
+            message: ( localize(19630, "Extension Bisect")),
             detail: ( localize(
-                17556,
+                19631,
                 "Extension Bisect is active and has disabled {0} extensions. Check if you can still reproduce the problem and proceed by selecting from these options.",
                 bisectService.disabledCount
             )),
             buttons: [{
-                label: ( localize(17557, "I ca&&n't reproduce")),
+                label: ( localize(19632, "I ca&&n't reproduce")),
                 run: () => false
             }, {
-                label: ( localize(17558, "I can &&reproduce")),
+                label: ( localize(19633, "I can &&reproduce")),
                 run: () => true
             }, {
-                label: ( localize(17559, "&&Stop Bisect")),
+                label: ( localize(19634, "&&Stop Bisect")),
                 run: () => undefined
             }],
             cancelButton: {
-                label: ( localize(17560, "&&Cancel Bisect")),
+                label: ( localize(19635, "&&Cancel Bisect")),
                 run: () => null
             }
         });
@@ -338,7 +338,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "extension.bisect.stop",
-            title: ( localize2(17561, "Stop Extension Bisect")),
+            title: ( localize2(19636, "Stop Extension Bisect")),
             category: Categories.Help,
             f1: true,
             precondition: ExtensionBisectUi.ctxIsBisectActive

package/vscode/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.js

@@ -767,7 +767,7 @@ let WebExtensionsScannerService = class WebExtensionsScannerService extends Disp
         }
         if (!this.extensionManifestPropertiesService.canExecuteOnWeb(manifest)) {
             throw ( new Error(( localize(
-                17576,
+                19651,
                 "Cannot add '{0}' because this extension is not a web extension.",
                 manifest.displayName || manifest.name
             ))));
@@ -1046,7 +1046,7 @@ if (isWeb) {
         constructor() {
             super({
                 id: "workbench.extensions.action.openInstalledWebExtensionsResource",
-                title: ( localize2(17577, "Open Installed Web Extensions Resource")),
+                title: ( localize2(19652, "Open Installed Web Extensions Resource")),
                 category: Categories.Developer,
                 f1: true,
                 precondition: IsWebContext

package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js

@@ -222,13 +222,13 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
                     }
                 }, {
                     id: "join.disconnectRemote",
-                    label: ( localize(17643, "Disconnect Remote Agent")),
+                    label: ( localize(19718, "Disconnect Remote Agent")),
                     order: WillShutdownJoinerOrder.Last
                 });
             } else {
                 event.join(this._doStopExtensionHosts(), {
                     id: "join.stopExtensionHosts",
-                    label: ( localize(17644, "Stopping Extension Hosts"))
+                    label: ( localize(19719, "Stopping Extension Hosts"))
                 });
             }
         }));
@@ -301,7 +301,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    17645,
+                    19720,
                     "The following extensions contain dependency loops and have been disabled: {0}",
                     ( result.removedDueToLooping.map(e => `'${e.identifier.value}'`)).join(", ")
                 ))
@@ -538,7 +538,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    17645,
+                    19720,
                     "The following extensions contain dependency loops and have been disabled: {0}",
                     ( result.removedDueToLooping.map(e => `'${e.identifier.value}'`)).join(", ")
                 ))
@@ -553,7 +553,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         const extensionHostManager = this.findTestExtensionHost(this._environmentService.extensionTestsLocationURI);
         if (!extensionHostManager) {
             const msg = ( localize(
-                17646,
+                19721,
                 "No extension host found that can launch the test runner at {0}.",
                 (this._environmentService.extensionTestsLocationURI.toString())
             ));
@@ -723,7 +723,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
                             vetoReasons.add(reason);
                         }
                     }).catch(error => {
-                        vetoReasons.add(( localize(17647, "{0} (Error: {1})", reason, toErrorMessage(error))));
+                        vetoReasons.add(( localize(19722, "{0} (Error: {1})", reason, toErrorMessage(error))));
                     });
                 }
             }
@@ -741,9 +741,9 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
                     confirmed
                 } = await this._dialogService.confirm({
                     type: Severity.Warning,
-                    message: ( localize(17648, "Please confirm restart of extensions.")),
+                    message: ( localize(19723, "Please confirm restart of extensions.")),
                     detail: vetoReasonsArray.length === 1 ? vetoReasonsArray[0] : vetoReasonsArray.join("\n -"),
-                    primaryButton: ( localize(17649, "Restart Anyway"))
+                    primaryButton: ( localize(19724, "Restart Anyway"))
                 });
                 if (confirmed) {
                     return true;
@@ -857,16 +857,16 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             this._remoteCrashTracker.registerCrash();
             if (this._remoteCrashTracker.shouldAutomaticallyRestart()) {
                 this._logService.info(`Automatically restarting the remote extension host.`);
-                this._notificationService.status(( localize(17650, "The remote extension host terminated unexpectedly. Restarting...")), {
+                this._notificationService.status(( localize(19725, "The remote extension host terminated unexpectedly. Restarting...")), {
                     hideAfter: 5000
                 });
                 this._startExtensionHostsIfNecessary(false, Array.from(( this._allRequestedActivateEvents.keys())));
             } else {
                 this._notificationService.prompt(Severity.Error, ( localize(
-                    17651,
+                    19726,
                     "Remote Extension host terminated unexpectedly 3 times within the last 5 minutes."
                 )), [{
-                    label: ( localize(17652, "Restart Remote Extension Host")),
+                    label: ( localize(19727, "Restart Remote Extension Host")),
                     run: () => {
                         this._startExtensionHostsIfNecessary(false, Array.from(( this._allRequestedActivateEvents.keys())));
                     }
@@ -1414,7 +1414,7 @@ class ActivationFeatureMarkdowneRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "activationEvents",
-    label: ( localize(17653, "Activation Events")),
+    label: ( localize(19728, "Activation Events")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.js

@@ -485,7 +485,7 @@ registerAction2(class MeasureExtHostLatencyAction extends Action2 {
     constructor() {
         super({
             id: "editor.action.measureExtHostLatency",
-            title: ( localize2(17654, "Measure Extension Host Latency")),
+            title: ( localize2(19729, "Measure Extension Host Latency")),
             category: Categories.Developer,
             f1: true
         });

package/vscode/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.js

@@ -115,7 +115,7 @@ let ExtensionRunningLocationTracker = class ExtensionRunningLocationTracker {
             if (!extension.extensionAffinity) {
                 continue;
             }
-            if (!isProposedApiEnabled(extension)) {
+            if (!isProposedApiEnabled(extension, "extensionAffinity")) {
                 this._logService.warn(
                     `Extension '${extension.identifier.value}' declares 'extensionAffinity' in its package.json but does not enable the 'extensionAffinity' API proposal. Add '"enabledApiProposals": ["extensionAffinity"]' to the extension's package.json to use this feature.`
                 );

package/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.js

@@ -110,7 +110,7 @@ class ApiProposalsMarkdowneRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "enabledApiProposals",
-    label: ( localize(17655, "API Proposals")),
+    label: ( localize(19730, "API Proposals")),
     access: {
         canToggle: false
     },