@codingame/monaco-vscode-api 17.2.1 → 18.0.0

package/vscode/src/vs/platform/window/common/window.d.ts

@@ -77,6 +77,17 @@ export interface IFileToOpen extends IBaseWindowOpenable {
 export declare function isWorkspaceToOpen(uriToOpen: IWindowOpenable): uriToOpen is IWorkspaceToOpen;
 export declare function isFolderToOpen(uriToOpen: IWindowOpenable): uriToOpen is IFolderToOpen;
 export declare function isFileToOpen(uriToOpen: IWindowOpenable): uriToOpen is IFileToOpen;
+export declare enum MenuSettings {
+    MenuStyle = "window.menuStyle",
+    MenuBarVisibility = "window.menuBarVisibility"
+}
+export declare enum MenuStyleConfiguration {
+    CUSTOM = "custom",
+    NATIVE = "native",
+    INHERIT = "inherit"
+}
+export declare function hasNativeContextMenu(configurationService: IConfigurationService, titleBarStyle?: TitlebarStyle): boolean;
+export declare function hasNativeMenu(configurationService: IConfigurationService, titleBarStyle?: TitlebarStyle): boolean;
 export type MenuBarVisibility = "classic" | "visible" | "toggle" | "hidden" | "compact";
 export declare function getMenuBarVisibility(configurationService: IConfigurationService): MenuBarVisibility;
 export interface IWindowsConfiguration {
@@ -91,6 +102,7 @@ export interface IWindowSettings {
     readonly zoomLevel: number;
     readonly titleBarStyle: TitlebarStyle;
     readonly controlsStyle: WindowControlsStyle;
+    readonly menuStyle: MenuStyleConfiguration;
     readonly autoDetectHighContrast: boolean;
     readonly autoDetectColorScheme: boolean;
     readonly menuBarVisibility: MenuBarVisibility;
@@ -226,8 +238,4 @@ export declare const DEFAULT_AUX_WINDOW_SIZE: {
     readonly width: 1024;
     readonly height: 768;
 };
-export declare const DEFAULT_COMPACT_AUX_WINDOW_SIZE: {
-    readonly width: 640;
-    readonly height: 640;
-};
 export {};

package/vscode/src/vs/platform/window/common/window.js

@@ -1,5 +1,5 @@
 
-import { isMacintosh, isNative, isWeb } from '../../../base/common/platform.js';
+import { isWeb, isMacintosh, isNative } from '../../../base/common/platform.js';
 
 const WindowMinimumSize = {
     WIDTH: 400,
@@ -14,10 +14,46 @@ function isFolderToOpen(uriToOpen) {
 function isFileToOpen(uriToOpen) {
     return !!uriToOpen.fileUri;
 }
+var MenuSettings;
+(function (MenuSettings) {
+    MenuSettings["MenuStyle"] = "window.menuStyle";
+    MenuSettings["MenuBarVisibility"] = "window.menuBarVisibility";
+})(MenuSettings || (MenuSettings = {}));
+var MenuStyleConfiguration;
+(function (MenuStyleConfiguration) {
+    MenuStyleConfiguration["CUSTOM"] = "custom";
+    MenuStyleConfiguration["NATIVE"] = "native";
+    MenuStyleConfiguration["INHERIT"] = "inherit";
+})(MenuStyleConfiguration || (MenuStyleConfiguration = {}));
+function hasNativeContextMenu(configurationService, titleBarStyle) {
+    if (isWeb) {
+        return false;
+    }
+    const nativeTitle = hasNativeTitlebar(configurationService, titleBarStyle);
+    const windowConfigurations = configurationService.getValue('window');
+    if (windowConfigurations?.menuStyle === MenuStyleConfiguration.NATIVE) {
+        if (!isMacintosh && !nativeTitle) {
+            return false;
+        }
+        return true;
+    }
+    if (windowConfigurations?.menuStyle === MenuStyleConfiguration.CUSTOM) {
+        return false;
+    }
+    return nativeTitle;
+}
+function hasNativeMenu(configurationService, titleBarStyle) {
+    if (isWeb) {
+        return false;
+    }
+    if (isMacintosh) {
+        return true;
+    }
+    return hasNativeContextMenu(configurationService, titleBarStyle);
+}
 function getMenuBarVisibility(configurationService) {
-    const nativeTitleBarEnabled = hasNativeTitlebar(configurationService);
-    const menuBarVisibility = configurationService.getValue('window.menuBarVisibility');
-    if (menuBarVisibility === 'default' || (nativeTitleBarEnabled && menuBarVisibility === 'compact') || (isMacintosh && isNative)) {
+    const menuBarVisibility = configurationService.getValue(MenuSettings.MenuBarVisibility);
+    if (menuBarVisibility === 'default' || (menuBarVisibility === 'compact' && hasNativeMenu(configurationService)) || (isMacintosh && isNative)) {
         return 'classic';
     }
     else {
@@ -105,6 +141,5 @@ function useWindowControlsOverlay(configurationService) {
 }
 const DEFAULT_WINDOW_SIZE = { width: 1200, height: 800 };
 const DEFAULT_AUX_WINDOW_SIZE = { width: 1024, height: 768 };
-const DEFAULT_COMPACT_AUX_WINDOW_SIZE = { width: 640, height: 640 };
 
-export { CustomTitleBarVisibility, DEFAULT_AUX_WINDOW_SIZE, DEFAULT_COMPACT_AUX_WINDOW_SIZE, DEFAULT_CUSTOM_TITLEBAR_HEIGHT, DEFAULT_WINDOW_SIZE, TitleBarSetting, TitlebarStyle, WindowControlsStyle, WindowMinimumSize, getMenuBarVisibility, getTitleBarStyle, getWindowControlsStyle, hasCustomTitlebar, hasNativeTitlebar, isFileToOpen, isFolderToOpen, isWorkspaceToOpen, useWindowControlsOverlay };
+export { CustomTitleBarVisibility, DEFAULT_AUX_WINDOW_SIZE, DEFAULT_CUSTOM_TITLEBAR_HEIGHT, DEFAULT_WINDOW_SIZE, MenuSettings, MenuStyleConfiguration, TitleBarSetting, TitlebarStyle, WindowControlsStyle, WindowMinimumSize, getMenuBarVisibility, getTitleBarStyle, getWindowControlsStyle, hasCustomTitlebar, hasNativeContextMenu, hasNativeMenu, hasNativeTitlebar, isFileToOpen, isFolderToOpen, isWorkspaceToOpen, useWindowControlsOverlay };

package/vscode/src/vs/platform/workspace/common/workspace.js

@@ -138,7 +138,7 @@ function toWorkspaceFolder(resource) {
 }
 const WORKSPACE_EXTENSION = 'code-workspace';
 const WORKSPACE_SUFFIX = `.${WORKSPACE_EXTENSION}`;
-const WORKSPACE_FILTER = [{ name: ( localize(2380, "Code Workspace")), extensions: [WORKSPACE_EXTENSION] }];
+const WORKSPACE_FILTER = [{ name: ( localize(2386, "Code Workspace")), extensions: [WORKSPACE_EXTENSION] }];
 const UNTITLED_WORKSPACE_NAME = 'workspace.json';
 function isUntitledWorkspace(path, environmentService) {
     return extUriBiasedIgnorePathCase.isEqualOrParent(path, environmentService.untitledWorkspacesHome);

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

@@ -71,7 +71,7 @@ import { ExtHostNotebookKernels } from './extHostNotebookKernels.js';
 import { ExtHostNotebookRenderers } from './extHostNotebookRenderers.js';
 import { IExtHostOutputService } from './extHostOutput.js';
 import { ExtHostProfileContentHandlers } from './extHostProfileContentHandler.js';
-import { ExtHostProgress } from './extHostProgress.js';
+import { IExtHostProgress } from './extHostProgress.js';
 import { ExtHostQuickDiff } from './extHostQuickDiff.js';
 import { createExtHostQuickOpen } from './extHostQuickOpen.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
@@ -94,10 +94,10 @@ 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, InlineEditTriggerKind, InlineEdit, NewSymbolNameTriggerKind, NewSymbolNameTag, NewSymbolName, LanguageModelPromptTsxPart, LanguageModelChatToolMode, PreparedTerminalToolInvocation, ExtendedLanguageModelToolResult, LanguageModelExtraDataPart, LanguageModelDataPart, LanguageModelToolResult2, LanguageModelToolResult, LanguageModelError, LanguageModelToolCallPart, LanguageModelTextPart, LanguageModelToolResultPart2, LanguageModelToolResultPart, LanguageModelChatMessage2, LanguageModelChatMessage, LanguageModelChatMessageRole, ChatRequestEditedFileEventKind, ChatReferenceBinaryData, ChatRequestNotebookData, ChatRequestEditorData, ChatLocation, ChatResponseTurn, ChatRequestTurn, ChatResponseReferencePartStatusKind, 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, 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, InlineEditTriggerKind, InlineEdit, NewSymbolNameTriggerKind, NewSymbolNameTag, NewSymbolName, LanguageModelPromptTsxPart, LanguageModelChatToolMode, PreparedTerminalToolInvocation, ExtendedLanguageModelToolResult, LanguageModelDataPart, LanguageModelToolResult2, LanguageModelToolResult, LanguageModelError, LanguageModelToolCallPart, LanguageModelTextPart, LanguageModelToolResultPart2, LanguageModelToolResultPart, LanguageModelChatMessage2, LanguageModelChatMessage, LanguageModelChatMessageRole, ChatRequestEditedFileEventKind, ChatReferenceBinaryData, ChatRequestNotebookData, ChatRequestEditorData, ChatLocation, ChatResponseTurn, ChatRequestTurn, ChatResponseReferencePartStatusKind, ChatPrepareToolInvocationPart, 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, 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 { ExtHostUriOpeners } from './extHostUriOpener.js';
 import { IURITransformerService } from './extHostUriTransformerService.js';
-import { ExtHostUrls } from './extHostUrls.js';
+import { IExtHostUrlsService } from './extHostUrls.js';
 import { ExtHostWebviews } from './extHostWebview.js';
 import { ExtHostWebviewPanels } from './extHostWebviewPanels.js';
 import { ExtHostWebviewViews } from './extHostWebviewView.js';
@@ -122,9 +122,11 @@ function createApiFactoryAndRegisterActors(accessor) {
     const extHostTunnelService = accessor.get(IExtHostTunnelService);
     const extHostApiDeprecation = accessor.get(IExtHostApiDeprecationService);
     const extHostWindow = accessor.get(IExtHostWindow);
+    const extHostUrls = accessor.get(IExtHostUrlsService);
     const extHostSecretState = accessor.get(IExtHostSecretState);
     const extHostEditorTabs = accessor.get(IExtHostEditorTabs);
     const extHostManagedSockets = accessor.get(IExtHostManagedSockets);
+    const extHostProgress = accessor.get(IExtHostProgress);
     const extHostAuthentication = accessor.get(IExtHostAuthentication);
     const extHostLanguageModels = accessor.get(IExtHostLanguageModels);
     const extHostMcp = accessor.get(IExtHostMpcService);
@@ -136,10 +138,12 @@ function createApiFactoryAndRegisterActors(accessor) {
     rpcProtocol.set(ExtHostContext.ExtHostStorage, extHostStorage);
     rpcProtocol.set(ExtHostContext.ExtHostTunnelService, extHostTunnelService);
     rpcProtocol.set(ExtHostContext.ExtHostWindow, extHostWindow);
+    rpcProtocol.set(ExtHostContext.ExtHostUrls, extHostUrls);
     rpcProtocol.set(ExtHostContext.ExtHostSecretState, extHostSecretState);
     rpcProtocol.set(ExtHostContext.ExtHostTelemetry, extHostTelemetry);
     rpcProtocol.set(ExtHostContext.ExtHostEditorTabs, extHostEditorTabs);
     rpcProtocol.set(ExtHostContext.ExtHostManagedSockets, extHostManagedSockets);
+    rpcProtocol.set(ExtHostContext.ExtHostProgress, extHostProgress);
     rpcProtocol.set(ExtHostContext.ExtHostAuthentication, extHostAuthentication);
     rpcProtocol.set(ExtHostContext.ExtHostChatProvider, extHostLanguageModels);
     const extHostDecorations = rpcProtocol.set(ExtHostContext.ExtHostDecorations, accessor.get(IExtHostDecorations));
@@ -152,7 +156,6 @@ function createApiFactoryAndRegisterActors(accessor) {
     const extHostTask = rpcProtocol.set(ExtHostContext.ExtHostTask, accessor.get(IExtHostTask));
     const extHostOutputService = rpcProtocol.set(ExtHostContext.ExtHostOutputService, accessor.get(IExtHostOutputService));
     const extHostLocalization = rpcProtocol.set(ExtHostContext.ExtHostLocalization, accessor.get(IExtHostLocalizationService));
-    const extHostUrls = rpcProtocol.set(ExtHostContext.ExtHostUrls, ( new ExtHostUrls(rpcProtocol)));
     const extHostDocuments = rpcProtocol.set(ExtHostContext.ExtHostDocuments, ( new ExtHostDocuments(rpcProtocol, extHostDocumentsAndEditors)));
     const extHostDocumentContentProviders = rpcProtocol.set(ExtHostContext.ExtHostDocumentContentProviders, ( new ExtHostDocumentContentProvider(rpcProtocol, extHostDocumentsAndEditors, extHostLogService)));
     const extHostDocumentSaveParticipant = rpcProtocol.set(ExtHostContext.ExtHostDocumentSaveParticipant, ( new ExtHostDocumentSaveParticipant(extHostLogService, extHostDocuments, ( rpcProtocol.getProxy(MainContext.MainThreadBulkEdits)))));
@@ -198,7 +201,6 @@ function createApiFactoryAndRegisterActors(accessor) {
     const extHostQuickDiff = rpcProtocol.set(ExtHostContext.ExtHostQuickDiff, ( new ExtHostQuickDiff(rpcProtocol, uriTransformer)));
     const extHostShare = rpcProtocol.set(ExtHostContext.ExtHostShare, ( new ExtHostShare(rpcProtocol, uriTransformer)));
     const extHostComment = rpcProtocol.set(ExtHostContext.ExtHostComments, createExtHostComments(rpcProtocol, extHostCommands, extHostDocuments));
-    const extHostProgress = rpcProtocol.set(ExtHostContext.ExtHostProgress, ( new ExtHostProgress(( rpcProtocol.getProxy(MainContext.MainThreadProgress)))));
     const extHostLabelService = rpcProtocol.set(ExtHostContext.ExtHostLabelService, ( new ExtHostLabelService(rpcProtocol)));
     const extHostTheming = rpcProtocol.set(ExtHostContext.ExtHostTheming, ( new ExtHostTheming(rpcProtocol)));
     const extHostTimeline = rpcProtocol.set(ExtHostContext.ExtHostTimeline, ( new ExtHostTimeline(rpcProtocol, extHostCommands)));
@@ -301,6 +303,9 @@ function createApiFactoryAndRegisterActors(accessor) {
                     (typeof options?.createIfNone === 'object' && options.createIfNone.learnMore)) {
                     checkProposedApiEnabled(extension, 'authLearnMore');
                 }
+                if (options?.authorizationServer) {
+                    checkProposedApiEnabled(extension, 'authIssuers');
+                }
                 return extHostAuthentication.getSession(extension, providerId, scopes, options);
             },
             getAccounts(providerId) {
@@ -314,6 +319,9 @@ function createApiFactoryAndRegisterActors(accessor) {
                 return _asExtensionEvent(extHostAuthentication.getExtensionScopedSessionsEvent(extension.identifier.value));
             },
             registerAuthenticationProvider(id, label, provider, options) {
+                if (options?.supportedAuthorizationServers) {
+                    checkProposedApiEnabled(extension, 'authIssuers');
+                }
                 return extHostAuthentication.registerAuthenticationProvider(id, label, provider, options);
             }
         };
@@ -1353,10 +1361,6 @@ function createApiFactoryAndRegisterActors(accessor) {
                 checkProposedApiEnabled(extension, 'notebookKernelSource');
                 return extHostNotebookKernels.registerKernelSourceActionProvider(extension, notebookType, provider);
             },
-            onDidChangeNotebookCellExecutionState(listener, thisArgs, disposables) {
-                checkProposedApiEnabled(extension, 'notebookCellExecutionState');
-                return _asExtensionEvent(extHostNotebookKernels.onDidChangeNotebookCellExecutionState)(listener, thisArgs, disposables);
-            }
         };
         const l10n = {
             t(...params) {
@@ -1475,11 +1479,9 @@ function createApiFactoryAndRegisterActors(accessor) {
                 return extHostLanguageModels.registerIgnoredFileProvider(extension, provider);
             },
             registerMcpServerDefinitionProvider(id, provider) {
-                checkProposedApiEnabled(extension, 'mcpConfigurationProvider');
                 return extHostMcp.registerMcpConfigurationProvider(extension, id, provider);
             }
         };
-        lm.registerMcpConfigurationProvider = lm.registerMcpServerDefinitionProvider;
         const speech = {
             registerSpeechProvider(id, provider) {
                 checkProposedApiEnabled(extension, 'speech');
@@ -1746,6 +1748,7 @@ function createApiFactoryAndRegisterActors(accessor) {
             ChatResponseConfirmationPart: ChatResponseConfirmationPart,
             ChatResponseMovePart: ChatResponseMovePart,
             ChatResponseExtensionsPart: ChatResponseExtensionsPart,
+            ChatPrepareToolInvocationPart: ChatPrepareToolInvocationPart,
             ChatResponseReferencePartStatusKind: ChatResponseReferencePartStatusKind,
             ChatRequestTurn: ChatRequestTurn,
             ChatRequestTurn2: ChatRequestTurn,
@@ -1766,7 +1769,6 @@ function createApiFactoryAndRegisterActors(accessor) {
             LanguageModelToolResult: LanguageModelToolResult,
             LanguageModelToolResult2: LanguageModelToolResult2,
             LanguageModelDataPart: LanguageModelDataPart,
-            LanguageModelExtraDataPart: LanguageModelExtraDataPart,
             ExtendedLanguageModelToolResult: ExtendedLanguageModelToolResult,
             PreparedTerminalToolInvocation: PreparedTerminalToolInvocation,
             LanguageModelChatToolMode: LanguageModelChatToolMode,

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

@@ -23,17 +23,18 @@ import { ILoggerService } from '../../../platform/log/common/log.service.js';
 import { IExtHostVariableResolverProvider, ExtHostVariableResolverProviderService } from './extHostVariableResolverService.js';
 import { IExtHostLocalizationService, ExtHostLocalizationService } from './extHostLocalizationService.js';
 import { IExtHostManagedSockets, ExtHostManagedSockets } from './extHostManagedSockets.js';
-import { IExtHostAuthentication, ExtHostAuthentication } from './extHostAuthentication.js';
 import { IExtHostLanguageModels, ExtHostLanguageModels } from './extHostLanguageModels.js';
 import { IExtHostTerminalShellIntegration, ExtHostTerminalShellIntegration } from './extHostTerminalShellIntegration.js';
 import { IExtHostTesting, ExtHostTesting } from './extHostTesting.js';
 import { IExtHostMpcService, ExtHostMcpService } from './extHostMcp.js';
+import { IExtHostUrlsService, ExtHostUrls } from './extHostUrls.js';
+import { IExtHostProgress, ExtHostProgress } from './extHostProgress.js';
 
 registerSingleton(IExtHostLocalizationService, ExtHostLocalizationService, InstantiationType.Delayed);
 registerSingleton(ILoggerService, ExtHostLoggerService, InstantiationType.Delayed);
 registerSingleton(IExtHostApiDeprecationService, ExtHostApiDeprecationService, InstantiationType.Delayed);
 registerSingleton(IExtHostCommands, ExtHostCommands, InstantiationType.Eager);
-registerSingleton(IExtHostAuthentication, ExtHostAuthentication, InstantiationType.Eager);
+registerSingleton(IExtHostProgress, ExtHostProgress, InstantiationType.Eager);
 registerSingleton(IExtHostLanguageModels, ExtHostLanguageModels, InstantiationType.Eager);
 registerSingleton(IExtHostConfiguration, ExtHostConfiguration, InstantiationType.Eager);
 registerSingleton(IExtHostConsumerFileSystem, ExtHostConsumerFileSystem, InstantiationType.Eager);
@@ -51,6 +52,7 @@ registerSingleton(IExtHostTerminalService, WorkerExtHostTerminalService, Instant
 registerSingleton(IExtHostTerminalShellIntegration, ExtHostTerminalShellIntegration, InstantiationType.Eager);
 registerSingleton(IExtHostTunnelService, ExtHostTunnelService, InstantiationType.Eager);
 registerSingleton(IExtHostWindow, ExtHostWindow, InstantiationType.Eager);
+registerSingleton(IExtHostUrlsService, ExtHostUrls, InstantiationType.Eager);
 registerSingleton(IExtHostWorkspace, ExtHostWorkspace, InstantiationType.Eager);
 registerSingleton(IExtHostSecretState, ExtHostSecretState, InstantiationType.Eager);
 registerSingleton(IExtHostEditorTabs, ExtHostEditorTabs, InstantiationType.Eager);

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

@@ -4,7 +4,9 @@ import { IRemoteConsoleLog } from "@codingame/monaco-vscode-extensions-service-o
 import { SerializedError } from "../../../base/common/errors.js";
 import { IRelativePattern } from "../../../base/common/glob.js";
 import { IMarkdownString } from "../../../base/common/htmlContent.js";
+import { IJSONSchema } from "../../../base/common/jsonSchema.js";
 import { IDisposable } from "../../../base/common/lifecycle.js";
+import { IAuthorizationProtectedResourceMetadata, IAuthorizationServerMetadata, IAuthorizationTokenResponse } from "../../../base/common/oauth.js";
 import * as performance from "../../../base/common/performance.js";
 import Severity from "../../../base/common/severity.js";
 import { ThemeColor, ThemeIcon } from "../../../base/common/themables.js";
@@ -26,7 +28,7 @@ import { IAccessibilityInformation } from "../../../platform/accessibility/commo
 import { ILocalizedString } from "../../../platform/action/common/action.js";
 import { ConfigurationTarget, IConfigurationChange, IConfigurationData, IConfigurationOverrides } from "../../../platform/configuration/common/configuration.js";
 import { ConfigurationScope } from "../../../platform/configuration/common/configurationRegistry.js";
-import { IExtensionIdWithVersion } from "@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common/vscode/vs/platform/extensionManagement/common/extensionStorage";
+import { IExtensionIdWithVersion } from "@codingame/monaco-vscode-cecd476b-6f89-54b7-b016-fe6fdaa6675e-common/vscode/vs/platform/extensionManagement/common/extensionStorage";
 import { ExtensionIdentifier, IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
 import * as files from "../../../platform/files/common/files.js";
 import { ResourceLabelFormatter } from "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common/vscode/vs/platform/label/common/label";
@@ -54,21 +56,22 @@ import { IChatContentInlineReference, IChatFollowup, IChatNotebookEdit, IChatPro
 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, IToolData, IToolInvocation, IToolProgressStep, IToolResult } from "../../contrib/chat/common/languageModelToolsService.js";
+import { IPreparedToolInvocation, IToolInvocation, IToolProgressStep, IToolResult } 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-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
-import { ICellRange } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
+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-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
 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-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/search/common/search";
+import { IWorkspaceSymbol, NotebookPriorityInfo } from "@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-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";
 import { Timeline, TimelineChangeEvent, TimelineOptions, TimelineProviderDescriptor } from "../../contrib/timeline/common/timeline.js";
 import { TypeHierarchyItem } from "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy";
 import { RelatedInformationResult, RelatedInformationType } from "@codingame/monaco-vscode-quickaccess-service-override/vscode/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation";
+import { AiSettingsSearchProviderOptions, AiSettingsSearchResult } from "../../services/aiSettingsSearch/common/aiSettingsSearch.js";
 import { AuthenticationSession, AuthenticationSessionAccount, AuthenticationSessionsChangeEvent, IAuthenticationCreateSessionOptions, IAuthenticationProviderSessionOptions } from "../../services/authentication/common/authentication.js";
 import { EditorGroupColumn } from "@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
 import { IExtensionDescriptionDelta, IStaticWorkspaceData } from "../../services/extensions/common/extensionHostProtocol.js";
@@ -81,7 +84,6 @@ import { CandidatePort } from "../../services/remote/common/tunnelModel.js";
 import { IFileQueryBuilderOptions, ITextQueryBuilderOptions } from "../../services/search/common/queryBuilder.js";
 import * as search from "../../services/search/common/search.js";
 import { AISearchKeyword, TextSearchCompleteMessage } from "../../services/search/common/searchExtTypes.js";
-import { AiSettingsSearchProviderOptions, AiSettingsSearchResult } from "../../services/aiSettingsSearch/common/aiSettingsSearch.js";
 import { ISaveProfileResult } from "@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common/vscode/vs/workbench/services/userDataProfile/common/userDataProfile";
 import { TerminalShellExecutionCommandLineConfidence } from "./extHostTypes.js";
 import * as tasks from "@codingame/monaco-vscode-extensions-service-override/vscode/vs/workbench/api/common/shared/tasks";
@@ -167,13 +169,20 @@ export interface AuthenticationGetSessionOptions {
     account?: AuthenticationSessionAccount;
 }
 export interface MainThreadAuthenticationShape extends IDisposable {
-    $registerAuthenticationProvider(id: string, label: string, supportsMultipleAccounts: boolean): void;
-    $unregisterAuthenticationProvider(id: string): void;
+    $registerAuthenticationProvider(id: string, label: string, supportsMultipleAccounts: boolean, supportedAuthorizationServers?: UriComponents[]): Promise<void>;
+    $unregisterAuthenticationProvider(id: string): Promise<void>;
     $ensureProvider(id: string): Promise<void>;
-    $sendDidChangeSessions(providerId: string, event: AuthenticationSessionsChangeEvent): void;
+    $sendDidChangeSessions(providerId: string, event: AuthenticationSessionsChangeEvent): Promise<void>;
     $getSession(providerId: string, scopes: readonly string[], 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>;
+    $showContinueNotification(message: string): Promise<boolean>;
+    $showDeviceCodeModal(userCode: string, verificationUri: string): Promise<boolean>;
+    $registerDynamicAuthenticationProvider(id: string, label: string, authorizationServer: UriComponents, clientId: string): Promise<void>;
+    $setSessionsForDynamicAuthProvider(authProviderId: string, clientId: string, sessions: (IAuthorizationTokenResponse & {
+        created_at: number;
+    })[]): Promise<void>;
 }
 export interface MainThreadSecretStateShape extends IDisposable {
     $getPassword(extensionId: string, key: string): Promise<string | undefined>;
@@ -1087,7 +1096,7 @@ 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>;
-    $reportResponsePart(requestId: number, chunk: IChatResponseFragment): 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;
@@ -1106,7 +1115,7 @@ export interface ExtHostLanguageModelsShape {
     $startChatRequest(handle: number, requestId: number, from: ExtensionIdentifier, messages: SerializableObjectWithBuffers<IChatMessage[]>, options: {
         [name: string]: any;
     }, token: CancellationToken): Promise<void>;
-    $acceptResponsePart(requestId: number, chunk: IChatResponseFragment): 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>;
     $isFileIgnored(handle: number, uri: UriComponents, token: CancellationToken): Promise<boolean>;
@@ -1143,7 +1152,10 @@ export interface MainThreadChatAgentsShape2 extends IDisposable {
     $unregisterAgentCompletionsProvider(handle: number, id: string): void;
     $updateAgent(handle: number, metadataUpdate: IExtensionChatAgentMetadata): void;
     $unregisterAgent(handle: number): void;
-    $handleProgressChunk(requestId: string, chunk: IChatProgressDto, handle?: number): Promise<number | void>;
+    $handleProgressChunk(requestId: string, chunks: (IChatProgressDto | [
+        IChatProgressDto,
+        number
+    ])[]): Promise<void>;
     $handleAnchorResolve(requestId: string, handle: string, anchor: Dto<IChatContentInlineReference>): void;
     $transferActiveChatSession(toWorkspace: UriComponents): void;
 }
@@ -1190,7 +1202,6 @@ export interface ExtHostChatAgentsShape2 {
     $acceptAction(handle: number, result: IChatAgentResult, action: IChatUserActionEvent): void;
     $invokeCompletionProvider(handle: number, query: string, token: CancellationToken): Promise<IChatAgentCompletionItem[]>;
     $provideChatTitle(handle: number, context: IChatAgentHistoryEntryDto[], token: CancellationToken): Promise<string | undefined>;
-    $provideSampleQuestions(handle: number, location: ChatAgentLocation, token: CancellationToken): Promise<IChatFollowup[] | undefined>;
     $releaseSession(sessionId: string): void;
     $detectChatParticipant(handle: number, request: Dto<IChatAgentRequest>, context: {
         history: IChatAgentHistoryEntryDto[];
@@ -1213,7 +1224,15 @@ export interface IChatParticipantDetectionResult {
     participant: string;
     command?: string;
 }
-export type IToolDataDto = Omit<IToolData, "when">;
+export interface IToolDataDto {
+    id: string;
+    toolReferenceName?: string;
+    tags?: string[];
+    displayName: string;
+    userDescription?: string;
+    modelDescription: string;
+    inputSchema?: IJSONSchema;
+}
 export interface MainThreadLanguageModelToolsShape extends IDisposable {
     $getTools(): Promise<Dto<IToolDataDto>[]>;
     $acceptToolProgress(callId: string, progress: IToolProgressStep): void;
@@ -1770,6 +1789,13 @@ export interface ExtHostAuthenticationShape {
     $createSession(id: string, scopes: string[], 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>;
+    $registerDynamicAuthProvider(authorizationServer: UriComponents, serverMetadata: IAuthorizationServerMetadata, resource?: IAuthorizationProtectedResourceMetadata, clientId?: string, initialTokens?: (IAuthorizationTokenResponse & {
+        created_at: number;
+    })[]): Promise<string>;
+    $onDidChangeDynamicAuthProviderTokens(authProviderId: string, clientId: string, tokens?: (IAuthorizationTokenResponse & {
+        created_at: number;
+    })[]): Promise<void>;
 }
 export interface ExtHostAiRelatedInformationShape {
     $provideAiRelatedInformation(handle: number, query: string, token: CancellationToken): Promise<RelatedInformationResult[]>;
@@ -2319,6 +2345,7 @@ export interface ExtHostSCMShape {
     $provideHistoryItemRefs(sourceControlHandle: number, historyItemRefs: string[] | undefined, token: CancellationToken): Promise<SCMHistoryItemRefDto[] | undefined>;
     $provideHistoryItems(sourceControlHandle: number, options: any, token: CancellationToken): Promise<SCMHistoryItemDto[] | undefined>;
     $provideHistoryItemChanges(sourceControlHandle: number, historyItemId: string, historyItemParentId: string | undefined, token: CancellationToken): Promise<SCMHistoryItemChangeDto[] | undefined>;
+    $resolveHistoryItemChatContext(sourceControlHandle: number, historyItemId: string, token: CancellationToken): Promise<string | undefined>;
     $resolveHistoryItemRefsCommonAncestor(sourceControlHandle: number, historyItemRefs: string[], token: CancellationToken): Promise<string | undefined>;
 }
 export interface ExtHostQuickDiffShape {
@@ -2632,7 +2659,6 @@ export interface ExtHostNotebookKernelsShape {
     $executeCells(handle: number, uri: UriComponents, handles: number[]): Promise<void>;
     $cancelCells(handle: number, uri: UriComponents, handles: number[]): Promise<void>;
     $acceptKernelMessageFromRenderer(handle: number, editorId: string, message: any): void;
-    $cellExecutionChanged(uri: UriComponents, cellHandle: number, state: notebookCommon.NotebookCellExecutionState | undefined): void;
     $provideKernelSourceActions(handle: number, token: CancellationToken): Promise<notebookCommon.INotebookKernelSourceAction[]>;
     $provideVariables(handle: number, requestId: string, notebookUri: UriComponents, parentId: number | undefined, kind: "named" | "indexed", start: number, token: CancellationToken): Promise<void>;
 }
@@ -2719,6 +2745,7 @@ export interface MainThreadMcpShape {
     $onDidReceiveMessage(id: number, message: string): void;
     $upsertMcpCollection(collection: McpCollectionDefinition.FromExtHost, servers: McpServerDefinition.Serialized[]): void;
     $deleteMcpCollection(collectionId: string): void;
+    $getTokenFromServerMetadata(id: number, authorizationServer: UriComponents, serverMetadata: IAuthorizationServerMetadata, resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined): Promise<string | undefined>;
 }
 export interface ExtHostLocalizationShape {
     getMessage(extensionId: string, details: IStringDetails): string;

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

@@ -34,6 +34,10 @@ const newCommands = [
                     return undefined;
                 }
                 class MergedInfo extends SymbolInformation {
+                    constructor() {
+                        super(...arguments);
+                        this.containerName = '';
+                    }
                     static to(symbol) {
                         const res = ( new MergedInfo(
                             symbol.name,

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

@@ -1,18 +1,33 @@
 import type * as vscode from "vscode";
-import { Event } from "../../../base/common/event.js";
-import { ExtHostAuthenticationShape } from "./extHost.protocol.js";
+import { Emitter, Event } from "../../../base/common/event.js";
+import { MainThreadAuthenticationShape, ExtHostAuthenticationShape } from "./extHost.protocol.js";
 import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
 import { IExtHostRpcService } from "./extHostRpcService.js";
+import { URI, UriComponents } from "../../../base/common/uri.js";
+import { IAuthorizationProtectedResourceMetadata, IAuthorizationServerMetadata, IAuthorizationTokenResponse } from "../../../base/common/oauth.js";
+import { IExtHostWindow } from "./extHostWindow.js";
+import { IExtHostInitDataService } from "./extHostInitDataService.js";
+import { ILogger } from "../../../platform/log/common/log.js";
+import { ILoggerService } from "../../../platform/log/common/log.service.js";
+import { IExtHostUrlsService } from "./extHostUrls.js";
+import { IExtHostProgress } from "./extHostProgress.js";
 export interface IExtHostAuthentication extends ExtHostAuthentication {
 }
 export declare const IExtHostAuthentication: import("../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IExtHostAuthentication>;
 export declare class ExtHostAuthentication implements ExtHostAuthenticationShape {
+    private readonly _initData;
+    private readonly _extHostWindow;
+    private readonly _extHostUrls;
+    private readonly _extHostProgress;
+    private readonly _extHostLoggerService;
     _serviceBrand: undefined;
+    protected readonly _dynamicAuthProviderCtor: typeof DynamicAuthProvider;
     private _proxy;
     private _authenticationProviders;
     private _onDidChangeSessions;
     private _getSessionTaskSingler;
-    constructor(extHostRpc: IExtHostRpcService);
+    private _onDidDynamicAuthProviderTokensChange;
+    constructor(extHostRpc: IExtHostRpcService, _initData: IExtHostInitDataService, _extHostWindow: IExtHostWindow, _extHostUrls: IExtHostUrlsService, _extHostProgress: IExtHostProgress, _extHostLoggerService: ILoggerService);
     getExtensionScopedSessionsEvent(extensionId: string): Event<vscode.AuthenticationSessionsChangeEvent>;
     getSession(requestingExtension: IExtensionDescription, providerId: string, scopes: readonly string[], options: vscode.AuthenticationGetSessionOptions & ({
         createIfNone: true;
@@ -35,4 +50,50 @@ export declare class ExtHostAuthentication implements ExtHostAuthenticationShape
     $removeSession(providerId: string, sessionId: string): Promise<void>;
     $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>;
+    $onDidChangeDynamicAuthProviderTokens(authProviderId: string, clientId: string, tokens: IAuthorizationToken[]): Promise<void>;
 }
+export declare class DynamicAuthProvider implements vscode.AuthenticationProvider {
+    protected readonly _extHostWindow: IExtHostWindow;
+    protected readonly _extHostUrls: IExtHostUrlsService;
+    protected readonly _initData: IExtHostInitDataService;
+    private readonly _extHostProgress;
+    protected readonly _proxy: MainThreadAuthenticationShape;
+    readonly authorizationServer: URI;
+    protected readonly _serverMetadata: IAuthorizationServerMetadata;
+    protected readonly _resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined;
+    readonly clientId: string;
+    readonly id: string;
+    readonly label: string;
+    private _onDidChangeSessions;
+    readonly onDidChangeSessions: Event<vscode.AuthenticationProviderAuthenticationSessionsChangeEvent>;
+    private readonly _tokenStore;
+    protected readonly _createFlows: Array<{
+        label: string;
+        handler: (scopes: string[], progress: vscode.Progress<{
+            message: string;
+        }>, token: vscode.CancellationToken) => Promise<IAuthorizationTokenResponse>;
+    }>;
+    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<{
+        authProviderId: string;
+        clientId: string;
+        tokens: IAuthorizationToken[];
+    }>, initialTokens: IAuthorizationToken[]);
+    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>;
+    dispose(): void;
+    private _createWithUrlHandler;
+    protected generateRandomString(length: number): string;
+    protected generateCodeChallenge(codeVerifier: string): Promise<string>;
+    private waitForAuthorizationCode;
+    protected exchangeCodeForToken(code: string, codeVerifier: string, redirectUri: string): Promise<IAuthorizationTokenResponse>;
+    protected exchangeRefreshTokenForToken(refreshToken: string): Promise<IAuthorizationToken>;
+}
+type IAuthorizationToken = IAuthorizationTokenResponse & {
+    created_at: number;
+};
+export {};