@codingame/monaco-vscode-api 15.0.2 → 16.0.0

package/vscode/src/vs/platform/userDataSync/common/userDataSync.service.d.ts

@@ -1,7 +1,7 @@
 import { VSBufferReadableStream } from "../../../base/common/buffer.js";
 import { IStringDictionary } from "../../../base/common/collections.js";
 import { Event } from "../../../base/common/event.js";
-import { FormattingOptions } from "@codingame/monaco-vscode-a4c2011e-8775-52bd-abf0-4a3c07a9696b-common/vscode/vs/base/common/jsonFormatter";
+import { FormattingOptions } from "@codingame/monaco-vscode-68b3311c-eb96-5711-8f72-f5f4b2e31932-common/vscode/vs/base/common/jsonFormatter";
 import { URI } from "../../../base/common/uri.js";
 import { IHeaders } from "@codingame/monaco-vscode-039b5553-0838-562a-97c2-30d6e54a7b42-common/vscode/vs/base/parts/request/common/request";
 import { ILogService } from "../../log/common/log.service.js";
@@ -56,6 +56,7 @@ export interface IUserDataSyncEnablementService {
     isResourceEnabled(resource: SyncResource, defaultValue?: boolean): boolean;
     setResourceEnablement(resource: SyncResource, enabled: boolean): void;
     getResourceSyncStateVersion(resource: SyncResource): string | undefined;
+    isResourceEnablementConfigured(resource: SyncResource): boolean;
 }
 export declare const IUserDataSyncService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IUserDataSyncService>;
 export interface IUserDataSyncService {

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

@@ -0,0 +1,12 @@
+import { VSBuffer } from "../../../base/common/buffer.js";
+import { CancellationToken } from "../../../base/common/cancellation.js";
+import { URI } from "../../../base/common/uri.js";
+import { IWebContentExtractorService, type ISharedWebContentExtractorService } from "./webContentExtractor.service.js";
+export declare class NullWebContentExtractorService implements IWebContentExtractorService {
+    _serviceBrand: undefined;
+    extract(_uri: URI[]): Promise<string[]>;
+}
+export declare class NullSharedWebContentExtractorService implements ISharedWebContentExtractorService {
+    _serviceBrand: undefined;
+    readImage(_uri: URI, _token: CancellationToken): Promise<VSBuffer | undefined>;
+}

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

@@ -0,0 +1,14 @@
+
+
+class NullWebContentExtractorService {
+    extract(_uri) {
+        throw ( new Error('Not implemented'));
+    }
+}
+class NullSharedWebContentExtractorService {
+    readImage(_uri, _token) {
+        throw ( new Error('Not implemented'));
+    }
+}
+
+export { NullSharedWebContentExtractorService, NullWebContentExtractorService };

package/vscode/src/vs/platform/webContentExtractor/common/webContentExtractor.service.d.ts

@@ -0,0 +1,13 @@
+import { VSBuffer } from "../../../base/common/buffer.js";
+import { CancellationToken } from "../../../base/common/cancellation.js";
+import { URI } from "../../../base/common/uri.js";
+export declare const IWebContentExtractorService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IWebContentExtractorService>;
+export interface IWebContentExtractorService {
+    _serviceBrand: undefined;
+    extract(uri: URI[]): Promise<string[]>;
+}
+export declare const ISharedWebContentExtractorService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<ISharedWebContentExtractorService>;
+export interface ISharedWebContentExtractorService {
+    _serviceBrand: undefined;
+    readImage(uri: URI, token: CancellationToken): Promise<VSBuffer | undefined>;
+}

package/vscode/src/vs/platform/webContentExtractor/common/webContentExtractor.service.js

@@ -0,0 +1,7 @@
+
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+
+const IWebContentExtractorService = ( createDecorator('IWebContentExtractorService'));
+const ISharedWebContentExtractorService = ( createDecorator('ISharedWebContentExtractorService'));
+
+export { ISharedWebContentExtractorService, IWebContentExtractorService };

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

@@ -90,6 +90,7 @@ export interface IWindowSettings {
     readonly restoreFullscreen: boolean;
     readonly zoomLevel: number;
     readonly titleBarStyle: TitlebarStyle;
+    readonly controlsStyle: WindowControlsStyle;
     readonly autoDetectHighContrast: boolean;
     readonly autoDetectColorScheme: boolean;
     readonly menuBarVisibility: MenuBarVisibility;
@@ -113,6 +114,11 @@ export declare enum TitlebarStyle {
     NATIVE = "native",
     CUSTOM = "custom"
 }
+export declare enum WindowControlsStyle {
+    NATIVE = "native",
+    CUSTOM = "custom",
+    HIDDEN = "hidden"
+}
 export declare enum CustomTitleBarVisibility {
     AUTO = "auto",
     WINDOWED = "windowed",
@@ -121,6 +127,7 @@ export declare enum CustomTitleBarVisibility {
 export declare function hasCustomTitlebar(configurationService: IConfigurationService, titleBarStyle?: TitlebarStyle): boolean;
 export declare function hasNativeTitlebar(configurationService: IConfigurationService, titleBarStyle?: TitlebarStyle): boolean;
 export declare function getTitleBarStyle(configurationService: IConfigurationService): TitlebarStyle;
+export declare function getWindowControlsStyle(configurationService: IConfigurationService): WindowControlsStyle;
 export declare const DEFAULT_CUSTOM_TITLEBAR_HEIGHT = 35;
 export declare function useWindowControlsOverlay(configurationService: IConfigurationService): boolean;
 export declare function useNativeFullScreen(configurationService: IConfigurationService): boolean;

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

@@ -34,6 +34,12 @@ var TitlebarStyle;
     TitlebarStyle["NATIVE"] = "native";
     TitlebarStyle["CUSTOM"] = "custom";
 })(TitlebarStyle || (TitlebarStyle = {}));
+var WindowControlsStyle;
+(function (WindowControlsStyle) {
+    WindowControlsStyle["NATIVE"] = "native";
+    WindowControlsStyle["CUSTOM"] = "custom";
+    WindowControlsStyle["HIDDEN"] = "hidden";
+})(WindowControlsStyle || (WindowControlsStyle = {}));
 var CustomTitleBarVisibility;
 (function (CustomTitleBarVisibility) {
     CustomTitleBarVisibility["AUTO"] = "auto";
@@ -70,6 +76,17 @@ function getTitleBarStyle(configurationService) {
     }
     return TitlebarStyle.CUSTOM;
 }
+function getWindowControlsStyle(configurationService) {
+    if (isWeb || isMacintosh || getTitleBarStyle(configurationService) === TitlebarStyle.NATIVE) {
+        return WindowControlsStyle.NATIVE;
+    }
+    const configuration = configurationService.getValue('window');
+    const style = configuration?.controlsStyle;
+    if (style === WindowControlsStyle.CUSTOM || style === WindowControlsStyle.HIDDEN) {
+        return style;
+    }
+    return WindowControlsStyle.NATIVE;
+}
 const DEFAULT_CUSTOM_TITLEBAR_HEIGHT = 35;
 function useWindowControlsOverlay(configurationService) {
     if (isWeb) {
@@ -78,9 +95,15 @@ function useWindowControlsOverlay(configurationService) {
     if (hasNativeTitlebar(configurationService)) {
         return false;
     }
+    if (!isMacintosh) {
+        const setting = getWindowControlsStyle(configurationService);
+        if (setting === WindowControlsStyle.CUSTOM || setting === WindowControlsStyle.HIDDEN) {
+            return false;
+        }
+    }
     return true;
 }
 const DEFAULT_WINDOW_SIZE = { width: 1200, height: 800 };
 const DEFAULT_AUX_WINDOW_SIZE = { width: 1024, height: 768 };
 
-export { CustomTitleBarVisibility, DEFAULT_AUX_WINDOW_SIZE, DEFAULT_CUSTOM_TITLEBAR_HEIGHT, DEFAULT_WINDOW_SIZE, TitleBarSetting, TitlebarStyle, WindowMinimumSize, getMenuBarVisibility, getTitleBarStyle, hasCustomTitlebar, hasNativeTitlebar, isFileToOpen, isFolderToOpen, isWorkspaceToOpen, useWindowControlsOverlay };
+export { CustomTitleBarVisibility, DEFAULT_AUX_WINDOW_SIZE, DEFAULT_CUSTOM_TITLEBAR_HEIGHT, DEFAULT_WINDOW_SIZE, TitleBarSetting, TitlebarStyle, WindowControlsStyle, WindowMinimumSize, getMenuBarVisibility, getTitleBarStyle, getWindowControlsStyle, hasCustomTitlebar, hasNativeTitlebar, isFileToOpen, isFolderToOpen, isWorkspaceToOpen, useWindowControlsOverlay };

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

@@ -72,13 +72,13 @@ export declare class Workspace implements IWorkspace {
     private _id;
     private _transient;
     private _configuration;
-    private _ignorePathCasing;
-    private _foldersMap;
+    private ignorePathCasing;
+    private foldersMap;
     private _folders;
-    constructor(_id: string, folders: WorkspaceFolder[], _transient: boolean, _configuration: URI | null, _ignorePathCasing: (key: URI) => boolean);
-    update(workspace: Workspace): void;
     get folders(): WorkspaceFolder[];
     set folders(folders: WorkspaceFolder[]);
+    constructor(_id: string, folders: WorkspaceFolder[], _transient: boolean, _configuration: URI | null, ignorePathCasing: (key: URI) => boolean);
+    update(workspace: Workspace): void;
     get id(): string;
     get transient(): boolean;
     get configuration(): URI | null;

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

@@ -67,28 +67,26 @@ function isWorkspaceFolder(thing) {
         && typeof candidate.toResource === 'function');
 }
 let Workspace$1 = class Workspace {
-    constructor(_id, folders, _transient, _configuration, _ignorePathCasing) {
+    get folders() { return this._folders; }
+    set folders(folders) {
+        this._folders = folders;
+        this.updateFoldersMap();
+    }
+    constructor(_id, folders, _transient, _configuration, ignorePathCasing) {
         this._id = _id;
         this._transient = _transient;
         this._configuration = _configuration;
-        this._ignorePathCasing = _ignorePathCasing;
-        this._foldersMap = TernarySearchTree.forUris(this._ignorePathCasing, () => true);
+        this.ignorePathCasing = ignorePathCasing;
+        this.foldersMap = TernarySearchTree.forUris(this.ignorePathCasing, () => true);
         this.folders = folders;
     }
     update(workspace) {
         this._id = workspace.id;
         this._configuration = workspace.configuration;
         this._transient = workspace.transient;
-        this._ignorePathCasing = workspace._ignorePathCasing;
+        this.ignorePathCasing = workspace.ignorePathCasing;
         this.folders = workspace.folders;
     }
-    get folders() {
-        return this._folders;
-    }
-    set folders(folders) {
-        this._folders = folders;
-        this.updateFoldersMap();
-    }
     get id() {
         return this._id;
     }
@@ -105,12 +103,12 @@ let Workspace$1 = class Workspace {
         if (!resource) {
             return null;
         }
-        return this._foldersMap.findSubstr(resource) || null;
+        return this.foldersMap.findSubstr(resource) || null;
     }
     updateFoldersMap() {
-        this._foldersMap = TernarySearchTree.forUris(this._ignorePathCasing, () => true);
+        this.foldersMap = TernarySearchTree.forUris(this.ignorePathCasing, () => true);
         for (const folder of this.folders) {
-            this._foldersMap.set(folder.uri, folder);
+            this.foldersMap.set(folder.uri, folder);
         }
     }
     toJSON() {
@@ -140,7 +138,7 @@ function toWorkspaceFolder(resource) {
 }
 const WORKSPACE_EXTENSION = 'code-workspace';
 const WORKSPACE_SUFFIX = `.${WORKSPACE_EXTENSION}`;
-const WORKSPACE_FILTER = [{ name: ( localize(2323, "Code Workspace")), extensions: [WORKSPACE_EXTENSION] }];
+const WORKSPACE_FILTER = [{ name: ( localize(2362, "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/browser/statusBarService.d.ts

@@ -5,7 +5,7 @@ import { Command } from "../../../editor/common/languages.js";
 import { IAccessibilityInformation } from "../../../platform/accessibility/common/accessibility.js";
 import { IMarkdownString } from "../../../base/common/htmlContent.js";
 import { Event } from "../../../base/common/event.js";
-import { IManagedHoverTooltipMarkdownString } from "@codingame/monaco-vscode-view-status-bar-service-override/vscode/vs/base/browser/ui/hover/hover";
+import { IManagedHoverTooltipMarkdownString } from "../../../base/browser/ui/hover/hover.js";
 export declare const IExtensionStatusBarItemService: import("../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IExtensionStatusBarItemService>;
 export interface IExtensionStatusBarItemChangeEvent {
     readonly added?: ExtensionStatusBarEntry;

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

@@ -1,8 +1,8 @@
+import type * as vscode from "vscode";
 import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
 import { ServicesAccessor } from "../../../platform/instantiation/common/instantiation.js";
-import { ExtHostConfigProvider } from "./extHostConfiguration.js";
 import { ExtensionDescriptionRegistry } from "../../services/extensions/common/extensionDescriptionRegistry.js";
-import type * as vscode from "vscode";
+import { ExtHostConfigProvider } from "./extHostConfiguration.js";
 export interface IExtensionRegistries {
     mine: ExtensionDescriptionRegistry;
     all: ExtensionDescriptionRegistry;

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

@@ -17,6 +17,10 @@ import { ILoggerService, ILogService } from '../../../platform/log/common/log.se
 import { getRemoteName } from '../../../platform/remote/common/remoteHosts.js';
 import { TelemetryTrustedValue } from '../../../platform/telemetry/common/telemetryUtils.js';
 import { EditSessionIdentityMatch } from '../../../platform/workspace/common/editSessions.js';
+import { DebugConfigurationProviderTriggerKind } from '../../contrib/debug/common/debug.js';
+import { UIKind } from '../../services/extensions/common/extensionHostProtocol.js';
+import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { TextSearchCompleteMessageType, TextSearchMatch2, TextSearchContext2, ExcludeSettingOptions } from '../../services/search/common/searchExtTypes.js';
 import { ExtHostContext, MainContext, CandidatePortSource } from './extHost.protocol.js';
 import { ExtHostRelatedInformation } from './extHostAiRelatedInformation.js';
 import { ExtHostApiCommands } from './extHostApiCommands.js';
@@ -24,8 +28,10 @@ import { IExtHostApiDeprecationService } from './extHostApiDeprecationService.js
 import { IExtHostAuthentication } from './extHostAuthentication.js';
 import { ExtHostBulkEdits } from './extHostBulkEdits.js';
 import { ExtHostChatAgents2 } from './extHostChatAgents2.js';
+import { ExtHostChatStatus } from './extHostChatStatus.js';
 import { ExtHostClipboard } from './extHostClipboard.js';
 import { ExtHostEditorInsets } from './extHostCodeInsets.js';
+import { ExtHostCodeMapper } from './extHostCodeMapper.js';
 import { IExtHostCommands } from './extHostCommands.js';
 import { createExtHostComments } from './extHostComments.js';
 import { IExtHostConfiguration } from './extHostConfiguration.js';
@@ -55,6 +61,7 @@ import { IExtHostLanguageModels } from './extHostLanguageModels.js';
 import { ExtHostLanguages } from './extHostLanguages.js';
 import { IExtHostLocalizationService } from './extHostLocalizationService.js';
 import { IExtHostManagedSockets } from './extHostManagedSockets.js';
+import { IExtHostMpcService } from './extHostMcp.js';
 import { ExtHostMessageService } from './extHostMessageService.js';
 import { ExtHostNotebookController } from './extHostNotebook.js';
 import { ExtHostNotebookDocumentSaveParticipant } from './extHostNotebookDocumentSaveParticipant.js';
@@ -87,7 +94,7 @@ import { ExtHostTimeline } from './extHostTimeline.js';
 import { ExtHostTreeViews } from './extHostTreeViews.js';
 import { IExtHostTunnelService } from './extHostTunnelService.js';
 import { LanguageSelector } from './extHostTypeConverters.js';
-import { ExtensionKind, ProgressLocation, ChatErrorLevel, InlineEditTriggerKind, InlineEdit, NewSymbolNameTriggerKind, NewSymbolNameTag, NewSymbolName, LanguageModelPromptTsxPart, LanguageModelChatToolMode, PreparedTerminalToolInvocation, ExtendedLanguageModelToolResult, LanguageModelToolResult, LanguageModelError, LanguageModelToolCallPart, LanguageModelTextPart, LanguageModelToolResultPart, LanguageModelChatMessage, LanguageModelChatMessageRole, ChatReferenceBinaryData, ChatRequestNotebookData, ChatRequestEditorData, ChatLocation, ChatResponseTurn, ChatRequestTurn, ChatResponseReferencePartStatusKind, ChatResponseMovePart, ChatResponseConfirmationPart, ChatResponseCommandButtonPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseNotebookEditPart, ChatResponseTextEditPart, ChatResponseWarningPart, ChatResponseCodeblockUriPart, ChatResponseCodeCitationPart, ChatResponseReferencePart, ChatResponseProgressPart2, ChatResponseProgressPart, ChatResponseAnchorPart, ChatResponseFileTreePart, ChatResponseMarkdownPart, KeywordRecognitionStatus, 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, 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, McpStdioServerDefinition, McpSSEServerDefinition, ChatErrorLevel, InlineEditTriggerKind, InlineEdit, NewSymbolNameTriggerKind, NewSymbolNameTag, NewSymbolName, LanguageModelPromptTsxPart, LanguageModelChatToolMode, PreparedTerminalToolInvocation, ExtendedLanguageModelToolResult, ChatImageMimeType, LanguageModelDataPart, LanguageModelToolResult, LanguageModelError, LanguageModelToolCallPart, LanguageModelTextPart, LanguageModelToolResultPart, LanguageModelChatMessage2, LanguageModelChatMessage, LanguageModelChatMessageRole, ChatReferenceBinaryData, ChatRequestNotebookData, ChatRequestEditorData, ChatLocation, ChatResponseTurn, ChatRequestTurn, ChatResponseReferencePartStatusKind, ChatResponseMovePart, ChatResponseConfirmationPart, ChatResponseCommandButtonPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseNotebookEditPart, ChatResponseTextEditPart, ChatResponseWarningPart, ChatResponseCodeblockUriPart, ChatResponseCodeCitationPart, ChatResponseReferencePart, ChatResponseProgressPart2, ChatResponseProgressPart, ChatResponseAnchorPart, ChatResponseFileTreePart, ChatResponseMarkdownPart, KeywordRecognitionStatus, 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';
@@ -96,11 +103,6 @@ import { ExtHostWebviewPanels } from './extHostWebviewPanels.js';
 import { ExtHostWebviewViews } from './extHostWebviewView.js';
 import { IExtHostWindow } from './extHostWindow.js';
 import { IExtHostWorkspace } from './extHostWorkspace.js';
-import { DebugConfigurationProviderTriggerKind } from '../../contrib/debug/common/debug.js';
-import { UIKind } from '../../services/extensions/common/extensionHostProtocol.js';
-import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
-import { TextSearchCompleteMessageType, TextSearchMatch2, TextSearchContext2, ExcludeSettingOptions } from '../../services/search/common/searchExtTypes.js';
-import { ExtHostCodeMapper } from './extHostCodeMapper.js';
 
 function createApiFactoryAndRegisterActors(accessor) {
     const initData = accessor.get(IExtHostInitDataService);
@@ -124,6 +126,7 @@ function createApiFactoryAndRegisterActors(accessor) {
     const extHostManagedSockets = accessor.get(IExtHostManagedSockets);
     const extHostAuthentication = accessor.get(IExtHostAuthentication);
     const extHostLanguageModels = accessor.get(IExtHostLanguageModels);
+    const extHostMcp = accessor.get(IExtHostMpcService);
     rpcProtocol.set(ExtHostContext.ExtHostFileSystemInfo, extHostFileSystemInfo);
     rpcProtocol.set(ExtHostContext.ExtHostLogLevelServiceShape, extHostLoggerService);
     rpcProtocol.set(ExtHostContext.ExtHostWorkspace, extHostWorkspace);
@@ -224,26 +227,29 @@ function createApiFactoryAndRegisterActors(accessor) {
         extHostCommands,
         extHostLogService
     )));
+    const extHostLanguageModelTools = rpcProtocol.set(ExtHostContext.ExtHostLanguageModelTools, ( new ExtHostLanguageModelTools(rpcProtocol, extHostLanguageModels)));
     const extHostChatAgents2 = rpcProtocol.set(ExtHostContext.ExtHostChatAgents2, ( new ExtHostChatAgents2(
         rpcProtocol,
         extHostLogService,
         extHostCommands,
         extHostDocuments,
         extHostLanguageModels,
-        extHostDiagnostics
+        extHostDiagnostics,
+        extHostLanguageModelTools
     )));
-    const extHostLanguageModelTools = rpcProtocol.set(ExtHostContext.ExtHostLanguageModelTools, ( new ExtHostLanguageModelTools(rpcProtocol)));
     const extHostAiRelatedInformation = rpcProtocol.set(ExtHostContext.ExtHostAiRelatedInformation, ( new ExtHostRelatedInformation(rpcProtocol)));
     const extHostAiEmbeddingVector = rpcProtocol.set(ExtHostContext.ExtHostAiEmbeddingVector, ( new ExtHostAiEmbeddingVector(rpcProtocol)));
     const extHostStatusBar = rpcProtocol.set(ExtHostContext.ExtHostStatusBar, ( new ExtHostStatusBar(rpcProtocol, extHostCommands.converter)));
     const extHostSpeech = rpcProtocol.set(ExtHostContext.ExtHostSpeech, ( new ExtHostSpeech(rpcProtocol)));
     const extHostEmbeddings = rpcProtocol.set(ExtHostContext.ExtHostEmbeddings, ( new ExtHostEmbeddings(rpcProtocol)));
+    rpcProtocol.set(ExtHostContext.ExtHostMcp, accessor.get(IExtHostMpcService));
     const expected = ( Object.values(ExtHostContext));
     rpcProtocol.assertRegistered(expected);
     const extHostBulkEdits = ( new ExtHostBulkEdits(rpcProtocol, extHostDocumentsAndEditors));
     const extHostClipboard = ( new ExtHostClipboard(rpcProtocol));
     const extHostMessageService = ( new ExtHostMessageService(rpcProtocol, extHostLogService));
     const extHostDialogs = ( new ExtHostDialogs(rpcProtocol));
+    const extHostChatStatus = ( new ExtHostChatStatus(rpcProtocol));
     ExtHostApiCommands.register(extHostCommands);
     return function (extension, extensionInfo, configProvider) {
         function _asExtensionEvent(actual) {
@@ -910,7 +916,11 @@ function createApiFactoryAndRegisterActors(accessor) {
             get nativeHandle() {
                 checkProposedApiEnabled(extension, 'nativeWindowHandle');
                 return extHostWindow.nativeHandle;
-            }
+            },
+            createChatStatusItem: (id) => {
+                checkProposedApiEnabled(extension, 'chatStatusItem');
+                return extHostChatStatus.createChatStatusItem(extension, id);
+            },
         };
         const workspace = {
             get rootPath() {
@@ -1318,6 +1328,14 @@ function createApiFactoryAndRegisterActors(accessor) {
             },
             onDidEndTaskProcess: (listeners, thisArgs, disposables) => {
                 return _asExtensionEvent(extHostTask.onDidEndTaskProcess)(listeners, thisArgs, disposables);
+            },
+            onDidStartTaskProblemMatchers: (listeners, thisArgs, disposables) => {
+                checkProposedApiEnabled(extension, 'taskProblemMatcherStatus');
+                return _asExtensionEvent(extHostTask.onDidStartTaskProblemMatchers)(listeners, thisArgs, disposables);
+            },
+            onDidEndTaskProblemMatchers: (listeners, thisArgs, disposables) => {
+                checkProposedApiEnabled(extension, 'taskProblemMatcherStatus');
+                return _asExtensionEvent(extHostTask.onDidEndTaskProblemMatchers)(listeners, thisArgs, disposables);
             }
         };
         const notebooks = {
@@ -1406,6 +1424,10 @@ function createApiFactoryAndRegisterActors(accessor) {
             registerRelatedFilesProvider(provider, metadata) {
                 checkProposedApiEnabled(extension, 'chatEditing');
                 return extHostChatAgents2.registerRelatedFilesProvider(extension, provider, metadata);
+            },
+            onDidDisposeChatSession: (listeners, thisArgs, disposables) => {
+                checkProposedApiEnabled(extension, 'chatParticipantPrivate');
+                return _asExtensionEvent(extHostChatAgents2.onDidDisposeChatSession)(listeners, thisArgs, disposables);
             }
         };
         const lm = {
@@ -1454,6 +1476,10 @@ function createApiFactoryAndRegisterActors(accessor) {
             },
             registerIgnoredFileProvider(provider) {
                 return extHostLanguageModels.registerIgnoredFileProvider(extension, provider);
+            },
+            registerMcpConfigurationProvider(id, provider) {
+                checkProposedApiEnabled(extension, 'mcpConfigurationProvider');
+                return extHostMcp.registerMcpConfigurationProvider(extension, id, provider);
             }
         };
         const speech = {
@@ -1592,6 +1618,7 @@ function createApiFactoryAndRegisterActors(accessor) {
             SymbolKind: SymbolKind,
             SymbolTag: SymbolTag,
             Task: Task,
+            TaskEventKind: TaskEventKind,
             TaskGroup: TaskGroup,
             TaskPanelKind: TaskPanelKind,
             TaskRevealKind: TaskRevealKind,
@@ -1727,11 +1754,14 @@ function createApiFactoryAndRegisterActors(accessor) {
             ChatReferenceBinaryData: ChatReferenceBinaryData,
             LanguageModelChatMessageRole: LanguageModelChatMessageRole,
             LanguageModelChatMessage: LanguageModelChatMessage,
+            LanguageModelChatMessage2: LanguageModelChatMessage2,
             LanguageModelToolResultPart: LanguageModelToolResultPart,
             LanguageModelTextPart: LanguageModelTextPart,
             LanguageModelToolCallPart: LanguageModelToolCallPart,
             LanguageModelError: LanguageModelError,
             LanguageModelToolResult: LanguageModelToolResult,
+            LanguageModelDataPart: LanguageModelDataPart,
+            ChatImageMimeType: ChatImageMimeType,
             ExtendedLanguageModelToolResult: ExtendedLanguageModelToolResult,
             PreparedTerminalToolInvocation: PreparedTerminalToolInvocation,
             LanguageModelChatToolMode: LanguageModelChatToolMode,
@@ -1746,6 +1776,8 @@ function createApiFactoryAndRegisterActors(accessor) {
             TextSearchMatch2: TextSearchMatch2,
             TextSearchCompleteMessageTypeNew: TextSearchCompleteMessageType,
             ChatErrorLevel: ChatErrorLevel,
+            McpSSEServerDefinition: McpSSEServerDefinition,
+            McpStdioServerDefinition: McpStdioServerDefinition,
         };
     };
 }

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

@@ -27,6 +27,7 @@ import { IExtHostAuthentication, ExtHostAuthentication } from './extHostAuthenti
 import { IExtHostLanguageModels, ExtHostLanguageModels } from './extHostLanguageModels.js';
 import { IExtHostTerminalShellIntegration, ExtHostTerminalShellIntegration } from './extHostTerminalShellIntegration.js';
 import { IExtHostTesting, ExtHostTesting } from './extHostTesting.js';
+import { IExtHostMpcService, ExtHostMcpService } from './extHostMcp.js';
 
 registerSingleton(IExtHostLocalizationService, ExtHostLocalizationService, InstantiationType.Delayed);
 registerSingleton(ILoggerService, ExtHostLoggerService, InstantiationType.Delayed);
@@ -54,3 +55,4 @@ registerSingleton(IExtHostWorkspace, ExtHostWorkspace, InstantiationType.Eager);
 registerSingleton(IExtHostSecretState, ExtHostSecretState, InstantiationType.Eager);
 registerSingleton(IExtHostEditorTabs, ExtHostEditorTabs, InstantiationType.Eager);
 registerSingleton(IExtHostVariableResolverProvider, ExtHostVariableResolverProviderService, InstantiationType.Eager);
+registerSingleton(IExtHostMpcService, ExtHostMcpService, InstantiationType.Eager);

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

@@ -46,15 +46,17 @@ 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 { ChatAgentLocation, IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, IChatWelcomeMessageContent } from "../../contrib/chat/common/chatAgents.js";
+import { IChatAgentMetadata, IChatAgentRequest, IChatAgentResult } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-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 { 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, 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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
@@ -81,7 +83,7 @@ import * as search from "../../services/search/common/search.js";
 import { TextSearchCompleteMessage } from "../../services/search/common/searchExtTypes.js";
 import { ISaveProfileResult } from "@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common/vscode/vs/workbench/services/userDataProfile/common/userDataProfile";
 import { TerminalShellExecutionCommandLineConfidence } from "./extHostTypes.js";
-import * as tasks from "./shared/tasks.js";
+import * as tasks from "@codingame/monaco-vscode-extensions-service-override/vscode/vs/workbench/api/common/shared/tasks";
 export interface IWorkspaceData extends IStaticWorkspaceData {
     folders: {
         uri: UriComponents;
@@ -1082,7 +1084,7 @@ export interface ExtHostSpeechShape {
 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: IChatMessage[], options: {}, token: CancellationToken): Promise<void>;
+    $tryStartChatRequest(extension: ExtensionIdentifier, provider: string, requestId: number, messages: SerializableObjectWithBuffers<IChatMessage[]>, options: {}, token: CancellationToken): Promise<void>;
     $reportResponsePart(requestId: number, chunk: IChatResponseFragment): Promise<void>;
     $reportResponseDone(requestId: number, error: SerializedError | undefined): Promise<void>;
     $selectChatModels(selector: ILanguageModelChatSelector): Promise<string[]>;
@@ -1099,7 +1101,7 @@ export interface ExtHostLanguageModelsShape {
         to: ExtensionIdentifier;
         enabled: boolean;
     }[]): void;
-    $startChatRequest(handle: number, requestId: number, from: ExtensionIdentifier, messages: IChatMessage[], options: {
+    $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>;
@@ -1185,7 +1187,6 @@ export interface ExtHostChatAgentsShape2 {
     $acceptFeedback(handle: number, result: IChatAgentResult, voteAction: IChatVoteAction): void;
     $acceptAction(handle: number, result: IChatAgentResult, action: IChatUserActionEvent): void;
     $invokeCompletionProvider(handle: number, query: string, token: CancellationToken): Promise<IChatAgentCompletionItem[]>;
-    $provideWelcomeMessage(handle: number, token: CancellationToken): Promise<IChatWelcomeMessageContent | undefined>;
     $provideChatTitle(handle: number, context: IChatAgentHistoryEntryDto[], token: CancellationToken): Promise<string | undefined>;
     $provideSampleQuestions(handle: number, location: ChatAgentLocation, token: CancellationToken): Promise<IChatFollowup[] | undefined>;
     $releaseSession(sessionId: string): void;
@@ -2306,6 +2307,8 @@ export interface ExtHostTaskShape {
     $onDidStartTaskProcess(value: tasks.ITaskProcessStartedDTO): void;
     $onDidEndTaskProcess(value: tasks.ITaskProcessEndedDTO): void;
     $OnDidEndTask(execution: tasks.ITaskExecutionDTO): void;
+    $onDidStartTaskProblemMatchers(status: tasks.ITaskProblemMatcherStartedDto): void;
+    $onDidEndTaskProblemMatchers(status: tasks.ITaskProblemMatcherEndedDto): void;
     $resolveVariables(workspaceFolder: UriComponents, toResolve: {
         process?: {
             name: string;
@@ -2674,6 +2677,19 @@ export interface ExtHostTestingShape {
     $executeTestFollowup(id: number): Promise<void>;
     $disposeTestFollowups(id: number[]): void;
 }
+export interface ExtHostMcpShape {
+    $startMcp(id: number, launch: McpServerLaunch.Serialized): void;
+    $stopMcp(id: number): void;
+    $sendMessage(id: number, message: string): void;
+    $waitForInitialCollectionProviders(): Promise<void>;
+}
+export interface MainThreadMcpShape {
+    $onDidChangeState(id: number, state: McpConnectionState): void;
+    $onDidPublishLog(id: number, level: LogLevel, log: string): void;
+    $onDidReceiveMessage(id: number, message: string): void;
+    $upsertMcpCollection(collection: McpCollectionDefinition.FromExtHost, servers: Dto<McpServerDefinition>[]): void;
+    $deleteMcpCollection(collectionId: string): void;
+}
 export interface ExtHostLocalizationShape {
     getMessage(extensionId: string, details: IStringDetails): string;
     getBundle(extensionId: string): {
@@ -2714,6 +2730,16 @@ export interface MainThreadTestingShape {
     $finishedExtensionTestRun(runId: string): void;
     $markTestRetired(testIds: string[] | undefined): void;
 }
+export type ChatStatusItemDto = {
+    id: string;
+    title: string;
+    description: string;
+    detail: string | undefined;
+};
+export interface MainThreadChatStatusShape {
+    $setEntry(id: string, entry: ChatStatusItemDto): void;
+    $disposeEntry(id: string): void;
+}
 export declare const MainContext: {
     MainThreadAuthentication: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadAuthenticationShape>;
     MainThreadBulkEdits: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadBulkEditsShape>;
@@ -2783,8 +2809,10 @@ export declare const MainContext: {
     MainThreadTimeline: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadTimelineShape>;
     MainThreadTesting: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadTestingShape>;
     MainThreadLocalization: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadLocalizationShape>;
+    MainThreadMcp: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadMcpShape>;
     MainThreadAiRelatedInformation: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadAiRelatedInformationShape>;
     MainThreadAiEmbeddingVector: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadAiEmbeddingVectorShape>;
+    MainThreadChatStatus: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<MainThreadChatStatusShape>;
 };
 export declare const ExtHostContext: {
     ExtHostCodeMapper: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostCodeMapperShape>;
@@ -2854,5 +2882,6 @@ export declare const ExtHostContext: {
     ExtHostTesting: import("../../services/extensions/common/proxyIdentifier.js").ProxyIdentifier<ExtHostTestingShape>;
     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>;
 };
 export {};

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

@@ -169,8 +169,10 @@ const MainContext = {
     MainThreadTimeline: ( createProxyIdentifier('MainThreadTimeline')),
     MainThreadTesting: ( createProxyIdentifier('MainThreadTesting')),
     MainThreadLocalization: ( createProxyIdentifier('MainThreadLocalizationShape')),
+    MainThreadMcp: ( createProxyIdentifier('MainThreadMcpShape')),
     MainThreadAiRelatedInformation: ( createProxyIdentifier('MainThreadAiRelatedInformation')),
-    MainThreadAiEmbeddingVector: ( createProxyIdentifier('MainThreadAiEmbeddingVector'))
+    MainThreadAiEmbeddingVector: ( createProxyIdentifier('MainThreadAiEmbeddingVector')),
+    MainThreadChatStatus: ( createProxyIdentifier('MainThreadChatStatus')),
 };
 const ExtHostContext = {
     ExtHostCodeMapper: ( createProxyIdentifier('ExtHostCodeMapper')),
@@ -239,7 +241,8 @@ const ExtHostContext = {
     ExtHostTimeline: ( createProxyIdentifier('ExtHostTimeline')),
     ExtHostTesting: ( createProxyIdentifier('ExtHostTesting')),
     ExtHostTelemetry: ( createProxyIdentifier('ExtHostTelemetry')),
-    ExtHostLocalization: ( createProxyIdentifier('ExtHostLocalization'))
+    ExtHostLocalization: ( createProxyIdentifier('ExtHostLocalization')),
+    ExtHostMcp: ( createProxyIdentifier('ExtHostMcp')),
 };
 
 export { CandidatePortSource, CellOutputKind, ExtHostContext, ExtHostTestingResource, ISuggestDataDtoField, ISuggestResultDtoField, MainContext, NotebookEditorRevealType, TabInputKind, TabModelOperationKind, TextEditorRevealType, WebviewEditorCapabilities, WebviewMessageArrayBufferViewType };

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

@@ -25,7 +25,9 @@ let ExtHostAuthentication = class ExtHostAuthentication {
     async getSession(requestingExtension, providerId, scopes, options = {}) {
         const extensionId = ExtensionIdentifier.toKey(requestingExtension.identifier);
         const sortedScopes = [...scopes].sort().join(' ');
-        return await this._getSessionTaskSingler.getOrCreate(`${extensionId} ${providerId} ${sortedScopes}`, async () => {
+        const keys = ( Object.keys(options));
+        const optionsStr = ( keys.sort().map(key => `${key}:${!!options[key]}`)).join(', ');
+        return await this._getSessionTaskSingler.getOrCreate(`${extensionId} ${providerId} ${sortedScopes} ${optionsStr}`, async () => {
             await this._proxy.$ensureProvider(providerId);
             const extensionName = requestingExtension.displayName || requestingExtension.name;
             return this._proxy.$getSession(providerId, scopes, extensionId, extensionName, options);