@codingame/monaco-vscode-api 21.6.0 → 22.0.1

package/vscode/src/vs/workbench/api/common/extHost.api.impl.js

@@ -250,6 +250,7 @@ function createApiFactoryAndRegisterActors(accessor) {
         extHostLogService
     )));
     const extHostLanguageModelTools = rpcProtocol.set(ExtHostContext.ExtHostLanguageModelTools, ( new ExtHostLanguageModelTools(rpcProtocol, extHostLanguageModels)));
+    const extHostChatSessions = rpcProtocol.set(ExtHostContext.ExtHostChatSessions, ( new ExtHostChatSessions(extHostCommands, extHostLanguageModels, rpcProtocol, extHostLogService)));
     const extHostChatAgents2 = rpcProtocol.set(ExtHostContext.ExtHostChatAgents2, ( new ExtHostChatAgents2(
         rpcProtocol,
         extHostLogService,
@@ -265,7 +266,6 @@ function createApiFactoryAndRegisterActors(accessor) {
     const extHostStatusBar = rpcProtocol.set(ExtHostContext.ExtHostStatusBar, ( new ExtHostStatusBar(rpcProtocol, extHostCommands.converter)));
     const extHostSpeech = rpcProtocol.set(ExtHostContext.ExtHostSpeech, ( new ExtHostSpeech(rpcProtocol)));
     const extHostEmbeddings = rpcProtocol.set(ExtHostContext.ExtHostEmbeddings, ( new ExtHostEmbeddings(rpcProtocol)));
-    const extHostChatSessions = rpcProtocol.set(ExtHostContext.ExtHostChatSessions, ( new ExtHostChatSessions(extHostCommands, extHostLanguageModels, rpcProtocol, extHostLogService)));
     rpcProtocol.set(ExtHostContext.ExtHostMcp, accessor.get(IExtHostMpcService));
     const expected = ( Object.values(ExtHostContext));
     rpcProtocol.assertRegistered(expected);
@@ -319,9 +319,6 @@ function createApiFactoryAndRegisterActors(accessor) {
         })();
         const authentication = {
             getSession(providerId, scopesOrChallenge, options) {
-                if (!Array.isArray(scopesOrChallenge)) {
-                    checkProposedApiEnabled(extension, 'authenticationChallenges');
-                }
                 if ((typeof options?.forceNewSession === 'object' && options.forceNewSession.learnMore) ||
                     (typeof options?.createIfNone === 'object' && options.createIfNone.learnMore)) {
                     checkProposedApiEnabled(extension, 'authLearnMore');
@@ -391,6 +388,10 @@ function createApiFactoryAndRegisterActors(accessor) {
         };
         const env = {
             get machineId() { return initData.telemetryInfo.machineId; },
+            get devDeviceId() {
+                checkProposedApiEnabled(extension, 'devDeviceId');
+                return initData.telemetryInfo.devDeviceId;
+            },
             get sessionId() { return initData.telemetryInfo.sessionId; },
             get language() { return initData.environment.appLanguage; },
             get appName() { return initData.environment.appName; },
@@ -425,9 +426,9 @@ function createApiFactoryAndRegisterActors(accessor) {
                 ExtHostTelemetryLogger.validateSender(sender);
                 return extHostTelemetry.instantiateLogger(extension, sender, options);
             },
-            openExternal(uri, options) {
+            async openExternal(uri, options) {
                 return extHostWindow.openUri(uri, {
-                    allowTunneling: !!initData.remote.authority,
+                    allowTunneling: initData.remote.isRemote ?? (initData.remote.authority ? await extHostTunnelService.hasTunnelProvider() : false),
                     allowContributedOpeners: options?.allowContributedOpeners,
                 });
             },
@@ -873,9 +874,9 @@ function createApiFactoryAndRegisterActors(accessor) {
             registerTerminalProfileProvider(id, provider) {
                 return extHostTerminalService.registerProfileProvider(extension, id, provider);
             },
-            registerTerminalCompletionProvider(provider, ...triggerCharacters) {
+            registerTerminalCompletionProvider(id, provider, ...triggerCharacters) {
                 checkProposedApiEnabled(extension, 'terminalCompletionProvider');
-                return extHostTerminalService.registerTerminalCompletionProvider(extension, provider, ...triggerCharacters);
+                return extHostTerminalService.registerTerminalCompletionProvider(extension, id, provider, ...triggerCharacters);
             },
             registerTerminalQuickFixProvider(id, provider) {
                 checkProposedApiEnabled(extension, 'terminalQuickFixProvider');
@@ -1487,9 +1488,9 @@ function createApiFactoryAndRegisterActors(accessor) {
                 checkProposedApiEnabled(extension, 'chatSessionsProvider');
                 return extHostChatSessions.registerChatSessionItemProvider(extension, chatSessionType, provider);
             },
-            registerChatSessionContentProvider(chatSessionType, provider, capabilities) {
+            registerChatSessionContentProvider(chatSessionType, provider, chatParticipant, capabilities) {
                 checkProposedApiEnabled(extension, 'chatSessionsProvider');
-                return extHostChatSessions.registerChatSessionContentProvider(extension, chatSessionType, provider, capabilities);
+                return extHostChatSessions.registerChatSessionContentProvider(extension, chatSessionType, chatParticipant, provider, capabilities);
             },
             registerChatOutputRenderer: (viewType, renderer) => {
                 checkProposedApiEnabled(extension, 'chatOutputRenderer');

package/vscode/src/vs/workbench/api/common/extHost.protocol.d.ts

@@ -67,7 +67,7 @@ import { ICellExecutionComplete, ICellExecutionStateUpdate } from "@codingame/mo
 import { ICellRange } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
 import { ISCMHistoryOptions } from "../../contrib/scm/common/history.js";
 import { InputValidationType } from "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm";
-import { IWorkspaceSymbol, NotebookPriorityInfo } from "@codingame/monaco-vscode-4dda7789-5a25-5e8b-b2de-c2f11b1b96e5-common/vscode/vs/workbench/contrib/search/common/search";
+import { IWorkspaceSymbol, NotebookPriorityInfo } from "@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/search/common/search";
 import { IRawClosedNotebookFileMatch } from "../../contrib/search/common/searchNotebookHelpers.js";
 import { IKeywordRecognitionEvent, ISpeechProviderMetadata, ISpeechToTextEvent, ITextToSpeechEvent } from "../../contrib/speech/common/speechService.js";
 import { CoverageDetails, ExtensionRunTestsRequest, ICallProfileRunHandler, IFileCoverage, ISerializedTestResults, IStartControllerTests, ITestItem, ITestMessage, ITestRunProfile, ITestRunTask, ResolvedTestRunRequest, TestControllerCapability, TestMessageFollowupRequest, TestMessageFollowupResponse, TestResultState, TestsDiffOp } from "../../contrib/testing/common/testTypes.js";
@@ -75,8 +75,8 @@ import { Timeline, TimelineChangeEvent, TimelineOptions, TimelineProviderDescrip
 import { TypeHierarchyItem } from "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy";
 import { RelatedInformationResult, RelatedInformationType } from "@codingame/monaco-vscode-quickaccess-service-override/vscode/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation";
 import { AiSettingsSearchProviderOptions, AiSettingsSearchResult } from "../../services/aiSettingsSearch/common/aiSettingsSearch.js";
-import { AuthenticationSession, AuthenticationSessionAccount, AuthenticationSessionsChangeEvent, IAuthenticationCreateSessionOptions, IAuthenticationGetSessionsOptions } from "../../services/authentication/common/authentication.js";
-import { EditorGroupColumn } from "@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
+import { AuthenticationSession, AuthenticationSessionAccount, AuthenticationSessionsChangeEvent, IAuthenticationConstraint, IAuthenticationCreateSessionOptions, IAuthenticationGetSessionsOptions, IAuthenticationWwwAuthenticateRequest } from "../../services/authentication/common/authentication.js";
+import { EditorGroupColumn } from "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
 import { IExtensionDescriptionDelta, IStaticWorkspaceData } from "../../services/extensions/common/extensionHostProtocol.js";
 import { IResolveAuthorityResult } from "../../services/extensions/common/extensionHostProxy.js";
 import { ActivationKind, ExtensionActivationReason, MissingExtensionDependency } from "../../services/extensions/common/extensions.js";
@@ -173,24 +173,12 @@ export interface AuthenticationGetSessionOptions {
     silent?: boolean;
     account?: AuthenticationSessionAccount;
 }
-export interface AuthenticationChallenge {
-    scheme: string;
-    params: Record<string, string>;
-}
-export interface AuthenticationWWWAuthenticateRequest {
-    wwwAuthenticate: string;
-    scopes?: readonly string[];
-}
-export interface AuthenticationConstraint {
-    challenges: readonly AuthenticationChallenge[];
-    scopes?: readonly string[];
-}
 export interface MainThreadAuthenticationShape extends IDisposable {
     $registerAuthenticationProvider(id: string, label: string, supportsMultipleAccounts: boolean, supportedAuthorizationServers?: UriComponents[], supportsChallenges?: boolean): Promise<void>;
     $unregisterAuthenticationProvider(id: string): Promise<void>;
     $ensureProvider(id: string): Promise<void>;
     $sendDidChangeSessions(providerId: string, event: AuthenticationSessionsChangeEvent): Promise<void>;
-    $getSession(providerId: string, scopeListOrRequest: ReadonlyArray<string> | AuthenticationWWWAuthenticateRequest, extensionId: string, extensionName: string, options: AuthenticationGetSessionOptions): Promise<AuthenticationSession | undefined>;
+    $getSession(providerId: string, scopeListOrRequest: ReadonlyArray<string> | IAuthenticationWwwAuthenticateRequest, extensionId: string, extensionName: string, options: AuthenticationGetSessionOptions): Promise<AuthenticationSession | undefined>;
     $getAccounts(providerId: string): Promise<ReadonlyArray<AuthenticationSessionAccount>>;
     $removeSession(providerId: string, sessionId: string): Promise<void>;
     $waitForUriHandler(expectedUri: UriComponents): Promise<UriComponents>;
@@ -1236,6 +1224,11 @@ export type IChatAgentHistoryEntryDto = {
 export interface ExtHostChatAgentsShape2 {
     $invokeAgent(handle: number, request: Dto<IChatAgentRequest>, context: {
         history: IChatAgentHistoryEntryDto[];
+        chatSessionContext?: {
+            chatSessionType: string;
+            chatSessionId: string;
+            isUntitled: boolean;
+        };
     }, token: CancellationToken): Promise<IChatAgentResult | undefined>;
     $provideFollowups(request: Dto<IChatAgentRequest>, handle: number, result: IChatAgentResult, context: {
         history: IChatAgentHistoryEntryDto[];
@@ -1645,6 +1638,7 @@ export interface MainThreadTunnelServiceShape extends IDisposable {
     }): Promise<void>;
     $getTunnels(): Promise<TunnelDescription[]>;
     $setTunnelProvider(features: TunnelProviderFeatures | undefined, enablePortsView: boolean): Promise<void>;
+    $hasTunnelProvider(): Promise<boolean>;
     $setRemoteTunnelService(processId: number): Promise<void>;
     $setCandidateFilter(): Promise<void>;
     $onFoundNewCandidates(candidates: CandidatePort[]): Promise<void>;
@@ -1850,8 +1844,8 @@ export interface ExtHostLabelServiceShape {
 export interface ExtHostAuthenticationShape {
     $getSessions(id: string, scopes: string[] | undefined, options: IAuthenticationGetSessionsOptions): Promise<ReadonlyArray<AuthenticationSession>>;
     $createSession(id: string, scopes: string[], options: IAuthenticationCreateSessionOptions): Promise<AuthenticationSession>;
-    $getSessionsFromChallenges(id: string, constraint: AuthenticationConstraint, options: IAuthenticationGetSessionsOptions): Promise<ReadonlyArray<AuthenticationSession>>;
-    $createSessionFromChallenges(id: string, constraint: AuthenticationConstraint, options: IAuthenticationCreateSessionOptions): Promise<AuthenticationSession>;
+    $getSessionsFromChallenges(id: string, constraint: IAuthenticationConstraint, options: IAuthenticationGetSessionsOptions): Promise<ReadonlyArray<AuthenticationSession>>;
+    $createSessionFromChallenges(id: string, constraint: IAuthenticationConstraint, options: IAuthenticationCreateSessionOptions): Promise<AuthenticationSession>;
     $removeSession(id: string, sessionId: string): Promise<void>;
     $onDidChangeAuthenticationSessions(id: string, label: string, extensionIdFilter?: string[]): Promise<void>;
     $onDidUnregisterAuthenticationProvider(id: string): Promise<void>;
@@ -2377,8 +2371,8 @@ export declare class TerminalCompletionListDto<T extends ITerminalCompletionItem
 export interface TerminalResourceRequestConfigDto {
     filesRequested?: boolean;
     foldersRequested?: boolean;
-    fileExtensions?: string[];
-    cwd?: UriComponents;
+    globPattern?: string | IRelativePattern;
+    cwd: UriComponents;
     pathSeparator: string;
 }
 export interface ExtHostTerminalServiceShape {
@@ -2435,7 +2429,9 @@ export interface ExtHostSCMShape {
     $provideHistoryItemRefs(sourceControlHandle: number, historyItemRefs: string[] | undefined, token: CancellationToken): Promise<SCMHistoryItemRefDto[] | undefined>;
     $provideHistoryItems(sourceControlHandle: number, options: ISCMHistoryOptions, token: CancellationToken): Promise<SCMHistoryItemDto[] | undefined>;
     $provideHistoryItemChanges(sourceControlHandle: number, historyItemId: string, historyItemParentId: string | undefined, token: CancellationToken): Promise<SCMHistoryItemChangeDto[] | undefined>;
+    $resolveHistoryItem(sourceControlHandle: number, historyItemId: string, token: CancellationToken): Promise<SCMHistoryItemDto | undefined>;
     $resolveHistoryItemChatContext(sourceControlHandle: number, historyItemId: string, token: CancellationToken): Promise<string | undefined>;
+    $resolveHistoryItemChangeRangeChatContext(sourceControlHandle: number, historyItemId: string, historyItemParentId: string, path: string, token: CancellationToken): Promise<string | undefined>;
     $resolveHistoryItemRefsCommonAncestor(sourceControlHandle: number, historyItemRefs: string[], token: CancellationToken): Promise<string | undefined>;
 }
 export interface ExtHostQuickDiffShape {
@@ -2834,9 +2830,15 @@ export interface ExtHostTestingShape {
     /** Disposes followup actions for a test (failure) message */
     $disposeTestFollowups(id: number[]): void;
 }
+export interface IStartMcpOptions {
+    launch: McpServerLaunch.Serialized;
+    defaultCwd?: UriComponents;
+    errorOnUserInteraction?: boolean;
+}
 export interface ExtHostMcpShape {
+    $substituteVariables(workspaceFolder: UriComponents | undefined, value: McpServerLaunch.Serialized): Promise<McpServerLaunch.Serialized>;
     $resolveMcpLaunch(collectionId: string, label: string): Promise<McpServerLaunch.Serialized | undefined>;
-    $startMcp(id: number, launch: McpServerLaunch.Serialized): void;
+    $startMcp(id: number, opts: IStartMcpOptions): void;
     $stopMcp(id: number): void;
     $sendMessage(id: number, message: string): void;
     $waitForInitialCollectionProviders(): Promise<void>;
@@ -2847,7 +2849,7 @@ export interface MainThreadMcpShape {
     $onDidReceiveMessage(id: number, message: string): void;
     $upsertMcpCollection(collection: McpCollectionDefinition.FromExtHost, servers: McpServerDefinition.Serialized[]): void;
     $deleteMcpCollection(collectionId: string): void;
-    $getTokenFromServerMetadata(id: number, authorizationServer: UriComponents, serverMetadata: IAuthorizationServerMetadata, resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined): Promise<string | undefined>;
+    $getTokenFromServerMetadata(id: number, authorizationServer: UriComponents, serverMetadata: IAuthorizationServerMetadata, resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined, errorOnUserInteraction?: boolean): Promise<string | undefined>;
 }
 export interface MainThreadDataChannelsShape extends IDisposable {
 }
@@ -2951,6 +2953,7 @@ export interface MainThreadChatSessionsShape extends IDisposable {
     $registerChatSessionItemProvider(handle: number, chatSessionType: string): void;
     $unregisterChatSessionItemProvider(handle: number): void;
     $onDidChangeChatSessionItems(handle: number): void;
+    $onDidCommitChatSessionItem(handle: number, original: string, modified: string): void;
     $registerChatSessionContentProvider(handle: number, chatSessionType: string): void;
     $unregisterChatSessionContentProvider(handle: number): void;
     $handleProgressChunk(handle: number, sessionId: string, requestId: string, chunks: (IChatProgressDto | [
@@ -2965,8 +2968,6 @@ export interface ExtHostChatSessionsShape {
     $provideChatSessionItems(providerHandle: number, token: CancellationToken): Promise<Dto<IChatSessionItem>[]>;
     $provideNewChatSessionItem(providerHandle: number, options: {
         request: IChatAgentRequest;
-        prompt?: string;
-        history?: any[];
         metadata?: any;
     }, token: CancellationToken): Promise<Dto<IChatSessionItem>>;
     $provideChatSessionContent(providerHandle: number, sessionId: string, token: CancellationToken): Promise<ChatSessionDto>;

package/vscode/src/vs/workbench/api/common/extHostAuthentication.d.ts

@@ -38,20 +38,20 @@ export declare class ExtHostAuthentication implements ExtHostAuthenticationShape
      * @returns An event with a built-in filter for the extensionId
      */
     getExtensionScopedSessionsEvent(extensionId: string): Event<vscode.AuthenticationSessionsChangeEvent>;
-    getSession(requestingExtension: IExtensionDescription, providerId: string, scopesOrRequest: readonly string[] | vscode.AuthenticationWWWAuthenticateRequest, options: vscode.AuthenticationGetSessionOptions & ({
+    getSession(requestingExtension: IExtensionDescription, providerId: string, scopesOrRequest: readonly string[] | vscode.AuthenticationWwwAuthenticateRequest, options: vscode.AuthenticationGetSessionOptions & ({
         createIfNone: true;
     } | {
         forceNewSession: true;
     } | {
         forceNewSession: vscode.AuthenticationForceNewSessionOptions;
     })): Promise<vscode.AuthenticationSession>;
-    getSession(requestingExtension: IExtensionDescription, providerId: string, scopesOrRequest: readonly string[] | vscode.AuthenticationWWWAuthenticateRequest, options: vscode.AuthenticationGetSessionOptions & {
+    getSession(requestingExtension: IExtensionDescription, providerId: string, scopesOrRequest: readonly string[] | vscode.AuthenticationWwwAuthenticateRequest, options: vscode.AuthenticationGetSessionOptions & {
         forceNewSession: true;
     }): Promise<vscode.AuthenticationSession>;
-    getSession(requestingExtension: IExtensionDescription, providerId: string, scopesOrRequest: readonly string[] | vscode.AuthenticationWWWAuthenticateRequest, options: vscode.AuthenticationGetSessionOptions & {
+    getSession(requestingExtension: IExtensionDescription, providerId: string, scopesOrRequest: readonly string[] | vscode.AuthenticationWwwAuthenticateRequest, options: vscode.AuthenticationGetSessionOptions & {
         forceNewSession: vscode.AuthenticationForceNewSessionOptions;
     }): Promise<vscode.AuthenticationSession>;
-    getSession(requestingExtension: IExtensionDescription, providerId: string, scopesOrRequest: readonly string[] | vscode.AuthenticationWWWAuthenticateRequest, options: vscode.AuthenticationGetSessionOptions): Promise<vscode.AuthenticationSession | undefined>;
+    getSession(requestingExtension: IExtensionDescription, providerId: string, scopesOrRequest: readonly string[] | vscode.AuthenticationWwwAuthenticateRequest, options: vscode.AuthenticationGetSessionOptions): Promise<vscode.AuthenticationSession | undefined>;
     getAccounts(providerId: string): Promise<readonly import("../../services/authentication/common/authentication.js").AuthenticationSessionAccount[]>;
     registerAuthenticationProvider(id: string, label: string, provider: vscode.AuthenticationProvider, options?: vscode.AuthenticationProviderOptions): vscode.Disposable;
     $createSession(providerId: string, scopes: string[], options: vscode.AuthenticationProviderSessionOptions): Promise<vscode.AuthenticationSession>;

package/vscode/src/vs/workbench/api/common/extHostAuthentication.js

@@ -5,7 +5,7 @@ import { Emitter, Event } from '../../../base/common/event.js';
 import { MainContext } from './extHost.protocol.js';
 import { Disposable, ProgressLocation } from './extHostTypes.js';
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
-import { isAuthenticationWWWAuthenticateRequest, INTERNAL_AUTH_PROVIDER_PREFIX } from '../../services/authentication/common/authentication.js';
+import { isAuthenticationWwwAuthenticateRequest, INTERNAL_AUTH_PROVIDER_PREFIX } from '../../services/authentication/common/authentication.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { URI } from '../../../base/common/uri.js';
@@ -53,19 +53,11 @@ let ExtHostAuthentication = class ExtHostAuthentication {
         const extensionId = ExtensionIdentifier.toKey(requestingExtension.identifier);
         const keys = ( Object.keys(options));
         const optionsStr = ( keys.sort().map(key => `${key}:${!!options[key]}`)).join(', ');
-        if ('challenge' in scopesOrRequest
-            && typeof scopesOrRequest.challenge === 'string'
-            && !scopesOrRequest.wwwAuthenticate) {
-            scopesOrRequest = {
-                wwwAuthenticate: scopesOrRequest.challenge,
-                scopes: scopesOrRequest.scopes
-            };
-        }
         let singlerKey;
-        if (isAuthenticationWWWAuthenticateRequest(scopesOrRequest)) {
+        if (isAuthenticationWwwAuthenticateRequest(scopesOrRequest)) {
             const challenge = scopesOrRequest;
             const challengeStr = challenge.wwwAuthenticate;
-            const scopesStr = challenge.scopes ? [...challenge.scopes].sort().join(' ') : '';
+            const scopesStr = challenge.fallbackScopes ? [...challenge.fallbackScopes].sort().join(' ') : '';
             singlerKey = `${extensionId} ${providerId} challenge:${challengeStr} ${scopesStr} ${optionsStr}`;
         }
         else {
@@ -273,7 +265,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
             ? stringifiedServer + ' ' + _resourceMetadata?.resource
             : stringifiedServer;
         this.label = _resourceMetadata?.resource_name ?? this.authorizationServer.authority;
-        this._logger = loggerService.createLogger(this.id, { name: this.label });
+        this._logger = loggerService.createLogger(this.id, { name: `Auth: ${this.label}` });
         this._disposable = ( new DisposableStore());
         this._disposable.add(this._onDidChangeSessions);
         const scopedEvent = Event.chain(onDidDynamicAuthProviderTokensChange.event, $ => ( $
@@ -287,7 +279,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         this._createFlows = [];
         if (_serverMetadata.authorization_endpoint) {
             this._createFlows.push({
-                label: ( localize(2622, "URL Handler")),
+                label: ( localize(2628, "URL Handler")),
                 handler: (scopes, progress, token) => this._createWithUrlHandler(scopes, progress, token)
             });
         }
@@ -355,7 +347,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
             try {
                 token = await this._extHostProgress.withProgressFromSource({ label: this.label, id: this.id }, {
                     location: ProgressLocation.Notification,
-                    title: ( localize(2623, "Authenticating to '{0}'", this.label)),
+                    title: ( localize(2629, "Authenticating to '{0}'", this.label)),
                     cancellable: true
                 }, (progress, token) => handler(scopes, progress, token));
                 if (token) {
@@ -369,13 +361,13 @@ let DynamicAuthProvider = class DynamicAuthProvider {
                 }
                 const message = isCancellationError(err)
                     ? ( localize(
-                    2624,
+                    2630,
                     "Having trouble authenticating to '{0}'? Would you like to try a different way? ({1})",
                     this.label,
                     nextMode
                 ))
                     : ( localize(
-                    2625,
+                    2631,
                     "You have not yet finished authenticating to '{0}'. Would you like to try a different way? ({1})",
                     this.label,
                     nextMode
@@ -396,7 +388,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         }
         this._tokenStore.update({ added: [{ ...token, created_at: Date.now() }], removed: [] });
         const session = this._tokenStore.sessions.find(t => t.accessToken === token.access_token);
-        this._logger.info(`Created session for scopes: ${token.scope}`);
+        this._logger.info(`Created ${token.refresh_token ? 'refreshable' : 'non-refreshable'} session for scopes: ${token.scope}${token.expires_in ? ` that expires in ${token.expires_in} seconds` : ''}`);
         return session;
     }
     async removeSession(sessionId) {
@@ -460,7 +452,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
             throw ( new CancellationError());
         }
         progress.report({
-            message: ( localize(2626, "Complete the authentication in the browser window that has opened.")),
+            message: ( localize(2632, "Complete the authentication in the browser window that has opened.")),
         });
         let code;
         try {

package/vscode/src/vs/workbench/api/common/extHostChatAgents2.d.ts

@@ -68,6 +68,11 @@ export declare class ExtHostChatAgents2 extends Disposable implements ExtHostCha
     $setRequestTools(requestId: string, tools: UserSelectedTools): Promise<void>;
     $invokeAgent(handle: number, requestDto: Dto<IChatAgentRequest>, context: {
         history: IChatAgentHistoryEntryDto[];
+        chatSessionContext?: {
+            chatSessionType: string;
+            chatSessionId: string;
+            isUntitled: boolean;
+        };
     }, token: CancellationToken): Promise<IChatAgentResult | undefined>;
     private getDiagnosticsWhenEnabled;
     private getToolsForRequest;

package/vscode/src/vs/workbench/api/common/extHostChatAgents2.js

@@ -391,7 +391,7 @@ class ExtHostChatAgents2 extends Disposable {
         const request = revive(requestDto);
         const convertedHistory = await this.prepareHistoryTurns(extension, request.agentId, context);
         let location;
-        if (request.locationData?.type === ChatAgentLocation.Editor) {
+        if (request.locationData?.type === ChatAgentLocation.EditorInline) {
             const document = this._documents.getDocument(request.locationData.document);
             location = new ChatRequestEditorData(document, Selection.to(request.locationData.selection), Range.to(request.locationData.wholeRange));
         }
@@ -453,7 +453,18 @@ class ExtHostChatAgents2 extends Disposable {
             const extRequest = ChatAgentRequest.to(request, location, model, this.getDiagnosticsWhenEnabled(agent.extension), this.getToolsForRequest(agent.extension, request.userSelectedTools), agent.extension, this._logService);
             inFlightRequest = { requestId: requestDto.requestId, extRequest, extension: agent.extension };
             this._inFlightRequests.add(inFlightRequest);
-            const task = agent.invoke(extRequest, { history }, stream.apiObject, token);
+            let chatSessionContext;
+            if (context.chatSessionContext) {
+                chatSessionContext = {
+                    chatSessionItem: {
+                        id: context.chatSessionContext.chatSessionId,
+                        label: context.chatSessionContext.isUntitled ? 'Untitled Session' : 'Session',
+                    },
+                    isUntitled: context.chatSessionContext.isUntitled,
+                };
+            }
+            const chatContext = { history, chatSessionContext };
+            const task = agent.invoke(extRequest, chatContext, stream.apiObject, token);
             return await raceCancellationWithTimeout(1000, Promise.resolve(task).then((result) => {
                 if (result?.metadata) {
                     try {
@@ -472,7 +483,7 @@ class ExtHostChatAgents2 extends Disposable {
                         responseIsIncomplete: true
                     };
                 }
-                if (errorDetails?.responseIsRedacted || errorDetails?.isQuotaExceeded || errorDetails?.confirmationButtons || errorDetails?.code) {
+                if (errorDetails?.responseIsRedacted || errorDetails?.isQuotaExceeded || errorDetails?.isRateLimited || errorDetails?.confirmationButtons || errorDetails?.code) {
                     checkProposedApiEnabled(agent.extension, 'chatParticipantPrivate');
                 }
                 return { errorDetails, timings: stream?.timings, metadata: result?.metadata, nextQuestion: result?.nextQuestion, details: result?.details };
@@ -484,7 +495,8 @@ class ExtHostChatAgents2 extends Disposable {
                 e = e.cause;
             }
             const isQuotaExceeded = e instanceof Error && e.name === 'ChatQuotaExceeded';
-            return { errorDetails: { message: toErrorMessage(e), responseIsIncomplete: true, isQuotaExceeded } };
+            const isRateLimited = e instanceof Error && e.name === 'ChatRateLimited';
+            return { errorDetails: { message: toErrorMessage(e), responseIsIncomplete: true, isQuotaExceeded, isRateLimited } };
         }
         finally {
             if (inFlightRequest) {

package/vscode/src/vs/workbench/api/common/extHostChatSessions.d.ts

@@ -23,14 +23,12 @@ export declare class ExtHostChatSessions extends Disposable implements ExtHostCh
     private readonly _sessionMap;
     constructor(commands: ExtHostCommands, _languageModels: ExtHostLanguageModels, _extHostRpc: IExtHostRpcService, _logService: ILogService);
     registerChatSessionItemProvider(extension: IExtensionDescription, chatSessionType: string, provider: vscode.ChatSessionItemProvider): vscode.Disposable;
-    registerChatSessionContentProvider(extension: IExtensionDescription, chatSessionType: string, provider: vscode.ChatSessionContentProvider, capabilities?: vscode.ChatSessionCapabilities): vscode.Disposable;
+    registerChatSessionContentProvider(extension: IExtensionDescription, chatSessionType: string, chatParticipant: vscode.ChatParticipant, provider: vscode.ChatSessionContentProvider, capabilities?: vscode.ChatSessionCapabilities): vscode.Disposable;
     showChatSession(_extension: IExtensionDescription, chatSessionType: string, sessionId: string, options: vscode.ChatSessionShowOptions | undefined): Promise<void>;
     private convertChatSessionStatus;
     private convertChatSessionItem;
     $provideNewChatSessionItem(handle: number, options: {
         request: IChatAgentRequest;
-        prompt?: string;
-        history: any[];
         metadata?: any;
     }, token: CancellationToken): Promise<IChatSessionItem>;
     $provideChatSessionItems(handle: number, token: vscode.CancellationToken): Promise<IChatSessionItem[]>;

package/vscode/src/vs/workbench/api/common/extHostChatSessions.js

@@ -3,6 +3,7 @@ import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.
 import { coalesce } from '../../../base/common/arrays.js';
 import { CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { revive } from '../../../base/common/marshalling.js';
 import { MarshalledId } from '../../../base/common/marshallingIds.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
 import { ChatSessionStatus } from '../../contrib/chat/common/chatSessionsService.js';
@@ -12,7 +13,6 @@ import { ChatAgentResponseStream } from './extHostChatAgents2.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { ViewColumn, MarkdownString, ChatAgentRequest, ChatResponsePart } from './extHostTypeConverters.js';
 import { Disposable as Disposable$1, ChatRequestTurn } from './extHostTypes.js';
-import { revive } from '../../../base/common/marshalling.js';
 
 var ExtHostChatSessions_1;
 class ExtHostChatSession {
@@ -80,6 +80,12 @@ let ExtHostChatSessions = class ExtHostChatSessions extends Disposable {
                 this._proxy.$onDidChangeChatSessionItems(handle);
             }));
         }
+        if (provider.onDidCommitChatSessionItem) {
+            disposables.add(provider.onDidCommitChatSessionItem((e) => {
+                const { original, modified } = e;
+                this._proxy.$onDidCommitChatSessionItem(handle, original.id, modified.id);
+            }));
+        }
         return {
             dispose: () => {
                 this._chatSessionItemProviders.delete(handle);
@@ -88,7 +94,7 @@ let ExtHostChatSessions = class ExtHostChatSessions extends Disposable {
             }
         };
     }
-    registerChatSessionContentProvider(extension, chatSessionType, provider, capabilities) {
+    registerChatSessionContentProvider(extension, chatSessionType, chatParticipant, provider, capabilities) {
         const handle = this._nextChatSessionContentProviderHandle++;
         const disposables = ( new DisposableStore());
         this._chatSessionContentProviders.set(handle, { provider, extension, capabilities, disposable: disposables });
@@ -146,8 +152,6 @@ let ExtHostChatSessions = class ExtHostChatSessions extends Disposable {
             const vscodeRequest = ChatAgentRequest.to(revive(options.request), undefined, model, [], ( new Map()), entry.extension, this._logService);
             const vscodeOptions = {
                 request: vscodeRequest,
-                prompt: options.prompt,
-                history: options.history,
                 metadata: options.metadata
             };
             const chatSessionItem = await entry.provider.provideNewChatSessionItem(vscodeOptions, token);
@@ -195,7 +199,7 @@ let ExtHostChatSessions = class ExtHostChatSessions extends Disposable {
             agentId: id,
             message: '',
             variables: { variables: [] },
-            location: ChatAgentLocation.Panel,
+            location: ChatAgentLocation.Chat,
         }, {
             $handleProgressChunk: (requestId, chunks) => {
                 return this._proxy.$handleProgressChunk(handle, id, requestId, chunks);

package/vscode/src/vs/workbench/api/common/extHostCustomEditors.d.ts

@@ -6,7 +6,7 @@ import { ExtHostDocuments } from "./extHostDocuments.js";
 import { IExtensionStoragePaths } from "./extHostStoragePaths.js";
 import { ExtHostWebviews } from "./extHostWebview.js";
 import { ExtHostWebviewPanels } from "./extHostWebviewPanels.js";
-import { EditorGroupColumn } from "@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
+import { EditorGroupColumn } from "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
 import type * as vscode from "vscode";
 import * as extHostProtocol from "./extHost.protocol.js";
 export declare class ExtHostCustomEditors implements extHostProtocol.ExtHostCustomEditorsShape {

package/vscode/src/vs/workbench/api/common/extHostDebugService.js

@@ -403,9 +403,6 @@ let ExtHostDebugServiceBase = class ExtHostDebugServiceBase extends Disposable {
                 uri: folder.uri,
                 name: folder.name,
                 index: folder.index,
-                toResource: () => {
-                    throw ( new Error('Not implemented'));
-                }
             };
         }
         const variableResolver = await this._variableResolver.getResolver();

package/vscode/src/vs/workbench/api/common/extHostDiagnostics.js

@@ -108,7 +108,7 @@ class DiagnosticCollection {
                     marker.push({
                         severity: MarkerSeverity.Info,
                         message: ( localize(
-                            2627,
+                            2633,
                             "Not showing {0} further errors and warnings.",
                             diagnostics.length - this._maxDiagnosticsPerFile
                         )),

package/vscode/src/vs/workbench/api/common/extHostExtensionService.js

@@ -540,7 +540,7 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
     async _doHandleExtensionTests() {
         const { extensionDevelopmentLocationURI, extensionTestsLocationURI } = this._initData.environment;
         if (!extensionDevelopmentLocationURI || !extensionTestsLocationURI) {
-            throw ( new Error(( localize(2628, "Cannot load test runner."))));
+            throw ( new Error(( localize(2634, "Cannot load test runner."))));
         }
         const extensionDescription = (await this.getExtensionPathIndex()).findSubstr(extensionTestsLocationURI);
         const isESM = this._isESM(extensionDescription, extensionTestsLocationURI.path);
@@ -549,7 +549,7 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
             : this._loadCommonJSModule(null, extensionTestsLocationURI, ( new ExtensionActivationTimesBuilder(false))));
         if (!testRunner || typeof testRunner.run !== 'function') {
             throw ( new Error(( localize(
-                2629,
+                2635,
                 "Path {0} does not point to a valid extension test runner.",
                 (extensionTestsLocationURI.toString())
             ))));

package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js

@@ -546,7 +546,7 @@ class DocumentPasteEditProvider {
         return (edits.map((edit, i) => ({
             _cacheId: [cacheId, i],
             title: edit.title ?? ( localize(
-                2630,
+                2636,
                 "Paste using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),
@@ -1696,7 +1696,7 @@ class DocumentDropEditAdapter {
         return (editsArray.map((edit, i) => ({
             _cacheId: [cacheId, i],
             title: edit.title ?? ( localize(
-                2631,
+                2637,
                 "Drop using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),

package/vscode/src/vs/workbench/api/common/extHostLanguageModelTools.js

@@ -2,18 +2,18 @@
 import { raceCancellation } from '../../../base/common/async.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { CancellationError } from '../../../base/common/errors.js';
+import { Lazy } from '../../../base/common/lazy.js';
 import { toDisposable } from '../../../base/common/lifecycle.js';
 import { revive } from '../../../base/common/marshalling.js';
 import { generateUuid } from '../../../base/common/uuid.js';
 import { isToolInvocationContext } from '../../contrib/chat/common/languageModelToolsService.js';
 import { InternalEditToolId, ExtensionEditToolId } from '../../contrib/chat/common/tools/editFileTool.js';
 import { InternalFetchWebPageToolId } from '../../contrib/chat/common/tools/tools.js';
+import { SearchExtensionsToolId } from '../../contrib/extensions/common/searchExtensionsTool.js';
 import { isProposedApiEnabled, checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 import { MainContext } from './extHost.protocol.js';
 import { LanguageModelToolSource, LanguageModelToolResult2, MarkdownString } from './extHostTypeConverters.js';
-import { SearchExtensionsToolId } from '../../contrib/extensions/common/searchExtensionsTool.js';
-import { Lazy } from '../../../base/common/lazy.js';
 
 class Tool {
     constructor(data) {
@@ -93,6 +93,7 @@ class ExtHostLanguageModelTools {
                 context: options.toolInvocationToken,
                 chatRequestId: isProposedApiEnabled(extension, 'chatParticipantPrivate') ? options.chatRequestId : undefined,
                 chatInteractionId: isProposedApiEnabled(extension, 'chatParticipantPrivate') ? options.chatInteractionId : undefined,
+                fromSubAgent: isProposedApiEnabled(extension, 'chatParticipantPrivate') ? options.fromSubAgent : undefined,
             }, token);
             const dto = result instanceof SerializableObjectWithBuffers ? result.value : result;
             return LanguageModelToolResult2.to(revive(dto));
@@ -148,6 +149,7 @@ class ExtHostLanguageModelTools {
             options.chatRequestId = dto.chatRequestId;
             options.chatInteractionId = dto.chatInteractionId;
             options.chatSessionId = dto.context?.sessionId;
+            options.fromSubAgent = dto.fromSubAgent;
         }
         if (isProposedApiEnabled(item.extension, 'chatParticipantAdditions') && dto.modelId) {
             options.model = await this.getModel(dto.modelId, item.extension);
@@ -160,12 +162,15 @@ class ExtHostLanguageModelTools {
         }
         let progress;
         if (isProposedApiEnabled(item.extension, 'toolProgress')) {
+            let lastProgress;
             progress = {
                 report: value => {
+                    if (value.increment !== undefined) {
+                        lastProgress = (lastProgress ?? 0) + value.increment;
+                    }
                     this._proxy.$acceptToolProgress(dto.callId, {
                         message: MarkdownString.fromStrict(value.message),
-                        increment: value.increment,
-                        total: 100,
+                        progress: lastProgress === undefined ? undefined : lastProgress / 100,
                     });
                 }
             };