@codingame/monaco-vscode-api 19.1.4 → 20.0.0

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

@@ -40,7 +40,7 @@ import { IRemoteConnectionData, TunnelDescription } from "../../../platform/remo
 import { AuthInfo, Credentials } from "../../../platform/request/common/request.js";
 import { ClassifiedEvent, IGDPRProperty, OmitMetadata, StrictPropertyCheck } from "../../../platform/telemetry/common/gdprTypings.js";
 import { TelemetryLevel } from "../../../platform/telemetry/common/telemetry.js";
-import { ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection } from "@codingame/monaco-vscode-terminal-service-override/vscode/vs/platform/terminal/common/environmentVariable";
+import { ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection } from "@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/platform/terminal/common/environmentVariable";
 import { ICreateContributedTerminalProfileOptions, IProcessProperty, IProcessReadyWindowsPty, IShellLaunchConfigDto, ITerminalEnvironment, ITerminalLaunchError, ITerminalProfile, TerminalExitReason, TerminalLocation, TerminalShellType } from "../../../platform/terminal/common/terminal.js";
 import { ProvidedPortAttributes, TunnelCreationOptions, TunnelOptions, TunnelPrivacyId, TunnelProviderFeatures } from "../../../platform/tunnel/common/tunnel.js";
 import { EditSessionIdentityMatch } from "../../../platform/workspace/common/editSessions.js";
@@ -48,21 +48,22 @@ 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-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatAgentMetadata, IChatAgentRequest, IChatAgentResult } 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-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatContentInlineReference, IChatFollowup, IChatNotebookEdit, IChatProgress, IChatResponseErrorDetails, IChatTask, IChatTaskDto, IChatUserActionEvent, IChatVoteAction } from "../../contrib/chat/common/chatService.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 { 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, ILanguageModelChatMetadata, ILanguageModelChatSelector, ILanguageModelsChangeEvent } from "../../contrib/chat/common/languageModels.js";
-import { IPreparedToolInvocation, IToolInvocation, IToolInvocationPreparationContext, IToolProgressStep, IToolResult } from "../../contrib/chat/common/languageModelToolsService.js";
+import { IChatMessage, IChatResponseFragment, 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";
 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-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
+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";
@@ -74,7 +75,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, IAuthenticationCreateSessionOptions, IAuthenticationGetSessionsOptions } from "../../services/authentication/common/authentication.js";
-import { EditorGroupColumn } from "@codingame/monaco-vscode-2726569c-a06b-5f25-b851-14311bef12fa-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
+import { EditorGroupColumn } from "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
 import { 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";
@@ -180,21 +181,27 @@ export interface MainThreadAuthenticationShape extends IDisposable {
     $waitForUriHandler(expectedUri: UriComponents): Promise<UriComponents>;
     $showContinueNotification(message: string): Promise<boolean>;
     $showDeviceCodeModal(userCode: string, verificationUri: string): Promise<boolean>;
-    $registerDynamicAuthenticationProvider(id: string, label: string, authorizationServer: UriComponents, clientId: string): Promise<void>;
+    $promptForClientRegistration(authorizationServerUrl: string): Promise<{
+        clientId: string;
+        clientSecret?: string;
+    } | undefined>;
+    $registerDynamicAuthenticationProvider(id: string, label: string, authorizationServer: UriComponents, clientId: string, clientSecret?: string): Promise<void>;
     $setSessionsForDynamicAuthProvider(authProviderId: string, clientId: string, sessions: (IAuthorizationTokenResponse & {
         created_at: number;
     })[]): Promise<void>;
-    $sendDidChangeDynamicProviderInfo({ providerId, clientId, authorizationServer, label }: {
+    $sendDidChangeDynamicProviderInfo({ providerId, clientId, authorizationServer, label, clientSecret }: {
         providerId: string;
         clientId?: string;
         authorizationServer?: UriComponents;
         label?: string;
+        clientSecret?: string;
     }): Promise<void>;
 }
 export interface MainThreadSecretStateShape extends IDisposable {
     $getPassword(extensionId: string, key: string): Promise<string | undefined>;
     $setPassword(extensionId: string, key: string, value: string): Promise<void>;
     $deletePassword(extensionId: string, key: string): Promise<void>;
+    $getKeys(extensionId: string): Promise<string[]>;
 }
 export interface MainThreadConfigurationShape extends IDisposable {
     $updateConfigurationOption(target: ConfigurationTarget | null, key: string, value: unknown, overrides: IConfigurationOverrides | undefined, scopeToLanguage: boolean | undefined): Promise<void>;
@@ -1096,31 +1103,33 @@ export interface ExtHostSpeechShape {
     $cancelKeywordRecognitionSession(session: number): Promise<void>;
 }
 export interface MainThreadLanguageModelsShape extends IDisposable {
-    $registerLanguageModelProvider(handle: number, identifier: string, metadata: ILanguageModelChatMetadata): void;
-    $unregisterProvider(handle: number): void;
-    $tryStartChatRequest(extension: ExtensionIdentifier, provider: string, requestId: number, messages: SerializableObjectWithBuffers<IChatMessage[]>, options: {}, token: CancellationToken): Promise<void>;
+    $registerLanguageModelProvider(vendor: string): void;
+    $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>;
     $reportResponseDone(requestId: number, error: SerializedError | undefined): Promise<void>;
     $selectChatModels(selector: ILanguageModelChatSelector): Promise<string[]>;
-    $whenLanguageModelChatRequestMade(identifier: string, extension: ExtensionIdentifier, participant?: string, tokenCount?: number): void;
-    $countTokens(provider: string, value: string | IChatMessage, token: CancellationToken): Promise<number>;
+    $countTokens(modelId: string, value: string | IChatMessage, token: CancellationToken): Promise<number>;
     $fileIsIgnored(uri: UriComponents, token: CancellationToken): Promise<boolean>;
     $registerFileIgnoreProvider(handle: number): void;
     $unregisterFileIgnoreProvider(handle: number): void;
 }
 export interface ExtHostLanguageModelsShape {
-    $acceptChatModelMetadata(data: ILanguageModelsChangeEvent): void;
+    $prepareLanguageModelProvider(vendor: string, options: {
+        silent: boolean;
+    }, token: CancellationToken): Promise<ILanguageModelChatMetadataAndIdentifier[]>;
     $updateModelAccesslist(data: {
         from: ExtensionIdentifier;
         to: ExtensionIdentifier;
         enabled: boolean;
     }[]): void;
-    $startChatRequest(handle: number, requestId: number, from: ExtensionIdentifier, messages: SerializableObjectWithBuffers<IChatMessage[]>, options: {
+    $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>;
     $acceptResponseDone(requestId: number, error: SerializedError | undefined): Promise<void>;
-    $provideTokenLength(handle: number, value: string | IChatMessage, token: CancellationToken): Promise<number>;
+    $provideTokenLength(modelId: string, value: string | IChatMessage, token: CancellationToken): Promise<number>;
     $isFileIgnored(handle: number, uri: UriComponents, token: CancellationToken): Promise<boolean>;
 }
 export interface MainThreadEmbeddingsShape extends IDisposable {
@@ -1145,7 +1154,14 @@ export interface IDynamicChatAgentProps {
     description?: string;
     fullName?: string;
 }
-export interface MainThreadChatAgentsShape2 extends IDisposable {
+export interface IChatAgentProgressShape {
+    $handleProgressChunk(requestId: string, chunks: (IChatProgressDto | [
+        IChatProgressDto,
+        number
+    ])[]): Promise<void>;
+    $handleAnchorResolve(requestId: string, handle: string, anchor: Dto<IChatContentInlineReference>): void;
+}
+export interface MainThreadChatAgentsShape2 extends IChatAgentProgressShape, IDisposable {
     $registerAgent(handle: number, extension: ExtensionIdentifier, id: string, metadata: IExtensionChatAgentMetadata, dynamicProps: IDynamicChatAgentProps | undefined): void;
     $registerChatParticipantDetectionProvider(handle: number): void;
     $unregisterChatParticipantDetectionProvider(handle: number): void;
@@ -1155,11 +1171,6 @@ export interface MainThreadChatAgentsShape2 extends IDisposable {
     $unregisterAgentCompletionsProvider(handle: number, id: string): void;
     $updateAgent(handle: number, metadataUpdate: IExtensionChatAgentMetadata): void;
     $unregisterAgent(handle: number): void;
-    $handleProgressChunk(requestId: string, chunks: (IChatProgressDto | [
-        IChatProgressDto,
-        number
-    ])[]): Promise<void>;
-    $handleAnchorResolve(requestId: string, handle: string, anchor: Dto<IChatContentInlineReference>): void;
     $transferActiveChatSession(toWorkspace: UriComponents): void;
 }
 export interface ICodeMapperTextEdit {
@@ -1214,6 +1225,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;
 }
 export interface IChatParticipantMetadata {
     participant: string;
@@ -1235,6 +1247,7 @@ export interface IToolDataDto {
     displayName: string;
     userDescription?: string;
     modelDescription: string;
+    source: Dto<ToolDataSource>;
     inputSchema?: IJSONSchema;
 }
 export interface MainThreadLanguageModelToolsShape extends IDisposable {
@@ -1257,19 +1270,6 @@ export interface MainThreadUrlsShape extends IDisposable {
     $unregisterUriHandler(handle: number): Promise<void>;
     $createAppUri(uri: UriComponents): Promise<UriComponents>;
 }
-export interface IChatDto {
-}
-export interface IChatRequestDto {
-    message: string;
-    variables?: Record<string, IChatRequestVariableValue[]>;
-}
-export interface IChatResponseDto {
-    errorDetails?: IChatResponseErrorDetails;
-    timings: {
-        firstProgress: number;
-        totalElapsed: number;
-    };
-}
 export interface IChatResponseProgressFileTreeData {
     label: string;
     uri: URI;
@@ -1280,7 +1280,7 @@ export type IDocumentContextDto = {
     version: number;
     ranges: IRange[];
 };
-export type IChatProgressDto = Dto<Exclude<IChatProgress, IChatTask | IChatNotebookEdit>> | IChatTaskDto | IChatNotebookEditDto;
+export type IChatProgressDto = Dto<Exclude<IChatProgress, IChatTask | IChatNotebookEdit>> | IChatTaskDto | IChatNotebookEditDto | IChatResponseClearToPreviousToolInvocationDto;
 export interface ExtHostUrlsShape {
     $handleExternalUri(handle: number, uri: UriComponents): Promise<void>;
 }
@@ -1295,6 +1295,13 @@ export interface ExtHostUriOpenersShape {
         sourceUri: UriComponents;
     }, token: CancellationToken): Promise<void>;
 }
+export interface MainThreadChatOutputRendererShape extends IDisposable {
+    $registerChatOutputRenderer(viewType: string, extensionId: ExtensionIdentifier, extensionLocation: UriComponents): void;
+    $unregisterChatOutputRenderer(viewType: string): void;
+}
+export interface ExtHostChatOutputRendererShape {
+    $renderChatOutput(viewType: string, mime: string, valueData: VSBuffer, webviewHandle: string, token: CancellationToken): Promise<void>;
+}
 export interface MainThreadProfileContentHandlersShape {
     $registerProfileContentHandler(id: string, name: string, description: string | undefined, extensionId: string): Promise<void>;
     $unregisterProfileContentHandler(id: string): Promise<void>;
@@ -1425,6 +1432,7 @@ export interface SCMProviderFeatures {
     acceptInputCommand?: languages.Command;
     actionButton?: SCMActionButtonDto | null;
     statusBarCommands?: ICommandDto[];
+    contextValue?: string;
 }
 export interface SCMActionButtonDto {
     command: ICommandDto & {
@@ -1504,7 +1512,10 @@ export interface SCMHistoryItemChangeDto {
     readonly modifiedUri: UriComponents | undefined;
 }
 export interface MainThreadSCMShape extends IDisposable {
-    $registerSourceControl(handle: number, id: string, label: string, rootUri: UriComponents | undefined, inputBoxDocumentUri: UriComponents): Promise<void>;
+    $registerSourceControl(handle: number, parentHandle: number | undefined, id: string, label: string, rootUri: UriComponents | undefined, iconPath: UriComponents | {
+        light: UriComponents;
+        dark: UriComponents;
+    } | ThemeIcon | undefined, inputBoxDocumentUri: UriComponents): Promise<void>;
     $updateSourceControl(handle: number, features: SCMProviderFeatures): Promise<void>;
     $unregisterSourceControl(handle: number): Promise<void>;
     $registerGroups(sourceControlHandle: number, groups: [
@@ -1794,7 +1805,7 @@ export interface ExtHostAuthenticationShape {
     $removeSession(id: string, sessionId: string): Promise<void>;
     $onDidChangeAuthenticationSessions(id: string, label: string, extensionIdFilter?: string[]): Promise<void>;
     $onDidUnregisterAuthenticationProvider(id: string): Promise<void>;
-    $registerDynamicAuthProvider(authorizationServer: UriComponents, serverMetadata: IAuthorizationServerMetadata, resource?: IAuthorizationProtectedResourceMetadata, clientId?: string, initialTokens?: (IAuthorizationTokenResponse & {
+    $registerDynamicAuthProvider(authorizationServer: UriComponents, serverMetadata: IAuthorizationServerMetadata, resource?: IAuthorizationProtectedResourceMetadata, clientId?: string, clientSecret?: string, initialTokens?: (IAuthorizationTokenResponse & {
         created_at: number;
     })[]): Promise<string>;
     $onDidChangeDynamicAuthProviderTokens(authProviderId: string, clientId: string, tokens?: (IAuthorizationTokenResponse & {
@@ -1983,11 +1994,15 @@ export interface IWorkspaceEditEntryMetadataDto {
     };
 }
 export interface IChatNotebookEditDto {
-    uri: URI;
+    uri: UriComponents;
     edits: ICellEditOperationDto[];
     kind: "notebookEdit";
     done?: boolean;
 }
+export interface IChatResponseClearToPreviousToolInvocationDto {
+    kind: "clearToPreviousToolInvocation";
+    reason: ChatResponseClearToPreviousToolInvocationReason;
+}
 export type ICellEditOperationDto = notebookCommon.ICellMetadataEdit | notebookCommon.IDocumentMetadataEdit | {
     editType: notebookCommon.CellEditType.Replace;
     index: number;
@@ -2748,6 +2763,11 @@ export interface MainThreadMcpShape {
     $deleteMcpCollection(collectionId: string): void;
     $getTokenFromServerMetadata(id: number, authorizationServer: UriComponents, serverMetadata: IAuthorizationServerMetadata, resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined): Promise<string | undefined>;
 }
+export interface MainThreadDataChannelsShape extends IDisposable {
+}
+export interface ExtHostDataChannelsShape {
+    $onDidReceiveData(channelId: string, data: unknown): void;
+}
 export interface ExtHostLocalizationShape {
     getMessage(extensionId: string, details: IStringDetails): string;
     getBundle(extensionId: string): {
@@ -2801,6 +2821,41 @@ export interface MainThreadChatStatusShape {
     $setEntry(id: string, entry: ChatStatusItemDto): void;
     $disposeEntry(id: string): void;
 }
+export interface IChatRequestTurnDto {
+}
+export interface ChatSessionDto {
+    id: string;
+    history: Array<{
+        type: "request";
+        prompt: string;
+    } | {
+        type: "response";
+        parts: IChatProgressDto[];
+    }>;
+    hasActiveResponseCallback: boolean;
+    hasRequestHandler: boolean;
+}
+export interface MainThreadChatSessionsShape extends IDisposable {
+    $registerChatSessionItemProvider(handle: number, chatSessionType: string): void;
+    $unregisterChatSessionItemProvider(handle: number): void;
+    $onDidChangeChatSessionItems(chatSessionType: string): void;
+    $registerChatSessionContentProvider(handle: number, chatSessionType: string): void;
+    $unregisterChatSessionContentProvider(handle: number): void;
+    $handleProgressChunk(handle: number, sessionId: string, 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>;
+}
+export interface ExtHostChatSessionsShape {
+    $provideChatSessionItems(providerHandle: number, 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>;
+}
 export declare const MainContext: {
     MainThreadAuthentication: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadAuthenticationShape>;
     MainThreadBulkEdits: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadBulkEditsShape>;
@@ -2875,6 +2930,9 @@ export declare const MainContext: {
     MainThreadAiEmbeddingVector: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadAiEmbeddingVectorShape>;
     MainThreadChatStatus: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadChatStatusShape>;
     MainThreadAiSettingsSearch: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadAiSettingsSearchShape>;
+    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>;
 };
 export declare const ExtHostContext: {
     ExtHostCodeMapper: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostCodeMapperShape>;
@@ -2919,6 +2977,7 @@ export declare const ExtHostContext: {
     ExtHostStorage: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostStorageShape>;
     ExtHostUrls: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostUrlsShape>;
     ExtHostUriOpeners: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostUriOpenersShape>;
+    ExtHostChatOutputRenderer: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostChatOutputRendererShape>;
     ExtHostProfileContentHandlers: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostProfileContentHandlersShape>;
     ExtHostOutputService: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostOutputServiceShape>;
     ExtHostLabelService: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostLabelServiceShape>;
@@ -2946,5 +3005,7 @@ export declare const ExtHostContext: {
     ExtHostTelemetry: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostTelemetryShape>;
     ExtHostLocalization: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostLocalizationShape>;
     ExtHostMcp: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostMcpShape>;
+    ExtHostDataChannels: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostDataChannelsShape>;
+    ExtHostChatSessions: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostChatSessionsShape>;
 };
 export {};

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

@@ -174,6 +174,9 @@ const MainContext = {
     MainThreadAiEmbeddingVector: ( createProxyIdentifier('MainThreadAiEmbeddingVector')),
     MainThreadChatStatus: ( createProxyIdentifier('MainThreadChatStatus')),
     MainThreadAiSettingsSearch: ( createProxyIdentifier('MainThreadAiSettingsSearch')),
+    MainThreadDataChannels: ( createProxyIdentifier('MainThreadDataChannels')),
+    MainThreadChatSessions: ( createProxyIdentifier('MainThreadChatSessions')),
+    MainThreadChatOutputRenderer: ( createProxyIdentifier('MainThreadChatOutputRenderer')),
 };
 const ExtHostContext = {
     ExtHostCodeMapper: ( createProxyIdentifier('ExtHostCodeMapper')),
@@ -218,6 +221,7 @@ const ExtHostContext = {
     ExtHostStorage: ( createProxyIdentifier('ExtHostStorage')),
     ExtHostUrls: ( createProxyIdentifier('ExtHostUrls')),
     ExtHostUriOpeners: ( createProxyIdentifier('ExtHostUriOpeners')),
+    ExtHostChatOutputRenderer: ( createProxyIdentifier('ExtHostChatOutputRenderer')),
     ExtHostProfileContentHandlers: ( createProxyIdentifier('ExtHostProfileContentHandlers')),
     ExtHostOutputService: ( createProxyIdentifier('ExtHostOutputService')),
     ExtHostLabelService: ( createProxyIdentifier('ExtHostLabelService')),
@@ -245,6 +249,8 @@ const ExtHostContext = {
     ExtHostTelemetry: ( createProxyIdentifier('ExtHostTelemetry')),
     ExtHostLocalization: ( createProxyIdentifier('ExtHostLocalization')),
     ExtHostMcp: ( createProxyIdentifier('ExtHostMcp')),
+    ExtHostDataChannels: ( createProxyIdentifier('ExtHostDataChannels')),
+    ExtHostChatSessions: ( createProxyIdentifier('ExtHostChatSessions')),
 };
 
 export { CandidatePortSource, CellOutputKind, ExtHostContext, ExtHostTestingResource, ISuggestDataDtoField, ISuggestResultDtoField, MainContext, NotebookEditorRevealType, TabInputKind, TabModelOperationKind, TextEditorRevealType, WebviewEditorCapabilities, WebviewMessageArrayBufferViewType };

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

@@ -53,7 +53,7 @@ export declare class ExtHostAuthentication implements ExtHostAuthenticationShape
     $getSessions(providerId: string, scopes: ReadonlyArray<string> | undefined, options: vscode.AuthenticationProviderSessionOptions): Promise<ReadonlyArray<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, initialTokens: IAuthorizationToken[] | undefined): Promise<string>;
+    $registerDynamicAuthProvider(authorizationServerComponents: UriComponents, serverMetadata: IAuthorizationServerMetadata, resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined, clientId: string | undefined, clientSecret: string | undefined, initialTokens: IAuthorizationToken[] | undefined): Promise<string>;
     $onDidChangeDynamicAuthProviderTokens(authProviderId: string, clientId: string, tokens: IAuthorizationToken[]): Promise<void>;
 }
 export declare class DynamicAuthProvider implements vscode.AuthenticationProvider {
@@ -66,6 +66,7 @@ export declare class DynamicAuthProvider implements vscode.AuthenticationProvide
     protected readonly _serverMetadata: IAuthorizationServerMetadata;
     protected readonly _resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined;
     protected _clientId: string;
+    protected _clientSecret: string | undefined;
     readonly id: string;
     readonly label: string;
     private _onDidChangeSessions;
@@ -81,12 +82,13 @@ export declare class DynamicAuthProvider implements vscode.AuthenticationProvide
     }>;
     protected readonly _logger: ILogger;
     private readonly _disposable;
-    constructor(_extHostWindow: IExtHostWindow, _extHostUrls: IExtHostUrlsService, _initData: IExtHostInitDataService, _extHostProgress: IExtHostProgress, loggerService: ILoggerService, _proxy: MainThreadAuthenticationShape, authorizationServer: URI, _serverMetadata: IAuthorizationServerMetadata, _resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined, _clientId: string, onDidDynamicAuthProviderTokensChange: Emitter<{
+    constructor(_extHostWindow: IExtHostWindow, _extHostUrls: IExtHostUrlsService, _initData: IExtHostInitDataService, _extHostProgress: IExtHostProgress, loggerService: ILoggerService, _proxy: MainThreadAuthenticationShape, authorizationServer: URI, _serverMetadata: IAuthorizationServerMetadata, _resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined, _clientId: string, _clientSecret: string | undefined, onDidDynamicAuthProviderTokensChange: Emitter<{
         authProviderId: string;
         clientId: string;
         tokens: IAuthorizationToken[];
     }>, initialTokens: IAuthorizationToken[]);
     get clientId(): string;
+    get clientSecret(): string | undefined;
     getSessions(scopes: readonly string[] | undefined, _options: vscode.AuthenticationProviderSessionOptions): Promise<vscode.AuthenticationSession[]>;
     createSession(scopes: string[], _options: vscode.AuthenticationProviderSessionOptions): Promise<vscode.AuthenticationSession>;
     removeSession(sessionId: string): Promise<void>;

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

@@ -129,28 +129,49 @@ let ExtHostAuthentication = class ExtHostAuthentication {
             }
         });
     }
-    async $registerDynamicAuthProvider(authorizationServerComponents, serverMetadata, resourceMetadata, clientId, initialTokens) {
+    async $registerDynamicAuthProvider(authorizationServerComponents, serverMetadata, resourceMetadata, clientId, clientSecret, initialTokens) {
         if (!clientId) {
-            try {
-                const registration = await fetchDynamicRegistration(serverMetadata, this._initData.environment.appName, resourceMetadata?.scopes_supported);
-                clientId = registration.client_id;
+            const authorizationServer = URI.revive(authorizationServerComponents);
+            if (serverMetadata.registration_endpoint) {
+                try {
+                    const registration = await fetchDynamicRegistration(serverMetadata, this._initData.environment.appName, resourceMetadata?.scopes_supported);
+                    clientId = registration.client_id;
+                    clientSecret = registration.client_secret;
+                }
+                catch (err) {
+                    this._logService.warn(`Dynamic registration failed for ${( authorizationServer.toString())}: ${err.message}. Prompting user for client ID and client secret...`);
+                }
             }
-            catch (err) {
-                throw ( new Error(`Dynamic registration failed: ${err.message}`));
+            if (!clientId) {
+                this._logService.info(`Prompting user for client registration details for ${( authorizationServer.toString())}`);
+                const clientDetails = await this._proxy.$promptForClientRegistration(( authorizationServer.toString()));
+                if (!clientDetails) {
+                    throw ( new Error('User did not provide client details'));
+                }
+                clientId = clientDetails.clientId;
+                clientSecret = clientDetails.clientSecret;
+                this._logService.info(`User provided client registration for ${( authorizationServer.toString())}`);
+                if (clientSecret) {
+                    this._logService.trace(`User provided client secret for ${( authorizationServer.toString())}`);
+                }
+                else {
+                    this._logService.trace(`User did not provide client secret for ${( authorizationServer.toString())}`);
+                }
             }
         }
-        const provider = new this._dynamicAuthProviderCtor(this._extHostWindow, this._extHostUrls, this._initData, this._extHostProgress, this._extHostLoggerService, this._proxy, URI.revive(authorizationServerComponents), serverMetadata, resourceMetadata, clientId, this._onDidDynamicAuthProviderTokensChange, initialTokens || []);
+        const provider = new this._dynamicAuthProviderCtor(this._extHostWindow, this._extHostUrls, this._initData, this._extHostProgress, this._extHostLoggerService, this._proxy, URI.revive(authorizationServerComponents), serverMetadata, resourceMetadata, clientId, clientSecret, this._onDidDynamicAuthProviderTokensChange, initialTokens || []);
         await this._providerOperations.queue(provider.id, async () => {
             this._authenticationProviders.set(provider.id, {
                 label: provider.label,
                 provider,
                 disposable: Disposable.from(provider, provider.onDidChangeSessions(e => this._proxy.$sendDidChangeSessions(provider.id, e)), provider.onDidChangeClientId(() => this._proxy.$sendDidChangeDynamicProviderInfo({
                     providerId: provider.id,
-                    clientId: provider.clientId
+                    clientId: provider.clientId,
+                    clientSecret: provider.clientSecret
                 }))),
                 options: { supportsMultipleAccounts: false }
             });
-            await this._proxy.$registerDynamicAuthenticationProvider(provider.id, provider.label, provider.authorizationServer, provider.clientId);
+            await this._proxy.$registerDynamicAuthenticationProvider(provider.id, provider.label, provider.authorizationServer, provider.clientId, provider.clientSecret);
         });
         return provider.id;
     }
@@ -182,7 +203,7 @@ class TaskSingler {
     }
 }
 let DynamicAuthProvider = class DynamicAuthProvider {
-    constructor(_extHostWindow, _extHostUrls, _initData, _extHostProgress, loggerService, _proxy, authorizationServer, _serverMetadata, _resourceMetadata, _clientId, onDidDynamicAuthProviderTokensChange, initialTokens) {
+    constructor(_extHostWindow, _extHostUrls, _initData, _extHostProgress, loggerService, _proxy, authorizationServer, _serverMetadata, _resourceMetadata, _clientId, _clientSecret, onDidDynamicAuthProviderTokensChange, initialTokens) {
         this._extHostWindow = _extHostWindow;
         this._extHostUrls = _extHostUrls;
         this._initData = _initData;
@@ -192,6 +213,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         this._serverMetadata = _serverMetadata;
         this._resourceMetadata = _resourceMetadata;
         this._clientId = _clientId;
+        this._clientSecret = _clientSecret;
         this._onDidChangeSessions = ( new Emitter());
         this.onDidChangeSessions = this._onDidChangeSessions.event;
         this._onDidChangeClientId = ( new Emitter());
@@ -212,14 +234,20 @@ let DynamicAuthProvider = class DynamicAuthProvider {
             set: (tokens) => _proxy.$setSessionsForDynamicAuthProvider(this.id, this.clientId, tokens),
         }, initialTokens, this._logger)));
         this._disposable.add(this._tokenStore.onDidChangeSessions(e => this._onDidChangeSessions.fire(e)));
-        this._createFlows = [{
-                label: ( localize(2590, "URL Handler")),
+        this._createFlows = [];
+        if (_serverMetadata.authorization_endpoint) {
+            this._createFlows.push({
+                label: ( localize(2617, "URL Handler")),
                 handler: (scopes, progress, token) => this._createWithUrlHandler(scopes, progress, token)
-            }];
+            });
+        }
     }
     get clientId() {
         return this._clientId;
     }
+    get clientSecret() {
+        return this._clientSecret;
+    }
     async getSessions(scopes, _options) {
         this._logger.info(`Getting sessions for scopes: ${scopes?.join(' ') ?? 'all'}`);
         if (!scopes) {
@@ -277,7 +305,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
             try {
                 token = await this._extHostProgress.withProgressFromSource({ label: this.label, id: this.id }, {
                     location: ProgressLocation.Notification,
-                    title: ( localize(2591, "Authenticating to '{0}'", this.label)),
+                    title: ( localize(2618, "Authenticating to '{0}'", this.label)),
                     cancellable: true
                 }, (progress, token) => handler(scopes, progress, token));
                 if (token) {
@@ -291,13 +319,13 @@ let DynamicAuthProvider = class DynamicAuthProvider {
                 }
                 const message = isCancellationError(err)
                     ? ( localize(
-                    2592,
+                    2619,
                     "Having trouble authenticating to '{0}'? Would you like to try a different way? ({1})",
                     this.label,
                     nextMode
                 ))
                     : ( localize(
-                    2593,
+                    2620,
                     "You have not yet finished authenticating to '{0}'. Would you like to try a different way? ({1})",
                     this.label,
                     nextMode
@@ -340,6 +368,12 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         this._disposable.dispose();
     }
     async _createWithUrlHandler(scopes, progress, token) {
+        if (!this._serverMetadata.authorization_endpoint) {
+            throw ( new Error('Authorization Endpoint required'));
+        }
+        if (!this._serverMetadata.token_endpoint) {
+            throw ( new Error('Token endpoint not available in server metadata'));
+        }
         const codeVerifier = this.generateRandomString(64);
         const codeChallenge = await this.generateCodeChallenge(codeVerifier);
         const nonce = this.generateRandomString(32);
@@ -376,7 +410,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
             throw ( new CancellationError());
         }
         progress.report({
-            message: ( localize(2594, "Complete the authentication in the browser window that has opened.")),
+            message: ( localize(2621, "Complete the authentication in the browser window that has opened.")),
         });
         let code;
         try {
@@ -430,14 +464,27 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         tokenRequest.append('code', code);
         tokenRequest.append('redirect_uri', redirectUri);
         tokenRequest.append('code_verifier', codeVerifier);
-        const response = await fetch(this._serverMetadata.token_endpoint, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
-                'Accept': 'application/json'
-            },
-            body: ( tokenRequest.toString())
-        });
+        if (this._clientSecret) {
+            tokenRequest.append('client_secret', this._clientSecret);
+        }
+        this._logger.info('Exchanging authorization code for token...');
+        this._logger.trace(`Url: ${this._serverMetadata.token_endpoint}`);
+        this._logger.trace(`Token request body: ${( tokenRequest.toString())}`);
+        let response;
+        try {
+            response = await fetch(this._serverMetadata.token_endpoint, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                    'Accept': 'application/json'
+                },
+                body: ( tokenRequest.toString())
+            });
+        }
+        catch (err) {
+            this._logger.error(`Failed to exchange authorization code for token: ${err}`);
+            throw ( new Error(`Failed to exchange authorization code for token: ${err}`));
+        }
         if (!response.ok) {
             const text = await response.text();
             throw ( new Error(
@@ -446,6 +493,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         }
         const result = await response.json();
         if (isAuthorizationTokenResponse(result)) {
+            this._logger.info(`Successfully exchanged authorization code for token.`);
             return result;
         }
         else if (isAuthorizationErrorResponse(result) && result.error === AuthorizationErrorType.InvalidClient) {
@@ -463,6 +511,9 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         tokenRequest.append('client_id', this._clientId);
         tokenRequest.append('grant_type', 'refresh_token');
         tokenRequest.append('refresh_token', refreshToken);
+        if (this._clientSecret) {
+            tokenRequest.append('client_secret', this._clientSecret);
+        }
         const response = await fetch(this._serverMetadata.token_endpoint, {
             method: 'POST',
             headers: {
@@ -489,11 +540,31 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         try {
             const registration = await fetchDynamicRegistration(this._serverMetadata, this._initData.environment.appName, this._resourceMetadata?.scopes_supported);
             this._clientId = registration.client_id;
+            this._clientSecret = registration.client_secret;
             this._onDidChangeClientId.fire();
         }
         catch (err) {
-            this._logger.error(`Failed to fetch new client ID: ${err}`);
-            throw ( new Error(`Failed to fetch new client ID: ${err}`));
+            this._logger.info(`Dynamic registration failed for ${( this.authorizationServer.toString())}: ${err}. Prompting user for client ID and client secret.`);
+            try {
+                const clientDetails = await this._proxy.$promptForClientRegistration(( this.authorizationServer.toString()));
+                if (!clientDetails) {
+                    throw ( new Error('User did not provide client details'));
+                }
+                this._clientId = clientDetails.clientId;
+                this._clientSecret = clientDetails.clientSecret;
+                this._logger.info(`User provided client ID for ${( this.authorizationServer.toString())}`);
+                if (clientDetails.clientSecret) {
+                    this._logger.info(`User provided client secret for ${( this.authorizationServer.toString())}`);
+                }
+                else {
+                    this._logger.info(`User did not provide client secret for ${( this.authorizationServer.toString())} (optional)`);
+                }
+                this._onDidChangeClientId.fire();
+            }
+            catch (promptErr) {
+                this._logger.error(`Failed to fetch new client ID and user did not provide one: ${err}`);
+                throw ( new Error(`Failed to fetch new client ID and user did not provide one: ${err}`));
+            }
         }
     }
 };