@codingame/monaco-vscode-extensions-service-override 17.2.1 → 18.0.1

package/vscode/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.js

@@ -14,7 +14,7 @@ class ExtHostEditSessionIdentityCreateParticipant {
     }
     async participate(workspaceFolder, token) {
         const p = ( new Promise((resolve, reject) => {
-            setTimeout(() => reject(( new Error(( localize(2395, "Aborted onWillCreateEditSessionIdentity-event after 10000ms"))))), this.timeout);
+            setTimeout(() => reject(( new Error(( localize(2407, "Aborted onWillCreateEditSessionIdentity-event after 10000ms"))))), this.timeout);
             this._proxy.$onWillCreateEditSessionIdentity(workspaceFolder.uri, token, this.timeout).then(resolve, reject);
         }));
         return raceCancellationError(p, token);

package/vscode/src/vs/workbench/api/browser/mainThreadEditorTabs.js

@@ -11,15 +11,15 @@ import { EditorResourceAccessor, SideBySideEditor, GroupModelChangeKind } from '
 import { DiffEditorInput } from '@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common/vscode/vs/workbench/common/editor/diffEditorInput';
 import { isGroupEditorMoveEvent } from '@codingame/monaco-vscode-c3c61c00-c254-5856-9dc9-d7929c1f9062-common/vscode/vs/workbench/common/editor/editorGroupModel';
 import { SideBySideEditorInput } from '@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common/vscode/vs/workbench/common/editor/sideBySideEditorInput';
-import { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/common/editor/textResourceEditorInput';
-import { ChatEditorInput } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-4ee27008-17b4-593f-9c09-19e8e3077f51-common/vscode/vs/workbench/common/editor/textResourceEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { CustomEditorInput } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
 import { InteractiveEditorInput } from '@codingame/monaco-vscode-eba0b9b3-174c-5dae-9867-a37810ca1808-common/vscode/vs/workbench/contrib/interactive/browser/interactiveEditorInput';
 import { MergeEditorInput } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
 import { MultiDiffEditorInput } from '@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
-import { NotebookEditorInput } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { TerminalEditorInput } from '@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/terminal/browser/terminalEditorInput';
-import { WebviewInput } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
+import { NotebookEditorInput } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { TerminalEditorInput } from '@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/vscode/vs/workbench/contrib/terminal/browser/terminalEditorInput';
+import { WebviewInput } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
 import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { GroupDirection, preferredSideBySideGroupDirection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';

package/vscode/src/vs/workbench/api/browser/mainThreadEditors.js

@@ -21,9 +21,10 @@ import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { isITextModel } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
 import { equals as equals$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
-import { constObservable, observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
-import { derived, derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
+import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
+import { derived, derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 
 var MainThreadTextEditors_1;
 let MainThreadTextEditors = class MainThreadTextEditors {

package/vscode/src/vs/workbench/api/browser/mainThreadExtensionService.js

@@ -89,13 +89,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    2396,
+                    2408,
                     "Cannot activate the '{0}' extension because it depends on the '{1}' extension, which is not loaded. Would you like to reload the window to load the extension?",
                     extName,
                     missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
                 )),
                 actions: {
-                    primary: [( new Action('reload', ( localize(2397, "Reload Window")), '', true, () => this._hostService.reload()))]
+                    primary: [( new Action('reload', ( localize(2409, "Reload Window")), '', true, () => this._hostService.reload()))]
                 }
             });
         }
@@ -105,7 +105,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2398,
+                        2410,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in the current workspace",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -116,13 +116,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2399,
+                        2411,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in Restricted Mode",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
                     )),
                     actions: {
-                        primary: [( new Action('manageWorkspaceTrust', ( localize(2400, "Manage Workspace Trust")), '', true, () => this._commandService.executeCommand('workbench.trust.manage')))]
+                        primary: [( new Action('manageWorkspaceTrust', ( localize(2412, "Manage Workspace Trust")), '', true, () => this._commandService.executeCommand('workbench.trust.manage')))]
                     }
                 });
             }
@@ -130,13 +130,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2401,
+                        2413,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled. Would you like to enable the extension and reload the window?",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
                     )),
                     actions: {
-                        primary: [( new Action('enable', ( localize(2402, "Enable and Reload")), '', true, () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === EnablementState.DisabledGlobally ? EnablementState.EnabledGlobally : EnablementState.EnabledWorkspace)
+                        primary: [( new Action('enable', ( localize(2414, "Enable and Reload")), '', true, () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === EnablementState.DisabledGlobally ? EnablementState.EnabledGlobally : EnablementState.EnabledWorkspace)
                                 .then(() => this._hostService.reload(), e => this._notificationService.error(e))))]
                     }
                 });
@@ -145,7 +145,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2403,
+                        2415,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled.",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -166,21 +166,21 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    2404,
+                    2416,
                     "Cannot activate the '{0}' extension because it depends on the '{1}' extension from '{2}', which is not installed. Would you like to install the extension and reload the window?",
                     extName,
                     dependencyExtension.displayName,
                     dependencyExtension.publisherDisplayName
                 )),
                 actions: {
-                    primary: [( new Action('install', ( localize(2405, "Install and Reload")), '', true, () => this._extensionsWorkbenchService.install(dependencyExtension)
+                    primary: [( new Action('install', ( localize(2417, "Install and Reload")), '', true, () => this._extensionsWorkbenchService.install(dependencyExtension)
                             .then(() => this._hostService.reload(), e => this._notificationService.error(e))))]
                 }
             });
         }
         else {
             this._notificationService.error(( localize(
-                2406,
+                2418,
                 "Cannot activate the '{0}' extension because it depends on an unknown '{1}' extension.",
                 extName,
                 missingDependency

package/vscode/src/vs/workbench/api/browser/mainThreadFileSystemEventService.js

@@ -75,28 +75,28 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     if (data.extensionNames.length === 1) {
                         if (operation === FileOperation.CREATE) {
                             message = ( localize(
-                                2407,
+                                2419,
                                 "Extension '{0}' wants to make refactoring changes with this file creation",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2408,
+                                2420,
                                 "Extension '{0}' wants to make refactoring changes with this file copy",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2409,
+                                2421,
                                 "Extension '{0}' wants to make refactoring changes with this file move",
                                 data.extensionNames[0]
                             ));
                         }
                         else  {
                             message = ( localize(
-                                2410,
+                                2422,
                                 "Extension '{0}' wants to make refactoring changes with this file deletion",
                                 data.extensionNames[0]
                             ));
@@ -105,28 +105,28 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     else {
                         if (operation === FileOperation.CREATE) {
                             message = ( localize(
-                                2411,
+                                2423,
                                 "{0} extensions want to make refactoring changes with this file creation",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2412,
+                                2424,
                                 "{0} extensions want to make refactoring changes with this file copy",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2413,
+                                2425,
                                 "{0} extensions want to make refactoring changes with this file move",
                                 data.extensionNames.length
                             ));
                         }
                         else  {
                             message = ( localize(
-                                2414,
+                                2426,
                                 "{0} extensions want to make refactoring changes with this file deletion",
                                 data.extensionNames.length
                             ));
@@ -136,8 +136,8 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                         const { confirmed } = await dialogService.confirm({
                             type: Severity.Info,
                             message,
-                            primaryButton: ( localize(2415, "Show &&Preview")),
-                            cancelButton: ( localize(2416, "Skip Changes"))
+                            primaryButton: ( localize(2427, "Show &&Preview")),
+                            cancelButton: ( localize(2428, "Skip Changes"))
                         });
                         showPreview = true;
                         if (!confirmed) {
@@ -156,19 +156,19 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                             message,
                             buttons: [
                                 {
-                                    label: ( localize(2417, "&&OK")),
+                                    label: ( localize(2429, "&&OK")),
                                     run: () => Choice.OK
                                 },
                                 {
-                                    label: ( localize(2415, "Show &&Preview")),
+                                    label: ( localize(2427, "Show &&Preview")),
                                     run: () => Choice.Preview
                                 }
                             ],
                             cancelButton: {
-                                label: ( localize(2416, "Skip Changes")),
+                                label: ( localize(2428, "Skip Changes")),
                                 run: () => Choice.Cancel
                             },
-                            checkbox: { label: ( localize(2418, "Do not ask me again")) }
+                            checkbox: { label: ( localize(2430, "Do not ask me again")) }
                         });
                         if (result === Choice.Cancel) {
                             return;
@@ -185,15 +185,15 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
             _progressLabel(operation) {
                 switch (operation) {
                     case FileOperation.CREATE:
-                        return localize(2419, "Running 'File Create' participants...");
+                        return localize(2431, "Running 'File Create' participants...");
                     case FileOperation.MOVE:
-                        return localize(2420, "Running 'File Rename' participants...");
+                        return localize(2432, "Running 'File Rename' participants...");
                     case FileOperation.COPY:
-                        return localize(2421, "Running 'File Copy' participants...");
+                        return localize(2433, "Running 'File Copy' participants...");
                     case FileOperation.DELETE:
-                        return localize(2422, "Running 'File Delete' participants...");
+                        return localize(2434, "Running 'File Delete' participants...");
                     case FileOperation.WRITE:
-                        return localize(2423, "Running 'File Write' participants...");
+                        return localize(2435, "Running 'File Write' participants...");
                 }
             }
         });
@@ -264,7 +264,7 @@ registerAction2(class ResetMemento extends Action2 {
         super({
             id: 'files.participants.resetChoice',
             title: {
-                value: ( localize(2424, "Reset choice for 'File operation needs preview'")),
+                value: ( localize(2436, "Reset choice for 'File operation needs preview'")),
                 original: `Reset choice for 'File operation needs preview'`
             },
             f1: true

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageFeatures.js

@@ -19,7 +19,7 @@ import { reviveWorkspaceEditDto } from './mainThreadBulkEdits.js';
 import { DataTransfer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHostTypeConverters';
 import { DataTransferFileCache } from '../common/shared/dataTransferCache.js';
 import { CallHierarchyProviderRegistry } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
-import { WorkspaceSymbolProviderRegistry } from '@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/search/common/search';
+import { WorkspaceSymbolProviderRegistry } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/workbench/contrib/search/common/search';
 import { TypeHierarchyProviderRegistry } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext, ISuggestDataDtoField, ISuggestResultDtoField, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';

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

@@ -1,17 +1,18 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IToolData, IToolInvocation, IToolResult, IToolProgressStep } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { IToolInvocation, IToolProgressStep, IToolResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
 import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { Dto, SerializableObjectWithBuffers } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier";
-import { MainThreadLanguageModelToolsShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+import { IToolDataDto, MainThreadLanguageModelToolsShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 export declare class MainThreadLanguageModelTools extends Disposable implements MainThreadLanguageModelToolsShape {
     private readonly _languageModelToolsService;
     private readonly _proxy;
     private readonly _tools;
     private readonly _runningToolCalls;
     constructor(extHostContext: IExtHostContext, _languageModelToolsService: ILanguageModelToolsService);
-    $getTools(): Promise<IToolData[]>;
+    private getToolDtos;
+    $getTools(): Promise<IToolDataDto[]>;
     $invokeTool(dto: IToolInvocation, token?: CancellationToken): Promise<Dto<IToolResult> | SerializableObjectWithBuffers<Dto<IToolResult>>>;
     $acceptToolProgress(callId: string, progress: IToolProgressStep): void;
     $countTokensForInvocation(callId: string, input: string, token: CancellationToken): Promise<number>;

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModelTools.js

@@ -16,10 +16,22 @@ let MainThreadLanguageModelTools = class MainThreadLanguageModelTools extends Di
         this._tools = this._register(( new DisposableMap()));
         this._runningToolCalls = ( new Map());
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostLanguageModelTools));
-        this._register(this._languageModelToolsService.onDidChangeTools(e => this._proxy.$onDidChangeTools([...this._languageModelToolsService.getTools()])));
+        this._register(this._languageModelToolsService.onDidChangeTools(e => this._proxy.$onDidChangeTools(this.getToolDtos())));
+    }
+    getToolDtos() {
+        return ( Array.from(this._languageModelToolsService.getTools())
+            .map(tool => ({
+            id: tool.id,
+            displayName: tool.displayName,
+            toolReferenceName: tool.toolReferenceName,
+            tags: tool.tags,
+            userDescription: tool.userDescription,
+            modelDescription: tool.modelDescription,
+            inputSchema: tool.inputSchema,
+        })));
     }
     async $getTools() {
-        return Array.from(this._languageModelToolsService.getTools());
+        return this.getToolDtos();
     }
     async $invokeTool(dto, token) {
         const result = await this._languageModelToolsService.invokeTool(dto, (input, token) => this._proxy.$countTokensForInvocation(dto.callId, input, token), token ?? CancellationToken.None);

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

@@ -29,7 +29,7 @@ export declare class MainThreadLanguageModels implements MainThreadLanguageModel
     constructor(extHostContext: IExtHostContext, _chatProviderService: ILanguageModelsService, _languageModelStatsService: ILanguageModelStatsService, _logService: ILogService, _authenticationService: IAuthenticationService, _authenticationAccessService: IAuthenticationAccessService, _extensionService: IExtensionService, _ignoredFilesService: ILanguageModelIgnoredFilesService);
     dispose(): void;
     $registerLanguageModelProvider(handle: number, identifier: string, metadata: ILanguageModelChatMetadata): void;
-    $reportResponsePart(requestId: number, chunk: IChatResponseFragment): Promise<void>;
+    $reportResponsePart(requestId: number, chunk: IChatResponseFragment | IChatResponseFragment[]): Promise<void>;
     $reportResponseDone(requestId: number, err: SerializedError | undefined): Promise<void>;
     $unregisterProvider(handle: number): void;
     $selectChatModels(selector: ILanguageModelChatSelector): Promise<string[]>;

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js

@@ -9,7 +9,7 @@ import { DisposableStore, DisposableMap, Disposable, toDisposable } from '@codin
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { resizeImage } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { resizeImage } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
 import { ILanguageModelIgnoredFilesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/ignoredFiles.service';
 import { ILanguageModelStatsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelStats.service';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
@@ -152,7 +152,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         if (this._authenticationService.getProviderIds().includes(authProviderId)) {
             return Disposable.None;
         }
-        const accountLabel = auth.accountLabel ?? ( localize(2425, 'Language Models'));
+        const accountLabel = auth.accountLabel ?? ( localize(2437, 'Language Models'));
         const disposables = ( new DisposableStore());
         this._authenticationService.registerAuthenticationProvider(authProviderId, ( new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel)));
         disposables.add(toDisposable(() => {

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

@@ -1,21 +1,37 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+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 { 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 { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { MainThreadMcpShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+import { IAuthorizationProtectedResourceMetadata, IAuthorizationServerMetadata } from "@codingame/monaco-vscode-api/vscode/vs/base/common/oauth";
 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 _serverIdCounter;
     private readonly _servers;
+    private readonly _serverDefinitions;
     private readonly _proxy;
     private readonly _collectionDefinitions;
-    constructor(_extHostContext: IExtHostContext, _mcpRegistry: IMcpRegistry);
+    constructor(_extHostContext: IExtHostContext, _mcpRegistry: IMcpRegistry, dialogService: IDialogService, _authenticationService: IAuthenticationService, authenticationMcpServersService: IAuthenticationMcpService, authenticationMCPServerAccessService: IAuthenticationMcpAccessService, authenticationMCPServerUsageService: IAuthenticationMcpUsageService);
     $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;
+    $getTokenFromServerMetadata(id: number, authServerComponents: UriComponents, serverMetadata: IAuthorizationServerMetadata, resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined): Promise<string | undefined>;
+    private continueWithIncorrectAccountPrompt;
+    private loginPrompt;
     dispose(): void;
 }

package/vscode/src/vs/workbench/api/browser/mainThreadMcp.js

@@ -1,24 +1,39 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { disposableTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+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 { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
 import { McpServerTransportType, McpServerDefinition, McpServerLaunch, McpConnectionState } 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 { ExtensionHostKind, extensionHostKindToString } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostKind';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
+import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
 let MainThreadMcp = class MainThreadMcp extends Disposable {
-    constructor(_extHostContext, _mcpRegistry) {
+    constructor(_extHostContext, _mcpRegistry, dialogService, _authenticationService, authenticationMcpServersService, authenticationMCPServerAccessService, authenticationMCPServerUsageService) {
         super();
         this._extHostContext = _extHostContext;
         this._mcpRegistry = _mcpRegistry;
+        this.dialogService = dialogService;
+        this._authenticationService = _authenticationService;
+        this.authenticationMcpServersService = authenticationMcpServersService;
+        this.authenticationMCPServerAccessService = authenticationMCPServerAccessService;
+        this.authenticationMCPServerUsageService = authenticationMCPServerUsageService;
         this._serverIdCounter = 0;
         this._servers = ( new Map());
+        this._serverDefinitions = ( new Map());
         this._collectionDefinitions = this._register(( new DisposableMap()));
         const proxy = this._proxy = ( _extHostContext.getProxy(ExtHostContext.ExtHostMcp));
         this._register(this._mcpRegistry.registerDelegate({
@@ -35,7 +50,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
                 }
                 return true;
             },
-            start: (collection, _serverDefiniton, resolveLaunch) => {
+            start: (_collection, serverDefiniton, resolveLaunch) => {
                 const id = ++this._serverIdCounter;
                 const launch = ( new ExtHostMcpServerLaunch(
                     _extHostContext.extensionHostKind,
@@ -43,6 +58,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
                     msg => proxy.$sendMessage(id, JSON.stringify(msg))
                 ));
                 this._servers.set(id, launch);
+                this._serverDefinitions.set(id, serverDefiniton);
                 proxy.$startMcp(id, resolveLaunch);
                 return launch;
             },
@@ -84,6 +100,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         if (!McpConnectionState.isRunning(update)) {
             server.dispose();
             this._servers.delete(id);
+            this._serverDefinitions.delete(id);
         }
     }
     $onDidPublishLog(id, level, log) {
@@ -96,17 +113,137 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     $onDidReceiveMessage(id, message) {
         this._servers.get(id)?.pushMessage(message);
     }
+    async $getTokenFromServerMetadata(id, authServerComponents, serverMetadata, resourceMetadata) {
+        const server = this._serverDefinitions.get(id);
+        if (!server) {
+            return undefined;
+        }
+        const authorizationServer = URI.revive(authServerComponents);
+        const scopesSupported = resourceMetadata?.scopes_supported || serverMetadata.scopes_supported || [];
+        let providerId = await this._authenticationService.getOrActivateProviderIdForServer(authorizationServer);
+        if (!providerId) {
+            const provider = await this._authenticationService.createDynamicAuthenticationProvider(authorizationServer, serverMetadata, resourceMetadata);
+            if (!provider) {
+                return undefined;
+            }
+            providerId = provider.id;
+        }
+        const sessions = await this._authenticationService.getSessions(providerId, scopesSupported, { authorizationServer: authorizationServer }, true);
+        const accountNamePreference = this.authenticationMcpServersService.getAccountPreference(server.id, providerId);
+        let matchingAccountPreferenceSession;
+        if (accountNamePreference) {
+            matchingAccountPreferenceSession = sessions.find(session => session.account.label === accountNamePreference);
+        }
+        const provider = this._authenticationService.getProvider(providerId);
+        let session;
+        if (sessions.length) {
+            if (matchingAccountPreferenceSession && this.authenticationMCPServerAccessService.isAccessAllowed(providerId, matchingAccountPreferenceSession.account.label, server.id)) {
+                return matchingAccountPreferenceSession.accessToken;
+            }
+            if (!provider.supportsMultipleAccounts && this.authenticationMCPServerAccessService.isAccessAllowed(providerId, sessions[0].account.label, server.id)) {
+                return sessions[0].accessToken;
+            }
+        }
+        const isAllowed = await this.loginPrompt(server.label, provider.label, false);
+        if (!isAllowed) {
+            throw ( new Error('User did not consent to login.'));
+        }
+        if (sessions.length) {
+            session = provider.supportsMultipleAccounts
+                ? await this.authenticationMcpServersService.selectSession(providerId, server.id, server.label, scopesSupported, sessions)
+                : sessions[0];
+        }
+        else {
+            const accountToCreate = matchingAccountPreferenceSession?.account;
+            do {
+                session = await this._authenticationService.createSession(providerId, scopesSupported, {
+                    activateImmediate: true,
+                    account: accountToCreate,
+                    authorizationServer
+                });
+            } while (accountToCreate
+                && accountToCreate.label !== session.account.label
+                && !(await this.continueWithIncorrectAccountPrompt(session.account.label, accountToCreate.label)));
+        }
+        this.authenticationMCPServerAccessService.updateAllowedMcpServers(providerId, session.account.label, [{ id: server.id, name: server.label, allowed: true }]);
+        this.authenticationMcpServersService.updateAccountPreference(server.id, providerId, session.account);
+        this.authenticationMCPServerUsageService.addAccountUsage(providerId, session.account.label, scopesSupported, server.id, server.label);
+        return session.accessToken;
+    }
+    async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
+        const result = await this.dialogService.prompt({
+            message: ( localize(2438, "Incorrect account detected")),
+            detail: ( localize(
+                2439,
+                "The chosen account, {0}, does not match the requested account, {1}.",
+                chosenAccountLabel,
+                requestedAccountLabel
+            )),
+            type: Severity.Warning,
+            cancelButton: true,
+            buttons: [
+                {
+                    label: ( localize(2440, 'Keep {0}', chosenAccountLabel)),
+                    run: () => chosenAccountLabel
+                },
+                {
+                    label: ( localize(2441, 'Login with {0}', requestedAccountLabel)),
+                    run: () => requestedAccountLabel
+                }
+            ],
+        });
+        if (!result.result) {
+            throw ( new CancellationError());
+        }
+        return result.result === chosenAccountLabel;
+    }
+    async loginPrompt(mcpLabel, providerLabel, recreatingSession) {
+        const message = recreatingSession
+            ? ( localize(
+            2442,
+            "The MCP Server Definition '{0}' wants you to authenticate to {1}.",
+            mcpLabel,
+            providerLabel
+        ))
+            : ( localize(
+            2443,
+            "The MCP Server Definition '{0}' wants to authenticate to {1}.",
+            mcpLabel,
+            providerLabel
+        ));
+        const buttons = [
+            {
+                label: ( localize(2444, "&&Allow")),
+                run() {
+                    return true;
+                },
+            }
+        ];
+        const { result } = await this.dialogService.prompt({
+            type: Severity.Info,
+            message,
+            buttons,
+            cancelButton: true,
+        });
+        return result ?? false;
+    }
     dispose() {
         for (const server of ( this._servers.values())) {
             server.extHostDispose();
         }
         this._servers.clear();
+        this._serverDefinitions.clear();
         super.dispose();
     }
 };
 MainThreadMcp = __decorate([
     extHostNamedCustomer(MainContext.MainThreadMcp),
-    ( __param(1, IMcpRegistry))
+    ( __param(1, IMcpRegistry)),
+    ( __param(2, IDialogService)),
+    ( __param(3, IAuthenticationService)),
+    ( __param(4, IAuthenticationMcpService)),
+    ( __param(5, IAuthenticationMcpAccessService)),
+    ( __param(6, IAuthenticationMcpUsageService))
 ], MainThreadMcp);
 class ExtHostMcpServerLaunch extends Disposable {
     pushLog(level, message) {