@codingame/monaco-vscode-extensions-service-override 10.1.4 → 11.0.0

package/assets/{webWorkerExtensionHostIframe.esm.html → webWorkerExtensionHostIframe.html}

@@ -4,7 +4,7 @@
 		<meta http-equiv="Content-Security-Policy" content="
 			default-src 'none';
 			child-src 'self' data: blob:;
-			script-src 'self' 'unsafe-eval' 'sha256-fCnZ3iXydTZHO961jO3ioYDdWSfm8PZg/rI6zFX/SE0=' https: http://localhost:* blob:;
+			script-src 'self' 'unsafe-eval' 'sha256-xM2KVDKIoeb8vVxk4ezEUsxdTZh5wFnKO3YmFhy9tkk=' https: http://localhost:* blob:;
 			connect-src 'self' data: https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/>
 	</head>
 	<body>
@@ -78,7 +78,7 @@
 				return;
 			}
 			const { data } = event.data;
-			createWorker(data.baseUrl, data.workerUrl, data.fileRoot, data.nls.messages, data.nls.language);
+			createWorker(data.workerUrl, data.fileRoot, data.nls.messages, data.nls.language);
 		};
 
 		window.parent.postMessage({
@@ -87,33 +87,26 @@
 		}, '*');
 	}
 
-	function createWorker(baseUrl, workerUrl, fileRoot, nlsMessages, nlsLanguage) {
+	function createWorker(workerUrl, fileRoot, nlsMessages, nlsLanguage) {
 		try {
 			if (globalThis.crossOriginIsolated) {
 				workerUrl += '?vscode-coi=2'; // COEP
 			}
 
-			const isESM = true;
-
 			// In below blob code, we are using JSON.stringify to ensure the passed
 			// in values are not breaking our script. The values may contain string
 			// terminating characters (such as ' or ").
 
 			const blob = new Blob([[
 				`/*extensionHostWorker*/`,
-				`globalThis.MonacoEnvironment = { baseUrl: ${JSON.stringify(baseUrl)} };`,
 				`globalThis._VSCODE_NLS_MESSAGES = ${JSON.stringify(nlsMessages)};`,
 				`globalThis._VSCODE_NLS_LANGUAGE = ${JSON.stringify(nlsLanguage)};`,
 				`globalThis._VSCODE_FILE_ROOT = ${JSON.stringify(fileRoot)};`,
-				isESM ? `await import(${JSON.stringify(workerUrl)});` : `importScripts(${JSON.stringify(workerUrl)});`,
+				`await import(${JSON.stringify(workerUrl)});`,
 				`/*extensionHostWorker*/`
 			].join('')], { type: 'application/javascript' });
 
-			const worker = new Worker(URL.createObjectURL(blob), { name, type: isESM ? 'module' : undefined });
-			if (!isESM) {
-				// Note: cannot postMessage into a worker that is ESM because imports are async
-				worker.postMessage('vs/workbench/api/worker/extensionHostWorker');
-			}
+			const worker = new Worker(URL.createObjectURL(blob), { name, type: 'module' });
 			const nestedWorkers = new Map();
 
 			worker.onmessage = (event) => {

package/extensions.js

@@ -229,7 +229,7 @@ class ExtensionResourceLoaderServiceOverride extends ExtensionResourceLoaderServ
 }
 let iframeAlternateDomains;
 registerAssets({
-    'vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html': () => changeUrlDomain(new URL('./assets/webWorkerExtensionHostIframe.esm.html', import.meta.url).href, iframeAlternateDomains)
+    'vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html': () => changeUrlDomain(new URL('./assets/webWorkerExtensionHostIframe.html', import.meta.url).href, iframeAlternateDomains)
 });
 function getServiceOverride(workerConfig, _iframeAlternateDomains) {
     if (_iframeAlternateDomains != null) {
@@ -243,7 +243,7 @@ function getServiceOverride(workerConfig, _iframeAlternateDomains) {
         : undefined;
     if (workerConfig != null) {
         registerAssets({
-            'vs/workbench/api/worker/extensionHostWorker.esm.js': () => workerConfig.url
+            'vs/workbench/api/worker/extensionHostWorkerMain.js': () => workerConfig.url
         });
     }
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "10.1.4",
+  "version": "11.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,11 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@10.1.4",
-    "@codingame/monaco-vscode-files-service-override": "10.1.4"
+    "vscode": "npm:@codingame/monaco-vscode-api@11.0.0",
+    "@codingame/monaco-vscode-files-service-override": "11.0.0",
+    "@codingame/monaco-vscode-chat-extensions-notebook-common": "11.0.0",
+    "@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common": "11.0.0",
+    "@codingame/monaco-vscode-chat-extensions-notebook-terminal-common": "11.0.0",
+    "@codingame/monaco-vscode-comments-extensions-common": "11.0.0"
   }
 }

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

@@ -11,9 +11,9 @@ import { IExtensionManagementService, IExtensionGalleryService } from 'vscode/vs
 import { getIdAndVersion, areSameExtensions, getGalleryExtensionId, getExtensionId } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { EXTENSION_CATEGORIES } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 
-const notFound = (id) => ( localize(9912, "Extension '{0}' not found.", id));
+const notFound = (id) => ( localize(10002, "Extension '{0}' not found.", id));
 const useId = ( localize(
-    9913,
+    10003,
     "Make sure you use the full extension ID, including the publisher, e.g.: {0}",
     'ms-dotnettools.csharp'
 ));
@@ -50,7 +50,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             return;
         }
         if (this.location) {
-            this.logger.info(( localize(9914, "Extensions installed on {0}:", this.location)));
+            this.logger.info(( localize(10004, "Extensions installed on {0}:", this.location)));
         }
         extensions = extensions.sort((e1, e2) => e1.identifier.id.localeCompare(e2.identifier.id));
         let lastId = undefined;
@@ -65,7 +65,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         const failed = [];
         try {
             if (extensions.length) {
-                this.logger.info(this.location ? ( localize(9915, "Installing extensions on {0}...", this.location)) : ( localize(9916, "Installing extensions...")));
+                this.logger.info(this.location ? ( localize(10005, "Installing extensions on {0}...", this.location)) : ( localize(10006, "Installing extensions...")));
             }
             const installVSIXInfos = [];
             const installExtensionInfos = [];
@@ -108,11 +108,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         catch (error) {
-            this.logger.error(( localize(9917, "Error while installing extensions: {0}", getErrorMessage(error))));
+            this.logger.error(( localize(10007, "Error while installing extensions: {0}", getErrorMessage(error))));
             throw error;
         }
         if (failed.length) {
-            throw ( (new Error(localize(9918, "Failed Installing Extensions: {0}", failed.join(', ')))));
+            throw ( (new Error(localize(10008, "Failed Installing Extensions: {0}", failed.join(', ')))));
         }
     }
     async updateExtensions(profileLocation) {
@@ -124,7 +124,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         this.logger.trace(( localize(
-            9919,
+            10009,
             "Fetching latest versions for {0} extensions",
             installedExtensionsQuery.length
         )));
@@ -141,11 +141,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         if (!extensionsToUpdate.length) {
-            this.logger.info(( localize(9920, "No extension to update")));
+            this.logger.info(( localize(10010, "No extension to update")));
             return;
         }
         this.logger.info(( localize(
-            9921,
+            10011,
             "Updating extensions: {0}",
             ( (extensionsToUpdate.map(ext => ext.extension.identifier.id))).join(', ')
         )));
@@ -153,7 +153,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         for (const extensionResult of installationResult) {
             if (extensionResult.error) {
                 this.logger.error(( localize(
-                    9922,
+                    10012,
                     "Error while updating extension {0}: {1}",
                     extensionResult.identifier.id,
                     getErrorMessage(extensionResult.error)
@@ -161,7 +161,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             else {
                 this.logger.info(( localize(
-                    9923,
+                    10013,
                     "Extension '{0}' v{1} was successfully updated.",
                     extensionResult.identifier.id,
                     extensionResult.local?.manifest.version
@@ -175,7 +175,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (installedExtension) {
                 if (!force && (!version || (version === 'prerelease' && installedExtension.preRelease))) {
                     this.logger.info(( localize(
-                        9924,
+                        10014,
                         "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,
@@ -184,7 +184,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                     return false;
                 }
                 if (version && installedExtension.manifest.version === version) {
-                    this.logger.info(( localize(9925, "Extension '{0}' is already installed.", `${id}@${version}`)));
+                    this.logger.info(( localize(10015, "Extension '{0}' is already installed.", `${id}@${version}`)));
                     return false;
                 }
             }
@@ -218,24 +218,24 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (installedExtension) {
                 if (gallery.version === installedExtension.manifest.version) {
                     this.logger.info(( localize(
-                        9925,
+                        10015,
                         "Extension '{0}' is already installed.",
                         version ? `${id}@${version}` : id
                     )));
                     return;
                 }
                 this.logger.info(( localize(
-                    9926,
+                    10016,
                     "Updating the extension '{0}' to the version {1}",
                     id,
                     gallery.version
                 )));
             }
             if (installOptions.isBuiltin) {
-                this.logger.info(version ? ( localize(9927, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(9928, "Installing builtin extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(10017, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(10018, "Installing builtin extension '{0}'...", id)));
             }
             else {
-                this.logger.info(version ? ( localize(9929, "Installing extension '{0}' v{1}...", id, version)) : ( localize(9930, "Installing extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(10019, "Installing extension '{0}' v{1}...", id, version)) : ( localize(10020, "Installing extension '{0}'...", id)));
             }
             extensionsToInstall.push({
                 extension: gallery,
@@ -247,7 +247,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             for (const extensionResult of installationResult) {
                 if (extensionResult.error) {
                     this.logger.error(( localize(
-                        9931,
+                        10021,
                         "Error while installing extension {0}: {1}",
                         extensionResult.identifier.id,
                         getErrorMessage(extensionResult.error)
@@ -256,7 +256,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                 }
                 else {
                     this.logger.info(( localize(
-                        9932,
+                        10022,
                         "Extension '{0}' v{1} was successfully installed.",
                         extensionResult.identifier.id,
                         extensionResult.local?.manifest.version
@@ -275,11 +275,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         if (valid) {
             try {
                 await this.extensionManagementService.install(vsix, { ...installOptions, installGivenVersion: true });
-                this.logger.info(( localize(9933, "Extension '{0}' was successfully installed.", basename(vsix))));
+                this.logger.info(( localize(10023, "Extension '{0}' was successfully installed.", basename(vsix))));
             }
             catch (error) {
                 if (isCancellationError(error)) {
-                    this.logger.info(( localize(9934, "Cancelled installing extension '{0}'.", basename(vsix))));
+                    this.logger.info(( localize(10024, "Cancelled installing extension '{0}'.", basename(vsix))));
                 }
                 else {
                     throw error;
@@ -314,7 +314,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             const newer = installedExtensions.find(local => areSameExtensions(extensionIdentifier, local.identifier) && semverExports.gt(local.manifest.version, manifest.version));
             if (newer) {
                 this.logger.info(( localize(
-                    9935,
+                    10025,
                     "A newer version of extension '{0}' v{1} is already installed. Use '--force' option to downgrade to older version.",
                     newer.identifier.id,
                     newer.manifest.version,
@@ -342,7 +342,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (( (extensionsToUninstall.some(e => e.type === 0 )))) {
                 this.logger.info(( localize(
-                    9936,
+                    10026,
                     "Extension '{0}' is a Built-in extension and cannot be uninstalled",
                     id
                 )));
@@ -350,26 +350,26 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (!force && ( (extensionsToUninstall.some(e => e.isBuiltin)))) {
                 this.logger.info(( localize(
-                    9937,
+                    10027,
                     "Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.",
                     id
                 )));
                 return;
             }
-            this.logger.info(( localize(9938, "Uninstalling {0}...", id)));
+            this.logger.info(( localize(10028, "Uninstalling {0}...", id)));
             for (const extensionToUninstall of extensionsToUninstall) {
                 await this.extensionManagementService.uninstall(extensionToUninstall, { profileLocation });
             }
             if (this.location) {
                 this.logger.info(( localize(
-                    9939,
+                    10029,
                     "Extension '{0}' was successfully uninstalled from {1}!",
                     id,
                     this.location
                 )));
             }
             else {
-                this.logger.info(( localize(9940, "Extension '{0}' was successfully uninstalled!", id)));
+                this.logger.info(( localize(10030, "Extension '{0}' was successfully uninstalled!", id)));
             }
         }
     }
@@ -387,7 +387,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         });
     }
     notInstalled(id) {
-        return this.location ? ( localize(9941, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(9942, "Extension '{0}' is not installed.", id));
+        return this.location ? ( localize(10031, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(10032, "Extension '{0}' is not installed.", id));
     }
 };
 ExtensionManagementCLI = ( (__decorate([

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

@@ -36,7 +36,7 @@ class MainThreadAuthenticationProvider extends Disposable {
     }
     async removeSession(sessionId) {
         await this._proxy.$removeSession(this.id, sessionId);
-        this.notificationService.info(( localize(4859, "Successfully signed out.")));
+        this.notificationService.info(( localize(4984, "Successfully signed out.")));
     }
 }
 let MainThreadAuthentication = class MainThreadAuthentication extends Disposable {
@@ -96,7 +96,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         let message;
         if (provider.id.startsWith(INTERNAL_AUTH_PROVIDER_PREFIX)) {
             message = ( localize(
-                4860,
+                4985,
                 "The extension '{0}' wants to access the language models provided by {1}.",
                 extensionName,
                 provider.label
@@ -105,13 +105,13 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         else {
             message = recreatingSession
                 ? ( localize(
-                4861,
+                4986,
                 "The extension '{0}' wants you to sign in again using {1}.",
                 extensionName,
                 provider.label
             ))
                 : ( localize(
-                4862,
+                4987,
                 "The extension '{0}' wants to sign in using {1}.",
                 extensionName,
                 provider.label
@@ -119,7 +119,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         }
         const buttons = [
             {
-                label: ( localize(4863, "&&Allow")),
+                label: ( localize(4988, "&&Allow")),
                 run() {
                     return true;
                 },
@@ -127,7 +127,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         ];
         if (options?.learnMore) {
             buttons.push({
-                label: ( localize(4864, "Learn more")),
+                label: ( localize(4989, "Learn more")),
                 run: async () => {
                     const result = this.loginPrompt(provider, extensionName, recreatingSession, options);
                     await this.openerService.open(URI.revive(options.learnMore), { allowCommands: true });
@@ -146,9 +146,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(4865, "Incorrect account detected")),
+            message: ( localize(4990, "Incorrect account detected")),
             detail: ( localize(
-                4866,
+                4991,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -157,11 +157,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             cancelButton: true,
             buttons: [
                 {
-                    label: ( localize(4867, 'Keep {0}', chosenAccountLabel)),
+                    label: ( localize(4992, 'Keep {0}', chosenAccountLabel)),
                     run: () => chosenAccountLabel
                 },
                 {
-                    label: ( localize(4868, 'Login with {0}', requestedAccountLabel)),
+                    label: ( localize(4993, 'Login with {0}', requestedAccountLabel)),
                     run: () => requestedAccountLabel
                 }
             ],
@@ -249,7 +249,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         const session = await this.doGetSession(providerId, scopes, extensionId, extensionName, options);
         if (session) {
             this.sendProviderUsageTelemetry(extensionId, providerId);
-            this.authenticationUsageService.addAccountUsage(providerId, session.account.label, extensionId, extensionName);
+            this.authenticationUsageService.addAccountUsage(providerId, session.account.label, scopes, extensionId, extensionName);
         }
         return session;
     }

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

@@ -46,30 +46,36 @@ CommandsRegistry.registerCommand('_remoteCLI.manageExtensions', async function (
             lines.push(message);
         }
     })();
-    const cliService = instantiationService.createChild(( (new ServiceCollection([IExtensionManagementService, remoteExtensionManagementService])))).createInstance(RemoteExtensionManagementCLI, logger);
-    if (args.list) {
-        await cliService.listExtensions(!!args.list.showVersions, args.list.category, undefined);
-    }
-    else {
-        const revive = (inputs) => ( (inputs.map(input => isString(input) ? input : URI.revive(input))));
-        if (Array.isArray(args.install) && args.install.length) {
-            try {
-                await cliService.installExtensions(revive(args.install), [], { isMachineScoped: true }, !!args.force);
-            }
-            catch (e) {
-                lines.push(e.message);
-            }
+    const childInstantiationService = instantiationService.createChild(( (new ServiceCollection([IExtensionManagementService, remoteExtensionManagementService]))));
+    try {
+        const cliService = childInstantiationService.createInstance(RemoteExtensionManagementCLI, logger);
+        if (args.list) {
+            await cliService.listExtensions(!!args.list.showVersions, args.list.category, undefined);
         }
-        if (Array.isArray(args.uninstall) && args.uninstall.length) {
-            try {
-                await cliService.uninstallExtensions(revive(args.uninstall), !!args.force, undefined);
+        else {
+            const revive = (inputs) => ( (inputs.map(input => isString(input) ? input : URI.revive(input))));
+            if (Array.isArray(args.install) && args.install.length) {
+                try {
+                    await cliService.installExtensions(revive(args.install), [], { isMachineScoped: true }, !!args.force);
+                }
+                catch (e) {
+                    lines.push(e.message);
+                }
             }
-            catch (e) {
-                lines.push(e.message);
+            if (Array.isArray(args.uninstall) && args.uninstall.length) {
+                try {
+                    await cliService.uninstallExtensions(revive(args.uninstall), !!args.force, undefined);
+                }
+                catch (e) {
+                    lines.push(e.message);
+                }
             }
         }
+        return lines.join('\n');
+    }
+    finally {
+        childInstantiationService.dispose();
     }
-    return lines.join('\n');
 });
 let RemoteExtensionManagementCLI = class RemoteExtensionManagementCLI extends ExtensionManagementCLI {
     constructor(logger, extensionManagementService, extensionGalleryService, labelService, envService, _extensionManifestPropertiesService) {
@@ -85,7 +91,7 @@ let RemoteExtensionManagementCLI = class RemoteExtensionManagementCLI extends Ex
         if (!this._extensionManifestPropertiesService.canExecuteOnWorkspace(manifest)
             && !(isWeb && this._extensionManifestPropertiesService.canExecuteOnWeb(manifest))) {
             this.logger.info(( localize(
-                4810,
+                4935,
                 "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

@@ -12,17 +12,17 @@ import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/service
 import { ExtensionIdentifier } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
-import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatInputPart } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
+import { ChatInputPart } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
+import { AddDynamicVariableAction } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { ChatRequestAgentPart } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
+import { ChatRequestAgentPart } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestParser } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
-import { addDynamicVariableActionId } from 'vscode/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariablesConstant';
+import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 
 class MainThreadChatTask {
     get onDidAddProgress() { return this._onDidAddProgress.event; }
@@ -64,6 +64,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
         this._pendingProgress = ( new Map());
         this._responsePartHandlePool = 0;
         this._activeTasks = ( new Map());
+        this._unresolvedAnchors = ( new Map());
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostChatAgents2));
         this._register(this._chatService.onDidDisposeSession(e => {
             this._proxy.$releaseSession(e.sessionId);
@@ -98,7 +99,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
         this._chatService.transferChatSession({ sessionId, inputValue }, URI.revive(toWorkspace));
     }
     $registerAgent(handle, extension, id, metadata, dynamicProps) {
-        const staticAgentRegistration = this._chatAgentService.getAgent(id);
+        const staticAgentRegistration = this._chatAgentService.getAgent(id, true);
         if (!staticAgentRegistration && !dynamicProps) {
             if (this._chatAgentService.getAgentsByName(id).length) {
                 throw ( new Error(
@@ -148,7 +149,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                 metadata: revive(metadata),
                 slashCommands: [],
                 disambiguation: [],
-                locations: [ChatAgentLocation.Panel]
+                locations: [ChatAgentLocation.Panel],
             }, impl);
         }
         else {
@@ -199,8 +200,25 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                     return;
             }
         }
+        if (revivedProgress.kind === 'inlineReference' && revivedProgress.resolveId) {
+            if (!( this._unresolvedAnchors.has(requestId))) {
+                this._unresolvedAnchors.set(requestId, ( new Map()));
+            }
+            this._unresolvedAnchors.get(requestId)?.set(revivedProgress.resolveId, revivedProgress);
+        }
         this._pendingProgress.get(requestId)?.(revivedProgress);
     }
+    $handleAnchorResolve(requestId, handle, resolveAnchor) {
+        const anchor = this._unresolvedAnchors.get(requestId)?.get(handle);
+        if (!anchor) {
+            return;
+        }
+        this._unresolvedAnchors.get(requestId)?.delete(handle);
+        if (resolveAnchor) {
+            const revivedAnchor = revive(resolveAnchor);
+            anchor.inlineReference = revivedAnchor.inlineReference;
+        }
+    }
     $registerAgentCompletionsProvider(handle, id, triggerCharacters) {
         const provide = async (query, token) => {
             const completions = await this._proxy.$invokeCompletionProvider(handle, query, token);
@@ -247,7 +265,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                         kind: 18 ,
                         detail: v.detail,
                         documentation: v.documentation,
-                        command: { id: addDynamicVariableActionId, title: '', arguments: [{ id: v.id, widget, range: rangeAfterInsert, variableData: revive(v.value), command: v.command }] }
+                        command: { id: AddDynamicVariableAction.ID, title: '', arguments: [{ id: v.id, widget, range: rangeAfterInsert, variableData: revive(v.value), command: v.command }] }
                     };
                 }));
                 return {