@codingame/monaco-vscode-api 22.1.9 → 23.0.0

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

@@ -49,12 +49,13 @@ import { WorkspaceTrustRequestOptions } from "../../../platform/workspace/common
 import { SaveReason } from "../../common/editor.js";
 import { IRevealOptions, ITreeItem, IViewBadge } from "../../common/views.js";
 import { CallHierarchyItem } from "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy";
-import { IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, UserSelectedTools } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, UserSelectedTools } from "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
 import { ICodeMapperRequest, ICodeMapperResult } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService";
+import { IChatContextItem, IChatContextSupport } from "../../services/chat/common/chatContext.js";
 import { IChatRelatedFile, IChatRelatedFileProviderMetadata as IChatRelatedFilesProviderMetadata, IChatRequestDraft } from "../../contrib/chat/common/chatEditingService.js";
-import { IChatProgressHistoryResponseContent } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { ChatResponseClearToPreviousToolInvocationReason, IChatContentInlineReference, IChatFollowup, IChatNotebookEdit, IChatProgress, IChatTask, IChatTaskDto, IChatUserActionEvent, IChatVoteAction } from "../../contrib/chat/common/chatService.js";
-import { IChatSessionItem } from "../../contrib/chat/common/chatSessionsService.js";
+import { IChatProgressHistoryResponseContent, IChatRequestVariableData } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { ChatResponseClearToPreviousToolInvocationReason, IChatContentInlineReference, IChatExternalEditsDto, IChatFollowup, IChatNotebookEdit, IChatProgress, IChatTask, IChatTaskDto, IChatUserActionEvent, IChatVoteAction } from "../../contrib/chat/common/chatService.js";
+import { IChatSessionItem, IChatSessionProviderOptionGroup } from "../../contrib/chat/common/chatSessionsService.js";
 import { IChatRequestVariableValue } from "../../contrib/chat/common/chatVariables.js";
 import { ChatAgentLocation } from "../../contrib/chat/common/constants.js";
 import { IChatMessage, IChatResponsePart, ILanguageModelChatMetadataAndIdentifier, ILanguageModelChatSelector } from "../../contrib/chat/common/languageModels.js";
@@ -64,10 +65,10 @@ import { McpCollectionDefinition, McpConnectionState, McpServerDefinition, McpSe
 import * as notebookCommon from "../../contrib/notebook/common/notebookCommon.js";
 import { CellExecutionUpdateType } from "../../contrib/notebook/common/notebookExecutionService.js";
 import { ICellExecutionComplete, ICellExecutionStateUpdate } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
-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-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/search/common/search";
+import { ICellRange } from "@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
+import { ISCMHistoryOptions } from "@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common/vscode/vs/workbench/contrib/scm/common/history";
+import { InputValidationType } from "../../contrib/scm/common/scm.js";
+import { IWorkspaceSymbol, NotebookPriorityInfo } from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-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";
@@ -76,7 +77,7 @@ import { TypeHierarchyItem } from "@codingame/monaco-vscode-7f39b6f1-3542-5430-8
 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, 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 { EditorGroupColumn } from "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-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";
@@ -88,10 +89,14 @@ import { CandidatePort } from "../../services/remote/common/tunnelModel.js";
 import { IFileQueryBuilderOptions, ITextQueryBuilderOptions } from "../../services/search/common/queryBuilder.js";
 import * as search from "../../services/search/common/search.js";
 import { AISearchKeyword, TextSearchCompleteMessage } from "../../services/search/common/searchExtTypes.js";
-import { ISaveProfileResult } from "@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common/vscode/vs/workbench/services/userDataProfile/common/userDataProfile";
+import { ISaveProfileResult } from "@codingame/monaco-vscode-dd5b2d07-86ca-557c-8510-224a400e258d-common/vscode/vs/workbench/services/userDataProfile/common/userDataProfile";
 import { IExtHostDocumentSaveDelegate } from "./extHostDocumentData.js";
 import { TerminalShellExecutionCommandLineConfidence } from "./extHostTypes.js";
 import * as tasks from "@codingame/monaco-vscode-extensions-service-override/vscode/vs/workbench/api/common/shared/tasks";
+export type IconPathDto = UriComponents | {
+    light: UriComponents;
+    dark: UriComponents;
+} | ThemeIcon;
 export interface IWorkspaceData extends IStaticWorkspaceData {
     folders: {
         uri: UriComponents;
@@ -115,7 +120,7 @@ export interface MainThreadCommandsShape extends IDisposable {
     $registerCommand(id: string): void;
     $unregisterCommand(id: string): void;
     $fireCommandActivationEvent(id: string): void;
-    $executeCommand(id: string, args: any[] | SerializableObjectWithBuffers<any[]>, retry: boolean): Promise<unknown | undefined>;
+    $executeCommand(id: string, args: unknown[] | SerializableObjectWithBuffers<unknown[]>, retry: boolean): Promise<unknown | undefined>;
     $getCommands(): Promise<string[]>;
 }
 export interface CommentProviderFeatures {
@@ -474,7 +479,8 @@ export interface MainThreadLanguageFeaturesShape extends IDisposable {
     $registerNewSymbolNamesProvider(handle: number, selector: IDocumentFilterDto[]): void;
     $registerDocumentSemanticTokensProvider(handle: number, selector: IDocumentFilterDto[], legend: languages.SemanticTokensLegend, eventHandle: number | undefined): void;
     $emitDocumentSemanticTokensEvent(eventHandle: number): void;
-    $registerDocumentRangeSemanticTokensProvider(handle: number, selector: IDocumentFilterDto[], legend: languages.SemanticTokensLegend): void;
+    $registerDocumentRangeSemanticTokensProvider(handle: number, selector: IDocumentFilterDto[], legend: languages.SemanticTokensLegend, eventHandle: number | undefined): void;
+    $emitDocumentRangeSemanticTokensEvent(eventHandle: number): void;
     $registerCompletionsProvider(handle: number, selector: IDocumentFilterDto[], triggerCharacters: string[], supportsResolveDetails: boolean, extensionId: ExtensionIdentifier): void;
     $registerInlineCompletionsSupport(handle: number, selector: IDocumentFilterDto[], supportsHandleDidShowCompletionItem: boolean, extensionId: string, extensionVersion: string, yieldToId: string | undefined, yieldsToExtensionIds: string[], displayName: string | undefined, debounceDelayMs: number | undefined, excludesExtensionIds: string[], eventHandle: number | undefined): void;
     $emitInlineCompletionsChange(handle: number): void;
@@ -603,19 +609,28 @@ export interface TransferQuickPickItem {
     handle: number;
     type?: "item";
     label: string;
-    iconPath?: {
-        light?: URI;
-        dark: URI;
-    };
-    iconClass?: string;
+    iconPathDto?: IconPathDto;
     description?: string;
     detail?: string;
     picked?: boolean;
     alwaysShow?: boolean;
     buttons?: TransferQuickInputButton[];
+    resourceUri?: UriComponents;
+    iconPath?: {
+        light?: URI;
+        dark: URI;
+    };
+    iconClass?: string;
 }
 export interface TransferQuickInputButton extends quickInput.IQuickInputButton {
     handle: number;
+    iconPathDto: IconPathDto;
+    checked?: boolean;
+    iconPath?: {
+        light?: URI;
+        dark: URI;
+    };
+    iconClass?: string;
 }
 export type TransferQuickInput = TransferQuickPick | TransferInputBox;
 export interface BaseTransferQuickInput {
@@ -631,6 +646,7 @@ export interface TransferQuickPick extends BaseTransferQuickInput {
     type?: "quickPick";
     value?: string;
     placeholder?: string;
+    prompt?: string;
     buttons?: TransferQuickInputButton[];
     items?: TransferQuickPickItemOrSeparator[];
     activeItems?: number[];
@@ -1149,6 +1165,17 @@ export interface ExtHostLanguageModelsShape {
     $provideTokenLength(modelId: string, value: string | IChatMessage, token: CancellationToken): Promise<number>;
     $isFileIgnored(handle: number, uri: UriComponents, token: CancellationToken): Promise<boolean>;
 }
+export interface ExtHostChatContextShape {
+    $provideChatContext(handle: number, token: CancellationToken): Promise<IChatContextItem[]>;
+    $provideChatContextForResource(handle: number, options: {
+        resource: UriComponents;
+    }, token: CancellationToken): Promise<IChatContextItem | undefined>;
+    $resolveChatContext(handle: number, context: IChatContextItem, token: CancellationToken): Promise<IChatContextItem>;
+}
+export interface MainThreadChatContextShape extends IDisposable {
+    $registerChatContextProvider(handle: number, id: string, selector: IDocumentFilterDto[], options: {}, support: IChatContextSupport): void;
+    $unregisterChatContextProvider(handle: number): void;
+}
 export interface MainThreadEmbeddingsShape extends IDisposable {
     $registerEmbeddingProvider(handle: number, identifier: string): void;
     $unregisterEmbeddingProvider(handle: number): void;
@@ -1221,13 +1248,17 @@ export type IChatAgentHistoryEntryDto = {
     response: ReadonlyArray<IChatContentProgressDto>;
     result: IChatAgentResult;
 };
+export interface IChatSessionContextDto {
+    readonly chatSessionResource: UriComponents;
+    readonly isUntitled: boolean;
+}
 export interface ExtHostChatAgentsShape2 {
     $invokeAgent(handle: number, request: Dto<IChatAgentRequest>, context: {
         history: IChatAgentHistoryEntryDto[];
-        chatSessionContext?: {
-            chatSessionType: string;
-            chatSessionId: string;
-            isUntitled: boolean;
+        chatSessionContext?: IChatSessionContextDto;
+        chatSummary?: {
+            prompt?: string;
+            history?: string;
         };
     }, token: CancellationToken): Promise<IChatAgentResult | undefined>;
     $provideFollowups(request: Dto<IChatAgentRequest>, handle: number, result: IChatAgentResult, context: {
@@ -1301,7 +1332,7 @@ export type IDocumentContextDto = {
     version: number;
     ranges: IRange[];
 };
-export type IChatProgressDto = Dto<Exclude<IChatProgress, IChatTask | IChatNotebookEdit>> | IChatTaskDto | IChatNotebookEditDto | IChatResponseClearToPreviousToolInvocationDto;
+export type IChatProgressDto = Dto<Exclude<IChatProgress, IChatTask | IChatNotebookEdit>> | IChatTaskDto | IChatNotebookEditDto | IChatExternalEditsDto | IChatResponseClearToPreviousToolInvocationDto;
 export interface ExtHostUrlsShape {
     $handleExternalUri(handle: number, uri: UriComponents): Promise<void>;
 }
@@ -1443,6 +1474,7 @@ export interface MainThreadExtensionServiceShape extends IDisposable {
     ][]>;
 }
 export interface SCMProviderFeatures {
+    hasArtifactProvider?: boolean;
     hasHistoryProvider?: boolean;
     hasQuickDiffProvider?: boolean;
     quickDiffLabel?: string;
@@ -1496,10 +1528,7 @@ export interface SCMHistoryItemRefDto {
     readonly revision?: string;
     readonly category?: string;
     readonly description?: string;
-    readonly icon?: UriComponents | {
-        light: UriComponents;
-        dark: UriComponents;
-    } | ThemeIcon;
+    readonly icon?: IconPathDto;
 }
 export interface SCMHistoryItemRefsChangeEventDto {
     readonly added: readonly SCMHistoryItemRefDto[];
@@ -1514,10 +1543,7 @@ export interface SCMHistoryItemDto {
     readonly message: string;
     readonly displayId?: string;
     readonly author?: string;
-    readonly authorIcon?: UriComponents | {
-        light: UriComponents;
-        dark: UriComponents;
-    } | ThemeIcon;
+    readonly authorIcon?: IconPathDto;
     readonly authorEmail?: string;
     readonly timestamp?: number;
     readonly statistics?: {
@@ -1526,17 +1552,32 @@ export interface SCMHistoryItemDto {
         readonly deletions: number;
     };
     readonly references?: SCMHistoryItemRefDto[];
+    readonly tooltip?: string | IMarkdownString | undefined;
 }
 export interface SCMHistoryItemChangeDto {
     readonly uri: UriComponents;
     readonly originalUri: UriComponents | undefined;
     readonly modifiedUri: UriComponents | undefined;
 }
-export interface MainThreadSCMShape extends IDisposable {
-    $registerSourceControl(handle: number, parentHandle: number | undefined, id: string, label: string, rootUri: UriComponents | undefined, iconPath: UriComponents | {
+export interface SCMArtifactGroupDto {
+    readonly id: string;
+    readonly name: string;
+    readonly icon?: UriComponents | {
+        light: UriComponents;
+        dark: UriComponents;
+    } | ThemeIcon;
+}
+export interface SCMArtifactDto {
+    readonly id: string;
+    readonly name: string;
+    readonly description?: string;
+    readonly icon?: UriComponents | {
         light: UriComponents;
         dark: UriComponents;
-    } | ThemeIcon | undefined, inputBoxDocumentUri: UriComponents): Promise<void>;
+    } | ThemeIcon;
+}
+export interface MainThreadSCMShape extends IDisposable {
+    $registerSourceControl(handle: number, parentHandle: number | undefined, id: string, label: string, rootUri: UriComponents | undefined, iconPath: IconPathDto | undefined, inputBoxDocumentUri: UriComponents): Promise<void>;
     $updateSourceControl(handle: number, features: SCMProviderFeatures): Promise<void>;
     $unregisterSourceControl(handle: number): Promise<void>;
     $registerGroups(sourceControlHandle: number, groups: [
@@ -1558,6 +1599,7 @@ export interface MainThreadSCMShape extends IDisposable {
     $setValidationProviderIsEnabled(sourceControlHandle: number, enabled: boolean): Promise<void>;
     $onDidChangeHistoryProviderCurrentHistoryItemRefs(sourceControlHandle: number, historyItemRef?: SCMHistoryItemRefDto, historyItemRemoteRef?: SCMHistoryItemRefDto, historyItemBaseRef?: SCMHistoryItemRefDto): Promise<void>;
     $onDidChangeHistoryProviderHistoryItemRefs(sourceControlHandle: number, historyItemRefs: SCMHistoryItemRefsChangeEventDto): Promise<void>;
+    $onDidChangeArtifacts(sourceControlHandle: number, groups: string[]): Promise<void>;
 }
 export interface MainThreadQuickDiffShape extends IDisposable {
     $registerQuickDiffProvider(handle: number, selector: IDocumentFilterDto[], id: string, label: string, rootUri: UriComponents | undefined): Promise<void>;
@@ -2033,12 +2075,7 @@ export interface IWorkspaceEditEntryMetadataDto {
     needsConfirmation: boolean;
     label: string;
     description?: string;
-    iconPath?: {
-        id: string;
-    } | UriComponents | {
-        light: UriComponents;
-        dark: UriComponents;
-    };
+    iconPath?: IconPathDto;
 }
 export interface IChatNotebookEditDto {
     uri: UriComponents;
@@ -2276,7 +2313,7 @@ export interface ExtHostQuickOpenShape {
     $onDidChangeSelection(sessionId: number, handles: number[]): void;
     $onDidAccept(sessionId: number): void;
     $onDidChangeValue(sessionId: number, value: string): void;
-    $onDidTriggerButton(sessionId: number, handle: number): void;
+    $onDidTriggerButton(sessionId: number, handle: number, checked?: boolean): void;
     $onDidTriggerItemButton(sessionId: number, itemHandle: number, buttonHandle: number): void;
     $onDidHide(sessionId: number): void;
 }
@@ -2326,19 +2363,21 @@ export interface ITerminalCommandDto {
 }
 export interface ITerminalCompletionContextDto {
     commandLine: string;
-    cursorPosition: number;
-    allowFallbackCompletions: boolean;
+    cursorIndex: number;
 }
 export interface ITerminalCompletionItemDto {
     label: string | CompletionItemLabel;
     detail?: string;
     documentation?: string | IMarkdownString;
     icon?: ThemeIcon | undefined;
+    kind?: number | undefined;
     isFile?: boolean | undefined;
     isDirectory?: boolean | undefined;
     isKeyword?: boolean | undefined;
-    replacementIndex: number;
-    replacementLength: number;
+    replacementRange: readonly [
+        number,
+        number
+    ];
 }
 export interface ITerminalCompletionProvider {
     id: string;
@@ -2355,7 +2394,7 @@ export declare class TerminalCompletionListDto<T extends ITerminalCompletionItem
     /**
      * Resources should be shown in the completions list
      */
-    resourceRequestConfig?: TerminalResourceRequestConfigDto;
+    resourceOptions?: TerminalCompletionResourceOptionsDto;
     /**
      * The completion items.
      */
@@ -2366,11 +2405,11 @@ export declare class TerminalCompletionListDto<T extends ITerminalCompletionItem
      * @param items The completion items.
      * @param isIncomplete The list is not complete.
      */
-    constructor(items?: T[], resourceRequestConfig?: TerminalResourceRequestConfigDto);
+    constructor(items?: T[], resourceOptions?: TerminalCompletionResourceOptionsDto);
 }
-export interface TerminalResourceRequestConfigDto {
-    filesRequested?: boolean;
-    foldersRequested?: boolean;
+export interface TerminalCompletionResourceOptionsDto {
+    showFiles?: boolean;
+    showFolders?: boolean;
     globPattern?: string | IRelativePattern;
     cwd: UriComponents;
     pathSeparator: string;
@@ -2408,8 +2447,8 @@ export interface ExtHostTerminalServiceShape {
     $provideTerminalCompletions(id: string, options: ITerminalCompletionContextDto, token: CancellationToken): Promise<TerminalCompletionListDto | undefined>;
 }
 export interface ExtHostTerminalShellIntegrationShape {
-    $shellIntegrationChange(instanceId: number): void;
-    $shellExecutionStart(instanceId: number, commandLineValue: string, commandLineConfidence: TerminalShellExecutionCommandLineConfidence, isTrusted: boolean, cwd: string | undefined): void;
+    $shellIntegrationChange(instanceId: number, supportsExecuteCommandApi: boolean): void;
+    $shellExecutionStart(instanceId: number, supportsExecuteCommandApi: boolean, commandLineValue: string, commandLineConfidence: TerminalShellExecutionCommandLineConfidence, isTrusted: boolean, cwd: string | undefined): void;
     $shellExecutionEnd(instanceId: number, commandLineValue: string, commandLineConfidence: TerminalShellExecutionCommandLineConfidence, isTrusted: boolean, exitCode: number | undefined): void;
     $shellExecutionData(instanceId: number, data: string): void;
     $shellEnvChange(instanceId: number, shellEnvKeys: string[], shellEnvValues: string[], isTrusted: boolean): void;
@@ -2433,6 +2472,8 @@ export interface ExtHostSCMShape {
     $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>;
+    $provideArtifactGroups(sourceControlHandle: number, token: CancellationToken): Promise<SCMArtifactGroupDto[] | undefined>;
+    $provideArtifacts(sourceControlHandle: number, group: string, token: CancellationToken): Promise<SCMArtifactDto[] | undefined>;
 }
 export interface ExtHostQuickDiffShape {
     $provideOriginalResource(sourceControlHandle: number, uri: UriComponents, token: CancellationToken): Promise<UriComponents | null>;
@@ -2843,13 +2884,23 @@ export interface ExtHostMcpShape {
     $sendMessage(id: number, message: string): void;
     $waitForInitialCollectionProviders(): Promise<void>;
 }
+export interface IMcpAuthenticationDetails {
+    authorizationServer: UriComponents;
+    authorizationServerMetadata: IAuthorizationServerMetadata;
+    resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined;
+    scopes: string[] | undefined;
+}
+export interface IMcpAuthenticationOptions {
+    errorOnUserInteraction?: boolean;
+    forceNewRegistration?: boolean;
+}
 export interface MainThreadMcpShape {
     $onDidChangeState(id: number, state: McpConnectionState): void;
     $onDidPublishLog(id: number, level: LogLevel, log: string): void;
     $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, errorOnUserInteraction?: boolean): Promise<string | undefined>;
+    $getTokenFromServerMetadata(id: number, authDetails: IMcpAuthenticationDetails, options?: IMcpAuthenticationOptions): Promise<string | undefined>;
 }
 export interface MainThreadDataChannelsShape extends IDisposable {
 }
@@ -2937,32 +2988,42 @@ export type IChatSessionHistoryItemDto = {
     type: "request";
     prompt: string;
     participant: string;
+    command?: string;
+    variableData?: Dto<IChatRequestVariableData>;
 } | {
     type: "response";
     parts: IChatProgressDto[];
     participant: string;
 };
+export interface ChatSessionOptionUpdateDto {
+    readonly optionId: string;
+    readonly value: string | undefined;
+}
 export interface ChatSessionDto {
     id: string;
+    resource: UriComponents;
     history: Array<IChatSessionHistoryItemDto>;
     hasActiveResponseCallback: boolean;
     hasRequestHandler: boolean;
     supportsInterruption: boolean;
+    options?: Record<string, string>;
+}
+export interface IChatSessionProviderOptions {
+    optionGroups?: IChatSessionProviderOptionGroup[];
 }
 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;
+    $onDidCommitChatSessionItem(handle: number, original: UriComponents, modified: UriComponents): void;
+    $registerChatSessionContentProvider(handle: number, chatSessionScheme: string): void;
     $unregisterChatSessionContentProvider(handle: number): void;
-    $handleProgressChunk(handle: number, sessionId: string, requestId: string, chunks: (IChatProgressDto | [
+    $handleProgressChunk(handle: number, sessionResource: UriComponents, requestId: string, chunks: (IChatProgressDto | [
         IChatProgressDto,
         number
     ])[]): Promise<void>;
-    $handleAnchorResolve(handle: number, sessionId: string, requestId: string, requestHandle: string, anchor: Dto<IChatContentInlineReference>): void;
-    $handleProgressComplete(handle: number, sessionId: string, requestId: string): void;
-    $showChatSession(chatSessionType: string, sessionId: string, position: EditorGroupColumn | undefined): Promise<void>;
+    $handleAnchorResolve(handle: number, sessionResource: UriComponents, requestId: string, requestHandle: string, anchor: Dto<IChatContentInlineReference>): void;
+    $handleProgressComplete(handle: number, sessionResource: UriComponents, requestId: string): void;
 }
 export interface ExtHostChatSessionsShape {
     $provideChatSessionItems(providerHandle: number, token: CancellationToken): Promise<Dto<IChatSessionItem>[]>;
@@ -2970,10 +3031,12 @@ export interface ExtHostChatSessionsShape {
         request: IChatAgentRequest;
         metadata?: any;
     }, token: CancellationToken): Promise<Dto<IChatSessionItem>>;
-    $provideChatSessionContent(providerHandle: number, sessionId: string, token: CancellationToken): Promise<ChatSessionDto>;
-    $interruptChatSessionActiveResponse(providerHandle: number, sessionId: string, requestId: string): Promise<void>;
-    $disposeChatSessionContent(providerHandle: number, sessionId: string): Promise<void>;
-    $invokeChatSessionRequestHandler(providerHandle: number, id: string, request: IChatAgentRequest, history: any[], token: CancellationToken): Promise<IChatAgentResult>;
+    $provideChatSessionContent(providerHandle: number, sessionResource: UriComponents, token: CancellationToken): Promise<ChatSessionDto>;
+    $interruptChatSessionActiveResponse(providerHandle: number, sessionResource: UriComponents, requestId: string): Promise<void>;
+    $disposeChatSessionContent(providerHandle: number, sessionResource: UriComponents): Promise<void>;
+    $invokeChatSessionRequestHandler(providerHandle: number, sessionResource: UriComponents, request: IChatAgentRequest, history: any[], token: CancellationToken): Promise<IChatAgentResult>;
+    $provideChatSessionProviderOptions(providerHandle: number, token: CancellationToken): Promise<IChatSessionProviderOptions | undefined>;
+    $provideHandleOptionsChange(providerHandle: number, sessionResource: UriComponents, updates: ReadonlyArray<ChatSessionOptionUpdateDto>, token: CancellationToken): Promise<void>;
 }
 export declare const MainContext: {
     MainThreadAuthentication: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadAuthenticationShape>;
@@ -3052,6 +3115,7 @@ export declare const MainContext: {
     MainThreadDataChannels: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadDataChannelsShape>;
     MainThreadChatSessions: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadChatSessionsShape>;
     MainThreadChatOutputRenderer: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadChatOutputRendererShape>;
+    MainThreadChatContext: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadChatContextShape>;
 };
 export declare const ExtHostContext: {
     ExtHostCodeMapper: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostCodeMapperShape>;
@@ -3110,6 +3174,7 @@ export declare const ExtHostContext: {
     ExtHostChatAgents2: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostChatAgentsShape2>;
     ExtHostLanguageModelTools: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostLanguageModelToolsShape>;
     ExtHostChatProvider: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostLanguageModelsShape>;
+    ExtHostChatContext: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostChatContextShape>;
     ExtHostSpeech: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostSpeechShape>;
     ExtHostEmbeddings: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostEmbeddingsShape>;
     ExtHostAiRelatedInformation: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostAiRelatedInformationShape>;

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

@@ -177,6 +177,7 @@ const MainContext = {
     MainThreadDataChannels: ( createProxyIdentifier('MainThreadDataChannels')),
     MainThreadChatSessions: ( createProxyIdentifier('MainThreadChatSessions')),
     MainThreadChatOutputRenderer: ( createProxyIdentifier('MainThreadChatOutputRenderer')),
+    MainThreadChatContext: ( createProxyIdentifier('MainThreadChatContext')),
 };
 const ExtHostContext = {
     ExtHostCodeMapper: ( createProxyIdentifier('ExtHostCodeMapper')),
@@ -235,6 +236,7 @@ const ExtHostContext = {
     ExtHostChatAgents2: ( createProxyIdentifier('ExtHostChatAgents')),
     ExtHostLanguageModelTools: ( createProxyIdentifier('ExtHostChatSkills')),
     ExtHostChatProvider: ( createProxyIdentifier('ExtHostChatProvider')),
+    ExtHostChatContext: ( createProxyIdentifier('ExtHostChatContext')),
     ExtHostSpeech: ( createProxyIdentifier('ExtHostSpeech')),
     ExtHostEmbeddings: ( createProxyIdentifier('ExtHostEmbeddings')),
     ExtHostAiRelatedInformation: ( createProxyIdentifier('ExtHostAiRelatedInformation')),

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

@@ -52,7 +52,26 @@ let ExtHostAuthentication = class ExtHostAuthentication {
     async getSession(requestingExtension, providerId, scopesOrRequest, options = {}) {
         const extensionId = ExtensionIdentifier.toKey(requestingExtension.identifier);
         const keys = ( Object.keys(options));
-        const optionsStr = ( keys.sort().map(key => `${key}:${!!options[key]}`)).join(', ');
+        const optionsStr = ( keys
+            .map(key => {
+            switch (key) {
+                case 'account':
+                    return `${key}:${options.account?.id}`;
+                case 'createIfNone':
+                case 'forceNewSession': {
+                    const value = typeof options[key] === 'boolean'
+                        ? `${options[key]}`
+                        : `'${options[key]?.detail}/${options[key]?.learnMore?.toString()}'`;
+                    return `${key}:${value}`;
+                }
+                case 'authorizationServer':
+                    return `${key}:${options.authorizationServer?.toString(true)}`;
+                default:
+                    return `${key}:${!!options[key]}`;
+            }
+        }))
+            .sort()
+            .join(', ');
         let singlerKey;
         if (isAuthenticationWwwAuthenticateRequest(scopesOrRequest)) {
             const challenge = scopesOrRequest;
@@ -279,7 +298,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         this._createFlows = [];
         if (_serverMetadata.authorization_endpoint) {
             this._createFlows.push({
-                label: ( localize(2628, "URL Handler")),
+                label: ( localize(2648, "URL Handler")),
                 handler: (scopes, progress, token) => this._createWithUrlHandler(scopes, progress, token)
             });
         }
@@ -347,7 +366,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
             try {
                 token = await this._extHostProgress.withProgressFromSource({ label: this.label, id: this.id }, {
                     location: ProgressLocation.Notification,
-                    title: ( localize(2629, "Authenticating to '{0}'", this.label)),
+                    title: ( localize(2649, "Authenticating to '{0}'", this.label)),
                     cancellable: true
                 }, (progress, token) => handler(scopes, progress, token));
                 if (token) {
@@ -361,13 +380,13 @@ let DynamicAuthProvider = class DynamicAuthProvider {
                 }
                 const message = isCancellationError(err)
                     ? ( localize(
-                    2630,
+                    2650,
                     "Having trouble authenticating to '{0}'? Would you like to try a different way? ({1})",
                     this.label,
                     nextMode
                 ))
                     : ( localize(
-                    2631,
+                    2651,
                     "You have not yet finished authenticating to '{0}'. Would you like to try a different way? ({1})",
                     this.label,
                     nextMode
@@ -452,7 +471,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
             throw ( new CancellationError());
         }
         progress.report({
-            message: ( localize(2632, "Complete the authentication in the browser window that has opened.")),
+            message: ( localize(2652, "Complete the authentication in the browser window that has opened.")),
         });
         let code;
         try {

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

@@ -3,12 +3,12 @@ import { CancellationToken } from "../../../base/common/cancellation.js";
 import { Disposable, DisposableStore } from "../../../base/common/lifecycle.js";
 import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
 import { ILogService } from "../../../platform/log/common/log.service.js";
-import { IChatAgentRequest, IChatAgentResult, IChatAgentResultTimings, UserSelectedTools } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatAgentRequest, IChatAgentResult, IChatAgentResultTimings, UserSelectedTools } from "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
 import { IChatRelatedFile, IChatRequestDraft } from "../../contrib/chat/common/chatEditingService.js";
 import { IChatFollowup, IChatUserActionEvent, IChatVoteAction } from "../../contrib/chat/common/chatService.js";
 import { ChatAgentLocation } from "../../contrib/chat/common/constants.js";
 import { Dto } from "../../services/extensions/common/proxyIdentifier.js";
-import { ExtHostChatAgentsShape2, IChatAgentCompletionItem, IChatAgentHistoryEntryDto, IChatAgentProgressShape, IMainContext } from "./extHost.protocol.js";
+import { ExtHostChatAgentsShape2, IChatAgentCompletionItem, IChatAgentHistoryEntryDto, IChatAgentProgressShape, IChatSessionContextDto, IMainContext } from "./extHost.protocol.js";
 import { CommandsConverter, ExtHostCommands } from "./extHostCommands.js";
 import { ExtHostDiagnostics } from "./extHostDiagnostics.js";
 import { ExtHostDocuments } from "./extHostDocuments.js";
@@ -68,10 +68,10 @@ 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;
+        chatSessionContext?: IChatSessionContextDto;
+        chatSummary?: {
+            prompt?: string;
+            history?: string;
         };
     }, token: CancellationToken): Promise<IChatAgentResult | undefined>;
     private getDiagnosticsWhenEnabled;