@codingame/monaco-vscode-extensions-service-override 24.3.0 → 25.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "24.3.0",
+  "version": "25.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": "24.3.0",
-    "@codingame/monaco-vscode-files-service-override": "24.3.0"
+    "@codingame/monaco-vscode-api": "25.0.0",
+    "@codingame/monaco-vscode-files-service-override": "25.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -12,9 +12,9 @@ import { IExtensionManagementService, IExtensionGalleryService } from '@codingam
 import { getIdAndVersion, areSameExtensions, getGalleryExtensionId, getExtensionId } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { ExtensionType, EXTENSION_CATEGORIES } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 
-const notFound = (id) => ( localize(1841, "Extension '{0}' not found.", id));
+const notFound = (id) => ( localize(1848, "Extension '{0}' not found.", id));
 const useId = ( localize(
-    1842,
+    1849,
     "Make sure you use the full extension ID, including the publisher, e.g.: {0}",
     'ms-dotnettools.csharp'
 ));
@@ -51,7 +51,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             return;
         }
         if (this.location) {
-            this.logger.info(( localize(1843, "Extensions installed on {0}:", this.location)));
+            this.logger.info(( localize(1850, "Extensions installed on {0}:", this.location)));
         }
         extensions = extensions.sort((e1, e2) => e1.identifier.id.localeCompare(e2.identifier.id));
         let lastId = undefined;
@@ -66,7 +66,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         const failed = [];
         try {
             if (extensions.length) {
-                this.logger.info(this.location ? ( localize(1844, "Installing extensions on {0}...", this.location)) : ( localize(1845, "Installing extensions...")));
+                this.logger.info(this.location ? ( localize(1851, "Installing extensions on {0}...", this.location)) : ( localize(1852, "Installing extensions...")));
             }
             const installVSIXInfos = [];
             const installExtensionInfos = [];
@@ -109,11 +109,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         catch (error) {
-            this.logger.error(( localize(1846, "Error while installing extensions: {0}", getErrorMessage(error))));
+            this.logger.error(( localize(1853, "Error while installing extensions: {0}", getErrorMessage(error))));
             throw error;
         }
         if (failed.length) {
-            throw ( new Error(( localize(1847, "Failed Installing Extensions: {0}", failed.join(', ')))));
+            throw ( new Error(( localize(1854, "Failed Installing Extensions: {0}", failed.join(', ')))));
         }
     }
     async updateExtensions(profileLocation) {
@@ -125,7 +125,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         this.logger.trace(( localize(
-            1848,
+            1855,
             "Fetching latest versions for {0} extensions",
             installedExtensionsQuery.length
         )));
@@ -142,11 +142,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         if (!extensionsToUpdate.length) {
-            this.logger.info(( localize(1849, "No extension to update")));
+            this.logger.info(( localize(1856, "No extension to update")));
             return;
         }
         this.logger.info(( localize(
-            1850,
+            1857,
             "Updating extensions: {0}",
             ( extensionsToUpdate.map(ext => ext.extension.identifier.id)).join(', ')
         )));
@@ -154,7 +154,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         for (const extensionResult of installationResult) {
             if (extensionResult.error) {
                 this.logger.error(( localize(
-                    1851,
+                    1858,
                     "Error while updating extension {0}: {1}",
                     extensionResult.identifier.id,
                     getErrorMessage(extensionResult.error)
@@ -162,7 +162,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             else {
                 this.logger.info(( localize(
-                    1852,
+                    1859,
                     "Extension '{0}' v{1} was successfully updated.",
                     extensionResult.identifier.id,
                     extensionResult.local?.manifest.version
@@ -177,7 +177,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (installedExtension) {
                 if (!force && (!version || (version === 'prerelease' && installedExtension.preRelease))) {
                     this.logger.info(( localize(
-                        1853,
+                        1860,
                         "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,
@@ -186,7 +186,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                     return false;
                 }
                 if (version && installedExtension.manifest.version === version) {
-                    this.logger.info(( localize(1854, "Extension '{0}' is already installed.", `${id}@${version}`)));
+                    this.logger.info(( localize(1861, "Extension '{0}' is already installed.", `${id}@${version}`)));
                     return false;
                 }
                 if (installedExtension.preRelease && version !== 'prerelease') {
@@ -223,24 +223,24 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (installedExtension) {
                 if (gallery.version === installedExtension.manifest.version) {
                     this.logger.info(( localize(
-                        1854,
+                        1861,
                         "Extension '{0}' is already installed.",
                         version ? `${id}@${version}` : id
                     )));
                     return;
                 }
                 this.logger.info(( localize(
-                    1855,
+                    1862,
                     "Updating the extension '{0}' to the version {1}",
                     id,
                     gallery.version
                 )));
             }
             if (installOptions.isBuiltin) {
-                this.logger.info(version ? ( localize(1856, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(1857, "Installing builtin extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(1863, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(1864, "Installing builtin extension '{0}'...", id)));
             }
             else {
-                this.logger.info(version ? ( localize(1858, "Installing extension '{0}' v{1}...", id, version)) : ( localize(1859, "Installing extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(1865, "Installing extension '{0}' v{1}...", id, version)) : ( localize(1866, "Installing extension '{0}'...", id)));
             }
             extensionsToInstall.push({
                 extension: gallery,
@@ -252,7 +252,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             for (const extensionResult of installationResult) {
                 if (extensionResult.error) {
                     this.logger.error(( localize(
-                        1860,
+                        1867,
                         "Error while installing extension {0}: {1}",
                         extensionResult.identifier.id,
                         getErrorMessage(extensionResult.error)
@@ -261,7 +261,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                 }
                 else {
                     this.logger.info(( localize(
-                        1861,
+                        1868,
                         "Extension '{0}' v{1} was successfully installed.",
                         extensionResult.identifier.id,
                         extensionResult.local?.manifest.version
@@ -280,11 +280,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         if (valid) {
             try {
                 await this.extensionManagementService.install(vsix, { ...installOptions, installGivenVersion: true });
-                this.logger.info(( localize(1862, "Extension '{0}' was successfully installed.", basename(vsix))));
+                this.logger.info(( localize(1869, "Extension '{0}' was successfully installed.", basename(vsix))));
             }
             catch (error) {
                 if (isCancellationError(error)) {
-                    this.logger.info(( localize(1863, "Cancelled installing extension '{0}'.", basename(vsix))));
+                    this.logger.info(( localize(1870, "Cancelled installing extension '{0}'.", basename(vsix))));
                 }
                 else {
                     throw error;
@@ -319,7 +319,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(
-                    1864,
+                    1871,
                     "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,
@@ -347,7 +347,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (( extensionsToUninstall.some(e => e.type === ExtensionType.System))) {
                 this.logger.info(( localize(
-                    1865,
+                    1872,
                     "Extension '{0}' is a Built-in extension and cannot be uninstalled",
                     id
                 )));
@@ -355,26 +355,26 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (!force && ( extensionsToUninstall.some(e => e.isBuiltin))) {
                 this.logger.info(( localize(
-                    1866,
+                    1873,
                     "Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.",
                     id
                 )));
                 return;
             }
-            this.logger.info(( localize(1867, "Uninstalling {0}...", id)));
+            this.logger.info(( localize(1874, "Uninstalling {0}...", id)));
             for (const extensionToUninstall of extensionsToUninstall) {
                 await this.extensionManagementService.uninstall(extensionToUninstall, { profileLocation });
             }
             if (this.location) {
                 this.logger.info(( localize(
-                    1868,
+                    1875,
                     "Extension '{0}' was successfully uninstalled from {1}!",
                     id,
                     this.location
                 )));
             }
             else {
-                this.logger.info(( localize(1869, "Extension '{0}' was successfully uninstalled!", id)));
+                this.logger.info(( localize(1876, "Extension '{0}' was successfully uninstalled!", id)));
             }
         }
     }
@@ -392,7 +392,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         });
     }
     notInstalled(id) {
-        return this.location ? ( localize(1870, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(1871, "Extension '{0}' is not installed.", id));
+        return this.location ? ( localize(1877, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(1878, "Extension '{0}' is not installed.", id));
     }
 };
 ExtensionManagementCLI = ( __decorate([

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

@@ -186,8 +186,8 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         return await deferredPromise.p;
     }
     $showContinueNotification(message) {
-        const yes = ( localize(2453, "Yes"));
-        const no = ( localize(2454, "No"));
+        const yes = ( localize(2472, "Yes"));
+        const no = ( localize(2473, "No"));
         const deferredPromise = ( new DeferredPromise());
         let result = false;
         const handle = this.notificationService.prompt(Severity.Warning, message, [{
@@ -235,13 +235,13 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         else {
             message = recreatingSession
                 ? ( localize(
-                2455,
+                2474,
                 "The extension '{0}' wants you to sign in again using {1}.",
                 extensionName,
                 provider.label
             ))
                 : ( localize(
-                2456,
+                2475,
                 "The extension '{0}' wants to sign in using {1}.",
                 extensionName,
                 provider.label
@@ -249,7 +249,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         }
         const buttons = [
             {
-                label: ( localize(2457, "&&Allow")),
+                label: ( localize(2476, "&&Allow")),
                 run() {
                     return true;
                 },
@@ -257,7 +257,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         ];
         if (options?.learnMore) {
             buttons.push({
-                label: ( localize(2458, "Learn more")),
+                label: ( localize(2477, "Learn more")),
                 run: async () => {
                     const result = this.loginPrompt(provider, extensionName, recreatingSession, options);
                     await this.openerService.open(URI.revive(options.learnMore), { allowCommands: true });
@@ -276,9 +276,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2459, "Incorrect account detected")),
+            message: ( localize(2478, "Incorrect account detected")),
             detail: ( localize(
-                2460,
+                2479,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -287,11 +287,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             cancelButton: true,
             buttons: [
                 {
-                    label: ( localize(2461, 'Keep {0}', chosenAccountLabel)),
+                    label: ( localize(2480, 'Keep {0}', chosenAccountLabel)),
                     run: () => chosenAccountLabel
                 },
                 {
-                    label: ( localize(2462, 'Login with {0}', requestedAccountLabel)),
+                    label: ( localize(2481, 'Login with {0}', requestedAccountLabel)),
                     run: () => requestedAccountLabel
                 }
             ],
@@ -371,10 +371,10 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             this.authenticationExtensionsService.updateAccountPreference(extensionId, providerId, session.account);
             return session;
         }
-        if (!matchingAccountPreferenceSession && !this.authenticationExtensionsService.getAccountPreference(extensionId, providerId)) {
-            const validSession = sessions.find(session => this.authenticationAccessService.isAccessAllowed(providerId, session.account.label, extensionId));
-            if (validSession) {
-                return validSession;
+        if (!matchingAccountPreferenceSession) {
+            const validSessions = sessions.filter(session => this.authenticationAccessService.isAccessAllowed(providerId, session.account.label, extensionId));
+            if (validSessions.length === 1) {
+                return validSessions[0];
             }
         }
         if (!options.silent) {
@@ -433,16 +433,16 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     async $showDeviceCodeModal(userCode, verificationUri) {
         const { result } = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(2463, "Device Code Authentication")),
+            message: ( localize(2482, "Device Code Authentication")),
             detail: ( localize(
-                2464,
+                2483,
                 "Your code: {0}\n\nTo complete authentication, navigate to {1} and enter the code above.",
                 userCode,
                 verificationUri
             )),
             buttons: [
                 {
-                    label: ( localize(2465, "Copy & Continue")),
+                    label: ( localize(2484, "Copy & Continue")),
                     run: () => true
                 }
             ],
@@ -454,7 +454,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                 return await this.openerService.open(( URI.parse(verificationUri)));
             }
             catch (error) {
-                this.notificationService.error(( localize(2466, "Failed to open {0}", verificationUri)));
+                this.notificationService.error(( localize(2485, "Failed to open {0}", verificationUri)));
             }
         }
         return false;
@@ -463,47 +463,47 @@ 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(2467, "Dynamic Client Registration not supported")),
+            message: ( localize(2486, "Dynamic Client Registration not supported")),
             detail: ( localize(
-                2468,
+                2487,
                 "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(2469, "Copy URIs & Proceed")),
+                    label: ( localize(2488, "Copy URIs & Proceed")),
                     run: async () => {
                         try {
                             await this.clipboardService.writeText(redirectUrls);
                         }
                         catch (error) {
-                            this.notificationService.error(( localize(2470, "Failed to copy redirect URIs to clipboard.")));
+                            this.notificationService.error(( localize(2489, "Failed to copy redirect URIs to clipboard.")));
                         }
                         return true;
                     }
                 },
             ],
             cancelButton: {
-                label: ( localize(2471, "Cancel")),
+                label: ( localize(2490, "Cancel")),
                 run: () => false
             }
         });
         if (!result) {
             return undefined;
         }
-        const sharedTitle = ( localize(2472, "Add Client Registration Details"));
+        const sharedTitle = ( localize(2491, "Add Client Registration Details"));
         const clientId = await this.quickInputService.input({
             title: sharedTitle,
             prompt: ( localize(
-                2473,
+                2492,
                 "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(2474, "OAuth client ID (azye39d...)")),
+            placeHolder: ( localize(2493, "OAuth client ID (azye39d...)")),
             ignoreFocusLost: true,
             validateInput: async (value) => {
                 if (!value || value.trim().length === 0) {
-                    return localize(2475, "Client ID is required");
+                    return localize(2494, "Client ID is required");
                 }
                 return undefined;
             }
@@ -514,11 +514,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         const clientSecret = await this.quickInputService.input({
             title: sharedTitle,
             prompt: ( localize(
-                2476,
+                2495,
                 "(optional) Enter an existing client secret associated with the client id '{0}' or leave this field blank",
                 clientId
             )),
-            placeHolder: ( localize(2477, "OAuth client secret (wer32o50f...) or leave it blank")),
+            placeHolder: ( localize(2496, "OAuth client secret (wer32o50f...) or leave it blank")),
             password: true,
             ignoreFocusLost: true
         });

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

@@ -92,7 +92,7 @@ let RemoteExtensionManagementCLI = class RemoteExtensionManagementCLI extends Ex
         if (!this._extensionManifestPropertiesService.canExecuteOnWorkspace(manifest)
             && !(isWeb && this._extensionManifestPropertiesService.canExecuteOnWeb(manifest))) {
             this.logger.info(( localize(
-                2478,
+                2497,
                 "Cannot install the '{0}' extension because it is declared to not run in this setup.",
                 getExtensionId(manifest.publisher, manifest.name)
             )));

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

@@ -9,12 +9,12 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
+import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service";
 import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
-import { IChatRelatedFileProviderMetadata } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service";
-import { IChatContentInlineReference, IChatContentReference, IChatTask, IChatTaskSerialized, IChatWarningMessage } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { IChatRelatedFileProviderMetadata } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
+import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service";
+import { IChatContentInlineReference, IChatContentReference, IChatTask, IChatTaskSerialized, IChatWarningMessage } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
@@ -59,7 +59,7 @@ export declare class MainThreadChatAgents2 extends Disposable implements MainThr
     private readonly _unresolvedAnchors;
     constructor(extHostContext: IExtHostContext, _chatAgentService: IChatAgentService, _chatSessionService: IChatSessionsService, _chatService: IChatService, _chatEditingService: IChatEditingService, _languageFeaturesService: ILanguageFeaturesService, _chatWidgetService: IChatWidgetService, _instantiationService: IInstantiationService, _logService: ILogService, _extensionService: IExtensionService, _uriIdentityService: IUriIdentityService, _promptsService: IPromptsService);
     $unregisterAgent(handle: number): void;
-    $transferActiveChatSession(toWorkspace: UriComponents): void;
+    $transferActiveChatSession(toWorkspace: UriComponents): Promise<void>;
     $registerAgent(handle: number, extension: ExtensionIdentifier, id: string, metadata: IExtensionChatAgentMetadata, dynamicProps: IDynamicChatAgentProps | undefined): Promise<void>;
     $updateAgent(handle: number, metadataUpdate: IExtensionChatAgentMetadata): Promise<void>;
     $handleProgressChunk(requestId: string, chunks: (IChatProgressDto | [

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

@@ -17,19 +17,19 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
+import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
-import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
-import { ChatRequestAgentPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service';
+import { ChatRequestAgentPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
+import { ChatRequestParser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatRequestParser';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { ChatModeKind, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 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 { addDynamicVariableActionId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariablesConstant';
+import { addDynamicVariableActionId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/input/editor/chatDynamicVariablesConstant';
 
 class MainThreadChatTask {
     get onDidAddProgress() { return this._onDidAddProgress.event; }
@@ -87,7 +87,9 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
         this._unresolvedAnchors = ( new Map());
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostChatAgents2));
         this._register(this._chatService.onDidDisposeSession(e => {
-            this._proxy.$releaseSession(e.sessionResource);
+            for (const resource of e.sessionResource) {
+                this._proxy.$releaseSession(resource);
+            }
         }));
         this._register(this._chatService.onDidPerformUserAction(e => {
             if (typeof e.agentId === 'string') {
@@ -108,15 +110,14 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
     $unregisterAgent(handle) {
         this._agents.deleteAndDispose(handle);
     }
-    $transferActiveChatSession(toWorkspace) {
+    async $transferActiveChatSession(toWorkspace) {
         const widget = this._chatWidgetService.lastFocusedWidget;
         const model = widget?.viewModel?.model;
         if (!model) {
             this._logService.error(`MainThreadChat#$transferActiveChatSession: No active chat session found`);
             return;
         }
-        const location = widget.location;
-        this._chatService.transferChatSession({ sessionId: model.sessionId, inputState: model.inputModel.state.get(), location }, URI.revive(toWorkspace));
+        await this._chatService.transferChatSession(model.sessionResource, URI.revive(toWorkspace));
     }
     async $registerAgent(handle, extension, id, metadata, dynamicProps) {
         await this._extensionService.whenInstalledExtensionsRegistered();
@@ -160,6 +161,9 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                 return this._proxy.$provideChatSummary(handle, history, token);
             },
         };
+        if (chatSessionRegistration?.alternativeIds?.includes(id)) {
+            return;
+        }
         let disposable;
         if (!staticAgentRegistration && dynamicProps) {
             const extensionDescription = this._extensionService.extensions.find(e => ExtensionIdentifier.equals(e.identifier, extension));

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

@@ -1,5 +1,5 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ICodeMapperService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService.service";
+import { ICodeMapperService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatCodeMapperService.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { ICodeMapperProgressDto, MainThreadCodeMapperShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 export declare class MainThreadChatCodemapper extends Disposable implements MainThreadCodeMapperShape {

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { TextEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
-import { ICodeMapperService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService.service';
+import { ICodeMapperService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatCodeMapperService.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 { NotebookDto } from './mainThreadNotebookDto.js';

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

@@ -1,9 +1,9 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
-import { IChatContextItem, IChatContextSupport } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContext";
+import { IChatContextItem, IChatContextSupport } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/contextContrib/chatContext";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { IDocumentFilterDto, MainThreadChatContextShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
-import { IChatContextService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextService.service";
+import { IChatContextService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/contextContrib/chatContextService.service";
 export declare class MainThreadChatContext extends Disposable implements MainThreadChatContextShape {
     private readonly _chatContextService;
     private readonly _proxy;

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { IChatContextService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextService.service';
+import { IChatContextService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/contextContrib/chatContextService.service';
 
 let MainThreadChatContext = class MainThreadChatContext extends Disposable {
     constructor(extHostContext, _chatContextService) {

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

@@ -6,9 +6,9 @@ import { URI, UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { IChatAgentRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents";
-import { IChatContentInlineReference, IChatProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { IChatAgentRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents";
+import { IChatContentInlineReference, IChatProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { IChatSession, IChatSessionHistoryItem, IChatSessionProviderOptionItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService";
 import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
@@ -81,7 +81,6 @@ export declare class MainThreadChatSessions extends Disposable implements MainTh
     $onDidCommitChatSessionItem(handle: number, originalComponents: UriComponents, modifiedCompoennts: UriComponents): Promise<void>;
     private _provideChatSessionItems;
     private handleSessionModelOverrides;
-    private _provideNewChatSessionItem;
     private _provideChatSessionContent;
     $unregisterChatSessionItemProvider(handle: number): void;
     $registerChatSessionContentProvider(handle: number, chatSessionScheme: string): void;
@@ -92,6 +91,8 @@ export declare class MainThreadChatSessions extends Disposable implements MainTh
     ])[]): Promise<void>;
     $handleProgressComplete(handle: number, sessionResource: UriComponents, requestId: string): void;
     $handleAnchorResolve(handle: number, sesssionResource: UriComponents, requestId: string, requestHandle: string, anchor: Dto<IChatContentInlineReference>): void;
+    $onDidChangeChatSessionProviderOptions(handle: number): void;
+    private _refreshProviderOptions;
     dispose(): void;
     private _reviveTooltip;
     /**