@codingame/monaco-vscode-mcp-service-override 37.0.0 → 37.2.0

package/index.js

@@ -29,6 +29,7 @@ import { IWorkbenchMcpGatewayService } from '@codingame/monaco-vscode-api/vscode
 import { BrowserMcpGatewayService } from './vscode/src/vs/workbench/contrib/mcp/browser/mcpGatewayService.js';
 import './vscode/src/vs/workbench/contrib/mcp/browser/mcp.contribution.js';
 import './vscode/src/vs/workbench/contrib/mcp/browser/mcp.view.contribution.js';
+import './vscode/src/vs/workbench/api/browser/mainThreadMcp.js';
 
 function getServiceOverride() {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-mcp-service-override",
-  "version": "37.0.0",
+  "version": "37.2.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - mcp service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "37.0.0"
+    "@codingame/monaco-vscode-api": "37.2.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/platform/mcp/common/allowedMcpServersService.js

@@ -32,7 +32,7 @@ let AllowedMcpServersService = class AllowedMcpServersService extends Disposable
                 query: `@id:${mcpAccessConfig}`
             }).toString());
             return (new MarkdownString(localize(
-                2352,
+                2398,
                 "Model Context Protocol servers are disabled in the Editor. Please check your [settings]({0}).",
                 settingsCommandLink
             )));
@@ -43,12 +43,12 @@ let AllowedMcpServersService = class AllowedMcpServersService extends Disposable
         switch (checkMcpServerAllowed(allowlist, denylist, identity)) {
         case McpServerAllowResult.Denied:
             return (new MarkdownString(localize(
-                2353,
+                2399,
                 "This Model Context Protocol server is blocked by your organization's policy. Please contact your administrator for more information."
             )));
         case McpServerAllowResult.NotAllowed:
             return (new MarkdownString(localize(
-                2354,
+                2400,
                 "This Model Context Protocol server is not in the list of servers allowed by your organization. Please contact your administrator for more information."
             )));
         }

package/vscode/src/vs/platform/mcp/common/mcpGalleryService.js

@@ -545,7 +545,7 @@ let McpGalleryService = class McpGalleryService extends Disposable {
     async getReadme(gallery, token) {
         const readmeUrl = gallery.readmeUrl;
         if (!readmeUrl) {
-            return Promise.resolve(( localize(2355, "No README available")));
+            return Promise.resolve(( localize(2401, "No README available")));
         }
         const uri = ( URI.parse(readmeUrl));
         if (uri.scheme === Schemas.file) {
@@ -557,7 +557,7 @@ let McpGalleryService = class McpGalleryService extends Disposable {
             }
         }
         if (uri.authority !== "raw.githubusercontent.com") {
-            return ( new MarkdownString(( localize(2356, "You can find information about this server [here]({0})", readmeUrl)))).value;
+            return ( new MarkdownString(( localize(2402, "You can find information about this server [here]({0})", readmeUrl)))).value;
         }
         const context = await this.requestService.request({
             type: "GET",

package/vscode/src/vs/workbench/api/browser/mainThreadMcp.d.ts

@@ -0,0 +1,108 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { URI, UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
+import { LogLevel } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log";
+import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
+import { ISecretStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/secrets/common/secrets.service";
+import { IWorkbenchMcpGatewayService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpGatewayService.service";
+import { IMcpRegistry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service";
+import { McpCollectionDefinition, McpConnectionState, McpServerDefinition } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes";
+import { IAuthenticationMcpAccessService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationMcpAccessService.service";
+import { IAuthenticationMcpService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationMcpService.service";
+import { IAuthenticationMcpUsageService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationMcpUsageService.service";
+import { IAuthenticationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service";
+import { IDynamicAuthenticationProviderStorageService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/dynamicAuthenticationProviderStorage.service";
+import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
+import { IExtHostContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers";
+import { IMcpAuthenticationDetails, IMcpAuthenticationOptions, IAuthMetadataSource, MainThreadMcpShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+export declare class MainThreadMcp extends Disposable implements MainThreadMcpShape {
+    private readonly _extHostContext;
+    private readonly _mcpRegistry;
+    private readonly dialogService;
+    private readonly _authenticationService;
+    private readonly authenticationMcpServersService;
+    private readonly authenticationMCPServerAccessService;
+    private readonly authenticationMCPServerUsageService;
+    private readonly _dynamicAuthenticationProviderStorageService;
+    private readonly _extensionService;
+    private readonly _contextKeyService;
+    private readonly _telemetryService;
+    private readonly _mcpGatewayService;
+    private readonly _configurationService;
+    private readonly _secretStorageService;
+    private _serverIdCounter;
+    private readonly _servers;
+    private readonly _serverDefinitions;
+    private readonly _serverAuthTracking;
+    private readonly _proxy;
+    private readonly _collectionDefinitions;
+    private readonly _gateways;
+    constructor(_extHostContext: IExtHostContext, _mcpRegistry: IMcpRegistry, dialogService: IDialogService, _authenticationService: IAuthenticationService, authenticationMcpServersService: IAuthenticationMcpService, authenticationMCPServerAccessService: IAuthenticationMcpAccessService, authenticationMCPServerUsageService: IAuthenticationMcpUsageService, _dynamicAuthenticationProviderStorageService: IDynamicAuthenticationProviderStorageService, _extensionService: IExtensionService, _contextKeyService: IContextKeyService, _telemetryService: ITelemetryService, _mcpGatewayService: IWorkbenchMcpGatewayService, _configurationService: IConfigurationService, _secretStorageService: ISecretStorageService);
+    private _publishServerDefinitions;
+    $upsertMcpCollection(collection: McpCollectionDefinition.FromExtHost, serversDto: McpServerDefinition.Serialized[]): void;
+    $deleteMcpCollection(collectionId: string): void;
+    $onDidChangeState(id: number, update: McpConnectionState): void;
+    $onDidPublishLog(id: number, level: LogLevel, log: string): void;
+    $onDidReceiveMessage(id: number, message: string): void;
+    $getTokenForProviderId(id: number, providerId: string, scopes: string[], options?: IMcpAuthenticationOptions): Promise<string | undefined>;
+    $getTokenFromServerMetadata(id: number, authDetails: IMcpAuthenticationDetails, { errorOnUserInteraction, forceNewRegistration, clientId }?: IMcpAuthenticationOptions): Promise<string | undefined>;
+    private _ensureXaaIssuer;
+    private _getSessionForProvider;
+    private continueWithIncorrectAccountPrompt;
+    private _onDidChangeAuthSessions;
+    $logMcpAuthSetup(data: IAuthMetadataSource): void;
+    $startMcpGateway(chatSessionResource?: UriComponents): Promise<{
+        servers: {
+            label: string;
+            address: URI;
+        }[];
+        gatewayId: string;
+    } | undefined>;
+    $disposeMcpGateway(gatewayId: string): void;
+    private loginPrompt;
+    dispose(): void;
+}
+/**
+ * The context needed to re-acquire a token for a tracked MCP server, captured when the
+ * session was first established. The tracker holds this opaquely and replays it verbatim on
+ * re-validation so the silent token request targets the same authority / resource / audience
+ * that the original sign-in used. Dropping the authorization server here would let the provider
+ * fall back to a default authority (e.g. the Microsoft provider's `organizations` tenant) and
+ * request a token against the wrong tenant.
+ */
+export interface IMcpServerAuthContext {
+    readonly authorizationServer?: URI;
+    readonly clientId?: string;
+    readonly resource?: string;
+    readonly audience?: string;
+}
+/**
+ * Tracks which MCP servers are using which authentication providers.
+ * Organized by provider ID for efficient lookup when auth sessions change.
+ */
+export declare class McpServerAuthTracker {
+    private readonly _tracking;
+    /**
+     * Track authentication for a server with a specific provider.
+     * Replaces any existing tracking for this server/provider combination.
+     */
+    track(providerId: string, serverId: number, scopes: string[], context: IMcpServerAuthContext): void;
+    /**
+     * Remove all authentication tracking for a server across all providers.
+     */
+    untrack(serverId: number): void;
+    /**
+     * Get all servers using a specific authentication provider.
+     */
+    get(providerId: string): ReadonlyArray<{
+        serverId: number;
+        scopes: string[];
+        context: IMcpServerAuthContext;
+    }> | undefined;
+    /**
+     * Clear all tracking data.
+     */
+    clear(): void;
+}