@codingame/monaco-vscode-extensions-service-override 31.0.0 → 32.0.0

package/index.js

@@ -100,6 +100,7 @@ import './vscode/src/vs/workbench/api/browser/mainThreadManagedSockets.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';
+import './vscode/src/vs/workbench/api/browser/mainThreadDocumentDiff.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadQuickOpen.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadRemoteConnectionData.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadSaveParticipant.js';
@@ -144,6 +145,7 @@ import './vscode/src/vs/workbench/api/browser/mainThreadMcp.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadChatContext.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadChatDebug.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadChatStatus.js';
+import './vscode/src/vs/workbench/api/browser/mainThreadChatInputNotification.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadChatOutputRenderer.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadChatSessions.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadDataChannels.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "31.0.0",
+  "version": "32.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": "31.0.0",
-    "@codingame/monaco-vscode-files-service-override": "31.0.0"
+    "@codingame/monaco-vscode-api": "32.0.0",
+    "@codingame/monaco-vscode-files-service-override": "32.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(1886, "Extension '{0}' not found.", id));
+const notFound = id => ( localize(1898, "Extension '{0}' not found.", id));
 const useId = ( localize(
-    1887,
+    1899,
     "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(1888, "Extensions installed on {0}:", this.location)));
+            this.logger.info(( localize(1900, "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(1889, "Installing extensions on {0}...", this.location)) : ( localize(1890, "Installing extensions...")));
+                this.logger.info(this.location ? ( localize(1901, "Installing extensions on {0}...", this.location)) : ( localize(1902, "Installing extensions...")));
             }
             const installVSIXInfos = [];
             const installExtensionInfos = [];
@@ -142,11 +142,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                 failed.push(...failedGalleryExtensions);
             }
         } catch (error) {
-            this.logger.error(( localize(1891, "Error while installing extensions: {0}", getErrorMessage(error))));
+            this.logger.error(( localize(1903, "Error while installing extensions: {0}", getErrorMessage(error))));
             throw error;
         }
         if (failed.length) {
-            throw ( new Error(( localize(1892, "Failed Installing Extensions: {0}", failed.join(", ")))));
+            throw ( new Error(( localize(1904, "Failed Installing Extensions: {0}", failed.join(", ")))));
         }
     }
     async updateExtensions(profileLocation) {
@@ -161,7 +161,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         this.logger.trace(( localize(
-            1893,
+            1905,
             "Fetching latest versions for {0} extensions",
             installedExtensionsQuery.length
         )));
@@ -185,11 +185,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         if (!extensionsToUpdate.length) {
-            this.logger.info(( localize(1894, "No extension to update")));
+            this.logger.info(( localize(1906, "No extension to update")));
             return;
         }
         this.logger.info(( localize(
-            1895,
+            1907,
             "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(
-                    1896,
+                    1908,
                     "Error while updating extension {0}: {1}",
                     extensionResult.identifier.id,
                     getErrorMessage(extensionResult.error)
                 )));
             } else {
                 this.logger.info(( localize(
-                    1897,
+                    1909,
                     "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(
-                        1898,
+                        1910,
                         "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(1899, "Extension '{0}' is already installed.", `${id}@${version}`)));
+                    this.logger.info(( localize(1911, "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(
-                        1899,
+                        1911,
                         "Extension '{0}' is already installed.",
                         version ? `${id}@${version}` : id
                     )));
                     return;
                 }
                 this.logger.info(( localize(
-                    1900,
+                    1912,
                     "Updating the extension '{0}' to the version {1}",
                     id,
                     gallery.version
                 )));
             }
             if (installOptions.isBuiltin) {
-                this.logger.info(version ? ( localize(1901, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(1902, "Installing builtin extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(1913, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(1914, "Installing builtin extension '{0}'...", id)));
             } else {
-                this.logger.info(version ? ( localize(1903, "Installing extension '{0}' v{1}...", id, version)) : ( localize(1904, "Installing extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(1915, "Installing extension '{0}' v{1}...", id, version)) : ( localize(1916, "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(
-                        1905,
+                        1917,
                         "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(
-                        1906,
+                        1918,
                         "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(1907, "Extension '{0}' was successfully installed.", basename(vsix))));
+                this.logger.info(( localize(1919, "Extension '{0}' was successfully installed.", basename(vsix))));
             } catch (error) {
                 if (isCancellationError(error)) {
-                    this.logger.info(( localize(1908, "Cancelled installing extension '{0}'.", basename(vsix))));
+                    this.logger.info(( localize(1920, "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(
-                        1909,
+                        1921,
                         "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(
-                    1910,
+                    1922,
                     "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(
-                    1911,
+                    1923,
                     "Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.",
                     id
                 )));
                 return;
             }
-            this.logger.info(( localize(1912, "Uninstalling {0}...", id)));
+            this.logger.info(( localize(1924, "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(
-                    1913,
+                    1925,
                     "Extension '{0}' was successfully uninstalled from {1}!",
                     id,
                     this.location
                 )));
             } else {
-                this.logger.info(( localize(1914, "Extension '{0}' was successfully uninstalled!", id)));
+                this.logger.info(( localize(1926, "Extension '{0}' was successfully uninstalled!", id)));
             }
         }
     }
@@ -470,12 +470,12 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         });
     }
     notInstalled(id) {
-        return this.location ? ( localize(1915, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(1916, "Extension '{0}' is not installed.", id));
+        return this.location ? ( localize(1927, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(1928, "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(
-                1917,
+                1929,
                 "Extension '{0}' is a built-in extension and not allowed to be updated in the current product quality '{1}'.",
                 extension.identifier.id,
                 this.productService.quality

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

@@ -245,8 +245,8 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         return await deferredPromise.p;
     }
     $showContinueNotification(message) {
-        const yes = ( localize(2523, "Yes"));
-        const no = ( localize(2524, "No"));
+        const yes = ( localize(2562, "Yes"));
+        const no = ( localize(2563, "No"));
         const deferredPromise = ( new DeferredPromise());
         let result = false;
         const handle = this.notificationService.prompt(Severity.Warning, message, [{
@@ -302,26 +302,26 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             message = customMessage;
         } else {
             message = recreatingSession ? ( localize(
-                2525,
+                2564,
                 "The extension '{0}' wants you to sign in again using {1}.",
                 extensionName,
                 provider.label
             )) : ( localize(
-                2526,
+                2565,
                 "The extension '{0}' wants to sign in using {1}.",
                 extensionName,
                 provider.label
             ));
         }
         const buttons = [{
-            label: ( localize(2527, "&&Allow")),
+            label: ( localize(2566, "&&Allow")),
             run() {
                 return true;
             }
         }];
         if (options?.learnMore) {
             buttons.push({
-                label: ( localize(2528, "Learn more")),
+                label: ( localize(2567, "Learn more")),
                 run: async () => {
                     const result = this.loginPrompt(provider, extensionName, recreatingSession, options);
                     await this.openerService.open(URI.revive(options.learnMore), {
@@ -344,9 +344,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2529, "Incorrect account detected")),
+            message: ( localize(2568, "Incorrect account detected")),
             detail: ( localize(
-                2530,
+                2569,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -354,10 +354,10 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             type: Severity.Warning,
             cancelButton: true,
             buttons: [{
-                label: ( localize(2531, "Keep {0}", chosenAccountLabel)),
+                label: ( localize(2570, "Keep {0}", chosenAccountLabel)),
                 run: () => chosenAccountLabel
             }, {
-                label: ( localize(2532, "Login with {0}", requestedAccountLabel)),
+                label: ( localize(2571, "Login with {0}", requestedAccountLabel)),
                 run: () => requestedAccountLabel
             }]
         });
@@ -510,15 +510,15 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             result
         } = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(2533, "Device Code Authentication")),
+            message: ( localize(2572, "Device Code Authentication")),
             detail: ( localize(
-                2534,
+                2573,
                 "Your code: {0}\n\nTo complete authentication, navigate to {1} and enter the code above.",
                 userCode,
                 verificationUri
             )),
             buttons: [{
-                label: ( localize(2535, "Copy & Continue")),
+                label: ( localize(2574, "Copy & Continue")),
                 run: () => true
             }],
             cancelButton: true
@@ -528,7 +528,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(2536, "Failed to open {0}", verificationUri)));
+                this.notificationService.error(( localize(2575, "Failed to open {0}", verificationUri)));
             }
         }
         return false;
@@ -537,44 +537,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(2537, "Dynamic Client Registration not supported")),
+            message: ( localize(2576, "Dynamic Client Registration not supported")),
             detail: ( localize(
-                2538,
+                2577,
                 "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(2539, "Copy URIs & Proceed")),
+                label: ( localize(2578, "Copy URIs & Proceed")),
                 run: async () => {
                     try {
                         await this.clipboardService.writeText(redirectUrls);
                     } catch (error) {
-                        this.notificationService.error(( localize(2540, "Failed to copy redirect URIs to clipboard.")));
+                        this.notificationService.error(( localize(2579, "Failed to copy redirect URIs to clipboard.")));
                     }
                     return true;
                 }
             }],
             cancelButton: {
-                label: ( localize(2541, "Cancel")),
+                label: ( localize(2580, "Cancel")),
                 run: () => false
             }
         });
         if (!result) {
             return undefined;
         }
-        const sharedTitle = ( localize(2542, "Add Client Registration Details"));
+        const sharedTitle = ( localize(2581, "Add Client Registration Details"));
         const clientId = await this.quickInputService.input({
             title: sharedTitle,
             prompt: ( localize(
-                2543,
+                2582,
                 "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(2544, "OAuth client ID (azye39d...)")),
+            placeHolder: ( localize(2583, "OAuth client ID (azye39d...)")),
             ignoreFocusLost: true,
             validateInput: async value => {
                 if (!value || value.trim().length === 0) {
-                    return localize(2545, "Client ID is required");
+                    return localize(2584, "Client ID is required");
                 }
                 return undefined;
             }
@@ -585,11 +585,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         const clientSecret = await this.quickInputService.input({
             title: sharedTitle,
             prompt: ( localize(
-                2546,
+                2585,
                 "(optional) Enter an existing client secret associated with the client id '{0}' or leave this field blank",
                 clientId
             )),
-            placeHolder: ( localize(2547, "OAuth client secret (wer32o50f...) or leave it blank")),
+            placeHolder: ( localize(2586, "OAuth client secret (wer32o50f...) or leave it blank")),
             password: true,
             ignoreFocusLost: true
         });

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

@@ -3,6 +3,7 @@ import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { BrowserTabDto, MainThreadBrowsersShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { IBrowserViewCDPService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/browserView/common/browserView.service";
+import { IBrowserViewWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/browserView/common/browserView.service";
 import { EditorGroupColumn } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupColumn";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
@@ -11,12 +12,13 @@ import { CDPRequest } from "@codingame/monaco-vscode-api/vscode/vs/platform/brow
 export declare class MainThreadBrowsers extends Disposable implements MainThreadBrowsersShape {
     private readonly editorService;
     private readonly cdpService;
+    private readonly browserViewService;
     private readonly editorGroupsService;
     private readonly configurationService;
     private readonly _proxy;
     private readonly _cdpSessions;
     private readonly _knownBrowsers;
-    constructor(extHostContext: IExtHostContext, editorService: IEditorService, cdpService: IBrowserViewCDPService, editorGroupsService: IEditorGroupsService, configurationService: IConfigurationService);
+    constructor(extHostContext: IExtHostContext, editorService: IEditorService, cdpService: IBrowserViewCDPService, browserViewService: IBrowserViewWorkbenchService, editorGroupsService: IEditorGroupsService, configurationService: IConfigurationService);
     $openBrowserTab(url: string, viewColumn?: EditorGroupColumn, options?: IEditorOptions): Promise<BrowserTabDto>;
     private _lastActiveBrowserId;
     private _syncActiveBrowserTab;

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

@@ -4,7 +4,7 @@ import { Disposable, DisposableMap, DisposableStore, toDisposable } from '@codin
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { IBrowserViewCDPService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/browserView/common/browserView.service';
+import { IBrowserViewCDPService, IBrowserViewWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/browserView/common/browserView.service';
 import { BrowserViewUri } from '@codingame/monaco-vscode-api/vscode/vs/platform/browserView/common/browserViewUri';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { columnToEditorGroup } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupColumn';
@@ -17,30 +17,30 @@ let MainThreadBrowsers = class MainThreadBrowsers extends Disposable {
         extHostContext,
         editorService,
         cdpService,
+        browserViewService,
         editorGroupsService,
         configurationService
     ) {
         super();
         this.editorService = editorService;
         this.cdpService = cdpService;
+        this.browserViewService = browserViewService;
         this.editorGroupsService = editorGroupsService;
         this.configurationService = configurationService;
         this._cdpSessions = this._register(( new DisposableMap()));
         this._knownBrowsers = this._register(( new DisposableMap()));
         this._lastActiveBrowserId = undefined;
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostBrowsers));
-        this._register(this.editorService.onWillOpenEditor(e => {
-            if (e.editor instanceof BrowserEditorInput) {
-                this._track(e.editor);
+        this._register(this.browserViewService.onDidChangeBrowserViews(() => {
+            for (const editor of ( this.browserViewService.getKnownBrowserViews().values())) {
+                this._track(editor);
             }
         }));
         this._register(
             this.editorService.onDidActiveEditorChange(() => this._syncActiveBrowserTab())
         );
-        for (const input of this.editorService.editors) {
-            if (input instanceof BrowserEditorInput) {
-                this._track(input);
-            }
+        for (const editor of ( this.browserViewService.getKnownBrowserViews().values())) {
+            this._track(editor);
         }
         this._syncActiveBrowserTab();
     }
@@ -142,6 +142,6 @@ let MainThreadBrowsers = class MainThreadBrowsers extends Disposable {
         known.input.dispose();
     }
 };
-MainThreadBrowsers = __decorate([extHostNamedCustomer(MainContext.MainThreadBrowsers), ( __param(1, IEditorService)), ( __param(2, IBrowserViewCDPService)), ( __param(3, IEditorGroupsService)), ( __param(4, IConfigurationService))], MainThreadBrowsers);
+MainThreadBrowsers = __decorate([extHostNamedCustomer(MainContext.MainThreadBrowsers), ( __param(1, IEditorService)), ( __param(2, IBrowserViewCDPService)), ( __param(3, IBrowserViewWorkbenchService)), ( __param(4, IEditorGroupsService)), ( __param(5, IConfigurationService))], MainThreadBrowsers);
 
 export { MainThreadBrowsers };

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

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

@@ -37,7 +37,7 @@ import { extHostNamedCustomer } from '../../services/extensions/common/extHostCu
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { NotebookDto } from './mainThreadNotebookDto.js';
-import { isUntitledChatSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
+import { isUntitledChatSession, getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { ICustomizationHarnessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService.service';
 import { AICustomizationManagementSection, BUILTIN_STORAGE } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
 import { IAgentPluginService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service';
@@ -202,7 +202,8 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
             tools: agent.tools,
             model: agent.model,
             userInvocable: agent.visibility.userInvocable,
-            disableModelInvocation: !agent.visibility.agentInvocable
+            disableModelInvocation: !agent.visibility.agentInvocable,
+            enabled: agent.enabled
         };
     }
     _toInstructionDto(instruction) {
@@ -226,7 +227,8 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
             extensionId: skill.extension?.identifier.value,
             pluginUri: skill.pluginUri,
             sessionTypes: skill.sessionTypes,
-            userInvocable: skill.userInvocable
+            userInvocable: skill.userInvocable,
+            disableModelInvocation: skill.disableModelInvocation
         };
     }
     _toSlashCommandDto(slashCommand) {
@@ -245,7 +247,10 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
     _toHookDto(hookFile) {
         return {
             uri: hookFile.uri,
-            sessionTypes: hookFile.sessionTypes
+            sessionTypes: hookFile.sessionTypes,
+            source: this._toChatResourceSource(hookFile.storage),
+            extensionId: hookFile.extension?.identifier.value,
+            pluginUri: hookFile.pluginUri
         };
     }
     _toPluginDto(plugin) {
@@ -319,7 +324,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                         history,
                         chatSessionContext
                     }, token);
-                    if (rpcResult?.errorCallstack) {
+                    if (rpcResult?.errorCallstack && !rpcResult.errorDetails?.isRateLimited && !rpcResult.errorDetails?.isQuotaExceeded && !rpcResult.errorDetails?.isExpectedError) {
                         this._telemetryService.publicLogError2("chatAgentError", {
                             callstack: rpcResult.errorCallstack,
                             msg: rpcResult.errorDetails?.message ?? "",
@@ -495,25 +500,34 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                 }
                 continue;
             }
-            if (revivedProgress.kind === "inlineReference" && revivedProgress.resolveId) {
+            if (revivedProgress.kind === "inlineReference" && revivedProgress.resolveId && response) {
                 if (!( this._unresolvedAnchors.has(requestId))) {
                     this._unresolvedAnchors.set(requestId, ( new Map()));
                 }
-                this._unresolvedAnchors.get(requestId)?.set(revivedProgress.resolveId, revivedProgress);
+                this._unresolvedAnchors.get(requestId)?.set(revivedProgress.resolveId, {
+                    response
+                });
             }
             chatProgressParts.push(revivedProgress);
         }
         progress(chatProgressParts);
     }
     $handleAnchorResolve(requestId, handle, resolveAnchor) {
-        const anchor = this._unresolvedAnchors.get(requestId)?.get(handle);
-        if (!anchor) {
+        const unresolvedAnchorsForRequest = this._unresolvedAnchors.get(requestId);
+        if (!unresolvedAnchorsForRequest) {
+            return;
+        }
+        const unresolvedAnchor = unresolvedAnchorsForRequest.get(handle);
+        if (!unresolvedAnchor) {
             return;
         }
-        this._unresolvedAnchors.get(requestId)?.delete(handle);
+        unresolvedAnchorsForRequest.delete(handle);
+        if (unresolvedAnchorsForRequest.size === 0) {
+            this._unresolvedAnchors.delete(requestId);
+        }
         if (resolveAnchor) {
             const revivedAnchor = revive(resolveAnchor);
-            anchor.inlineReference = revivedAnchor.inlineReference;
+            unresolvedAnchor.response.resolveInlineReference(handle, revivedAnchor);
         }
     }
     $registerAgentCompletionsProvider(handle, id, triggerCharacters) {
@@ -542,10 +556,15 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                 if (query && !( triggerCharacters.some(c => query.startsWith(c)))) {
                     return;
                 }
+                const context = {
+                    sessionType: getChatSessionType(widget.viewModel.model.sessionResource)
+                };
                 const parsedRequest = this._instantiationService.createInstance(ChatRequestParser).parseChatRequestWithReferences(
                     getDynamicVariablesForWidget(widget),
                     getSelectedToolAndToolSetsForWidget(widget),
-                    model.getValue()
+                    model.getValue(),
+                    ChatAgentLocation.Chat,
+                    context
                 ).parts;
                 const agentPart = parsedRequest.find(part => part instanceof ChatRequestAgentPart);
                 const thisAgentId = this._agents.get(handle)?.id;
@@ -654,7 +673,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
         }
     }
     async $registerChatSessionCustomizationProvider(handle, chatSessionType, metadata, extensionId) {
-        if (this._environmentService.isSessionsWindow && chatSessionType !== "copilotcli") {
+        if (this._environmentService.isSessionsWindow && !this._chatSessionService.getContentProviderSchemes().includes(chatSessionType)) {
             return;
         }
         const extension = await this._extensionService.getExtension(extensionId.value);
@@ -680,7 +699,10 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                     description: item.description,
                     groupKey: item.groupKey,
                     badge: item.badge,
-                    badgeTooltip: item.badgeTooltip
+                    badgeTooltip: item.badgeTooltip,
+                    extensionId: item.extensionId,
+                    pluginUri: item.pluginUri ? URI.revive(item.pluginUri) : undefined,
+                    userInvocable: item.userInvocable
                 })));
             }
         };