@codingame/monaco-vscode-extensions-service-override 20.5.0 → 21.0.1

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

@@ -3,18 +3,16 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { isAuthenticationWWWAuthenticateRequest } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication';
 import { IAuthenticationService, IAuthenticationExtensionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
-import { ActivationKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
-import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 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 { 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';
@@ -46,8 +44,19 @@ class MainThreadAuthenticationProvider extends Disposable {
         await this._proxy.$removeSession(this.id, sessionId);
     }
 }
+class MainThreadAuthenticationProviderWithChallenges extends MainThreadAuthenticationProvider {
+    constructor(proxy, id, label, supportsMultipleAccounts, authorizationServers, onDidChangeSessionsEmitter) {
+        super(proxy, id, label, supportsMultipleAccounts, authorizationServers, onDidChangeSessionsEmitter);
+    }
+    getSessionsFromChallenges(constraint, options) {
+        return this._proxy.$getSessionsFromChallenges(this.id, constraint, options);
+    }
+    createSessionFromChallenges(constraint, options) {
+        return this._proxy.$createSessionFromChallenges(this.id, constraint, options);
+    }
+}
 let MainThreadAuthentication = class MainThreadAuthentication extends Disposable {
-    constructor(extHostContext, authenticationService, authenticationExtensionsService, authenticationAccessService, authenticationUsageService, dialogService, notificationService, extensionService, telemetryService, openerService, logService, urlService, dynamicAuthProviderStorageService, clipboardService, quickInputService) {
+    constructor(extHostContext, authenticationService, authenticationExtensionsService, authenticationAccessService, authenticationUsageService, dialogService, notificationService, telemetryService, openerService, logService, urlService, dynamicAuthProviderStorageService, clipboardService, quickInputService) {
         super();
         this.authenticationService = authenticationService;
         this.authenticationExtensionsService = authenticationExtensionsService;
@@ -55,7 +64,6 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         this.authenticationUsageService = authenticationUsageService;
         this.dialogService = dialogService;
         this.notificationService = notificationService;
-        this.extensionService = extensionService;
         this.telemetryService = telemetryService;
         this.openerService = openerService;
         this.logService = logService;
@@ -96,7 +104,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             }
         }));
     }
-    async $registerAuthenticationProvider(id, label, supportsMultipleAccounts, supportedAuthorizationServer = []) {
+    async $registerAuthenticationProvider(id, label, supportsMultipleAccounts, supportedAuthorizationServer = [], 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 });
@@ -104,7 +112,16 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         const emitter = ( new Emitter());
         this._registrations.set(id, emitter);
         const supportedAuthorizationServerUris = ( supportedAuthorizationServer.map(i => URI.revive(i)));
-        const provider = ( new MainThreadAuthenticationProvider(
+        const provider = supportsChallenges
+            ? ( new MainThreadAuthenticationProviderWithChallenges(
+            this._proxy,
+            id,
+            label,
+            supportsMultipleAccounts,
+            supportedAuthorizationServerUris,
+            emitter
+        ))
+            : ( new MainThreadAuthenticationProvider(
             this._proxy,
             id,
             label,
@@ -124,11 +141,6 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             this._suppressUnregisterEvent = false;
         }
     }
-    async $ensureProvider(id) {
-        if (!this.authenticationService.isAuthenticationProviderRegistered(id)) {
-            return await this.extensionService.activateByEvent(getAuthenticationProviderActivationEvent(id), ActivationKind.Immediate);
-        }
-    }
     async $sendDidChangeSessions(providerId, event) {
         const obj = this._registrations.get(providerId);
         if (obj instanceof Emitter) {
@@ -157,8 +169,8 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         return await deferredPromise.p;
     }
     $showContinueNotification(message) {
-        const yes = ( localize(2420, "Yes"));
-        const no = ( localize(2421, "No"));
+        const yes = ( localize(2424, "Yes"));
+        const no = ( localize(2425, "No"));
         const deferredPromise = ( new DeferredPromise());
         let result = false;
         const handle = this.notificationService.prompt(Severity.Warning, message, [{
@@ -200,13 +212,13 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         else {
             message = recreatingSession
                 ? ( localize(
-                2422,
+                2426,
                 "The extension '{0}' wants you to sign in again using {1}.",
                 extensionName,
                 provider.label
             ))
                 : ( localize(
-                2423,
+                2427,
                 "The extension '{0}' wants to sign in using {1}.",
                 extensionName,
                 provider.label
@@ -214,7 +226,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         }
         const buttons = [
             {
-                label: ( localize(2424, "&&Allow")),
+                label: ( localize(2428, "&&Allow")),
                 run() {
                     return true;
                 },
@@ -222,7 +234,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         ];
         if (options?.learnMore) {
             buttons.push({
-                label: ( localize(2425, "Learn more")),
+                label: ( localize(2429, "Learn more")),
                 run: async () => {
                     const result = this.loginPrompt(provider, extensionName, recreatingSession, options);
                     await this.openerService.open(URI.revive(options.learnMore), { allowCommands: true });
@@ -241,9 +253,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2426, "Incorrect account detected")),
+            message: ( localize(2430, "Incorrect account detected")),
             detail: ( localize(
-                2427,
+                2431,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -252,11 +264,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             cancelButton: true,
             buttons: [
                 {
-                    label: ( localize(2428, 'Keep {0}', chosenAccountLabel)),
+                    label: ( localize(2432, 'Keep {0}', chosenAccountLabel)),
                     run: () => chosenAccountLabel
                 },
                 {
-                    label: ( localize(2429, 'Login with {0}', requestedAccountLabel)),
+                    label: ( localize(2433, 'Login with {0}', requestedAccountLabel)),
                     run: () => requestedAccountLabel
                 }
             ],
@@ -266,9 +278,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         }
         return result.result === chosenAccountLabel;
     }
-    async doGetSession(providerId, scopes, extensionId, extensionName, options) {
+    async doGetSession(providerId, scopeListOrRequest, extensionId, extensionName, options) {
         const authorizationServer = URI.revive(options.authorizationServer);
-        const sessions = await this.authenticationService.getSessions(providerId, scopes, { account: options.account, authorizationServer }, true);
+        const sessions = await this.authenticationService.getSessions(providerId, scopeListOrRequest, { account: options.account, authorizationServer }, true);
         const provider = this.authenticationService.getProvider(providerId);
         if (options.forceNewSession && options.createIfNone) {
             throw ( new Error(
@@ -286,12 +298,12 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             ));
         }
         if (options.clearSessionPreference) {
-            this._removeAccountPreference(extensionId, providerId, scopes);
+            this.authenticationExtensionsService.removeAccountPreference(extensionId, providerId);
         }
         const matchingAccountPreferenceSession =
         options.account
             ? sessions[0]
-            : this._getAccountPreference(extensionId, providerId, scopes, sessions);
+            : this._getAccountPreference(extensionId, providerId, sessions);
         if (!options.forceNewSession && sessions.length) {
             if (matchingAccountPreferenceSession && this.authenticationAccessService.isAccessAllowed(providerId, matchingAccountPreferenceSession.account.label, extensionId)) {
                 return matchingAccountPreferenceSession;
@@ -316,13 +328,13 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             let session;
             if (sessions?.length && !options.forceNewSession) {
                 session = provider.supportsMultipleAccounts && !options.account
-                    ? await this.authenticationExtensionsService.selectSession(providerId, extensionId, extensionName, scopes, sessions)
+                    ? await this.authenticationExtensionsService.selectSession(providerId, extensionId, extensionName, scopeListOrRequest, sessions)
                     : sessions[0];
             }
             else {
                 const accountToCreate = options.account ?? matchingAccountPreferenceSession?.account;
                 do {
-                    session = await this.authenticationService.createSession(providerId, scopes, {
+                    session = await this.authenticationService.createSession(providerId, scopeListOrRequest, {
                         activateImmediate: true,
                         account: accountToCreate,
                         authorizationServer
@@ -332,7 +344,8 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                     && !(await this.continueWithIncorrectAccountPrompt(session.account.label, accountToCreate.label)));
             }
             this.authenticationAccessService.updateAllowedExtensions(providerId, session.account.label, [{ id: extensionId, name: extensionName, allowed: true }]);
-            this._updateAccountPreference(extensionId, providerId, session);
+            this.authenticationExtensionsService.updateNewSessionRequests(providerId, [session]);
+            this.authenticationExtensionsService.updateAccountPreference(extensionId, providerId, session.account);
             return session;
         }
         if (!matchingAccountPreferenceSession && !this.authenticationExtensionsService.getAccountPreference(extensionId, providerId)) {
@@ -343,16 +356,20 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         }
         if (!options.silent) {
             sessions.length
-                ? this.authenticationExtensionsService.requestSessionAccess(providerId, extensionId, extensionName, scopes, sessions)
-                : await this.authenticationExtensionsService.requestNewSession(providerId, scopes, extensionId, extensionName);
+                ? this.authenticationExtensionsService.requestSessionAccess(providerId, extensionId, extensionName, scopeListOrRequest, sessions)
+                : await this.authenticationExtensionsService.requestNewSession(providerId, scopeListOrRequest, extensionId, extensionName);
         }
         return undefined;
     }
-    async $getSession(providerId, scopes, extensionId, extensionName, options) {
-        this.sendClientIdUsageTelemetry(extensionId, providerId, scopes);
-        const session = await this.doGetSession(providerId, scopes, extensionId, extensionName, options);
+    async $getSession(providerId, scopeListOrRequest, extensionId, extensionName, options) {
+        const scopes = isAuthenticationWWWAuthenticateRequest(scopeListOrRequest) ? scopeListOrRequest.scopes : scopeListOrRequest;
+        if (scopes) {
+            this.sendClientIdUsageTelemetry(extensionId, providerId, scopes);
+        }
+        const session = await this.doGetSession(providerId, scopeListOrRequest, extensionId, extensionName, options);
         if (session) {
             this.sendProviderUsageTelemetry(extensionId, providerId);
+            const scopes = isAuthenticationWWWAuthenticateRequest(scopeListOrRequest) ? scopeListOrRequest.scopes : scopeListOrRequest;
             this.authenticationUsageService.addAccountUsage(providerId, session.account.label, scopes, extensionId, extensionName);
         }
         return session;
@@ -380,7 +397,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         this._sentProviderUsageEvents.add(key);
         this.telemetryService.publicLog2('authentication.providerUsage', { providerId, extensionId });
     }
-    _getAccountPreference(extensionId, providerId, scopes, sessions) {
+    _getAccountPreference(extensionId, providerId, sessions) {
         if (sessions.length === 0) {
             return undefined;
         }
@@ -389,37 +406,21 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             const session = sessions.find(session => session.account.label === accountNamePreference);
             return session;
         }
-        const sessionIdPreference = this.authenticationExtensionsService.getSessionPreference(providerId, extensionId, scopes);
-        if (sessionIdPreference) {
-            const session = sessions.find(session => session.id === sessionIdPreference);
-            if (session) {
-                this.authenticationExtensionsService.updateAccountPreference(extensionId, providerId, session.account);
-                return session;
-            }
-        }
         return undefined;
     }
-    _updateAccountPreference(extensionId, providerId, session) {
-        this.authenticationExtensionsService.updateAccountPreference(extensionId, providerId, session.account);
-        this.authenticationExtensionsService.updateSessionPreference(providerId, extensionId, session);
-    }
-    _removeAccountPreference(extensionId, providerId, scopes) {
-        this.authenticationExtensionsService.removeAccountPreference(extensionId, providerId);
-        this.authenticationExtensionsService.removeSessionPreference(providerId, extensionId, scopes);
-    }
     async $showDeviceCodeModal(userCode, verificationUri) {
         const { result } = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(2430, "Device Code Authentication")),
+            message: ( localize(2434, "Device Code Authentication")),
             detail: ( localize(
-                2431,
+                2435,
                 "Your code: {0}\n\nTo complete authentication, navigate to {1} and enter the code above.",
                 userCode,
                 verificationUri
             )),
             buttons: [
                 {
-                    label: ( localize(2432, "Copy & Continue")),
+                    label: ( localize(2436, "Copy & Continue")),
                     run: () => true
                 }
             ],
@@ -431,7 +432,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                 return await this.openerService.open(( URI.parse(verificationUri)));
             }
             catch (error) {
-                this.notificationService.error(( localize(2433, "Failed to open {0}", verificationUri)));
+                this.notificationService.error(( localize(2437, "Failed to open {0}", verificationUri)));
             }
         }
         return false;
@@ -439,38 +440,38 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     async $promptForClientRegistration(authorizationServerUrl) {
         const result = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(2434, "Dynamic Client Registration not supported")),
+            message: ( localize(2438, "Dynamic Client Registration not supported")),
             detail: ( localize(
-                2435,
+                2439,
                 "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:\nhttp://127.0.0.1:33418\nhttps://vscode.dev/redirect",
                 authorizationServerUrl
             )),
             buttons: [
                 {
-                    label: ( localize(2436, "Proceed")),
+                    label: ( localize(2440, "Proceed")),
                     run: () => true
                 }
             ],
             cancelButton: {
-                label: ( localize(2437, "Cancel")),
+                label: ( localize(2441, "Cancel")),
                 run: () => false
             }
         });
         if (!result) {
             return undefined;
         }
-        const sharedTitle = ( localize(2438, "Add Client Registration Details"));
+        const sharedTitle = ( localize(2442, "Add Client Registration Details"));
         const clientId = await this.quickInputService.input({
             title: sharedTitle,
             prompt: ( localize(
-                2439,
+                2443,
                 "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(2440, "OAuth client ID (azye39d...)")),
+            placeHolder: ( localize(2444, "OAuth client ID (azye39d...)")),
             ignoreFocusLost: true,
             validateInput: async (value) => {
                 if (!value || value.trim().length === 0) {
-                    return localize(2441, "Client ID is required");
+                    return localize(2445, "Client ID is required");
                 }
                 return undefined;
             }
@@ -481,11 +482,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         const clientSecret = await this.quickInputService.input({
             title: sharedTitle,
             prompt: ( localize(
-                2442,
+                2446,
                 "(optional) Enter an existing client secret associated with the client id '{0}' or leave this field blank",
                 clientId
             )),
-            placeHolder: ( localize(2443, "OAuth client secret (wer32o50f...) or leave it blank")),
+            placeHolder: ( localize(2447, "OAuth client secret (wer32o50f...) or leave it blank")),
             password: true,
             ignoreFocusLost: true
         });
@@ -503,14 +504,13 @@ MainThreadAuthentication = __decorate([
     ( __param(4, IAuthenticationUsageService)),
     ( __param(5, IDialogService)),
     ( __param(6, INotificationService)),
-    ( __param(7, IExtensionService)),
-    ( __param(8, ITelemetryService)),
-    ( __param(9, IOpenerService)),
-    ( __param(10, ILogService)),
-    ( __param(11, IURLService)),
-    ( __param(12, IDynamicAuthenticationProviderStorageService)),
-    ( __param(13, IClipboardService)),
-    ( __param(14, IQuickInputService))
+    ( __param(7, ITelemetryService)),
+    ( __param(8, IOpenerService)),
+    ( __param(9, ILogService)),
+    ( __param(10, IURLService)),
+    ( __param(11, IDynamicAuthenticationProviderStorageService)),
+    ( __param(12, IClipboardService)),
+    ( __param(13, IQuickInputService))
 ], MainThreadAuthentication);
 
-export { MainThreadAuthentication, MainThreadAuthenticationProvider };
+export { MainThreadAuthentication };

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(
-                2444,
+                2448,
                 "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

@@ -27,7 +27,7 @@ import { extHostNamedCustomer } from '../../services/extensions/common/extHostCu
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { NotebookDto } from './mainThreadNotebookDto.js';
-import { addDynamicVariableActionId } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariablesConstant';
+import { addDynamicVariableActionId } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariablesConstant';
 
 class MainThreadChatTask {
     get onDidAddProgress() { return this._onDidAddProgress.event; }
@@ -138,9 +138,6 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
             setRequestTools: (requestId, tools) => {
                 this._proxy.$setRequestTools(requestId, tools);
             },
-            setRequestPaused: (requestId, isPaused) => {
-                this._proxy.$setRequestPaused(handle, requestId, isPaused);
-            },
             provideFollowups: async (request, result, history, token) => {
                 if (!this._agents.get(handle)?.hasFollowups) {
                     return [];
@@ -162,6 +159,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                 name: dynamicProps.name,
                 description: dynamicProps.description,
                 extensionId: extension,
+                extensionVersion: extensionDescription?.version,
                 extensionDisplayName: extensionDescription?.displayName ?? extension.value,
                 extensionPublisherId: extensionDescription?.publisher ?? '',
                 publisherDisplayName: dynamicProps.publisherName,

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

@@ -1,14 +1,57 @@
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 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 { 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 { IChatContentInlineReference } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { IChatAgentRequest } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatContentInlineReference, IChatProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { ChatSession, IChatSessionHistoryItem } 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 { EditorGroupColumn } from "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
+import { EditorGroupColumn } from "@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { Dto } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier";
 import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
-import { IChatProgressDto, MainThreadChatSessionsShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+import { ExtHostChatSessionsShape, IChatProgressDto, MainThreadChatSessionsShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+export declare class ObservableChatSession extends Disposable implements ChatSession {
+    static generateSessionKey(providerHandle: number, sessionId: string): string;
+    readonly sessionId: string;
+    readonly providerHandle: number;
+    readonly history: Array<IChatSessionHistoryItem>;
+    private readonly _progressObservable;
+    private readonly _isCompleteObservable;
+    private readonly _onWillDispose;
+    readonly onWillDispose: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
+    private readonly _pendingProgressChunks;
+    private _isInitialized;
+    private _interruptionWasCanceled;
+    private _disposalPending;
+    private _initializationPromise?;
+    interruptActiveResponseCallback?: () => Promise<boolean>;
+    requestHandler?: (request: IChatAgentRequest, progress: (progress: IChatProgress[]) => void, history: any[], token: CancellationToken) => Promise<void>;
+    private readonly _proxy;
+    private readonly _providerHandle;
+    private readonly _logService;
+    private readonly _dialogService;
+    get sessionKey(): string;
+    get progressObs(): IObservable<IChatProgress[]>;
+    get isCompleteObs(): IObservable<boolean>;
+    constructor(id: string, providerHandle: number, proxy: ExtHostChatSessionsShape, logService: ILogService, dialogService: IDialogService);
+    initialize(token: CancellationToken): Promise<void>;
+    private _doInitializeContent;
+    /**
+     * Handle progress chunks coming from the extension host.
+     * If the session is not initialized yet, the chunks will be queued.
+     */
+    handleProgressChunk(requestId: string, progress: IChatProgress[]): void;
+    /**
+     * Handle progress completion from the extension host.
+     */
+    handleProgressComplete(requestId: string): void;
+    private _addProgress;
+    private _markComplete;
+    dispose(): void;
+}
 export declare class MainThreadChatSessions extends Disposable implements MainThreadChatSessionsShape {
     private readonly _extHostContext;
     private readonly _chatSessionsService;
@@ -17,15 +60,15 @@ export declare class MainThreadChatSessions extends Disposable implements MainTh
     private readonly _logService;
     private readonly _viewsService;
     private readonly _itemProvidersRegistrations;
-    private readonly _contentProvidersRegisterations;
-    private readonly _activeProgressEmitters;
-    private readonly _completionEmitters;
-    private readonly _pendingProgressChunks;
+    private readonly _contentProvidersRegistrations;
+    private readonly _activeSessions;
+    private readonly _sessionDisposables;
     private readonly _proxy;
     constructor(_extHostContext: IExtHostContext, _chatSessionsService: IChatSessionsService, _dialogService: IDialogService, _editorService: IEditorService, _logService: ILogService, _viewsService: IViewsService);
     $registerChatSessionItemProvider(handle: number, chatSessionType: string): void;
-    $onDidChangeChatSessionItems(chatSessionType: string): void;
+    $onDidChangeChatSessionItems(handle: number): void;
     private _provideChatSessionItems;
+    private _provideNewChatSessionItem;
     private _provideChatSessionContent;
     $unregisterChatSessionItemProvider(handle: number): void;
     $registerChatSessionContentProvider(handle: number, chatSessionType: string): void;
@@ -37,6 +80,6 @@ export declare class MainThreadChatSessions extends Disposable implements MainTh
     $handleProgressComplete(handle: number, sessionId: string, requestId: string): void;
     $handleAnchorResolve(handle: number, sessionId: string, requestId: string, requestHandle: string, anchor: Dto<IChatContentInlineReference>): void;
     dispose(): void;
-    private _reviveIconPath;
+    private _reviveTooltip;
     $showChatSession(chatSessionType: string, sessionId: string, position: EditorGroupColumn | undefined): Promise<void>;
 }