@codingame/monaco-vscode-api 20.5.0 → 21.0.1

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

@@ -95,7 +95,7 @@ import { ExtHostTimeline } from './extHostTimeline.js';
 import { ExtHostTreeViews } from './extHostTreeViews.js';
 import { IExtHostTunnelService } from './extHostTunnelService.js';
 import { LanguageSelector } from './extHostTypeConverters.js';
-import { ExtensionKind, ProgressLocation, SettingsSearchResultKind, McpStdioServerDefinition, McpHttpServerDefinition, ChatErrorLevel, NewSymbolNameTriggerKind, NewSymbolNameTag, NewSymbolName, LanguageModelPromptTsxPart, LanguageModelChatToolMode, ExtendedLanguageModelToolResult, LanguageModelToolMCPSource, LanguageModelToolExtensionSource, LanguageModelDataPart, LanguageModelToolResult2, LanguageModelToolResult, LanguageModelError, LanguageModelToolCallPart, ToolResultAudience, LanguageModelTextPart, LanguageModelToolResultPart2, LanguageModelToolResultPart, LanguageModelChatMessage2, LanguageModelChatMessage, LanguageModelChatMessageRole, ChatRequestEditedFileEventKind, ChatReferenceBinaryData, ChatRequestNotebookData, ChatRequestEditorData, ChatLocation, ChatToolInvocationPart, ChatResponseTurn2, ChatResponseTurn, ChatRequestTurn, ChatResponseClearToPreviousToolInvocationReason, ChatResponseReferencePartStatusKind, ChatResponseMultiDiffPart, ChatPrepareToolInvocationPart, ChatResponsePullRequestPart, ChatResponseExtensionsPart, ChatResponseMovePart, ChatResponseConfirmationPart, ChatResponseCommandButtonPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseNotebookEditPart, ChatResponseTextEditPart, ChatResponseWarningPart, ChatResponseCodeblockUriPart, ChatResponseCodeCitationPart, ChatResponseReferencePart, ChatResponseProgressPart2, ChatResponseProgressPart, ChatResponseAnchorPart, ChatResponseFileTreePart, ChatResponseMarkdownPart, ChatImageMimeType, KeywordRecognitionStatus, InlineCompletionEndOfLifeReasonKind, PartialAcceptTriggerKind, TextToSpeechStatus, SpeechToTextStatus, RelatedInformationType, DebugThread, DebugStackFrame, InteractiveEditorResponseFeedbackKind, ChatEditingSessionActionOutcome, ChatCopyKind, InteractiveSessionVoteDirection, TextMultiDiffTabInput, ChatEditorTabInput, InteractiveWindowInput, TerminalEditorTabInput, WebviewEditorTabInput, NotebookDiffEditorTabInput, NotebookEditorTabInput, CustomEditorTabInput, TextMergeTabInput, TextDiffTabInput, TextTabInput, InputBoxValidationSeverity, QuickPickItemKind, LanguageStatusSeverity, WorkspaceTrustState, DeclarationCoverage, BranchCoverage, StatementCoverage, FileCoverage, TestCoverageCount, DataTransferItem, DataTransfer, TestRunProfileKind, TestTag, TestMessageStackFrame, TestMessage, TestRunRequest, TestResultState, LinkedEditingRanges, PortAttributes, NotebookVariablesRequestKind, NotebookKernelSourceAction, NotebookEdit, NotebookControllerAffinity2, NotebookControllerAffinity, NotebookCellStatusBarItem, CellErrorStackFrame, NotebookCellOutputItem, NotebookCellOutput, NotebookEditorRevealType, NotebookCellStatusBarAlignment, NotebookRendererScript, NotebookData, NotebookCellData, NotebookCellExecutionState, NotebookCellKind, NotebookRange, TimelineItem, ExtensionRuntime, SourceControlInputBoxValidationType, ManagedResolvedAuthority, ResolvedAuthority, RemoteAuthorityResolverError, InlayHintKind, InlayHintLabelPart, InlayHint, DocumentPasteEdit, DocumentDropOrPasteEditKind, DocumentDropEdit, DocumentPasteTriggerKind, WorkspaceEdit, ViewColumn, TypeHierarchyItem, TreeItemCollapsibleState, TreeItemCheckboxState, TreeItem, ThemeIcon, ThemeColor, TextDocumentChangeReason, SyntaxTokenType, TextEditorSelectionChangeKind, TextEditorRevealType, TextEditorLineNumbersStyle, TextEditorChangeKind, SnippetTextEdit, TextEdit, TextDocumentSaveReason, TerminalShellType, TerminalCompletionList, TerminalCompletionItemKind, TerminalCompletionItem, TerminalShellExecutionCommandLineConfidence, TerminalExitReason, TerminalProfile, TerminalLocation, TerminalQuickFixOpener, TerminalQuickFixCommand, TerminalLink, TaskScope, TaskRevealKind, TaskPanelKind, TaskGroup, TaskEventKind, Task, SymbolTag, SymbolKind, SymbolInformation, StatusBarAlignment, StandardTokenType, SourceBreakpoint, SnippetString, SignatureInformation, SignatureHelpTriggerKind, SignatureHelp, ShellQuoting, ShellExecution, SemanticTokensLegend, SemanticTokensEdits, SemanticTokensEdit, SemanticTokensBuilder, SemanticTokens, SelectionRange, Selection, RelativePattern, Range, QuickInputButtons, QuickInputButtonLocation, ProcessExecution, Position, PortAutoForwardAction, ParameterInformation, MarkdownString, Location, HoverVerbosityAction, VerboseHover, Hover, InlineSuggestionList, InlineSuggestion, FunctionBreakpoint, FoldingRangeKind, FoldingRange, FileSystemError, FileDecoration, FileChangeType, ExternalUriOpenerPriority, ExtensionMode, InlineCompletionsDisposeReasonKind, InlineCompletionTriggerKind, InlineValueEvaluatableExpression, InlineValueVariableLookup, InlineValueText, EvaluatableExpression, EnvironmentVariableMutatorType, EndOfLine, DocumentSymbol, DocumentLink, MultiDocumentHighlight, DocumentHighlightKind, DocumentHighlight, Disposable, DiagnosticTag, DiagnosticSeverity, DiagnosticRelatedInformation, Diagnostic, DecorationRangeBehavior, DebugVisualization, DebugConsoleMode, DebugAdapterServer, DebugAdapterNamedPipeServer, DebugAdapterInlineImplementation, DebugAdapterExecutable, CustomExecution, ConfigurationTarget, CompletionTriggerKind, CompletionList, CompletionItemTag, CompletionItemKind, CompletionItem, CommentThreadFocus, CommentThreadApplicability, CommentThreadState, CommentThreadCollapsibleState, CommentState, CommentMode, ColorThemeKind, ColorPresentation, ColorInformation, Color, CodeLens, CodeActionTriggerKind, CodeActionKind, CodeAction, CallHierarchyOutgoingCall, CallHierarchyItem, CallHierarchyIncomingCall, ChatReferenceDiagnostic, ChatCompletionItem, ChatVariableLevel, ChatResultFeedbackKind, TerminalOutputAnchor, Breakpoint } from './extHostTypes.js';
+import { ExtensionKind, ProgressLocation, SettingsSearchResultKind, McpStdioServerDefinition, McpHttpServerDefinition, ChatErrorLevel, NewSymbolNameTriggerKind, NewSymbolNameTag, NewSymbolName, LanguageModelPromptTsxPart, LanguageModelChatToolMode, ExtendedLanguageModelToolResult, LanguageModelToolMCPSource, LanguageModelToolExtensionSource, LanguageModelDataPart, LanguageModelToolResult2, LanguageModelToolResult, LanguageModelError, LanguageModelThinkingPart, LanguageModelToolCallPart, LanguageModelPartAudience, LanguageModelTextPart, LanguageModelToolResultPart2, LanguageModelToolResultPart, LanguageModelChatMessage2, LanguageModelChatMessage, LanguageModelChatMessageRole, ChatRequestEditedFileEventKind, ChatReferenceBinaryData, ChatRequestNotebookData, ChatRequestEditorData, ChatSessionStatus, ChatLocation, ChatToolInvocationPart, ChatResponseTurn2, ChatResponseTurn, ChatRequestTurn, ChatResponseClearToPreviousToolInvocationReason, ChatResponseReferencePartStatusKind, ChatResponseMultiDiffPart, ChatPrepareToolInvocationPart, ChatResponsePullRequestPart, ChatResponseExtensionsPart, ChatResponseMovePart, ChatResponseConfirmationPart, ChatResponseCommandButtonPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseNotebookEditPart, ChatResponseTextEditPart, ChatResponseWarningPart, ChatResponseCodeblockUriPart, ChatResponseCodeCitationPart, ChatResponseReferencePart, ChatResponseThinkingProgressPart, ChatResponseProgressPart2, ChatResponseProgressPart, ChatResponseAnchorPart, ChatResponseFileTreePart, ChatResponseMarkdownPart, ChatImageMimeType, KeywordRecognitionStatus, InlineCompletionDisplayLocationKind, InlineCompletionEndOfLifeReasonKind, PartialAcceptTriggerKind, TextToSpeechStatus, SpeechToTextStatus, RelatedInformationType, DebugThread, DebugStackFrame, InteractiveEditorResponseFeedbackKind, ChatEditingSessionActionOutcome, ChatCopyKind, InteractiveSessionVoteDirection, TextMultiDiffTabInput, ChatEditorTabInput, InteractiveWindowInput, TerminalEditorTabInput, WebviewEditorTabInput, NotebookDiffEditorTabInput, NotebookEditorTabInput, CustomEditorTabInput, TextMergeTabInput, TextDiffTabInput, TextTabInput, InputBoxValidationSeverity, QuickPickItemKind, LanguageStatusSeverity, WorkspaceTrustState, DeclarationCoverage, BranchCoverage, StatementCoverage, FileCoverage, TestCoverageCount, DataTransferItem, DataTransfer, TestRunProfileKind, TestTag, TestMessageStackFrame, TestMessage, TestRunRequest, TestResultState, LinkedEditingRanges, PortAttributes, NotebookVariablesRequestKind, NotebookKernelSourceAction, NotebookControllerAffinity2, NotebookControllerAffinity, NotebookCellStatusBarItem, CellErrorStackFrame, NotebookEditorRevealType, NotebookCellStatusBarAlignment, NotebookRendererScript, NotebookCellExecutionState, TimelineItem, ExtensionRuntime, SourceControlInputBoxValidationType, ManagedResolvedAuthority, ResolvedAuthority, RemoteAuthorityResolverError, InlayHintKind, InlayHintLabelPart, InlayHint, DocumentPasteEdit, DocumentDropOrPasteEditKind, DocumentDropEdit, DocumentPasteTriggerKind, ViewColumn, TypeHierarchyItem, TreeItemCollapsibleState, TreeItemCheckboxState, TreeItem, ThemeIcon, ThemeColor, TextDocumentChangeReason, SyntaxTokenType, TextEditorSelectionChangeKind, TextEditorRevealType, TextEditorLineNumbersStyle, TextEditorChangeKind, TextDocumentSaveReason, TerminalShellType, TerminalCompletionList, TerminalCompletionItemKind, TerminalCompletionItem, TerminalShellExecutionCommandLineConfidence, TerminalExitReason, TerminalProfile, TerminalLocation, TerminalQuickFixOpener, TerminalQuickFixCommand, TerminalLink, TaskScope, TaskRevealKind, TaskPanelKind, TaskGroup, TaskEventKind, Task, StatusBarAlignment, StandardTokenType, SourceBreakpoint, SignatureInformation, SignatureHelpTriggerKind, SignatureHelp, ShellQuoting, ShellExecution, SemanticTokensLegend, SemanticTokensEdits, SemanticTokensEdit, SemanticTokensBuilder, SemanticTokens, SelectionRange, RelativePattern, QuickInputButtons, QuickInputButtonLocation, ProcessExecution, PortAutoForwardAction, ParameterInformation, HoverVerbosityAction, VerboseHover, Hover, InlineSuggestionList, InlineSuggestion, FunctionBreakpoint, FoldingRangeKind, FoldingRange, FileSystemError, FileDecoration, FileChangeType, ExternalUriOpenerPriority, ExtensionMode, InlineCompletionsDisposeReasonKind, InlineCompletionTriggerKind, InlineValueEvaluatableExpression, InlineValueVariableLookup, InlineValueText, EvaluatableExpression, EnvironmentVariableMutatorType, DocumentSymbol, DocumentLink, MultiDocumentHighlight, DocumentHighlightKind, DocumentHighlight, Disposable, DecorationRangeBehavior, DebugVisualization, DebugConsoleMode, DebugAdapterServer, DebugAdapterNamedPipeServer, DebugAdapterInlineImplementation, DebugAdapterExecutable, CustomExecution, ConfigurationTarget, CompletionTriggerKind, CompletionList, CompletionItemTag, CompletionItemKind, CompletionItem, CommentThreadFocus, CommentThreadApplicability, CommentThreadState, CommentThreadCollapsibleState, CommentState, CommentMode, ColorThemeKind, ColorPresentation, ColorInformation, Color, CodeLens, CodeActionTriggerKind, CodeAction, CallHierarchyOutgoingCall, CallHierarchyItem, CallHierarchyIncomingCall, ChatReferenceDiagnostic, ChatCompletionItem, ChatVariableLevel, ChatResultFeedbackKind, TerminalOutputAnchor, Breakpoint } from './extHostTypes.js';
 import { ExtHostUriOpeners } from './extHostUriOpener.js';
 import { IURITransformerService } from './extHostUriTransformerService.js';
 import { IExtHostUrlsService } from './extHostUrls.js';
@@ -107,6 +107,19 @@ import { IExtHostWorkspace } from './extHostWorkspace.js';
 import { ExtHostAiSettingsSearch } from './extHostAiSettingsSearch.js';
 import { ExtHostChatSessions } from './extHostChatSessions.js';
 import { ExtHostChatOutputRenderer } from './extHostChatOutputRenderer.js';
+import { NotebookEdit, NotebookCellOutputItem, NotebookCellOutput, NotebookData, NotebookCellData, NotebookCellKind, NotebookRange } from './extHostTypes/notebooks.js';
+import { WorkspaceEdit } from './extHostTypes/workspaceEdit.js';
+import { SnippetTextEdit } from './extHostTypes/snippetTextEdit.js';
+import { TextEdit, EndOfLine } from './extHostTypes/textEdit.js';
+import { SymbolTag, SymbolKind, SymbolInformation } from './extHostTypes/symbolInformation.js';
+import { SnippetString } from './extHostTypes/snippetString.js';
+import { Selection } from './extHostTypes/selection.js';
+import { Range } from './extHostTypes/range.js';
+import { Position } from './extHostTypes/position.js';
+import { MarkdownString } from './extHostTypes/markdownString.js';
+import { Location } from './extHostTypes/location.js';
+import { DiagnosticTag, DiagnosticSeverity, DiagnosticRelatedInformation, Diagnostic } from './extHostTypes/diagnostic.js';
+import { CodeActionKind } from './extHostTypes/codeActionKind.js';
 
 function createApiFactoryAndRegisterActors(accessor) {
     const initData = accessor.get(IExtHostInitDataService);
@@ -305,7 +318,10 @@ function createApiFactoryAndRegisterActors(accessor) {
             };
         })();
         const authentication = {
-            getSession(providerId, scopes, options) {
+            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');
@@ -313,7 +329,7 @@ function createApiFactoryAndRegisterActors(accessor) {
                 if (options?.authorizationServer) {
                     checkProposedApiEnabled(extension, 'authIssuers');
                 }
-                return extHostAuthentication.getSession(extension, providerId, scopes, options);
+                return extHostAuthentication.getSession(extension, providerId, scopesOrChallenge, options);
             },
             getAccounts(providerId) {
                 return extHostAuthentication.getAccounts(providerId);
@@ -654,6 +670,14 @@ function createApiFactoryAndRegisterActors(accessor) {
                 }
                 return extHostLanguageFeatures.registerInlineCompletionsProvider(extension, checkSelector(selector), provider, metadata);
             },
+            get inlineCompletionsUnificationState() {
+                checkProposedApiEnabled(extension, 'inlineCompletionsAdditions');
+                return extHostLanguageFeatures.inlineCompletionsUnificationState;
+            },
+            onDidChangeCompletionsUnificationState(listener, thisArg, disposables) {
+                checkProposedApiEnabled(extension, 'inlineCompletionsAdditions');
+                return _asExtensionEvent(extHostLanguageFeatures.onDidChangeInlineCompletionsUnificationState)(listener, thisArg, disposables);
+            },
             registerDocumentLinkProvider(selector, provider) {
                 return extHostLanguageFeatures.registerDocumentLinkProvider(extension, checkSelector(selector), provider);
             },
@@ -1463,9 +1487,9 @@ function createApiFactoryAndRegisterActors(accessor) {
                 checkProposedApiEnabled(extension, 'chatSessionsProvider');
                 return extHostChatSessions.registerChatSessionItemProvider(extension, chatSessionType, provider);
             },
-            registerChatSessionContentProvider(chatSessionType, provider) {
+            registerChatSessionContentProvider(chatSessionType, provider, capabilities) {
                 checkProposedApiEnabled(extension, 'chatSessionsProvider');
-                return extHostChatSessions.registerChatSessionContentProvider(extension, chatSessionType, provider);
+                return extHostChatSessions.registerChatSessionContentProvider(extension, chatSessionType, provider, capabilities);
             },
             registerChatOutputRenderer: (viewType, renderer) => {
                 checkProposedApiEnabled(extension, 'chatOutputRenderer');
@@ -1479,9 +1503,8 @@ function createApiFactoryAndRegisterActors(accessor) {
             onDidChangeChatModels: (listener, thisArgs, disposables) => {
                 return extHostLanguageModels.onDidChangeProviders(listener, thisArgs, disposables);
             },
-            registerChatModelProvider: (vendor, provider) => {
-                checkProposedApiEnabled(extension, 'chatProvider');
-                return extHostLanguageModels.registerLanguageModelProvider(extension, vendor, provider);
+            registerLanguageModelChatProvider: (vendor, provider) => {
+                return extHostLanguageModels.registerLanguageModelChatProvider(extension, vendor, provider);
             },
             get embeddingModels() {
                 checkProposedApiEnabled(extension, 'embeddings');
@@ -1775,6 +1798,7 @@ function createApiFactoryAndRegisterActors(accessor) {
             TextToSpeechStatus: TextToSpeechStatus,
             PartialAcceptTriggerKind: PartialAcceptTriggerKind,
             InlineCompletionEndOfLifeReasonKind: InlineCompletionEndOfLifeReasonKind,
+            InlineCompletionDisplayLocationKind: InlineCompletionDisplayLocationKind,
             KeywordRecognitionStatus: KeywordRecognitionStatus,
             ChatImageMimeType: ChatImageMimeType,
             ChatResponseMarkdownPart: ChatResponseMarkdownPart,
@@ -1782,6 +1806,7 @@ function createApiFactoryAndRegisterActors(accessor) {
             ChatResponseAnchorPart: ChatResponseAnchorPart,
             ChatResponseProgressPart: ChatResponseProgressPart,
             ChatResponseProgressPart2: ChatResponseProgressPart2,
+            ChatResponseThinkingProgressPart: ChatResponseThinkingProgressPart,
             ChatResponseReferencePart: ChatResponseReferencePart,
             ChatResponseReferencePart2: ChatResponseReferencePart,
             ChatResponseCodeCitationPart: ChatResponseCodeCitationPart,
@@ -1805,6 +1830,7 @@ function createApiFactoryAndRegisterActors(accessor) {
             ChatResponseTurn2: ChatResponseTurn2,
             ChatToolInvocationPart: ChatToolInvocationPart,
             ChatLocation: ChatLocation,
+            ChatSessionStatus: ChatSessionStatus,
             ChatRequestEditorData: ChatRequestEditorData,
             ChatRequestNotebookData: ChatRequestNotebookData,
             ChatReferenceBinaryData: ChatReferenceBinaryData,
@@ -1816,8 +1842,10 @@ function createApiFactoryAndRegisterActors(accessor) {
             LanguageModelToolResultPart2: LanguageModelToolResultPart2,
             LanguageModelTextPart: LanguageModelTextPart,
             LanguageModelTextPart2: LanguageModelTextPart,
-            ToolResultAudience: ToolResultAudience,
+            LanguageModelPartAudience: LanguageModelPartAudience,
+            ToolResultAudience: LanguageModelPartAudience,
             LanguageModelToolCallPart: LanguageModelToolCallPart,
+            LanguageModelThinkingPart: LanguageModelThinkingPart,
             LanguageModelError: LanguageModelError,
             LanguageModelToolResult: LanguageModelToolResult,
             LanguageModelToolResult2: LanguageModelToolResult2,

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

@@ -23,6 +23,7 @@ import * as languages from "../../../editor/common/languages.js";
 import { CompletionItemLabel } from "../../../editor/common/languages.js";
 import { CharacterPair, CommentRule, EnterAction } from "../../../editor/common/languages/languageConfiguration.js";
 import { EndOfLineSequence } from "../../../editor/common/model.js";
+import { EditSuggestionId } from "../../../editor/common/textModelEditSource.js";
 import { ISerializedModelContentChangedEvent } from "../../../editor/common/textModelEvents.js";
 import { IAccessibilityInformation } from "../../../platform/accessibility/common/accessibility.js";
 import { ILocalizedString } from "../../../platform/action/common/action.js";
@@ -48,15 +49,15 @@ 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 } 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-b994942c-360d-5b68-8a33-77d4bde6b714-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 { 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 { IChatContentInlineReference, IChatFollowup, IChatNotebookEdit, IChatProgress, IChatTask, IChatTaskDto, IChatUserActionEvent, IChatVoteAction, ChatResponseClearToPreviousToolInvocationReason } from "../../contrib/chat/common/chatService.js";
+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 { IChatRequestVariableValue } from "../../contrib/chat/common/chatVariables.js";
 import { ChatAgentLocation } from "../../contrib/chat/common/constants.js";
-import { IChatMessage, IChatResponseFragment, ILanguageModelChatMetadataAndIdentifier, ILanguageModelChatSelector } from "../../contrib/chat/common/languageModels.js";
+import { IChatMessage, IChatResponsePart, ILanguageModelChatMetadataAndIdentifier, ILanguageModelChatSelector } from "../../contrib/chat/common/languageModels.js";
 import { IPreparedToolInvocation, IToolInvocation, IToolInvocationPreparationContext, IToolProgressStep, IToolResult, ToolDataSource } from "../../contrib/chat/common/languageModelToolsService.js";
 import { DebugConfigurationProviderTriggerKind, IAdapterDescriptor, IConfig, IDebugSessionReplMode, IDebugTestRunReference, IDebugVisualization, IDebugVisualizationContext, IDebugVisualizationTreeItem, MainThreadDebugVisualization } from "../../contrib/debug/common/debug.js";
 import { McpCollectionDefinition, McpConnectionState, McpServerDefinition, McpServerLaunch } from "../../contrib/mcp/common/mcpTypes.js";
@@ -66,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-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/search/common/search";
+import { IWorkspaceSymbol, NotebookPriorityInfo } from "@codingame/monaco-vscode-4dda7789-5a25-5e8b-b2de-c2f11b1b96e5-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,11 +76,12 @@ 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, IAuthenticationCreateSessionOptions, IAuthenticationGetSessionsOptions } 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-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-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";
 import { Dto, IRPCProtocol, SerializableObjectWithBuffers } from "../../services/extensions/common/proxyIdentifier.js";
+import { IInlineCompletionsUnificationState } from "@codingame/monaco-vscode-base-service-override/vscode/vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification";
 import { ILanguageStatus } from "@codingame/monaco-vscode-languages-service-override/vscode/vs/workbench/services/languageStatus/common/languageStatusService";
 import { OutputChannelUpdateMode } from "../../services/output/common/output.js";
 import { CandidatePort } from "../../services/remote/common/tunnelModel.js";
@@ -87,6 +89,7 @@ import { IFileQueryBuilderOptions, ITextQueryBuilderOptions } from "../../servic
 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 { 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 interface IWorkspaceData extends IStaticWorkspaceData {
@@ -170,12 +173,23 @@ 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[]): Promise<void>;
+    $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, scopes: readonly string[], extensionId: string, extensionName: string, options: AuthenticationGetSessionOptions): Promise<AuthenticationSession | undefined>;
+    $getSession(providerId: string, scopeListOrRequest: ReadonlyArray<string> | AuthenticationWWWAuthenticateRequest, 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>;
@@ -248,7 +262,7 @@ export interface MainThreadDocumentContentProvidersShape extends IDisposable {
     $unregisterTextContentProvider(handle: number): void;
     $onVirtualDocumentChange(uri: UriComponents, value: string): Promise<void>;
 }
-export interface MainThreadDocumentsShape extends IDisposable {
+export interface MainThreadDocumentsShape extends IDisposable, IExtHostDocumentSaveDelegate {
     $tryCreateDocument(options?: {
         language?: string;
         content?: string;
@@ -438,9 +452,11 @@ export interface ISignatureHelpProviderMetadataDto {
 }
 export interface IdentifiableInlineCompletions extends languages.InlineCompletions<IdentifiableInlineCompletion> {
     pid: number;
+    languageId: string;
 }
 export interface IdentifiableInlineCompletion extends languages.InlineCompletion {
     idx: number;
+    suggestionId: EditSuggestionId | undefined;
 }
 export interface MainThreadLanguageFeaturesShape extends IDisposable {
     $unregister(handle: number): void;
@@ -471,7 +487,7 @@ export interface MainThreadLanguageFeaturesShape extends IDisposable {
     $emitDocumentSemanticTokensEvent(eventHandle: number): void;
     $registerDocumentRangeSemanticTokensProvider(handle: number, selector: IDocumentFilterDto[], legend: languages.SemanticTokensLegend): 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, eventHandle: number | undefined): 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;
     $registerSignatureHelpProvider(handle: number, selector: IDocumentFilterDto[], metadata: ISignatureHelpProviderMetadataDto): void;
     $registerInlayHintsProvider(handle: number, selector: IDocumentFilterDto[], supportsResolve: boolean, eventHandle: number | undefined, displayName: string | undefined): void;
@@ -563,6 +579,7 @@ export interface TerminalLaunchConfig {
         splitActiveTerminal: boolean;
     };
     isTransient?: boolean;
+    shellIntegrationNonce?: string;
 }
 export interface MainThreadTerminalServiceShape extends IDisposable {
     $createTerminal(extHostTerminalId: string, config: TerminalLaunchConfig): Promise<void>;
@@ -1118,7 +1135,7 @@ export interface MainThreadLanguageModelsShape extends IDisposable {
     $onLMProviderChange(vendor: string): void;
     $unregisterProvider(vendor: string): void;
     $tryStartChatRequest(extension: ExtensionIdentifier, modelIdentifier: string, requestId: number, messages: SerializableObjectWithBuffers<IChatMessage[]>, options: {}, token: CancellationToken): Promise<void>;
-    $reportResponsePart(requestId: number, chunk: IChatResponseFragment | IChatResponseFragment[]): Promise<void>;
+    $reportResponsePart(requestId: number, chunk: SerializableObjectWithBuffers<IChatResponsePart | IChatResponsePart[]>): Promise<void>;
     $reportResponseDone(requestId: number, error: SerializedError | undefined): Promise<void>;
     $selectChatModels(selector: ILanguageModelChatSelector): Promise<string[]>;
     $countTokens(modelId: string, value: string | IChatMessage, token: CancellationToken): Promise<number>;
@@ -1127,7 +1144,7 @@ export interface MainThreadLanguageModelsShape extends IDisposable {
     $unregisterFileIgnoreProvider(handle: number): void;
 }
 export interface ExtHostLanguageModelsShape {
-    $prepareLanguageModelProvider(vendor: string, options: {
+    $provideLanguageModelChatInfo(vendor: string, options: {
         silent: boolean;
     }, token: CancellationToken): Promise<ILanguageModelChatMetadataAndIdentifier[]>;
     $updateModelAccesslist(data: {
@@ -1138,7 +1155,7 @@ export interface ExtHostLanguageModelsShape {
     $startChatRequest(modelId: string, requestId: number, from: ExtensionIdentifier, messages: SerializableObjectWithBuffers<IChatMessage[]>, options: {
         [name: string]: any;
     }, token: CancellationToken): Promise<void>;
-    $acceptResponsePart(requestId: number, chunk: IChatResponseFragment | IChatResponseFragment[]): Promise<void>;
+    $acceptResponsePart(requestId: number, chunk: SerializableObjectWithBuffers<IChatResponsePart | IChatResponsePart[]>): Promise<void>;
     $acceptResponseDone(requestId: number, error: SerializedError | undefined): Promise<void>;
     $provideTokenLength(modelId: string, value: string | IChatMessage, token: CancellationToken): Promise<number>;
     $isFileIgnored(handle: number, uri: UriComponents, token: CancellationToken): Promise<boolean>;
@@ -1219,7 +1236,6 @@ export interface ExtHostChatAgentsShape2 {
     $invokeAgent(handle: number, request: Dto<IChatAgentRequest>, context: {
         history: IChatAgentHistoryEntryDto[];
     }, token: CancellationToken): Promise<IChatAgentResult | undefined>;
-    $setRequestPaused(handle: number, requestId: string, isPaused: boolean): void;
     $provideFollowups(request: Dto<IChatAgentRequest>, handle: number, result: IChatAgentResult, context: {
         history: IChatAgentHistoryEntryDto[];
     }, token: CancellationToken): Promise<IChatFollowup[]>;
@@ -1236,7 +1252,7 @@ export interface ExtHostChatAgentsShape2 {
         location: ChatAgentLocation;
     }, token: CancellationToken): Promise<IChatParticipantDetectionResult | null | undefined>;
     $provideRelatedFiles(handle: number, request: Dto<IChatRequestDraft>, token: CancellationToken): Promise<Dto<IChatRelatedFile>[] | undefined>;
-    $setRequestTools(requestId: string, tools: Pick<IChatAgentRequest, "userSelectedTools">): void;
+    $setRequestTools(requestId: string, tools: UserSelectedTools): void;
 }
 export interface IChatParticipantMetadata {
     participant: string;
@@ -1833,6 +1849,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>;
     $removeSession(id: string, sessionId: string): Promise<void>;
     $onDidChangeAuthenticationSessions(id: string, label: string, extensionIdFilter?: string[]): Promise<void>;
     $onDidUnregisterAuthenticationProvider(id: string): Promise<void>;
@@ -2228,6 +2246,7 @@ export interface ExtHostLanguageFeaturesShape {
     }>): void;
     $handleInlineCompletionRejection(handle: number, pid: number, idx: number): void;
     $freeInlineCompletionsList(handle: number, pid: number, reason: languages.InlineCompletionsDisposeReason): void;
+    $acceptInlineCompletionsUnificationState(state: IInlineCompletionsUnificationState): void;
     $provideSignatureHelp(handle: number, resource: UriComponents, position: IPosition, context: languages.SignatureHelpContext, token: CancellationToken): Promise<ISignatureHelpDto | undefined>;
     $releaseSignatureHelp(handle: number, id: number): void;
     $provideInlayHints(handle: number, resource: UriComponents, range: IRange, token: CancellationToken): Promise<IInlayHintsDto | undefined>;
@@ -2676,7 +2695,7 @@ export interface ExtHostNotebookShape extends ExtHostNotebookDocumentsAndEditors
     $releaseNotebookCellStatusBarItems(id: number): void;
     $dataToNotebook(handle: number, data: VSBuffer, token: CancellationToken): Promise<SerializableObjectWithBuffers<NotebookDataDto>>;
     $notebookToData(handle: number, data: SerializableObjectWithBuffers<NotebookDataDto>, token: CancellationToken): Promise<VSBuffer>;
-    $saveNotebook(handle: number, uri: UriComponents, versionId: number, options: files.IWriteFileOptions, token: CancellationToken): Promise<INotebookPartialFileStatsWithMetadata>;
+    $saveNotebook(handle: number, uri: UriComponents, versionId: number, options: files.IWriteFileOptions, token: CancellationToken): Promise<INotebookPartialFileStatsWithMetadata | files.FileOperationError>;
     $searchInNotebooks(handle: number, textQuery: search.ITextQuery, viewTypeFileTargets: NotebookPriorityInfo[], otherViewTypeFileTargets: NotebookPriorityInfo[], token: CancellationToken): Promise<{
         results: IRawClosedNotebookFileMatch[];
         limitHit: boolean;
@@ -2911,24 +2930,26 @@ export interface MainThreadChatStatusShape {
     $setEntry(id: string, entry: ChatStatusItemDto): void;
     $disposeEntry(id: string): void;
 }
-export interface IChatRequestTurnDto {
-}
+export type IChatSessionHistoryItemDto = {
+    type: "request";
+    prompt: string;
+    participant: string;
+} | {
+    type: "response";
+    parts: IChatProgressDto[];
+    participant: string;
+};
 export interface ChatSessionDto {
     id: string;
-    history: Array<{
-        type: "request";
-        prompt: string;
-    } | {
-        type: "response";
-        parts: IChatProgressDto[];
-    }>;
+    history: Array<IChatSessionHistoryItemDto>;
     hasActiveResponseCallback: boolean;
     hasRequestHandler: boolean;
+    supportsInterruption: boolean;
 }
 export interface MainThreadChatSessionsShape extends IDisposable {
     $registerChatSessionItemProvider(handle: number, chatSessionType: string): void;
     $unregisterChatSessionItemProvider(handle: number): void;
-    $onDidChangeChatSessionItems(chatSessionType: string): void;
+    $onDidChangeChatSessionItems(handle: number): void;
     $registerChatSessionContentProvider(handle: number, chatSessionType: string): void;
     $unregisterChatSessionContentProvider(handle: number): void;
     $handleProgressChunk(handle: number, sessionId: string, requestId: string, chunks: (IChatProgressDto | [
@@ -2941,6 +2962,12 @@ export interface MainThreadChatSessionsShape extends IDisposable {
 }
 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>;
     $interruptChatSessionActiveResponse(providerHandle: number, sessionId: string, requestId: string): Promise<void>;
     $disposeChatSessionContent(providerHandle: number, sessionId: string): Promise<void>;

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

@@ -7,7 +7,13 @@ import { decodeSemanticTokensDto } from '../../../editor/common/services/semanti
 import { validateWhenClauses } from '../../../platform/contextkey/common/contextkey.js';
 import { ApiCommand, ApiCommandArgument, ApiCommandResult } from './extHostCommands.js';
 import { DocumentHighlight, SymbolKind, Range, TextEdit, location, Hover, Position as Position$1, WorkspaceSymbol, CallHierarchyItem, CallHierarchyIncomingCall, CallHierarchyOutgoingCall, WorkspaceEdit, DocumentLink, CompletionItem, SignatureHelp, Selection, Color, ColorPresentation, InlayHint, FoldingRange, NotebookExclusiveDocumentPattern, InlineValueContext, InlineValue, ViewColumn, TextEditorOpenOptions, TypeHierarchyItem, DefinitionLink } from './extHostTypeConverters.js';
-import { SymbolInformation, Location, Position, SelectionRange, SemanticTokensLegend, SemanticTokens, CompletionList, CodeLens, Range as Range$1, Selection as Selection$1, CodeAction, CodeActionKind, ColorInformation, Color as Color$1 } from './extHostTypes.js';
+import { SelectionRange, SemanticTokensLegend, SemanticTokens, CompletionList, CodeLens, CodeAction, ColorInformation, Color as Color$1 } from './extHostTypes.js';
+import { Position } from './extHostTypes/position.js';
+import { Range as Range$1 } from './extHostTypes/range.js';
+import { Selection as Selection$1 } from './extHostTypes/selection.js';
+import { SymbolInformation } from './extHostTypes/symbolInformation.js';
+import { Location } from './extHostTypes/location.js';
+import { CodeActionKind } from './extHostTypes/codeActionKind.js';
 
 const newCommands = [
     (

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

@@ -38,25 +38,27 @@ 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, scopes: readonly string[], 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, scopes: readonly string[], 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, scopes: readonly string[], 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, scopes: readonly string[], 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>;
     $removeSession(providerId: string, sessionId: string): Promise<void>;
     $getSessions(providerId: string, scopes: ReadonlyArray<string> | undefined, options: vscode.AuthenticationProviderSessionOptions): Promise<ReadonlyArray<vscode.AuthenticationSession>>;
+    $getSessionsFromChallenges(providerId: string, constraint: vscode.AuthenticationConstraint, options: vscode.AuthenticationProviderSessionOptions): Promise<ReadonlyArray<vscode.AuthenticationSession>>;
+    $createSessionFromChallenges(providerId: string, constraint: vscode.AuthenticationConstraint, options: vscode.AuthenticationProviderSessionOptions): Promise<vscode.AuthenticationSession>;
     $onDidChangeAuthenticationSessions(id: string, label: string, extensionIdFilter?: string[]): Promise<void>;
     $onDidUnregisterAuthenticationProvider(id: string): Promise<void>;
     $registerDynamicAuthProvider(authorizationServerComponents: UriComponents, serverMetadata: IAuthorizationServerMetadata, resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined, clientId: string | undefined, clientSecret: string | undefined, initialTokens: IAuthorizationToken[] | undefined): Promise<string>;

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 { 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';
@@ -49,19 +49,35 @@ let ExtHostAuthentication = class ExtHostAuthentication {
             .filter(e => !e.extensionIdFilter || e.extensionIdFilter.includes(normalizedExtensionId))
             .map(e => ({ provider: e.provider }))));
     }
-    async getSession(requestingExtension, providerId, scopes, options = {}) {
+    async getSession(requestingExtension, providerId, scopesOrRequest, options = {}) {
         const extensionId = ExtensionIdentifier.toKey(requestingExtension.identifier);
-        const sortedScopes = [...scopes].sort().join(' ');
         const keys = ( Object.keys(options));
         const optionsStr = ( keys.sort().map(key => `${key}:${!!options[key]}`)).join(', ');
-        return await this._getSessionTaskSingler.getOrCreate(`${extensionId} ${providerId} ${sortedScopes} ${optionsStr}`, async () => {
-            await this._proxy.$ensureProvider(providerId);
+        if ('challenge' in scopesOrRequest
+            && typeof scopesOrRequest.challenge === 'string'
+            && !scopesOrRequest.wwwAuthenticate) {
+            scopesOrRequest = {
+                wwwAuthenticate: scopesOrRequest.challenge,
+                scopes: scopesOrRequest.scopes
+            };
+        }
+        let singlerKey;
+        if (isAuthenticationWWWAuthenticateRequest(scopesOrRequest)) {
+            const challenge = scopesOrRequest;
+            const challengeStr = challenge.wwwAuthenticate;
+            const scopesStr = challenge.scopes ? [...challenge.scopes].sort().join(' ') : '';
+            singlerKey = `${extensionId} ${providerId} challenge:${challengeStr} ${scopesStr} ${optionsStr}`;
+        }
+        else {
+            const sortedScopes = [...scopesOrRequest].sort().join(' ');
+            singlerKey = `${extensionId} ${providerId} ${sortedScopes} ${optionsStr}`;
+        }
+        return await this._getSessionTaskSingler.getOrCreate(singlerKey, async () => {
             const extensionName = requestingExtension.displayName || requestingExtension.name;
-            return this._proxy.$getSession(providerId, scopes, extensionId, extensionName, options);
+            return this._proxy.$getSession(providerId, scopesOrRequest, extensionId, extensionName, options);
         });
     }
     async getAccounts(providerId) {
-        await this._proxy.$ensureProvider(providerId);
         return await this._proxy.$getAccounts(providerId);
     }
     registerAuthenticationProvider(id, label, provider, options) {
@@ -72,7 +88,7 @@ let ExtHostAuthentication = class ExtHostAuthentication {
             }
             const listener = provider.onDidChangeSessions(e => this._proxy.$sendDidChangeSessions(id, e));
             this._authenticationProviders.set(id, { label, provider, disposable: listener, options: options ?? { supportsMultipleAccounts: false } });
-            await this._proxy.$registerAuthenticationProvider(id, label, options?.supportsMultipleAccounts ?? false, options?.supportedAuthorizationServers);
+            await this._proxy.$registerAuthenticationProvider(id, label, options?.supportsMultipleAccounts ?? false, options?.supportedAuthorizationServers, options?.supportsChallenges);
         });
         return ( new Disposable(() => {
             void this._providerOperations.queue(id, async () => {
@@ -114,6 +130,38 @@ let ExtHostAuthentication = class ExtHostAuthentication {
             throw ( new Error(`Unable to find authentication provider with handle: ${providerId}`));
         });
     }
+    $getSessionsFromChallenges(providerId, constraint, options) {
+        return this._providerOperations.queue(providerId, async () => {
+            const providerData = this._authenticationProviders.get(providerId);
+            if (providerData) {
+                const provider = providerData.provider;
+                if (typeof provider.getSessionsFromChallenges === 'function') {
+                    options.authorizationServer = URI.revive(options.authorizationServer);
+                    return await provider.getSessionsFromChallenges(constraint, options);
+                }
+                throw ( new Error(
+                    `Authentication provider with handle: ${providerId} does not support getSessionsFromChallenges`
+                ));
+            }
+            throw ( new Error(`Unable to find authentication provider with handle: ${providerId}`));
+        });
+    }
+    $createSessionFromChallenges(providerId, constraint, options) {
+        return this._providerOperations.queue(providerId, async () => {
+            const providerData = this._authenticationProviders.get(providerId);
+            if (providerData) {
+                const provider = providerData.provider;
+                if (typeof provider.createSessionFromChallenges === 'function') {
+                    options.authorizationServer = URI.revive(options.authorizationServer);
+                    return await provider.createSessionFromChallenges(constraint, options);
+                }
+                throw ( new Error(
+                    `Authentication provider with handle: ${providerId} does not support createSessionFromChallenges`
+                ));
+            }
+            throw ( new Error(`Unable to find authentication provider with handle: ${providerId}`));
+        });
+    }
     $onDidChangeAuthenticationSessions(id, label, extensionIdFilter) {
         if (!id.startsWith(INTERNAL_AUTH_PROVIDER_PREFIX)) {
             this._onDidChangeSessions.fire({ provider: { id, label }, extensionIdFilter });
@@ -237,7 +285,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         this._createFlows = [];
         if (_serverMetadata.authorization_endpoint) {
             this._createFlows.push({
-                label: ( localize(2617, "URL Handler")),
+                label: ( localize(2622, "URL Handler")),
                 handler: (scopes, progress, token) => this._createWithUrlHandler(scopes, progress, token)
             });
         }
@@ -305,7 +353,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
             try {
                 token = await this._extHostProgress.withProgressFromSource({ label: this.label, id: this.id }, {
                     location: ProgressLocation.Notification,
-                    title: ( localize(2618, "Authenticating to '{0}'", this.label)),
+                    title: ( localize(2623, "Authenticating to '{0}'", this.label)),
                     cancellable: true
                 }, (progress, token) => handler(scopes, progress, token));
                 if (token) {
@@ -319,13 +367,13 @@ let DynamicAuthProvider = class DynamicAuthProvider {
                 }
                 const message = isCancellationError(err)
                     ? ( localize(
-                    2619,
+                    2624,
                     "Having trouble authenticating to '{0}'? Would you like to try a different way? ({1})",
                     this.label,
                     nextMode
                 ))
                     : ( localize(
-                    2620,
+                    2625,
                     "You have not yet finished authenticating to '{0}'. Would you like to try a different way? ({1})",
                     this.label,
                     nextMode
@@ -410,7 +458,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
             throw ( new CancellationError());
         }
         progress.report({
-            message: ( localize(2621, "Complete the authentication in the browser window that has opened.")),
+            message: ( localize(2626, "Complete the authentication in the browser window that has opened.")),
         });
         let code;
         try {
@@ -464,6 +512,9 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         tokenRequest.append('code', code);
         tokenRequest.append('redirect_uri', redirectUri);
         tokenRequest.append('code_verifier', codeVerifier);
+        if (this._resourceMetadata?.resource) {
+            tokenRequest.append('resource', this._resourceMetadata.resource);
+        }
         if (this._clientSecret) {
             tokenRequest.append('client_secret', this._clientSecret);
         }
@@ -511,6 +562,9 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         tokenRequest.append('client_id', this._clientId);
         tokenRequest.append('grant_type', 'refresh_token');
         tokenRequest.append('refresh_token', refreshToken);
+        if (this._resourceMetadata?.resource) {
+            tokenRequest.append('resource', this._resourceMetadata.resource);
+        }
         if (this._clientSecret) {
             tokenRequest.append('client_secret', this._clientSecret);
         }

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

@@ -3,7 +3,7 @@ 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 } 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-b994942c-360d-5b68-8a33-77d4bde6b714-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";
@@ -65,8 +65,7 @@ export declare class ExtHostChatAgents2 extends Disposable implements ExtHostCha
     }, token: CancellationToken): Promise<vscode.ChatParticipantDetectionResult | null | undefined>;
     private _createRequest;
     private getModelForRequest;
-    $setRequestPaused(handle: number, requestId: string, isPaused: boolean): Promise<void>;
-    $setRequestTools(requestId: string, tools: Pick<IChatAgentRequest, "userSelectedTools">): Promise<void>;
+    $setRequestTools(requestId: string, tools: UserSelectedTools): Promise<void>;
     $invokeAgent(handle: number, requestDto: Dto<IChatAgentRequest>, context: {
         history: IChatAgentHistoryEntryDto[];
     }, token: CancellationToken): Promise<IChatAgentResult | undefined>;