@codingame/monaco-vscode-extensions-service-override 33.0.9 → 34.0.0

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

@@ -0,0 +1,22 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
+import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
+
+let MainThreadChatQuota = class MainThreadChatQuota extends Disposable {
+    constructor(extHostContext, _chatEntitlementService) {
+        super();
+        this._chatEntitlementService = _chatEntitlementService;
+    }
+    $updateQuotas(quotas) {
+        this._chatEntitlementService.acceptQuotas({
+            ...this._chatEntitlementService.quotas,
+            ...quotas
+        });
+    }
+};
+MainThreadChatQuota = __decorate([extHostNamedCustomer(MainContext.MainThreadChatQuota), ( __param(1, IChatEntitlementService))], MainThreadChatQuota);
+
+export { MainThreadChatQuota };

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

@@ -136,7 +136,7 @@ class ObservableChatSession extends Disposable {
                         return confirmInterrupt();
                     }
                     return this._dialogService.confirm({
-                        message: ( localize(2610, "Are you sure you want to interrupt the active session?"))
+                        message: ( localize(2662, "Are you sure you want to interrupt the active session?"))
                     }).then(confirmed => {
                         if (confirmed.confirmed) {
                             return confirmInterrupt();
@@ -468,6 +468,7 @@ class MainThreadChatSessionItem {
         this.tooltip = reviveMarkdownString(dto.tooltip);
         this.archived = dto.archived;
         this.metadata = dto.metadata;
+        this.legacyResource = dto.legacyResource ? URI.revive(dto.legacyResource) : undefined;
         this.description = (model && getInProgressSessionDescription(model)) ?? reviveMarkdownString(dto.description);
         this.status = (model && getSessionStatusForModel(model)) ?? dto.status;
         this.changes = revive(dto.changes);
@@ -483,7 +484,7 @@ class MainThreadChatSessionItem {
         }
     }
     isEqual(other) {
-        return isEqual(this.resource, other.resource) && this.label === other.label && this.description === other.description && this.status === other.status && this.timing.created === other.timing.created && this.timing.lastRequestStarted === other.timing.lastRequestStarted && this.timing.lastRequestEnded === other.timing.lastRequestEnded && equals(this.changes, other.changes) && equals(this.iconPath, other.iconPath) && stringOrMarkdownEqual(this.badge, other.badge) && stringOrMarkdownEqual(this.tooltip, other.tooltip) && this.archived === other.archived && equals(this.metadata, other.metadata);
+        return isEqual(this.resource, other.resource) && this.label === other.label && this.description === other.description && this.status === other.status && this.timing.created === other.timing.created && this.timing.lastRequestStarted === other.timing.lastRequestStarted && this.timing.lastRequestEnded === other.timing.lastRequestEnded && equals(this.changes, other.changes) && equals(this.iconPath, other.iconPath) && stringOrMarkdownEqual(this.badge, other.badge) && stringOrMarkdownEqual(this.tooltip, other.tooltip) && this.archived === other.archived && equals(this.metadata, other.metadata) && isEqual(this.legacyResource, other.legacyResource);
     }
 }
 let MainThreadChatSessions = class MainThreadChatSessions extends Disposable {
@@ -652,7 +653,7 @@ let MainThreadChatSessions = class MainThreadChatSessions extends Disposable {
             const options = {
                 title: {
                     preferred: originalEditor?.getName() || undefined,
-                    fallback: ( localize(2611, "{0}", contribution?.displayName))
+                    fallback: ( localize(2663, "{0}", contribution?.displayName))
                 }
             };
             const newSession = await this._chatSessionsService.getOrCreateChatSession(URI.revive(modifiedResource), CancellationToken.None);

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

@@ -468,7 +468,7 @@ let MainThreadCommentController = class MainThreadCommentController extends Disp
     }
 };
 MainThreadCommentController = ( __decorate([( __param(6, ICommentService)), ( __param(7, IUriIdentityService))], MainThreadCommentController));
-const commentsViewIcon = registerIcon("comments-view-icon", Codicon.commentDiscussion, ( localize(2612, "View icon of the comments view.")));
+const commentsViewIcon = registerIcon("comments-view-icon", Codicon.commentDiscussion, ( localize(2664, "View icon of the comments view.")));
 let MainThreadComments = class MainThreadComments extends Disposable {
     constructor(
         extHostContext,

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

@@ -532,7 +532,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
             this._register(workingCopyService.registerWorkingCopy(this));
             this._register(extensionService.onWillStop(e => {
                 e.veto(true, ( localize(
-                    2613,
+                    2665,
                     "An extension provided editor for '{0}' is still open that would close otherwise.",
                     this.name
                 )));
@@ -600,7 +600,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
         this._undoService.pushElement({
             type: UndoRedoElementType.Resource,
             resource: this._editorResource,
-            label: label ?? ( localize(2614, "Edit")),
+            label: label ?? ( localize(2666, "Edit")),
             code: "undoredo.customEditorEdit",
             undo: () => this.undo(),
             redo: () => this.redo()

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(2615, "Aborted onWillCreateEditSessionIdentity-event after 10000ms"))))), this.timeout);
+            setTimeout(() => reject(( new Error(( localize(2667, "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

@@ -443,6 +443,8 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
             }
         case GroupModelChangeKind.EDITOR_TRANSIENT:
             break;
+        case GroupModelChangeKind.EDITORS_SELECTION:
+            break;
         case GroupModelChangeKind.EDITOR_MOVE:
             if (isGroupEditorMoveEvent(event) && event.editor && event.editorIndex !== undefined && event.oldEditorIndex !== undefined) {
                 this._onDidTabMove(groupId, event.editorIndex, event.oldEditorIndex, event.editor);

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

@@ -111,7 +111,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    2616,
+                    2668,
                     "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
@@ -119,7 +119,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 actions: {
                     primary: [toAction({
                         id: "reload",
-                        label: ( localize(2617, "Reload Window")),
+                        label: ( localize(2669, "Reload Window")),
                         run: () => this._hostService.reload()
                     })]
                 }
@@ -130,7 +130,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2618,
+                        2670,
                         "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
@@ -140,7 +140,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2619,
+                        2671,
                         "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
@@ -148,7 +148,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                     actions: {
                         primary: [toAction({
                             id: "manageWorkspaceTrust",
-                            label: ( localize(2620, "Manage Workspace Trust")),
+                            label: ( localize(2672, "Manage Workspace Trust")),
                             run: () => this._commandService.executeCommand("workbench.trust.manage")
                         })]
                     }
@@ -157,7 +157,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2621,
+                        2673,
                         "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
@@ -165,7 +165,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                     actions: {
                         primary: [toAction({
                             id: "enable",
-                            label: ( localize(2622, "Enable and Reload")),
+                            label: ( localize(2674, "Enable and Reload")),
                             enabled: true,
                             run: () => this._extensionEnablementService.setEnablement(
                                 [missingInstalledDependency],
@@ -178,7 +178,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2623,
+                        2675,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled.",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -199,7 +199,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    2624,
+                    2676,
                     "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,
@@ -208,14 +208,14 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 actions: {
                     primary: [toAction({
                         id: "install",
-                        label: ( localize(2625, "Install and Reload")),
+                        label: ( localize(2677, "Install and Reload")),
                         run: () => this._extensionsWorkbenchService.install(dependencyExtension).then(() => this._hostService.reload(), e => this._notificationService.error(e))
                     })]
                 }
             });
         } else {
             this._notificationService.error(( localize(
-                2626,
+                2678,
                 "Cannot activate the '{0}' extension because it depends on an unknown '{1}' extension.",
                 extName,
                 missingDependency

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

@@ -94,25 +94,25 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     if (data.extensionNames.length === 1) {
                         if (operation === FileOperation.CREATE) {
                             message = ( localize(
-                                2627,
+                                2679,
                                 "Extension '{0}' wants to make refactoring changes with this file creation",
                                 data.extensionNames[0]
                             ));
                         } else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2628,
+                                2680,
                                 "Extension '{0}' wants to make refactoring changes with this file copy",
                                 data.extensionNames[0]
                             ));
                         } else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2629,
+                                2681,
                                 "Extension '{0}' wants to make refactoring changes with this file move",
                                 data.extensionNames[0]
                             ));
                         } else  {
                             message = ( localize(
-                                2630,
+                                2682,
                                 "Extension '{0}' wants to make refactoring changes with this file deletion",
                                 data.extensionNames[0]
                             ));
@@ -120,25 +120,25 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     } else {
                         if (operation === FileOperation.CREATE) {
                             message = ( localize(
-                                2631,
+                                2683,
                                 "{0} extensions want to make refactoring changes with this file creation",
                                 data.extensionNames.length
                             ));
                         } else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2632,
+                                2684,
                                 "{0} extensions want to make refactoring changes with this file copy",
                                 data.extensionNames.length
                             ));
                         } else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2633,
+                                2685,
                                 "{0} extensions want to make refactoring changes with this file move",
                                 data.extensionNames.length
                             ));
                         } else  {
                             message = ( localize(
-                                2634,
+                                2686,
                                 "{0} extensions want to make refactoring changes with this file deletion",
                                 data.extensionNames.length
                             ));
@@ -150,8 +150,8 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                         } = await dialogService.confirm({
                             type: Severity.Info,
                             message,
-                            primaryButton: ( localize(2635, "Show &&Preview")),
-                            cancelButton: ( localize(2636, "Skip Changes"))
+                            primaryButton: ( localize(2687, "Show &&Preview")),
+                            cancelButton: ( localize(2688, "Skip Changes"))
                         });
                         showPreview = true;
                         if (!confirmed) {
@@ -171,18 +171,18 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                             type: Severity.Info,
                             message,
                             buttons: [{
-                                label: ( localize(2637, "&&OK")),
+                                label: ( localize(2689, "&&OK")),
                                 run: () => Choice.OK
                             }, {
-                                label: ( localize(2635, "Show &&Preview")),
+                                label: ( localize(2687, "Show &&Preview")),
                                 run: () => Choice.Preview
                             }],
                             cancelButton: {
-                                label: ( localize(2636, "Skip Changes")),
+                                label: ( localize(2688, "Skip Changes")),
                                 run: () => Choice.Cancel
                             },
                             checkbox: {
-                                label: ( localize(2638, "Do not ask me again"))
+                                label: ( localize(2690, "Do not ask me again"))
                             }
                         });
                         if (result === Choice.Cancel) {
@@ -211,15 +211,15 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
             _progressLabel(operation) {
                 switch (operation) {
                 case FileOperation.CREATE:
-                    return localize(2639, "Running 'File Create' participants...");
+                    return localize(2691, "Running 'File Create' participants...");
                 case FileOperation.MOVE:
-                    return localize(2640, "Running 'File Rename' participants...");
+                    return localize(2692, "Running 'File Rename' participants...");
                 case FileOperation.COPY:
-                    return localize(2641, "Running 'File Copy' participants...");
+                    return localize(2693, "Running 'File Copy' participants...");
                 case FileOperation.DELETE:
-                    return localize(2642, "Running 'File Delete' participants...");
+                    return localize(2694, "Running 'File Delete' participants...");
                 case FileOperation.WRITE:
-                    return localize(2643, "Running 'File Write' participants...");
+                    return localize(2695, "Running 'File Write' participants...");
                 }
             }
         })();
@@ -307,7 +307,7 @@ registerAction2(class ResetMemento extends Action2 {
         super({
             id: "files.participants.resetChoice",
             title: {
-                value: ( localize(2644, "Reset choice for 'File operation needs preview'")),
+                value: ( localize(2696, "Reset choice for 'File operation needs preview'")),
                 original: `Reset choice for 'File operation needs preview'`
             },
             f1: true

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

@@ -5,6 +5,7 @@ import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buf
 import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
 import { transformErrorFromSerialization, transformErrorForSerialization } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { equalSets } from '@codingame/monaco-vscode-api/vscode/vs/base/common/collections';
 import { DisposableStore, DisposableMap, Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -43,6 +44,15 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         this._pendingProgress = ( new Map());
         this._ignoredFileProviderRegistrations = ( new DisposableMap());
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostChatProvider));
+        let lastModelIds = ( new Set(this._chatProviderService.getLanguageModelIds()));
+        this._store.add(this._chatProviderService.onDidChangeLanguageModels(() => {
+            const currentModelIds = ( new Set(this._chatProviderService.getLanguageModelIds()));
+            if (equalSets(lastModelIds, currentModelIds)) {
+                return;
+            }
+            lastModelIds = currentModelIds;
+            this._proxy.$onChatModelsChange();
+        }));
     }
     dispose() {
         this._lmProviderChange.dispose();
@@ -178,7 +188,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         if (this._authenticationService.getProviderIds().includes(authProviderId)) {
             return Disposable.None;
         }
-        const accountLabel = auth.accountLabel ?? ( localize(2645, "Language Models"));
+        const accountLabel = auth.accountLabel ?? ( localize(2697, "Language Models"));
         const disposables = ( new DisposableStore());
         const provider = ( new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel));
         this._authenticationService.registerAuthenticationProvider(authProviderId, provider);
@@ -261,7 +271,7 @@ class LanguageModelAccessAuthProvider {
     }
     confirmation(extensionName, _recreatingSession) {
         return localize(
-            2646,
+            2698,
             "The extension '{0}' wants to access the language models provided by {1}.",
             extensionName,
             this.label

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

@@ -1,9 +1,11 @@
 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";
@@ -28,6 +30,8 @@ export declare class MainThreadMcp extends Disposable implements MainThreadMcpSh
     private readonly _contextKeyService;
     private readonly _telemetryService;
     private readonly _mcpGatewayService;
+    private readonly _configurationService;
+    private readonly _secretStorageService;
     private _serverIdCounter;
     private readonly _servers;
     private readonly _serverDefinitions;
@@ -35,7 +39,7 @@ export declare class MainThreadMcp extends Disposable implements MainThreadMcpSh
     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);
+    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;
@@ -44,6 +48,7 @@ export declare class MainThreadMcp extends Disposable implements MainThreadMcpSh
     $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;