@codingame/monaco-vscode-extensions-service-override 34.1.2 → 35.0.0

package/index.js

@@ -56,6 +56,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/workbench/services/themes/common/
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/api/browser/statusBarExtensionPoint';
 import './vscode/src/vs/workbench/services/themes/browser/cssExtensionPoint.js';
+import './vscode/src/vs/workbench/api/browser/mainThreadAgentEditorComments.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadLocalization.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadBulkEdits.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js';
@@ -97,6 +98,7 @@ import './vscode/src/vs/workbench/api/browser/mainThreadLanguages.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadLogService.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadMessageService.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadManagedSockets.js';
+import './vscode/src/vs/workbench/api/browser/mainThreadBrowserTunnelProxy.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadOutputService.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadProgress.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadQuickDiff.js';

package/package.json

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

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

@@ -13,9 +13,9 @@ import { getIdAndVersion, areSameExtensions, getGalleryExtensionId, getExtension
 import { ExtensionType, EXTENSION_CATEGORIES } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 
-const notFound = id => ( localize(1950, "Extension '{0}' not found.", id));
+const notFound = id => ( localize(2026, "Extension '{0}' not found.", id));
 const useId = ( localize(
-    1951,
+    2027,
     "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(1952, "Extensions installed on {0}:", this.location)));
+            this.logger.info(( localize(2028, "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(1953, "Installing extensions on {0}...", this.location)) : ( localize(1954, "Installing extensions...")));
+                this.logger.info(this.location ? ( localize(2029, "Installing extensions on {0}...", this.location)) : ( localize(2030, "Installing extensions...")));
             }
             const installVSIXInfos = [];
             const installExtensionInfos = [];
@@ -142,11 +142,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                 failed.push(...failedGalleryExtensions);
             }
         } catch (error) {
-            this.logger.error(( localize(1955, "Error while installing extensions: {0}", getErrorMessage(error))));
+            this.logger.error(( localize(2031, "Error while installing extensions: {0}", getErrorMessage(error))));
             throw error;
         }
         if (failed.length) {
-            throw ( new Error(( localize(1956, "Failed Installing Extensions: {0}", failed.join(", ")))));
+            throw ( new Error(( localize(2032, "Failed Installing Extensions: {0}", failed.join(", ")))));
         }
     }
     async updateExtensions(profileLocation) {
@@ -161,7 +161,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         this.logger.trace(( localize(
-            1957,
+            2033,
             "Fetching latest versions for {0} extensions",
             installedExtensionsQuery.length
         )));
@@ -185,11 +185,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         if (!extensionsToUpdate.length) {
-            this.logger.info(( localize(1958, "No extension to update")));
+            this.logger.info(( localize(2034, "No extension to update")));
             return;
         }
         this.logger.info(( localize(
-            1959,
+            2035,
             "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(
-                    1960,
+                    2036,
                     "Error while updating extension {0}: {1}",
                     extensionResult.identifier.id,
                     getErrorMessage(extensionResult.error)
                 )));
             } else {
                 this.logger.info(( localize(
-                    1961,
+                    2037,
                     "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(
-                        1962,
+                        2038,
                         "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(1963, "Extension '{0}' is already installed.", `${id}@${version}`)));
+                    this.logger.info(( localize(2039, "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(
-                        1963,
+                        2039,
                         "Extension '{0}' is already installed.",
                         version ? `${id}@${version}` : id
                     )));
                     return;
                 }
                 this.logger.info(( localize(
-                    1964,
+                    2040,
                     "Updating the extension '{0}' to the version {1}",
                     id,
                     gallery.version
                 )));
             }
             if (installOptions.isBuiltin) {
-                this.logger.info(version ? ( localize(1965, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(1966, "Installing builtin extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(2041, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(2042, "Installing builtin extension '{0}'...", id)));
             } else {
-                this.logger.info(version ? ( localize(1967, "Installing extension '{0}' v{1}...", id, version)) : ( localize(1968, "Installing extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(2043, "Installing extension '{0}' v{1}...", id, version)) : ( localize(2044, "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(
-                        1969,
+                        2045,
                         "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(
-                        1970,
+                        2046,
                         "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(1971, "Extension '{0}' was successfully installed.", basename(vsix))));
+                this.logger.info(( localize(2047, "Extension '{0}' was successfully installed.", basename(vsix))));
             } catch (error) {
                 if (isCancellationError(error)) {
-                    this.logger.info(( localize(1972, "Cancelled installing extension '{0}'.", basename(vsix))));
+                    this.logger.info(( localize(2048, "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(
-                        1973,
+                        2049,
                         "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(
-                    1974,
+                    2050,
                     "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(
-                    1975,
+                    2051,
                     "Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.",
                     id
                 )));
                 return;
             }
-            this.logger.info(( localize(1976, "Uninstalling {0}...", id)));
+            this.logger.info(( localize(2052, "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(
-                    1977,
+                    2053,
                     "Extension '{0}' was successfully uninstalled from {1}!",
                     id,
                     this.location
                 )));
             } else {
-                this.logger.info(( localize(1978, "Extension '{0}' was successfully uninstalled!", id)));
+                this.logger.info(( localize(2054, "Extension '{0}' was successfully uninstalled!", id)));
             }
         }
     }
@@ -470,12 +470,12 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         });
     }
     notInstalled(id) {
-        return this.location ? ( localize(1979, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(1980, "Extension '{0}' is not installed.", id));
+        return this.location ? ( localize(2055, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(2056, "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(
-                1981,
+                2057,
                 "Extension '{0}' is a built-in extension and not allowed to be updated in the current product quality '{1}'.",
                 extension.identifier.id,
                 this.productService.quality

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

@@ -0,0 +1,25 @@
+import { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IRange } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
+import { IAgentEditorCommentsBridge } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/agentEditorComments/common/agentEditorComments.service";
+import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { MainThreadAgentEditorCommentsShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+/**
+ * Bridges the {@link IAgentEditorCommentsBridge} (backed, in the Agents window,
+ * by the same store the code editor renders its session comments from) to the
+ * extension host, so custom editors (e.g. the Markdown editor) can render and
+ * contribute the same comments. Registered in every extension host; when no
+ * provider is installed (e.g. the regular workbench window) the bridge is a
+ * no-op and this customer simply reports no comments.
+ */
+export declare class MainThreadAgentEditorComments implements MainThreadAgentEditorCommentsShape {
+    private readonly _bridge;
+    private readonly _proxy;
+    private readonly _resources;
+    private readonly _disposables;
+    constructor(extHostContext: IExtHostContext, _bridge: IAgentEditorCommentsBridge);
+    $createAgentEditorComments(handle: number, uri: UriComponents): Promise<void>;
+    $addComment(handle: number, range: IRange, body: string): Promise<void>;
+    $disposeAgentEditorComments(handle: number): Promise<void>;
+    private _sendComments;
+    dispose(): void;
+}

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

@@ -0,0 +1,57 @@
+
+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 { 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';
+import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
+
+let MainThreadAgentEditorComments = class MainThreadAgentEditorComments {
+    constructor(extHostContext, _bridge) {
+        this._bridge = _bridge;
+        this._resources = ( new Map());
+        this._disposables = ( new DisposableMap());
+        this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostAgentEditorComments));
+    }
+    async $createAgentEditorComments(handle, uri) {
+        const resource = URI.revive(uri);
+        this._resources.set(handle, resource);
+        const store = ( new DisposableStore());
+        store.add(this._bridge.onDidChangeComments(() => this._sendComments(handle)));
+        this._disposables.set(handle, store);
+        this._sendComments(handle);
+    }
+    async $addComment(handle, range, body) {
+        const resource = this._resources.get(handle);
+        if (!resource) {
+            return;
+        }
+        this._bridge.addComment(resource, range, body);
+    }
+    async $disposeAgentEditorComments(handle) {
+        this._resources.delete(handle);
+        this._disposables.deleteAndDispose(handle);
+    }
+    _sendComments(handle) {
+        const resource = this._resources.get(handle);
+        if (!resource) {
+            return;
+        }
+        const comments = ( this._bridge.getComments(resource).map(comment => ({
+            id: comment.id,
+            range: comment.range,
+            body: comment.body
+        })));
+        this._proxy.$acceptAgentEditorComments(handle, comments);
+    }
+    dispose() {
+        this._disposables.dispose();
+        this._resources.clear();
+    }
+};
+MainThreadAgentEditorComments = __decorate([
+    extHostNamedCustomer(MainContext.MainThreadAgentEditorComments),
+    ( __param(1, IAgentEditorCommentsBridge))
+], MainThreadAgentEditorComments);
+
+export { MainThreadAgentEditorComments };

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

@@ -277,8 +277,8 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         return await deferredPromise.p;
     }
     $showContinueNotification(message) {
-        const yes = ( localize(2633, "Yes"));
-        const no = ( localize(2634, "No"));
+        const yes = ( localize(2709, "Yes"));
+        const no = ( localize(2710, "No"));
         const deferredPromise = ( new DeferredPromise());
         let result = false;
         const handle = this.notificationService.prompt(Severity.Warning, message, [{
@@ -334,26 +334,26 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             message = customMessage;
         } else {
             message = recreatingSession ? ( localize(
-                2635,
+                2711,
                 "The extension '{0}' wants you to sign in again using {1}.",
                 extensionName,
                 provider.label
             )) : ( localize(
-                2636,
+                2712,
                 "The extension '{0}' wants to sign in using {1}.",
                 extensionName,
                 provider.label
             ));
         }
         const buttons = [{
-            label: ( localize(2637, "&&Allow")),
+            label: ( localize(2713, "&&Allow")),
             run() {
                 return true;
             }
         }];
         if (options?.learnMore) {
             buttons.push({
-                label: ( localize(2638, "Learn more")),
+                label: ( localize(2714, "Learn more")),
                 run: async () => {
                     const result = this.loginPrompt(provider, extensionName, recreatingSession, options);
                     await this.openerService.open(URI.revive(options.learnMore), {
@@ -376,9 +376,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2639, "Incorrect account detected")),
+            message: ( localize(2715, "Incorrect account detected")),
             detail: ( localize(
-                2640,
+                2716,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -386,10 +386,10 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             type: Severity.Warning,
             cancelButton: true,
             buttons: [{
-                label: ( localize(2641, "Keep {0}", chosenAccountLabel)),
+                label: ( localize(2717, "Keep {0}", chosenAccountLabel)),
                 run: () => chosenAccountLabel
             }, {
-                label: ( localize(2642, "Login with {0}", requestedAccountLabel)),
+                label: ( localize(2718, "Login with {0}", requestedAccountLabel)),
                 run: () => requestedAccountLabel
             }]
         });
@@ -542,15 +542,15 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             result
         } = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(2643, "Device Code Authentication")),
+            message: ( localize(2719, "Device Code Authentication")),
             detail: ( localize(
-                2644,
+                2720,
                 "Your code: {0}\n\nTo complete authentication, navigate to {1} and enter the code above.",
                 userCode,
                 verificationUri
             )),
             buttons: [{
-                label: ( localize(2645, "Copy & Continue")),
+                label: ( localize(2721, "Copy & Continue")),
                 run: () => true
             }],
             cancelButton: true
@@ -560,7 +560,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                 await this.clipboardService.writeText(userCode);
                 return await this.openerService.open(( URI.parse(verificationUri)));
             } catch (error) {
-                this.notificationService.error(( localize(2646, "Failed to open {0}", verificationUri)));
+                this.notificationService.error(( localize(2722, "Failed to open {0}", verificationUri)));
             }
         }
         return false;
@@ -569,44 +569,44 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         const redirectUrls = "http://127.0.0.1:33418\nhttps://vscode.dev/redirect";
         const result = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(2647, "Dynamic Client Registration not supported")),
+            message: ( localize(2723, "Dynamic Client Registration not supported")),
             detail: ( localize(
-                2648,
+                2724,
                 "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(2649, "Copy URIs & Proceed")),
+                label: ( localize(2725, "Copy URIs & Proceed")),
                 run: async () => {
                     try {
                         await this.clipboardService.writeText(redirectUrls);
                     } catch (error) {
-                        this.notificationService.error(( localize(2650, "Failed to copy redirect URIs to clipboard.")));
+                        this.notificationService.error(( localize(2726, "Failed to copy redirect URIs to clipboard.")));
                     }
                     return true;
                 }
             }],
             cancelButton: {
-                label: ( localize(2651, "Cancel")),
+                label: ( localize(2727, "Cancel")),
                 run: () => false
             }
         });
         if (!result) {
             return undefined;
         }
-        const sharedTitle = ( localize(2652, "Add Client Registration Details"));
+        const sharedTitle = ( localize(2728, "Add Client Registration Details"));
         const clientId = await this.quickInputService.input({
             title: sharedTitle,
             prompt: ( localize(
-                2653,
+                2729,
                 "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(2654, "OAuth client ID (azye39d...)")),
+            placeHolder: ( localize(2730, "OAuth client ID (azye39d...)")),
             ignoreFocusLost: true,
             validateInput: async value => {
                 if (!value || value.trim().length === 0) {
-                    return localize(2655, "Client ID is required");
+                    return localize(2731, "Client ID is required");
                 }
                 return undefined;
             }
@@ -617,11 +617,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         const clientSecret = await this.quickInputService.input({
             title: sharedTitle,
             prompt: ( localize(
-                2656,
+                2732,
                 "(optional) Enter an existing client secret associated with the client id '{0}' or leave this field blank",
                 clientId
             )),
-            placeHolder: ( localize(2657, "OAuth client secret (wer32o50f...) or leave it blank")),
+            placeHolder: ( localize(2733, "OAuth client secret (wer32o50f...) or leave it blank")),
             password: true,
             ignoreFocusLost: true
         });
@@ -632,14 +632,14 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async $promptForResourceClientSecret(resourceClientId, resource) {
         const value = await this.quickInputService.input({
-            title: ( localize(2658, "Resource Client Secret Required")),
+            title: ( localize(2734, "Resource Client Secret Required")),
             prompt: ( localize(
-                2659,
+                2735,
                 "The resource at '{0}' uses a per-resource client identifier '{1}'. Enter the matching client secret (leave blank if none). The value is saved in OS secret storage; manage it later via the 'Set Client Secret' code lens in mcp.json.",
                 resource,
                 resourceClientId
             )),
-            placeHolder: ( localize(2660, "Resource client secret")),
+            placeHolder: ( localize(2736, "Resource client secret")),
             password: true,
             ignoreFocusLost: true
         });

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

@@ -0,0 +1,23 @@
+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 { ITunnelProxyInfo } from "@codingame/monaco-vscode-api/vscode/vs/platform/tunnel/common/tunnelProxy";
+import { IBrowserViewWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/browserView/common/browserView.service";
+import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
+import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { MainThreadBrowserTunnelProxyShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+/**
+ * Renderer-side bridge for the local extension host tunnel proxy. Gates the
+ * ext host proxy by the remote-proxy setting (and the presence of a remote
+ * authority) and forwards the resolved proxy info to the main process so it
+ * can be applied to the window's remote browser view Electron sessions.
+ */
+export declare class MainThreadBrowserTunnelProxy extends Disposable implements MainThreadBrowserTunnelProxyShape {
+    private readonly _configurationService;
+    private readonly _environmentService;
+    private readonly _browserViewWorkbenchService;
+    private readonly _proxy;
+    constructor(extHostContext: IExtHostContext, _configurationService: IConfigurationService, _environmentService: IWorkbenchEnvironmentService, _browserViewWorkbenchService: IBrowserViewWorkbenchService);
+    private _isEnabled;
+    private _updateEnabled;
+    $updateProxyInfo(info: ITunnelProxyInfo | undefined): void;
+}

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

@@ -0,0 +1,47 @@
+
+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 { IBrowserViewWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/browserView/common/browserView.service';
+import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
+
+const browserRemoteProxyEnabledSettingId = "workbench.browser.enableRemoteProxy";
+let MainThreadBrowserTunnelProxy = class MainThreadBrowserTunnelProxy extends Disposable {
+    constructor(
+        extHostContext,
+        _configurationService,
+        _environmentService,
+        _browserViewWorkbenchService
+    ) {
+        super();
+        this._configurationService = _configurationService;
+        this._environmentService = _environmentService;
+        this._browserViewWorkbenchService = _browserViewWorkbenchService;
+        this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostBrowserTunnelProxy));
+        this._updateEnabled();
+        this._register(this._configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration(browserRemoteProxyEnabledSettingId)) {
+                this._updateEnabled();
+            }
+        }));
+    }
+    _isEnabled() {
+        return !!this._environmentService.remoteAuthority && this._configurationService.getValue(browserRemoteProxyEnabledSettingId) === true;
+    }
+    _updateEnabled() {
+        this._proxy.$setEnabled(this._isEnabled());
+    }
+    $updateProxyInfo(info) {
+        this._browserViewWorkbenchService.setRemoteProxyInfo(info);
+    }
+};
+MainThreadBrowserTunnelProxy = __decorate([
+    extHostNamedCustomer(MainContext.MainThreadBrowserTunnelProxy),
+    ( __param(1, IConfigurationService)),
+    ( __param(2, IWorkbenchEnvironmentService)),
+    ( __param(3, IBrowserViewWorkbenchService))
+], MainThreadBrowserTunnelProxy);
+
+export { MainThreadBrowserTunnelProxy };

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