@codingame/monaco-vscode-api 24.3.0 → 25.0.0

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

@@ -3,7 +3,7 @@ import { CancellationToken } from "../../../base/common/cancellation.js";
 import { UriComponents } from "../../../base/common/uri.js";
 import { ExtHostChatContextShape } from "./extHost.protocol.js";
 import { IExtHostRpcService } from "./extHostRpcService.js";
-import { IChatContextItem } from "../../contrib/chat/common/chatContext.js";
+import { IChatContextItem } from "../../contrib/chat/common/contextContrib/chatContext.js";
 import { Disposable } from "../../../base/common/lifecycle.js";
 export declare class ExtHostChatContext extends Disposable implements ExtHostChatContextShape {
     _serviceBrand: undefined;

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

@@ -4,7 +4,7 @@ import { Disposable } from "../../../base/common/lifecycle.js";
 import { UriComponents } from "../../../base/common/uri.js";
 import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
 import { ILogService } from "../../../platform/log/common/log.service.js";
-import { IChatAgentRequest, IChatAgentResult } from "../../contrib/chat/common/chatAgents.js";
+import { IChatAgentRequest, IChatAgentResult } from "../../contrib/chat/common/participants/chatAgents.js";
 import { IChatSessionItem, IChatSessionProviderOptionItem } from "../../contrib/chat/common/chatSessionsService.js";
 import { ChatSessionDto, ExtHostChatSessionsShape, IChatSessionProviderOptions } from "./extHost.protocol.js";
 import { ExtHostCommands } from "./extHostCommands.js";
@@ -36,10 +36,6 @@ export declare class ExtHostChatSessions extends Disposable implements ExtHostCh
     registerChatSessionContentProvider(extension: IExtensionDescription, chatSessionScheme: string, chatParticipant: vscode.ChatParticipant, provider: vscode.ChatSessionContentProvider, capabilities?: vscode.ChatSessionCapabilities): vscode.Disposable;
     private convertChatSessionStatus;
     private convertChatSessionItem;
-    $provideNewChatSessionItem(handle: number, options: {
-        request: IChatAgentRequest;
-        metadata?: any;
-    }, token: CancellationToken): Promise<IChatSessionItem>;
     $provideChatSessionItems(handle: number, token: vscode.CancellationToken): Promise<IChatSessionItem[]>;
     $provideChatSessionContent(handle: number, sessionResourceComponents: UriComponents, token: CancellationToken): Promise<ChatSessionDto>;
     $provideHandleOptionsChange(handle: number, sessionResourceComponents: UriComponents, updates: ReadonlyArray<{

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

@@ -5,7 +5,6 @@ import { CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { CancellationError } from '../../../base/common/errors.js';
 import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../base/common/map.js';
-import { revive } from '../../../base/common/marshalling.js';
 import { MarshalledId } from '../../../base/common/marshallingIds.js';
 import { URI } from '../../../base/common/uri.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
@@ -16,7 +15,7 @@ import { ChatAgentResponseStream } from './extHostChatAgents2.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { MarkdownString, ChatAgentRequest, Location, Diagnostic, ChatResponsePart } from './extHostTypeConverters.js';
 import { Disposable as Disposable$1, ChatRequestTurn, ChatReferenceDiagnostic } from './extHostTypes.js';
-import { IDiagnosticVariableEntryFilterData, PromptFileVariableKind } from '../../contrib/chat/common/chatVariableEntries.js';
+import { IDiagnosticVariableEntryFilterData, PromptFileVariableKind } from '../../contrib/chat/common/attachments/chatVariableEntries.js';
 import { basename } from '../../../base/common/resources.js';
 import { SymbolKinds, SymbolKind } from '../../../editor/common/languages.js';
 import { Location as Location$1 } from './extHostTypes/location.js';
@@ -62,7 +61,7 @@ let ExtHostChatSessions = class ExtHostChatSessions extends Disposable {
         this._proxy = ( this._extHostRpc.getProxy(MainContext.MainThreadChatSessions));
         commands.registerArgumentProcessor({
             processArgument: (arg) => {
-                if (arg && arg.$mid === MarshalledId.ChatSessionContext) {
+                if (arg && arg.$mid === MarshalledId.AgentSessionContext) {
                     const id = arg.session.resource || arg.sessionId;
                     const sessionContent = this._sessionItems.get(id);
                     if (sessionContent) {
@@ -111,6 +110,11 @@ let ExtHostChatSessions = class ExtHostChatSessions extends Disposable {
                 this._proxy.$onDidChangeChatSessionOptions(handle, evt.resource, evt.updates);
             }));
         }
+        if (provider.onDidChangeChatSessionProviderOptions) {
+            disposables.add(provider.onDidChangeChatSessionProviderOptions(() => {
+                this._proxy.$onDidChangeChatSessionProviderOptions(handle);
+            }));
+        }
         return new Disposable$1(() => {
             this._chatSessionContentProviders.delete(handle);
             disposables.dispose();
@@ -137,6 +141,7 @@ let ExtHostChatSessions = class ExtHostChatSessions extends Disposable {
             resource: sessionContent.resource,
             label: sessionContent.label,
             description: sessionContent.description ? MarkdownString.from(sessionContent.description) : undefined,
+            badge: sessionContent.badge ? MarkdownString.from(sessionContent.badge) : undefined,
             status: this.convertChatSessionStatus(sessionContent.status),
             tooltip: MarkdownString.fromStrict(sessionContent.tooltip),
             timing: {
@@ -152,32 +157,6 @@ let ExtHostChatSessions = class ExtHostChatSessions extends Disposable {
                 }),
         };
     }
-    async $provideNewChatSessionItem(handle, options, token) {
-        const entry = this._chatSessionItemProviders.get(handle);
-        if (!entry || !entry.provider.provideNewChatSessionItem) {
-            throw ( new Error(
-                `No provider registered for handle ${handle} or provider does not support creating sessions`
-            ));
-        }
-        try {
-            const model = await this.getModelForRequest(options.request, entry.extension);
-            const vscodeRequest = ChatAgentRequest.to(revive(options.request), undefined, model, [], ( new Map()), entry.extension, this._logService);
-            const vscodeOptions = {
-                request: vscodeRequest,
-                metadata: options.metadata
-            };
-            const chatSessionItem = await entry.provider.provideNewChatSessionItem(vscodeOptions, token);
-            if (!chatSessionItem) {
-                throw ( new Error('Provider did not create session'));
-            }
-            this._sessionItems.set(chatSessionItem.resource, chatSessionItem);
-            return this.convertChatSessionItem(entry.sessionType, chatSessionItem);
-        }
-        catch (error) {
-            this._logService.error(`Error creating chat session: ${error}`);
-            throw error;
-        }
-    }
     async $provideChatSessionItems(handle, token) {
         const entry = this._chatSessionItemProviders.get(handle);
         if (!entry) {

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

@@ -1,7 +1,7 @@
 import type * as vscode from "vscode";
 import { CancellationToken } from "../../../base/common/cancellation.js";
 import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
-import { ICodeMapperResult } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService";
+import { ICodeMapperResult } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/editing/chatCodeMapperService";
 import * as extHostProtocol from "./extHost.protocol.js";
 export declare class ExtHostCodeMapper implements extHostProtocol.ExtHostCodeMapperShape {
     private static _providerHandlePool;

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

@@ -3,7 +3,7 @@ import { MainContext } from './extHost.protocol.js';
 import { NotebookEdit, TextEdit } from './extHostTypeConverters.js';
 import { URI } from '../../../base/common/uri.js';
 import { asArray } from '../../../base/common/arrays.js';
-import { LocalChatSessionUri } from '../../contrib/chat/common/chatUri.js';
+import { LocalChatSessionUri } from '../../contrib/chat/common/model/chatUri.js';
 
 class ExtHostCodeMapper {
     static { this._providerHandlePool = 0; }

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

@@ -109,7 +109,7 @@ class DiagnosticCollection {
                     marker.push({
                         severity: MarkerSeverity.Info,
                         message: ( localize(
-                            2667,
+                            2689,
                             "Not showing {0} further errors and warnings.",
                             diagnostics.length - this._maxDiagnosticsPerFile
                         )),

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

@@ -540,7 +540,7 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
     async _doHandleExtensionTests() {
         const { extensionDevelopmentLocationURI, extensionTestsLocationURI } = this._initData.environment;
         if (!extensionDevelopmentLocationURI || !extensionTestsLocationURI) {
-            throw ( new Error(( localize(2668, "Cannot load test runner."))));
+            throw ( new Error(( localize(2690, "Cannot load test runner."))));
         }
         const extensionDescription = (await this.getExtensionPathIndex()).findSubstr(extensionTestsLocationURI);
         const isESM = this._isESM(extensionDescription, extensionTestsLocationURI.path);
@@ -549,7 +549,7 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
             : this._loadCommonJSModule(null, extensionTestsLocationURI, ( new ExtensionActivationTimesBuilder(false))));
         if (!testRunner || typeof testRunner.run !== 'function') {
             throw ( new Error(( localize(
-                2669,
+                2691,
                 "Path {0} does not point to a valid extension test runner.",
                 (extensionTestsLocationURI.toString())
             ))));

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

@@ -546,7 +546,7 @@ class DocumentPasteEditProvider {
         return (edits.map((edit, i) => ({
             _cacheId: [cacheId, i],
             title: edit.title ?? ( localize(
-                2670,
+                2692,
                 "Paste using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),
@@ -1718,7 +1718,7 @@ class DocumentDropEditAdapter {
         return (editsArray.map((edit, i) => ({
             _cacheId: [cacheId, i],
             title: edit.title ?? ( localize(
-                2671,
+                2693,
                 "Drop using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),

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

@@ -2,7 +2,7 @@ import type * as vscode from "vscode";
 import { CancellationToken } from "../../../base/common/cancellation.js";
 import { IDisposable } from "../../../base/common/lifecycle.js";
 import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
-import { IPreparedToolInvocation, IToolInvocation, IToolInvocationPreparationContext, IToolResult } from "../../contrib/chat/common/languageModelToolsService.js";
+import { IPreparedToolInvocation, IToolInvocation, IToolInvocationPreparationContext, IToolResult } from "../../contrib/chat/common/tools/languageModelToolsService.js";
 import { Dto, SerializableObjectWithBuffers } from "../../services/extensions/common/proxyIdentifier.js";
 import { ExtHostLanguageModelToolsShape, IMainContext, IToolDataDto } from "./extHost.protocol.js";
 import { ExtHostLanguageModels } from "./extHostLanguageModels.js";

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

@@ -6,9 +6,9 @@ import { Lazy } from '../../../base/common/lazy.js';
 import { toDisposable } from '../../../base/common/lifecycle.js';
 import { revive } from '../../../base/common/marshalling.js';
 import { generateUuid } from '../../../base/common/uuid.js';
-import { isToolInvocationContext } from '../../contrib/chat/common/languageModelToolsService.js';
-import { InternalEditToolId, ExtensionEditToolId } from '../../contrib/chat/common/tools/editFileTool.js';
-import { InternalFetchWebPageToolId } from '../../contrib/chat/common/tools/tools.js';
+import { isToolInvocationContext } from '../../contrib/chat/common/tools/languageModelToolsService.js';
+import { InternalEditToolId, ExtensionEditToolId } from '../../contrib/chat/common/tools/builtinTools/editFileTool.js';
+import { InternalFetchWebPageToolId } from '../../contrib/chat/common/tools/builtinTools/tools.js';
 import { SearchExtensionsToolId } from '../../contrib/extensions/common/searchExtensionsTool.js';
 import { isProposedApiEnabled, checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';

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

@@ -13,7 +13,7 @@ import { ExtensionIdentifierMap, ExtensionIdentifier, ExtensionIdentifierSet } f
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
 import { Progress } from '../../../platform/progress/common/progress.js';
-import { DEFAULT_MODEL_PICKER_CATEGORY } from '../../contrib/chat/common/modelPicker/modelPickerWidget.js';
+import { DEFAULT_MODEL_PICKER_CATEGORY } from '../../contrib/chat/common/widget/input/modelPickerWidget.js';
 import { INTERNAL_AUTH_PROVIDER_PREFIX } from '../../services/authentication/common/authentication.js';
 import { isProposedApiEnabled, checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
@@ -392,7 +392,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         }
         try {
             const detail = justification
-                ? ( localize(2672, "Justification: {1}", to.displayName, justification))
+                ? ( localize(2694, "Justification: {1}", to.displayName, justification))
                 : undefined;
             await this._extHostAuthentication.getSession(from, providerId, [], { forceNewSession: { detail } });
             this.$updateModelAccesslist([{ from: from.identifier, to: to.identifier, enabled: true }]);

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

@@ -8,7 +8,7 @@ import { IExtHostInitDataService } from './extHostInitDataService.js';
 let ExtHostLogService = class ExtHostLogService extends LogService {
     constructor(isWorker, loggerService, initData) {
         const id = initData.remote.isRemote ? 'remoteexthost' : isWorker ? 'workerexthost' : 'exthost';
-        const name = initData.remote.isRemote ? ( localize(2673, "Extension Host (Remote)")) : isWorker ? ( localize(2674, "Extension Host (Worker)")) : ( localize(2675, "Extension Host"));
+        const name = initData.remote.isRemote ? ( localize(2695, "Extension Host (Remote)")) : isWorker ? ( localize(2696, "Extension Host (Worker)")) : ( localize(2697, "Extension Host"));
         super(loggerService.createLogger(id, { name }));
     }
 };

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

@@ -6,7 +6,7 @@ import { IExtensionDescription } from "../../../platform/extensions/common/exten
 import { LogLevel } from "../../../platform/log/common/log.js";
 import { ILogService } from "../../../platform/log/common/log.service.js";
 import { McpServerLaunch, McpServerTransportHTTP } from "../../contrib/mcp/common/mcpTypes.js";
-import { ExtHostMcpShape, IStartMcpOptions, MainThreadMcpShape } from "./extHost.protocol.js";
+import { ExtHostMcpShape, IMcpAuthSetupTelemetry, IStartMcpOptions, MainThreadMcpShape } from "./extHost.protocol.js";
 import { IExtHostInitDataService } from "./extHostInitDataService.js";
 import { IExtHostRpcService } from "./extHostRpcService.js";
 import { IExtHostVariableResolverProvider } from "./extHostVariableResolverService.js";
@@ -131,6 +131,8 @@ export interface IAuthMetadata {
     readonly serverMetadata: IAuthorizationServerMetadata;
     readonly resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined;
     readonly scopes: string[] | undefined;
+    /** Telemetry data about how auth metadata was discovered */
+    readonly telemetry: IMcpAuthSetupTelemetry;
     /**
      * Updates the scopes based on the WWW-Authenticate header in the response.
      * @param response The HTTP response containing potential scope challenges
@@ -146,9 +148,10 @@ declare class AuthMetadata implements IAuthMetadata {
     readonly authorizationServer: URI;
     readonly serverMetadata: IAuthorizationServerMetadata;
     readonly resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined;
+    readonly telemetry: IMcpAuthSetupTelemetry;
     private readonly _log;
     private _scopes;
-    constructor(authorizationServer: URI, serverMetadata: IAuthorizationServerMetadata, resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined, scopes: string[] | undefined, _log: AuthMetadataLogger);
+    constructor(authorizationServer: URI, serverMetadata: IAuthorizationServerMetadata, resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined, scopes: string[] | undefined, telemetry: IMcpAuthSetupTelemetry, _log: AuthMetadataLogger);
     get scopes(): string[] | undefined;
     update(response: CommonResponse): boolean;
     private _parseScopesFromResponse;

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

@@ -18,7 +18,7 @@ import { StorageScope } from '../../../platform/storage/common/storage.js';
 import { McpServerLaunch, McpServerTransportType, extensionPrefixedIdentifier, McpServerStaticToolAvailability, McpConnectionState, UserInteractionRequiredError } from '../../contrib/mcp/common/mcpTypes.js';
 import { MCP } from '../../contrib/mcp/common/modelContextProtocol.js';
 import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
-import { MainContext } from './extHost.protocol.js';
+import { MainContext, McpAuthResourceMetadataSource, McpAuthServerMetadataSource } from './extHost.protocol.js';
 import { IExtHostInitDataService } from './extHostInitDataService.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { McpServerDefinition } from './extHostTypeConverters.js';
@@ -249,7 +249,13 @@ class McpHTTPHandle extends Disposable {
             ...Object.fromEntries(this._launch.headers),
             'Mcp-Session-Id': sessionId,
         };
-        await this._addAuthHeader(headers);
+        try {
+            await this._addAuthHeader(headers, { errorOnUserInteraction: true });
+        }
+        catch (e) {
+            this._log(LogLevel.Debug, `Skipping session close: authentication no longer available`);
+            return;
+        }
         await this._fetch(( this._launch.uri.toString(true)), {
             method: 'DELETE',
             headers,
@@ -488,7 +494,8 @@ class McpHTTPHandle extends Disposable {
             }
         } while (!chunk.done);
     }
-    async _addAuthHeader(headers, forceNewRegistration) {
+    async _addAuthHeader(headers, options) {
+        const errorOnUserInteraction = options?.errorOnUserInteraction ?? this._errorOnUserInteraction;
         if (this._authMetadata) {
             try {
                 const authDetails = {
@@ -498,8 +505,8 @@ class McpHTTPHandle extends Disposable {
                     scopes: this._authMetadata.scopes
                 };
                 const token = await this._proxy.$getTokenFromServerMetadata(this._id, authDetails, {
-                    errorOnUserInteraction: this._errorOnUserInteraction,
-                    forceNewRegistration
+                    errorOnUserInteraction,
+                    forceNewRegistration: options?.forceNewRegistration
                 });
                 if (token) {
                     headers['Authorization'] = `Bearer ${token}`;
@@ -517,8 +524,8 @@ class McpHTTPHandle extends Disposable {
             try {
                 this._log(LogLevel.Debug, `Using provided authentication config: providerId=${this._launch.authentication.providerId}, scopes=${this._launch.authentication.scopes.join(', ')}`);
                 const token = await this._proxy.$getTokenForProviderId(this._id, this._launch.authentication.providerId, this._launch.authentication.scopes, {
-                    errorOnUserInteraction: this._errorOnUserInteraction,
-                    forceNewRegistration
+                    errorOnUserInteraction,
+                    forceNewRegistration: options?.forceNewRegistration
                 });
                 if (token) {
                     headers['Authorization'] = `Bearer ${token}`;
@@ -558,6 +565,7 @@ class McpHTTPHandle extends Disposable {
                     fetch: (url, init) => this._fetch(url, init),
                     log: (level, message) => this._log(level, message)
                 });
+                this._proxy.$logMcpAuthSetup(this._authMetadata.telemetry);
                 await this._addAuthHeader(headers);
                 if (headers['Authorization']) {
                     init.headers = headers;
@@ -576,8 +584,8 @@ class McpHTTPHandle extends Disposable {
         }
         if (headers['Authorization'] && isAuthStatusCode(res.status)) {
             const errorText = await this._getErrText(res);
-            this._log(LogLevel.Debug, `Received ${res.status} status with Authorization header, retrying with new auth registration. Error details: ${errorText || 'no additional details'}`);
-            await this._addAuthHeader(headers, true);
+            this._log(LogLevel.Info, `Received ${res.status} status with Authorization header, retrying with new auth registration. Error details: ${errorText || 'no additional details'}`);
+            await this._addAuthHeader(headers, { forceNewRegistration: true });
             res = await doFetch();
         }
         return res;
@@ -644,10 +652,11 @@ function isAuthStatusCode(status) {
     return status === 401 || status === 403;
 }
 class AuthMetadata {
-    constructor(authorizationServer, serverMetadata, resourceMetadata, scopes, _log) {
+    constructor(authorizationServer, serverMetadata, resourceMetadata, scopes, telemetry, _log) {
         this.authorizationServer = authorizationServer;
         this.serverMetadata = serverMetadata;
         this.resourceMetadata = resourceMetadata;
+        this.telemetry = telemetry;
         this._log = _log;
         this._scopes = scopes;
     }
@@ -657,7 +666,7 @@ class AuthMetadata {
     update(response) {
         const scopesChallenge = this._parseScopesFromResponse(response);
         if (!scopesMatch(scopesChallenge, this._scopes)) {
-            this._log(LogLevel.Debug, `Scopes changed from ${JSON.stringify(this._scopes)} to ${JSON.stringify(scopesChallenge)}, updating`);
+            this._log(LogLevel.Info, `Scopes changed from ${JSON.stringify(this._scopes)} to ${JSON.stringify(scopesChallenge)}, updating`);
             this._scopes = scopesChallenge;
             return true;
         }
@@ -673,7 +682,7 @@ class AuthMetadata {
             if (challenge.scheme === 'Bearer' && challenge.params['scope']) {
                 const scopes = challenge.params['scope'].split(AUTH_SCOPE_SEPARATOR).filter(s => s.trim().length);
                 if (scopes.length) {
-                    this._log(LogLevel.Debug, `Found scope challenge in WWW-Authenticate header: ${challenge.params['scope']}`);
+                    this._log(LogLevel.Info, `Found scope challenge in WWW-Authenticate header: ${challenge.params['scope']}`);
                     return scopes;
                 }
             }
@@ -683,22 +692,35 @@ class AuthMetadata {
 }
 async function createAuthMetadata(mcpUrl, originalResponse, options) {
     const { launchHeaders, fetch, log } = options;
+    let resourceMetadataSource = McpAuthResourceMetadataSource.None;
+    let serverMetadataSource;
     const { resourceMetadataChallenge, scopesChallenge: scopesChallengeFromHeader } = parseWWWAuthenticateHeaderForChallenges(originalResponse, log);
     let serverMetadataUrl;
     let resource;
     let scopesChallenge = scopesChallengeFromHeader;
     try {
-        const resourceMetadata = await fetchResourceMetadata(mcpUrl, resourceMetadataChallenge, {
+        const { metadata, discoveryUrl, errors } = await fetchResourceMetadata(mcpUrl, resourceMetadataChallenge, {
             sameOriginHeaders: {
                 ...Object.fromEntries(launchHeaders),
                 'MCP-Protocol-Version': MCP.LATEST_PROTOCOL_VERSION
             },
             fetch: (url, init) => fetch(url, init)
         });
-        serverMetadataUrl = resourceMetadata.authorization_servers?.[0];
-        log(LogLevel.Debug, `Using auth server metadata url: ${serverMetadataUrl}`);
-        scopesChallenge ??= resourceMetadata.scopes_supported;
-        resource = resourceMetadata;
+        for (const err of errors) {
+            log(LogLevel.Warning, `Error fetching resource metadata: ${err}`);
+        }
+        log(LogLevel.Info, `Discovered resource metadata at ${discoveryUrl}`);
+        resourceMetadataSource = resourceMetadataChallenge ? McpAuthResourceMetadataSource.Header : McpAuthResourceMetadataSource.WellKnown;
+        serverMetadataUrl = metadata.authorization_servers?.[0];
+        if (!serverMetadataUrl) {
+            log(LogLevel.Warning, `No authorization_servers found in resource metadata ${discoveryUrl} - Is this resource metadata configured correctly?`);
+        }
+        else {
+            log(LogLevel.Info, `Using auth server metadata url: ${serverMetadataUrl}`);
+            serverMetadataSource = McpAuthServerMetadataSource.ResourceMetadata;
+        }
+        scopesChallenge ??= metadata.scopes_supported;
+        resource = metadata;
     }
     catch (e) {
         log(LogLevel.Warning, `Could not fetch resource metadata: ${String(e)}`);
@@ -714,19 +736,23 @@ async function createAuthMetadata(mcpUrl, originalResponse, options) {
     }
     try {
         log(LogLevel.Debug, `Fetching auth server metadata for: ${serverMetadataUrl} ...`);
-        const serverMetadataResponse = await fetchAuthorizationServerMetadata(serverMetadataUrl, {
+        const { metadata, discoveryUrl, errors } = await fetchAuthorizationServerMetadata(serverMetadataUrl, {
             additionalHeaders,
             fetch: (url, init) => fetch(url, init)
         });
-        log(LogLevel.Info, 'Populated auth metadata');
-        return ( new AuthMetadata(( URI.parse(serverMetadataUrl)), serverMetadataResponse, resource, scopesChallenge, log));
+        for (const err of errors) {
+            log(LogLevel.Warning, `Error fetching authorization server metadata: ${err}`);
+        }
+        log(LogLevel.Info, `Discovered authorization server metadata at ${discoveryUrl}`);
+        serverMetadataSource ??= McpAuthServerMetadataSource.WellKnown;
+        return ( new AuthMetadata(( URI.parse(serverMetadataUrl)), metadata, resource, scopesChallenge, { resourceMetadataSource, serverMetadataSource }, log));
     }
     catch (e) {
         log(LogLevel.Warning, `Error populating auth server metadata for ${serverMetadataUrl}: ${String(e)}`);
     }
     const defaultMetadata = getDefaultMetadataForUrl(( new URL(baseUrl)));
     log(LogLevel.Info, 'Using default auth metadata');
-    return ( new AuthMetadata(( URI.parse(baseUrl)), defaultMetadata, resource, scopesChallenge, log));
+    return ( new AuthMetadata(( URI.parse(baseUrl)), defaultMetadata, resource, scopesChallenge, { resourceMetadataSource, serverMetadataSource: McpAuthServerMetadataSource.Default }, log));
 }
 function parseWWWAuthenticateHeaderForChallenges(response, log) {
     let resourceMetadataChallenge;

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

@@ -265,7 +265,7 @@ class ExtHostNotebookController {
                 ));
             }
             if (!this._extHostFileSystem.value.isWritableFileSystem(uri.scheme)) {
-                throw new FileOperationError(( localize(2676, "Unable to modify read-only file '{0}'", this._resourceForError(uri))), FileOperationResult.FILE_PERMISSION_DENIED);
+                throw new FileOperationError(( localize(2698, "Unable to modify read-only file '{0}'", this._resourceForError(uri))), FileOperationResult.FILE_PERMISSION_DENIED);
             }
             const data = {
                 metadata: filter(document.apiNotebook.metadata, key => !(serializer.options?.transientDocumentMetadata ?? {})[key]),
@@ -299,8 +299,8 @@ class ExtHostNotebookController {
                 size: stat.size,
                 readonly: Boolean((stat.permissions ?? 0) & FilePermission.Readonly) || !this._extHostFileSystem.value.isWritableFileSystem(uri.scheme),
                 locked: Boolean((stat.permissions ?? 0) & FilePermission.Locked),
-                etag: etag({ mtime: stat.mtime, size: stat.size }),
-                children: undefined
+                executable: Boolean((stat.permissions ?? 0) & FilePermission.Executable),
+                etag: etag({ mtime: stat.mtime, size: stat.size })
             };
             this.trace(`exit saveNotebook(versionId: ${versionId}, ${( uri.toString())})`);
             return fileStats;
@@ -444,7 +444,7 @@ class ExtHostNotebookController {
         if (typeof options?.mtime === 'number' && typeof options.etag === 'string' && options.etag !== ETAG_DISABLED &&
             typeof stat.mtime === 'number' && typeof stat.size === 'number' &&
             options.mtime < stat.mtime && options.etag !== etag({ mtime: options.mtime , size: stat.size })) {
-            throw new FileOperationError(( localize(2677, "File Modified Since")), FileOperationResult.FILE_MODIFIED_SINCE, options);
+            throw new FileOperationError(( localize(2699, "File Modified Since")), FileOperationResult.FILE_MODIFIED_SINCE, options);
         }
         return;
     }

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

@@ -17,7 +17,8 @@ export declare class ExtHostOutputService implements ExtHostOutputServiceShape {
     private readonly proxy;
     private readonly outputsLocation;
     private outputDirectoryPromise;
-    private readonly extensionLogDirectoryPromise;
+    private readonly extensionLogDirectoryCreationPromise;
+    private readonly logOutputChannels;
     private namePool;
     private readonly channels;
     private visibleChannelId;

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

@@ -4,7 +4,7 @@ import { MainContext } from './extHost.protocol.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
-import { AbstractMessageLogger, log, parseLogLevel } from '../../../platform/log/common/log.js';
+import { AbstractMessageLogger, log } from '../../../platform/log/common/log.js';
 import { ILoggerService, ILogService } from '../../../platform/log/common/log.service.js';
 import { OutputChannelUpdateMode } from '../../services/output/common/output.js';
 import { IExtHostConsumerFileSystem } from './extHostFileSystemConsumer.js';
@@ -16,6 +16,7 @@ import { isString } from '../../../base/common/types.js';
 import { toFileSystemProviderErrorCode, FileSystemProviderErrorCode } from '../../../platform/files/common/files.js';
 import { Emitter } from '../../../base/common/event.js';
 import { toDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../base/common/map.js';
 
 class ExtHostOutputChannel extends AbstractMessageLogger {
     constructor(id, name, logger, proxy, extension) {
@@ -81,7 +82,8 @@ let ExtHostOutputService = class ExtHostOutputService {
         this.extHostFileSystemInfo = extHostFileSystemInfo;
         this.loggerService = loggerService;
         this.logService = logService;
-        this.extensionLogDirectoryPromise = ( new Map());
+        this.extensionLogDirectoryCreationPromise = ( new ResourceMap());
+        this.logOutputChannels = ( new ResourceMap());
         this.namePool = 1;
         this.channels = ( new Map());
         this.visibleChannelId = null;
@@ -104,23 +106,39 @@ let ExtHostOutputService = class ExtHostOutputService {
         if (isString(languageId) && !languageId.trim()) {
             throw ( new Error('illegal argument `languageId`. must not be empty'));
         }
-        let logLevel;
-        const logLevelValue = this.initData.environment.extensionLogLevel?.find(([identifier]) => ExtensionIdentifier.equals(extension.identifier, identifier))?.[1];
-        if (logLevelValue) {
-            logLevel = parseLogLevel(logLevelValue);
-        }
         const channelDisposables = ( new DisposableStore());
-        const extHostOutputChannel = log
-            ? this.doCreateLogOutputChannel(name, logLevel, extension, channelDisposables)
-            : this.doCreateOutputChannel(name, languageId, extension, channelDisposables);
-        extHostOutputChannel.then(channel => {
+        let extHostOutputChannelPromise;
+        let logLevel = this.initData.environment.extensionLogLevel?.find(([identifier]) => ExtensionIdentifier.equals(extension.identifier, identifier))?.[1];
+        let logFile;
+        if (log) {
+            const extensionLogDirectory = this.extHostFileSystemInfo.extUri.joinPath(this.initData.logsLocation, extension.identifier.value);
+            logFile = this.extHostFileSystemInfo.extUri.joinPath(extensionLogDirectory, `${name.replace(/[\\/:\*\?"<>\|]/g, '')}.log`);
+            const existingOutputChannel = this.logOutputChannels.get(logFile);
+            if (existingOutputChannel) {
+                return existingOutputChannel;
+            }
+            logLevel = this.loggerService.getLogLevel(logFile) ?? logLevel;
+            extHostOutputChannelPromise = this.doCreateLogOutputChannel(name, logFile, logLevel, extension, channelDisposables);
+        }
+        else {
+            extHostOutputChannelPromise = this.doCreateOutputChannel(name, languageId, extension, channelDisposables);
+        }
+        extHostOutputChannelPromise.then(channel => {
             this.channels.set(channel.id, channel);
             channel.visible = channel.id === this.visibleChannelId;
-            channelDisposables.add(toDisposable(() => this.channels.delete(channel.id)));
+            channelDisposables.add(toDisposable(() => {
+                this.channels.delete(channel.id);
+                if (logFile) {
+                    this.logOutputChannels.delete(logFile);
+                }
+            }));
         });
-        return log
-            ? this.createExtHostLogOutputChannel(name, logLevel ?? this.logService.getLevel(), extHostOutputChannel, channelDisposables)
-            : this.createExtHostOutputChannel(name, extHostOutputChannel, channelDisposables);
+        if (logFile) {
+            const logOutputChannel = this.createExtHostLogOutputChannel(name, logLevel ?? this.logService.getLevel(), extHostOutputChannelPromise, channelDisposables);
+            this.logOutputChannels.set(logFile, logOutputChannel);
+            return logOutputChannel;
+        }
+        return this.createExtHostOutputChannel(name, extHostOutputChannelPromise, channelDisposables);
     }
     async doCreateOutputChannel(name, languageId, extension, channelDisposables) {
         if (!this.outputDirectoryPromise) {
@@ -133,20 +151,18 @@ let ExtHostOutputService = class ExtHostOutputService {
         channelDisposables.add(toDisposable(() => this.loggerService.deregisterLogger(file)));
         return ( new ExtHostOutputChannel(id, name, logger, this.proxy, extension));
     }
-    async doCreateLogOutputChannel(name, logLevel, extension, channelDisposables) {
-        const extensionLogDir = await this.createExtensionLogDirectory(extension);
-        const fileName = name.replace(/[\\/:\*\?"<>\|]/g, '');
-        const file = this.extHostFileSystemInfo.extUri.joinPath(extensionLogDir, `${fileName}.log`);
-        const id = `${extension.identifier.value}.${fileName}`;
+    async doCreateLogOutputChannel(name, file, logLevel, extension, channelDisposables) {
+        await this.createExtensionLogDirectory(file);
+        const id = `${extension.identifier.value}.${this.extHostFileSystemInfo.extUri.basename(file)}`;
         const logger = channelDisposables.add(this.loggerService.createLogger(file, { id, name, logLevel, extensionId: extension.identifier.value }));
         channelDisposables.add(toDisposable(() => this.loggerService.deregisterLogger(file)));
         return ( new ExtHostLogOutputChannel(id, name, logger, this.proxy, extension));
     }
-    createExtensionLogDirectory(extension) {
-        let extensionLogDirectoryPromise = this.extensionLogDirectoryPromise.get(extension.identifier.value);
+    createExtensionLogDirectory(file) {
+        const extensionLogDirectory = this.extHostFileSystemInfo.extUri.dirname(file);
+        let extensionLogDirectoryPromise = this.extensionLogDirectoryCreationPromise.get(extensionLogDirectory);
         if (!extensionLogDirectoryPromise) {
-            const extensionLogDirectory = this.extHostFileSystemInfo.extUri.joinPath(this.initData.logsLocation, extension.identifier.value);
-            this.extensionLogDirectoryPromise.set(extension.identifier.value, extensionLogDirectoryPromise = (async () => {
+            this.extensionLogDirectoryCreationPromise.set(extensionLogDirectory, extensionLogDirectoryPromise = (async () => {
                 try {
                     await this.extHostFileSystem.value.createDirectory(extensionLogDirectory);
                 }
@@ -155,7 +171,6 @@ let ExtHostOutputService = class ExtHostOutputService {
                         throw err;
                     }
                 }
-                return extensionLogDirectory;
             })());
         }
         return extensionLogDirectoryPromise;