@codingame/monaco-vscode-extensions-service-override 23.2.2 → 24.1.0

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

@@ -15,7 +15,7 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { IAuthenticationAccessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationAccessService.service';
 import { IAuthenticationUsageService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationUsageService.service';
-import { getAuthenticationProviderActivationEvent } from '@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common/vscode/vs/workbench/services/authentication/browser/authenticationService';
+import { getAuthenticationProviderActivationEvent } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationService';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
@@ -29,13 +29,14 @@ import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 
 class MainThreadAuthenticationProvider extends Disposable {
-    constructor(_proxy, id, label, supportsMultipleAccounts, authorizationServers, onDidChangeSessionsEmitter) {
+    constructor(_proxy, id, label, supportsMultipleAccounts, authorizationServers, resourceServer, onDidChangeSessionsEmitter) {
         super();
         this._proxy = _proxy;
         this.id = id;
         this.label = label;
         this.supportsMultipleAccounts = supportsMultipleAccounts;
         this.authorizationServers = authorizationServers;
+        this.resourceServer = resourceServer;
         this.onDidChangeSessions = onDidChangeSessionsEmitter.event;
     }
     async getSessions(scopes, options) {
@@ -49,8 +50,8 @@ class MainThreadAuthenticationProvider extends Disposable {
     }
 }
 class MainThreadAuthenticationProviderWithChallenges extends MainThreadAuthenticationProvider {
-    constructor(proxy, id, label, supportsMultipleAccounts, authorizationServers, onDidChangeSessionsEmitter) {
-        super(proxy, id, label, supportsMultipleAccounts, authorizationServers, onDidChangeSessionsEmitter);
+    constructor(proxy, id, label, supportsMultipleAccounts, authorizationServers, resourceServer, onDidChangeSessionsEmitter) {
+        super(proxy, id, label, supportsMultipleAccounts, authorizationServers, resourceServer, onDidChangeSessionsEmitter);
     }
     getSessionsFromChallenges(constraint, options) {
         return this._proxy.$getSessionsFromChallenges(this.id, constraint, options);
@@ -113,14 +114,14 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             }
         }));
     }
-    async $registerAuthenticationProvider(id, label, supportsMultipleAccounts, supportedAuthorizationServer = [], supportsChallenges) {
+    async $registerAuthenticationProvider({ id, label, supportsMultipleAccounts, resourceServer, supportedAuthorizationServers, supportsChallenges }) {
         if (!this.authenticationService.declaredProviders.find(p => p.id === id)) {
             this.logService.warn(`Authentication provider ${id} was not declared in the Extension Manifest.`);
             this.telemetryService.publicLog2('authentication.providerNotDeclared', { id });
         }
         const emitter = ( new Emitter());
         this._registrations.set(id, emitter);
-        const supportedAuthorizationServerUris = ( supportedAuthorizationServer.map(i => URI.revive(i)));
+        const supportedAuthorizationServerUris = ( (supportedAuthorizationServers ?? []).map(i => URI.revive(i)));
         const provider = supportsChallenges
             ? ( new MainThreadAuthenticationProviderWithChallenges(
             this._proxy,
@@ -128,6 +129,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             label,
             supportsMultipleAccounts,
             supportedAuthorizationServerUris,
+            resourceServer ? URI.revive(resourceServer) : undefined,
             emitter
         ))
             : ( new MainThreadAuthenticationProvider(
@@ -136,6 +138,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             label,
             supportsMultipleAccounts,
             supportedAuthorizationServerUris,
+            resourceServer ? URI.revive(resourceServer) : undefined,
             emitter
         ));
         this.authenticationService.registerAuthenticationProvider(id, provider);
@@ -183,8 +186,8 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         return await deferredPromise.p;
     }
     $showContinueNotification(message) {
-        const yes = ( localize(2440, "Yes"));
-        const no = ( localize(2441, "No"));
+        const yes = ( localize(2453, "Yes"));
+        const no = ( localize(2454, "No"));
         const deferredPromise = ( new DeferredPromise());
         let result = false;
         const handle = this.notificationService.prompt(Severity.Warning, message, [{
@@ -200,9 +203,15 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         });
         return deferredPromise.p;
     }
-    async $registerDynamicAuthenticationProvider(id, label, authorizationServer, clientId, clientSecret) {
-        await this.$registerAuthenticationProvider(id, label, true, [authorizationServer]);
-        await this.dynamicAuthProviderStorageService.storeClientRegistration(id, ( URI.revive(authorizationServer).toString(true)), clientId, clientSecret, label);
+    async $registerDynamicAuthenticationProvider(details) {
+        await this.$registerAuthenticationProvider({
+            id: details.id,
+            label: details.label,
+            supportsMultipleAccounts: true,
+            supportedAuthorizationServers: [details.authorizationServer],
+            resourceServer: details.resourceServer,
+        });
+        await this.dynamicAuthProviderStorageService.storeClientRegistration(details.id, ( URI.revive(details.authorizationServer).toString(true)), details.clientId, details.clientSecret, details.label);
     }
     async $setSessionsForDynamicAuthProvider(authProviderId, clientId, sessions) {
         await this.dynamicAuthProviderStorageService.setSessionsForDynamicAuthProvider(authProviderId, clientId, sessions);
@@ -226,13 +235,13 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         else {
             message = recreatingSession
                 ? ( localize(
-                2442,
+                2455,
                 "The extension '{0}' wants you to sign in again using {1}.",
                 extensionName,
                 provider.label
             ))
                 : ( localize(
-                2443,
+                2456,
                 "The extension '{0}' wants to sign in using {1}.",
                 extensionName,
                 provider.label
@@ -240,7 +249,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         }
         const buttons = [
             {
-                label: ( localize(2444, "&&Allow")),
+                label: ( localize(2457, "&&Allow")),
                 run() {
                     return true;
                 },
@@ -248,7 +257,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         ];
         if (options?.learnMore) {
             buttons.push({
-                label: ( localize(2445, "Learn more")),
+                label: ( localize(2458, "Learn more")),
                 run: async () => {
                     const result = this.loginPrompt(provider, extensionName, recreatingSession, options);
                     await this.openerService.open(URI.revive(options.learnMore), { allowCommands: true });
@@ -267,9 +276,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2446, "Incorrect account detected")),
+            message: ( localize(2459, "Incorrect account detected")),
             detail: ( localize(
-                2447,
+                2460,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -278,11 +287,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             cancelButton: true,
             buttons: [
                 {
-                    label: ( localize(2448, 'Keep {0}', chosenAccountLabel)),
+                    label: ( localize(2461, 'Keep {0}', chosenAccountLabel)),
                     run: () => chosenAccountLabel
                 },
                 {
-                    label: ( localize(2449, 'Login with {0}', requestedAccountLabel)),
+                    label: ( localize(2462, 'Login with {0}', requestedAccountLabel)),
                     run: () => requestedAccountLabel
                 }
             ],
@@ -424,16 +433,16 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     async $showDeviceCodeModal(userCode, verificationUri) {
         const { result } = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(2450, "Device Code Authentication")),
+            message: ( localize(2463, "Device Code Authentication")),
             detail: ( localize(
-                2451,
+                2464,
                 "Your code: {0}\n\nTo complete authentication, navigate to {1} and enter the code above.",
                 userCode,
                 verificationUri
             )),
             buttons: [
                 {
-                    label: ( localize(2452, "Copy & Continue")),
+                    label: ( localize(2465, "Copy & Continue")),
                     run: () => true
                 }
             ],
@@ -445,7 +454,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                 return await this.openerService.open(( URI.parse(verificationUri)));
             }
             catch (error) {
-                this.notificationService.error(( localize(2453, "Failed to open {0}", verificationUri)));
+                this.notificationService.error(( localize(2466, "Failed to open {0}", verificationUri)));
             }
         }
         return false;
@@ -454,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(2454, "Dynamic Client Registration not supported")),
+            message: ( localize(2467, "Dynamic Client Registration not supported")),
             detail: ( localize(
-                2455,
+                2468,
                 "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(2456, "Copy URIs & Proceed")),
+                    label: ( localize(2469, "Copy URIs & Proceed")),
                     run: async () => {
                         try {
                             await this.clipboardService.writeText(redirectUrls);
                         }
                         catch (error) {
-                            this.notificationService.error(( localize(2457, "Failed to copy redirect URIs to clipboard.")));
+                            this.notificationService.error(( localize(2470, "Failed to copy redirect URIs to clipboard.")));
                         }
                         return true;
                     }
                 },
             ],
             cancelButton: {
-                label: ( localize(2458, "Cancel")),
+                label: ( localize(2471, "Cancel")),
                 run: () => false
             }
         });
         if (!result) {
             return undefined;
         }
-        const sharedTitle = ( localize(2459, "Add Client Registration Details"));
+        const sharedTitle = ( localize(2472, "Add Client Registration Details"));
         const clientId = await this.quickInputService.input({
             title: sharedTitle,
             prompt: ( localize(
-                2460,
+                2473,
                 "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(2461, "OAuth client ID (azye39d...)")),
+            placeHolder: ( localize(2474, "OAuth client ID (azye39d...)")),
             ignoreFocusLost: true,
             validateInput: async (value) => {
                 if (!value || value.trim().length === 0) {
-                    return localize(2462, "Client ID is required");
+                    return localize(2475, "Client ID is required");
                 }
                 return undefined;
             }
@@ -505,11 +514,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         const clientSecret = await this.quickInputService.input({
             title: sharedTitle,
             prompt: ( localize(
-                2463,
+                2476,
                 "(optional) Enter an existing client secret associated with the client id '{0}' or leave this field blank",
                 clientId
             )),
-            placeHolder: ( localize(2464, "OAuth client secret (wer32o50f...) or leave it blank")),
+            placeHolder: ( localize(2477, "OAuth client secret (wer32o50f...) or leave it blank")),
             password: true,
             ignoreFocusLost: true
         });

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

@@ -7,7 +7,7 @@ import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/
 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 { MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
+import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
 import { CellEditType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 

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(
-                2465,
+                2478,
                 "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

@@ -10,6 +10,7 @@ import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log
 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 { 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";
@@ -44,16 +45,19 @@ export declare class MainThreadChatAgents2 extends Disposable implements MainThr
     private readonly _logService;
     private readonly _extensionService;
     private readonly _uriIdentityService;
+    private readonly _promptsService;
     private readonly _agents;
     private readonly _agentCompletionProviders;
     private readonly _agentIdsToCompletionProviders;
     private readonly _chatParticipantDetectionProviders;
     private readonly _chatRelatedFilesProviders;
+    private readonly _customAgentsProviders;
+    private readonly _customAgentsProviderEmitters;
     private readonly _pendingProgress;
     private readonly _proxy;
     private readonly _activeTasks;
     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);
+    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;
     $registerAgent(handle: number, extension: ExtensionIdentifier, id: string, metadata: IExtensionChatAgentMetadata, dynamicProps: IDynamicChatAgentProps | undefined): Promise<void>;
@@ -69,4 +73,7 @@ export declare class MainThreadChatAgents2 extends Disposable implements MainThr
     $unregisterChatParticipantDetectionProvider(handle: number): void;
     $registerRelatedFilesProvider(handle: number, metadata: IChatRelatedFileProviderMetadata): void;
     $unregisterRelatedFilesProvider(handle: number): void;
+    $registerCustomAgentsProvider(handle: number, extensionId: ExtensionIdentifier): Promise<void>;
+    $unregisterCustomAgentsProvider(handle: number): void;
+    $onDidChangeCustomAgents(handle: number): void;
 }

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

@@ -18,18 +18,18 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 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 { 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-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
+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 { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
-import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
 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-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariablesConstant';
+import { addDynamicVariableActionId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariablesConstant';
 
 class MainThreadChatTask {
     get onDidAddProgress() { return this._onDidAddProgress.event; }
@@ -62,7 +62,7 @@ class MainThreadChatTask {
     }
 }
 let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
-    constructor(extHostContext, _chatAgentService, _chatSessionService, _chatService, _chatEditingService, _languageFeaturesService, _chatWidgetService, _instantiationService, _logService, _extensionService, _uriIdentityService) {
+    constructor(extHostContext, _chatAgentService, _chatSessionService, _chatService, _chatEditingService, _languageFeaturesService, _chatWidgetService, _instantiationService, _logService, _extensionService, _uriIdentityService, _promptsService) {
         super();
         this._chatAgentService = _chatAgentService;
         this._chatSessionService = _chatSessionService;
@@ -74,20 +74,20 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
         this._logService = _logService;
         this._extensionService = _extensionService;
         this._uriIdentityService = _uriIdentityService;
+        this._promptsService = _promptsService;
         this._agents = this._register(( new DisposableMap()));
         this._agentCompletionProviders = this._register(( new DisposableMap()));
         this._agentIdsToCompletionProviders = this._register(( new DisposableMap()));
         this._chatParticipantDetectionProviders = this._register(( new DisposableMap()));
         this._chatRelatedFilesProviders = this._register(( new DisposableMap()));
+        this._customAgentsProviders = this._register(( new DisposableMap()));
+        this._customAgentsProviderEmitters = this._register(( new DisposableMap()));
         this._pendingProgress = ( new Map());
         this._activeTasks = ( new Map());
         this._unresolvedAnchors = ( new Map());
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostChatAgents2));
         this._register(this._chatService.onDidDisposeSession(e => {
-            const localSessionId = LocalChatSessionUri.parseLocalSessionId(e.sessionResource);
-            if (localSessionId) {
-                this._proxy.$releaseSession(localSessionId);
-            }
+            this._proxy.$releaseSession(e.sessionResource);
         }));
         this._register(this._chatService.onDidPerformUserAction(e => {
             if (typeof e.agentId === 'string') {
@@ -110,15 +110,13 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
     }
     $transferActiveChatSession(toWorkspace) {
         const widget = this._chatWidgetService.lastFocusedWidget;
-        const sessionId = widget?.viewModel?.model.sessionId;
-        if (!sessionId) {
+        const model = widget?.viewModel?.model;
+        if (!model) {
             this._logService.error(`MainThreadChat#$transferActiveChatSession: No active chat session found`);
             return;
         }
-        const inputValue = widget?.inputEditor.getValue() ?? '';
         const location = widget.location;
-        const mode = widget.input.currentModeKind;
-        this._chatService.transferChatSession({ sessionId, inputValue, location, mode }, URI.revive(toWorkspace));
+        this._chatService.transferChatSession({ sessionId: model.sessionId, inputState: model.inputModel.state.get(), location }, URI.revive(toWorkspace));
     }
     async $registerAgent(handle, extension, id, metadata, dynamicProps) {
         await this._extensionService.whenInstalledExtensionsRegistered();
@@ -134,13 +132,12 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
         }
         const impl = {
             invoke: async (request, progress, history, token) => {
-                const chatSession = this._chatService.getSessionByLegacyId(request.sessionId);
+                const chatSession = this._chatService.getSession(request.sessionResource);
                 this._pendingProgress.set(request.requestId, { progress, chatSession });
                 try {
                     return (await this._proxy.$invokeAgent(handle, request, {
                         history,
-                        chatSessionContext: chatSession?.contributedChatSession,
-                        chatSummary: request.chatSummary
+                        chatSessionContext: chatSession?.contributedChatSession
                     }, token)) ?? {};
                 }
                 finally {
@@ -217,7 +214,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                 const response = chatSession?.getRequests().at(-1)?.response;
                 if (chatSession?.editingSession && responsePartHandle !== undefined && response) {
                     const parts = progress.start
-                        ? await chatSession.editingSession.startExternalEdits(response, responsePartHandle, revive(progress.resources))
+                        ? await chatSession.editingSession.startExternalEdits(response, responsePartHandle, revive(progress.resources), progress.undoStopId)
                         : await chatSession.editingSession.stopExternalEdits(response, responsePartHandle);
                     chatProgressParts.push(...parts);
                 }
@@ -361,6 +358,39 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
     $unregisterRelatedFilesProvider(handle) {
         this._chatRelatedFilesProviders.deleteAndDispose(handle);
     }
+    async $registerCustomAgentsProvider(handle, extensionId) {
+        const extension = await this._extensionService.getExtension(extensionId.value);
+        if (!extension) {
+            this._logService.error(`[MainThreadChatAgents2] Could not find extension for CustomAgentsProvider: ${extensionId.value}`);
+            return;
+        }
+        const emitter = ( new Emitter());
+        this._customAgentsProviderEmitters.set(handle, emitter);
+        const disposable = this._promptsService.registerCustomAgentsProvider(extension, {
+            onDidChangeCustomAgents: emitter.event,
+            provideCustomAgents: async (options, token) => {
+                const agents = await this._proxy.$provideCustomAgents(handle, options, token);
+                if (!agents) {
+                    return undefined;
+                }
+                return ( agents.map(agent => ({
+                    ...agent,
+                    uri: URI.revive(agent.uri)
+                })));
+            }
+        });
+        this._customAgentsProviders.set(handle, disposable);
+    }
+    $unregisterCustomAgentsProvider(handle) {
+        this._customAgentsProviders.deleteAndDispose(handle);
+        this._customAgentsProviderEmitters.deleteAndDispose(handle);
+    }
+    $onDidChangeCustomAgents(handle) {
+        const emitter = this._customAgentsProviderEmitters.get(handle);
+        if (emitter) {
+            emitter.fire();
+        }
+    }
 };
 MainThreadChatAgents2 = __decorate([
     extHostNamedCustomer(MainContext.MainThreadChatAgents2),
@@ -373,7 +403,8 @@ MainThreadChatAgents2 = __decorate([
     ( __param(7, IInstantiationService)),
     ( __param(8, ILogService)),
     ( __param(9, IExtensionService)),
-    ( __param(10, IUriIdentityService))
+    ( __param(10, IUriIdentityService)),
+    ( __param(11, IPromptsService))
 ], MainThreadChatAgents2);
 function computeCompletionRanges(model, position, reg) {
     const varWord = getWordAtText(position.column, reg, model.getLineContent(position.lineNumber), 0);

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

@@ -30,7 +30,7 @@ let MainThreadChatCodemapper = class MainThreadChatCodemapper extends Disposable
                     codeBlocks: uiRequest.codeBlocks,
                     chatRequestId: uiRequest.chatRequestId,
                     chatRequestModel: uiRequest.chatRequestModel,
-                    chatSessionId: uiRequest.chatSessionId,
+                    chatSessionResource: uiRequest.chatSessionResource,
                     location: uiRequest.location
                 };
                 try {

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

@@ -1,6 +1,6 @@
 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 { IChatContextSupport } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatContext";
+import { IChatContextItem, IChatContextSupport } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/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";
@@ -9,8 +9,9 @@ export declare class MainThreadChatContext extends Disposable implements MainThr
     private readonly _proxy;
     private readonly _providers;
     constructor(extHostContext: IExtHostContext, _chatContextService: IChatContextService);
-    $registerChatContextProvider(handle: number, id: string, selector: IDocumentFilterDto[], _options: {
+    $registerChatContextProvider(handle: number, id: string, selector: IDocumentFilterDto[] | undefined, _options: {
         icon: ThemeIcon;
     }, support: IChatContextSupport): void;
     $unregisterChatContextProvider(handle: number): void;
+    $updateWorkspaceContextItems(handle: number, items: IChatContextItem[]): void;
 }

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

@@ -21,8 +21,8 @@ let MainThreadChatContext = class MainThreadChatContext extends Disposable {
             resolveChatContext: support.supportsResolve ? (context, token) => {
                 return this._proxy.$resolveChatContext(handle, context, token);
             } : undefined,
-            provideChatContextForResource: support.supportsResource ? (resource, token) => {
-                return this._proxy.$provideChatContextForResource(handle, { resource }, token);
+            provideChatContextForResource: support.supportsResource ? (resource, withValue, token) => {
+                return this._proxy.$provideChatContextForResource(handle, { resource, withValue }, token);
             } : undefined
         });
     }
@@ -34,6 +34,13 @@ let MainThreadChatContext = class MainThreadChatContext extends Disposable {
         this._chatContextService.unregisterChatContextProvider(provider.id);
         this._providers.delete(handle);
     }
+    $updateWorkspaceContextItems(handle, items) {
+        const provider = this._providers.get(handle);
+        if (!provider) {
+            return;
+        }
+        this._chatContextService.updateWorkspaceContextItems(provider.id, items);
+    }
 };
 MainThreadChatContext = __decorate([
     extHostNamedCustomer(MainContext.MainThreadChatContext),

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

@@ -1,12 +1,15 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI, UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 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 { IChatAgentRequest } from "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
+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 { IChatSession, IChatSessionHistoryItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/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";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
@@ -18,11 +21,11 @@ export declare class ObservableChatSession extends Disposable implements IChatSe
     readonly providerHandle: number;
     readonly history: Array<IChatSessionHistoryItem>;
     private _options?;
-    get options(): Record<string, string> | undefined;
+    get options(): Record<string, string | IChatSessionProviderOptionItem> | undefined;
     private readonly _progressObservable;
     private readonly _isCompleteObservable;
     private readonly _onWillDispose;
-    readonly onWillDispose: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
+    readonly onWillDispose: Event<void>;
     private readonly _pendingProgressChunks;
     private _isInitialized;
     private _interruptionWasCanceled;
@@ -55,6 +58,8 @@ export declare class ObservableChatSession extends Disposable implements IChatSe
 export declare class MainThreadChatSessions extends Disposable implements MainThreadChatSessionsShape {
     private readonly _extHostContext;
     private readonly _chatSessionsService;
+    private readonly _chatService;
+    private readonly _chatWidgetService;
     private readonly _dialogService;
     private readonly _editorService;
     private readonly editorGroupService;
@@ -65,12 +70,17 @@ export declare class MainThreadChatSessions extends Disposable implements MainTh
     private readonly _activeSessions;
     private readonly _sessionDisposables;
     private readonly _proxy;
-    constructor(_extHostContext: IExtHostContext, _chatSessionsService: IChatSessionsService, _dialogService: IDialogService, _editorService: IEditorService, editorGroupService: IEditorGroupsService, _logService: ILogService);
+    constructor(_extHostContext: IExtHostContext, _chatSessionsService: IChatSessionsService, _chatService: IChatService, _chatWidgetService: IChatWidgetService, _dialogService: IDialogService, _editorService: IEditorService, editorGroupService: IEditorGroupsService, _logService: ILogService);
     private _getHandleForSessionType;
     $registerChatSessionItemProvider(handle: number, chatSessionType: string): void;
     $onDidChangeChatSessionItems(handle: number): void;
+    $onDidChangeChatSessionOptions(handle: number, sessionResourceComponents: UriComponents, updates: ReadonlyArray<{
+        optionId: string;
+        value: string;
+    }>): void;
     $onDidCommitChatSessionItem(handle: number, originalComponents: UriComponents, modifiedCompoennts: UriComponents): Promise<void>;
     private _provideChatSessionItems;
+    private handleSessionModelOverrides;
     private _provideNewChatSessionItem;
     private _provideChatSessionContent;
     $unregisterChatSessionItemProvider(handle: number): void;
@@ -89,6 +99,6 @@ export declare class MainThreadChatSessions extends Disposable implements MainTh
      */
     notifyOptionsChange(handle: number, sessionResource: URI, updates: ReadonlyArray<{
         optionId: string;
-        value: string | undefined;
+        value: string | IChatSessionProviderOptionItem | undefined;
     }>): Promise<void>;
 }