@codingame/monaco-vscode-extensions-service-override 24.2.0 → 25.0.0

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

@@ -2,6 +2,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.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 { 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";
@@ -11,7 +12,7 @@ import { IAuthenticationService } from "@codingame/monaco-vscode-api/vscode/vs/w
 import { IDynamicAuthenticationProviderStorageService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/dynamicAuthenticationProviderStorage.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
-import { IMcpAuthenticationDetails, IMcpAuthenticationOptions, MainThreadMcpShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+import { IMcpAuthenticationDetails, IMcpAuthenticationOptions, IMcpAuthSetupTelemetry, MainThreadMcpShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 export declare class MainThreadMcp extends Disposable implements MainThreadMcpShape {
     private readonly _extHostContext;
     private readonly _mcpRegistry;
@@ -23,13 +24,14 @@ export declare class MainThreadMcp extends Disposable implements MainThreadMcpSh
     private readonly _dynamicAuthenticationProviderStorageService;
     private readonly _extensionService;
     private readonly _contextKeyService;
+    private readonly _telemetryService;
     private _serverIdCounter;
     private readonly _servers;
     private readonly _serverDefinitions;
     private readonly _serverAuthTracking;
     private readonly _proxy;
     private readonly _collectionDefinitions;
-    constructor(_extHostContext: IExtHostContext, _mcpRegistry: IMcpRegistry, dialogService: IDialogService, _authenticationService: IAuthenticationService, authenticationMcpServersService: IAuthenticationMcpService, authenticationMCPServerAccessService: IAuthenticationMcpAccessService, authenticationMCPServerUsageService: IAuthenticationMcpUsageService, _dynamicAuthenticationProviderStorageService: IDynamicAuthenticationProviderStorageService, _extensionService: IExtensionService, _contextKeyService: IContextKeyService);
+    constructor(_extHostContext: IExtHostContext, _mcpRegistry: IMcpRegistry, dialogService: IDialogService, _authenticationService: IAuthenticationService, authenticationMcpServersService: IAuthenticationMcpService, authenticationMCPServerAccessService: IAuthenticationMcpAccessService, authenticationMCPServerUsageService: IAuthenticationMcpUsageService, _dynamicAuthenticationProviderStorageService: IDynamicAuthenticationProviderStorageService, _extensionService: IExtensionService, _contextKeyService: IContextKeyService, _telemetryService: ITelemetryService);
     $upsertMcpCollection(collection: McpCollectionDefinition.FromExtHost, serversDto: McpServerDefinition.Serialized[]): void;
     $deleteMcpCollection(collectionId: string): void;
     $onDidChangeState(id: number, update: McpConnectionState): void;
@@ -40,6 +42,7 @@ export declare class MainThreadMcp extends Disposable implements MainThreadMcpSh
     private _getSessionForProvider;
     private continueWithIncorrectAccountPrompt;
     private _onDidChangeAuthSessions;
+    $logMcpAuthSetup(data: IMcpAuthSetupTelemetry): void;
     private loginPrompt;
     dispose(): void;
 }

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

@@ -14,6 +14,7 @@ import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 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 { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
 import { McpServerLaunch, McpServerTransportType, McpServerDefinition, McpServerTrust, extensionPrefixedIdentifier, McpConnectionState, UserInteractionRequiredError } 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';
@@ -28,7 +29,7 @@ import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
 let MainThreadMcp = class MainThreadMcp extends Disposable {
-    constructor(_extHostContext, _mcpRegistry, dialogService, _authenticationService, authenticationMcpServersService, authenticationMCPServerAccessService, authenticationMCPServerUsageService, _dynamicAuthenticationProviderStorageService, _extensionService, _contextKeyService) {
+    constructor(_extHostContext, _mcpRegistry, dialogService, _authenticationService, authenticationMcpServersService, authenticationMCPServerAccessService, authenticationMCPServerUsageService, _dynamicAuthenticationProviderStorageService, _extensionService, _contextKeyService, _telemetryService) {
         super();
         this._extHostContext = _extHostContext;
         this._mcpRegistry = _mcpRegistry;
@@ -40,6 +41,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         this._dynamicAuthenticationProviderStorageService = _dynamicAuthenticationProviderStorageService;
         this._extensionService = _extensionService;
         this._contextKeyService = _contextKeyService;
+        this._telemetryService = _telemetryService;
         this._serverIdCounter = 0;
         this._servers = ( new Map());
         this._serverDefinitions = ( new Map());
@@ -250,9 +252,9 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2516, "Incorrect account detected")),
+            message: ( localize(2535, "Incorrect account detected")),
             detail: ( localize(
-                2517,
+                2536,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -261,11 +263,11 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             cancelButton: true,
             buttons: [
                 {
-                    label: ( localize(2518, 'Keep {0}', chosenAccountLabel)),
+                    label: ( localize(2537, 'Keep {0}', chosenAccountLabel)),
                     run: () => chosenAccountLabel
                 },
                 {
-                    label: ( localize(2519, 'Login with {0}', requestedAccountLabel)),
+                    label: ( localize(2538, 'Login with {0}', requestedAccountLabel)),
                     run: () => requestedAccountLabel
                 }
             ],
@@ -296,7 +298,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             catch (e) {
                 if (UserInteractionRequiredError.is(e)) {
                     server.pushLog(LogLevel.Warning, ( localize(
-                        2520,
+                        2539,
                         "Authentication session for {0} removed, stopping server",
                         providerLabel
                     )));
@@ -305,23 +307,26 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             }
         }
     }
+    $logMcpAuthSetup(data) {
+        this._telemetryService.publicLog2('mcp/authSetup', data);
+    }
     async loginPrompt(mcpLabel, providerLabel, recreatingSession) {
         const message = recreatingSession
             ? ( localize(
-            2521,
+            2540,
             "The MCP Server Definition '{0}' wants you to authenticate to {1}.",
             mcpLabel,
             providerLabel
         ))
             : ( localize(
-            2522,
+            2541,
             "The MCP Server Definition '{0}' wants to authenticate to {1}.",
             mcpLabel,
             providerLabel
         ));
         const buttons = [
             {
-                label: ( localize(2523, "&&Allow")),
+                label: ( localize(2542, "&&Allow")),
                 run() {
                     return true;
                 },
@@ -355,7 +360,8 @@ MainThreadMcp = __decorate([
     ( __param(6, IAuthenticationMcpUsageService)),
     ( __param(7, IDynamicAuthenticationProviderStorageService)),
     ( __param(8, IExtensionService)),
-    ( __param(9, IContextKeyService))
+    ( __param(9, IContextKeyService)),
+    ( __param(10, ITelemetryService))
 ], MainThreadMcp);
 class ExtHostMcpServerLaunch extends Disposable {
     pushLog(level, message) {

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

@@ -60,13 +60,13 @@ let MainThreadMessageService = class MainThreadMessageService {
                 sourceIsUrgent = MainThreadMessageService_1.URGENT_NOTIFICATION_SOURCES.includes(source.id);
             }
             if (!source) {
-                source = ( localize(2524, "Extension"));
+                source = ( localize(2543, "Extension"));
             }
             const secondaryActions = [];
             if (options.source) {
                 secondaryActions.push(toAction({
                     id: options.source.identifier.value,
-                    label: ( localize(2525, "Manage Extension")),
+                    label: ( localize(2544, "Manage Extension")),
                     run: () => {
                         return this._commandService.executeCommand('_extensions.manage', options.source.identifier.value);
                     }
@@ -103,13 +103,13 @@ let MainThreadMessageService = class MainThreadMessageService {
         if (!cancelButton) {
             if (buttons.length > 0) {
                 cancelButton = {
-                    label: ( localize(2526, "Cancel")),
+                    label: ( localize(2545, "Cancel")),
                     run: () => undefined
                 };
             }
             else {
                 cancelButton = {
-                    label: ( localize(2527, "&&OK")),
+                    label: ( localize(2546, "&&OK")),
                     run: () => undefined
                 };
             }

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

@@ -18,7 +18,7 @@ class ExtHostNotebookDocumentSaveParticipant {
         }
         let _warningTimeout;
         const p = ( new Promise((resolve, reject) => {
-            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2528, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
+            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2547, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
             this._proxy.$participateInSave(workingCopy.resource, context.reason, token).then(_ => {
                 clearTimeout(_warningTimeout);
                 return undefined;

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

@@ -69,11 +69,11 @@ let MainThreadOutputService = class MainThreadOutputService extends Disposable {
     }
     _showChannelQuietly(channel) {
         const statusProperties = {
-            name: ( localize(2529, "Show Output")),
+            name: ( localize(2548, "Show Output")),
             text: '$(output)',
-            ariaLabel: ( localize(2530, "Show {0} Output Channel", channel.label)),
+            ariaLabel: ( localize(2549, "Show {0} Output Channel", channel.label)),
             command: `workbench.action.output.show.${channel.id}`,
-            tooltip: ( localize(2531, "Show {0} Output Channel", channel.label)),
+            tooltip: ( localize(2550, "Show {0} Output Channel", channel.label)),
             kind: 'prominent'
         };
         if (!this._outputStatusItem.value) {

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

@@ -37,7 +37,7 @@ let MainThreadProgress = class MainThreadProgress {
                 location: ProgressLocation.Notification,
                 secondaryActions: [toAction({
                         id: extensionId,
-                        label: ( localize(2532, "Manage Extension")),
+                        label: ( localize(2551, "Manage Extension")),
                         run: () => this._commandService.executeCommand('_extensions.manage', extensionId)
                     })]
             };

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

@@ -32,9 +32,4 @@ export declare class MainThreadQuickOpen implements MainThreadQuickOpenShape {
     * Converts IconPath DTO into iconPath/iconClass properties.
     */
     private expandIconPath;
-    /**
-    * Updates the toggles for a given quick input session by creating new {@link Toggle}-s
-    * from buttons, updating existing toggles props and removing old ones.
-    */
-    private updateToggles;
 }

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

@@ -1,6 +1,5 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { Toggle } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/toggle/toggle';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { basenameOrAuthority, dirname, hasTrailingPathSeparator } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
@@ -11,19 +10,7 @@ import { getIconClasses } from '@codingame/monaco-vscode-api/vscode/vs/editor/co
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { FileKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
-import { QuickInputButtonLocation } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
-import { asCssVariable } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/editorColors';
-import { inputActiveOptionBackground, inputActiveOptionForeground, inputActiveOptionBorder } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/inputColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/listColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/menuColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/minimapColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 import { ICustomEditorLabelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/customEditorLabelService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
@@ -117,7 +104,7 @@ let MainThreadQuickOpen = class MainThreadQuickOpen {
                 this._proxy.$onDidAccept(sessionId);
             }));
             store.add(input.onDidTriggerButton(button => {
-                this._proxy.$onDidTriggerButton(sessionId, button.handle);
+                this._proxy.$onDidTriggerButton(sessionId, button.handle, button.toggle?.checked);
             }));
             store.add(input.onDidChangeValue(value => {
                 this._proxy.$onDidChangeValue(sessionId, value);
@@ -126,21 +113,20 @@ let MainThreadQuickOpen = class MainThreadQuickOpen {
                 this._proxy.$onDidHide(sessionId);
             }));
             if (params.type === 'quickPick') {
-                const quickpick = input;
-                store.add(quickpick.onDidChangeActive(items => {
+                const quickPick = input;
+                store.add(quickPick.onDidChangeActive(items => {
                     this._proxy.$onDidChangeActive(sessionId, ( items.map(item => item.handle)));
                 }));
-                store.add(quickpick.onDidChangeSelection(items => {
+                store.add(quickPick.onDidChangeSelection(items => {
                     this._proxy.$onDidChangeSelection(sessionId, ( items.map(item => item.handle)));
                 }));
-                store.add(quickpick.onDidTriggerItemButton((e) => {
+                store.add(quickPick.onDidTriggerItemButton((e) => {
                     this._proxy.$onDidTriggerItemButton(sessionId, e.item.handle, e.button.handle);
                 }));
             }
             session = {
                 input,
                 handlesToItems: ( new Map()),
-                handlesToToggles: ( new Map()),
                 store
             };
             this.sessions.set(sessionId, session);
@@ -183,23 +169,17 @@ let MainThreadQuickOpen = class MainThreadQuickOpen {
                         .filter(Boolean);
                     break;
                 case 'buttons': {
-                    const buttons = [], toggles = [];
+                    const buttons = [];
                     for (const button of params.buttons) {
                         if (button.handle === -1) {
                             buttons.push(this._quickInputService.backButton);
                         }
                         else {
                             this.expandIconPath(button);
-                            if (button.location === QuickInputButtonLocation.Input) {
-                                toggles.push(button);
-                            }
-                            else {
-                                buttons.push(button);
-                            }
+                            buttons.push(button);
                         }
                     }
                     input.buttons = buttons;
-                    this.updateToggles(sessionId, session, toggles);
                     break;
                 }
                 default:
@@ -263,44 +243,6 @@ let MainThreadQuickOpen = class MainThreadQuickOpen {
             target.iconPath = { dark: ( URI.from(dark)), light: ( URI.from(light)) };
         }
     }
-    updateToggles(sessionId, session, buttons) {
-        const { input, handlesToToggles, store } = session;
-        const toggles = [];
-        for (const button of buttons) {
-            const title = button.tooltip || '';
-            const isChecked = !!button.checked;
-            const icon = ThemeIcon.isThemeIcon(button.iconPathDto) ? button.iconPathDto : undefined;
-            let { toggle } = handlesToToggles.get(button.handle) || {};
-            if (toggle) {
-                toggle.setTitle(title);
-                toggle.setIcon(icon);
-                toggle.checked = isChecked;
-            }
-            else {
-                toggle = store.add(( new Toggle({
-                    title,
-                    icon,
-                    isChecked,
-                    inputActiveOptionBorder: asCssVariable(inputActiveOptionBorder),
-                    inputActiveOptionForeground: asCssVariable(inputActiveOptionForeground),
-                    inputActiveOptionBackground: asCssVariable(inputActiveOptionBackground)
-                })));
-                const listener = store.add(toggle.onChange(() => {
-                    this._proxy.$onDidTriggerButton(sessionId, button.handle, toggle.checked);
-                }));
-                handlesToToggles.set(button.handle, { toggle, listener });
-            }
-            toggles.push(toggle);
-        }
-        for (const [handle, { toggle, listener }] of handlesToToggles) {
-            if (!( buttons.some(button => button.handle === handle))) {
-                handlesToToggles.delete(handle);
-                store.delete(toggle);
-                store.delete(listener);
-            }
-        }
-        input.toggles = toggles;
-    }
 };
 MainThreadQuickOpen = __decorate([
     extHostNamedCustomer(MainContext.MainThreadQuickOpen),

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

@@ -31,7 +31,7 @@ export declare class MainThreadSCM implements MainThreadSCMShape {
     $registerSourceControl(handle: number, parentHandle: number | undefined, id: string, label: string, rootUri: UriComponents | undefined, iconPath: UriComponents | {
         light: UriComponents;
         dark: UriComponents;
-    } | ThemeIcon | undefined, inputBoxDocumentUri: UriComponents): Promise<void>;
+    } | ThemeIcon | undefined, isHidden: boolean | undefined, inputBoxDocumentUri: UriComponents): Promise<void>;
     $updateSourceControl(handle: number, features: SCMProviderFeatures): Promise<void>;
     $unregisterSourceControl(handle: number): Promise<void>;
     $registerGroups(sourceControlHandle: number, groups: [

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

@@ -242,6 +242,7 @@ class MainThreadSCMProvider {
     get label() { return this._label; }
     get rootUri() { return this._rootUri; }
     get iconPath() { return this._iconPath; }
+    get isHidden() { return this._isHidden; }
     get inputBoxTextModel() { return this._inputBoxTextModel; }
     get contextValue() { return this._contextValue; }
     get acceptInputCommand() { return this.features.acceptInputCommand; }
@@ -252,7 +253,7 @@ class MainThreadSCMProvider {
     get actionButton() { return this._actionButton; }
     get artifactProvider() { return this._artifactProvider; }
     get historyProvider() { return this._historyProvider; }
-    constructor(proxy, _handle, _parentHandle, _providerId, _label, _rootUri, _iconPath, _inputBoxTextModel, _quickDiffService, _uriIdentService, _workspaceContextService) {
+    constructor(proxy, _handle, _parentHandle, _providerId, _label, _rootUri, _iconPath, _isHidden, _inputBoxTextModel, _quickDiffService, _uriIdentService, _workspaceContextService) {
         this.proxy = proxy;
         this._handle = _handle;
         this._parentHandle = _parentHandle;
@@ -260,6 +261,7 @@ class MainThreadSCMProvider {
         this._label = _label;
         this._rootUri = _rootUri;
         this._iconPath = _iconPath;
+        this._isHidden = _isHidden;
         this._inputBoxTextModel = _inputBoxTextModel;
         this._quickDiffService = _quickDiffService;
         this._uriIdentService = _uriIdentService;
@@ -502,7 +504,7 @@ let MainThreadSCM = class MainThreadSCM {
         this._repositoryDisposables.clear();
         this._disposables.dispose();
     }
-    async $registerSourceControl(handle, parentHandle, id, label, rootUri, iconPath, inputBoxDocumentUri) {
+    async $registerSourceControl(handle, parentHandle, id, label, rootUri, iconPath, isHidden, inputBoxDocumentUri) {
         this._repositoryBarriers.set(handle, ( new Barrier()));
         const inputBoxTextModelRef = await this.textModelService.createModelReference(URI.revive(inputBoxDocumentUri));
         const provider = ( new MainThreadSCMProvider(
@@ -513,6 +515,7 @@ let MainThreadSCM = class MainThreadSCM {
             label,
             rootUri ? URI.revive(rootUri) : undefined,
             getIconFromIconDto(iconPath),
+            isHidden,
             inputBoxTextModelRef.object.textEditorModel,
             this.quickDiffService,
             this._uriIdentService,

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

@@ -17,7 +17,7 @@ class ExtHostSaveParticipant {
             return undefined;
         }
         const p = ( new Promise((resolve, reject) => {
-            setTimeout(() => reject(( new Error(( localize(2533, "Aborted onWillSaveTextDocument-event after 1750ms"))))), 1750);
+            setTimeout(() => reject(( new Error(( localize(2552, "Aborted onWillSaveTextDocument-event after 1750ms"))))), 1750);
             this._proxy.$participateInSave(editorModel.resource, context.reason).then(values => {
                 if (!values.every(success => success)) {
                     return Promise.reject(( new Error('listener failed')));

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

@@ -14,6 +14,7 @@ export declare class MainThreadSearch implements MainThreadSearchShape {
     protected contextKeyService: IContextKeyService;
     private readonly _proxy;
     private readonly _searchProvider;
+    private readonly _aiSearchProviderHandles;
     constructor(extHostContext: IExtHostContext, _searchService: ISearchService, _telemetryService: ITelemetryService, _configurationService: IConfigurationService, contextKeyService: IContextKeyService);
     dispose(): void;
     $registerTextSearchProvider(handle: number, scheme: string): void;

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

@@ -19,18 +19,22 @@ let MainThreadSearch = class MainThreadSearch {
         this._telemetryService = _telemetryService;
         this.contextKeyService = contextKeyService;
         this._searchProvider = ( new Map());
+        this._aiSearchProviderHandles = ( new Set());
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostSearch));
         this._proxy.$enableExtensionHostSearch();
     }
     dispose() {
         this._searchProvider.forEach(value => value.dispose());
         this._searchProvider.clear();
+        this._aiSearchProviderHandles.clear();
+        SearchContext.hasAIResultProvider.bindTo(this.contextKeyService).set(false);
     }
     $registerTextSearchProvider(handle, scheme) {
         this._searchProvider.set(handle, ( new RemoteSearchProvider(this._searchService, SearchProviderType.text, scheme, handle, this._proxy)));
     }
     $registerAITextSearchProvider(handle, scheme) {
         SearchContext.hasAIResultProvider.bindTo(this.contextKeyService).set(true);
+        this._aiSearchProviderHandles.add(handle);
         this._searchProvider.set(handle, ( new RemoteSearchProvider(
             this._searchService,
             SearchProviderType.aiText,
@@ -45,6 +49,9 @@ let MainThreadSearch = class MainThreadSearch {
     $unregisterProvider(handle) {
         dispose(this._searchProvider.get(handle));
         this._searchProvider.delete(handle);
+        if (this._aiSearchProviderHandles.delete(handle) && this._aiSearchProviderHandles.size === 0) {
+            SearchContext.hasAIResultProvider.bindTo(this.contextKeyService).set(false);
+        }
     }
     $handleFileMatch(handle, session, data) {
         const provider = this._searchProvider.get(handle);

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

@@ -1,16 +1,16 @@
 import { MainThreadStatusBarShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { ThemeColor } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { Command } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { IAccessibilityInformation } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility";
 import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
 import { IExtensionStatusBarItemService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/browser/statusBarService";
-export declare class MainThreadStatusBar implements MainThreadStatusBarShape {
+export declare class MainThreadStatusBar extends Disposable implements MainThreadStatusBarShape {
     private readonly statusbarService;
     private readonly _proxy;
-    private readonly _store;
+    private readonly _entryDisposables;
     constructor(extHostContext: IExtHostContext, statusbarService: IExtensionStatusBarItemService);
-    dispose(): void;
     $setEntry(entryId: string, id: string, extensionId: string | undefined, name: string, text: string, tooltip: IMarkdownString | string | undefined, hasTooltipProvider: boolean, command: Command | undefined, color: string | ThemeColor | undefined, backgroundColor: ThemeColor | undefined, alignLeft: boolean, priority: number | undefined, accessibilityInformation: IAccessibilityInformation | undefined): void;
     $disposeEntry(entryId: string): void;
 }

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

@@ -2,21 +2,22 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableMap, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { StatusbarAlignment } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { StatusBarUpdateKind, IExtensionStatusBarItemService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/browser/statusBarService';
 
-let MainThreadStatusBar = class MainThreadStatusBar {
+let MainThreadStatusBar = class MainThreadStatusBar extends Disposable {
     constructor(extHostContext, statusbarService) {
+        super();
         this.statusbarService = statusbarService;
-        this._store = ( new DisposableStore());
+        this._entryDisposables = this._register(( new DisposableMap()));
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostStatusBar));
         const entries = [];
         for (const [entryId, item] of statusbarService.getEntries()) {
             entries.push(asDto(entryId, item));
         }
         this._proxy.$acceptStaticEntries(entries);
-        this._store.add(statusbarService.onDidChange(e => {
+        this._register(statusbarService.onDidChange(e => {
             if (e.added) {
                 this._proxy.$acceptStaticEntries([asDto(e.added[0], e.added[1])]);
             }
@@ -34,9 +35,6 @@ let MainThreadStatusBar = class MainThreadStatusBar {
             };
         }
     }
-    dispose() {
-        this._store.dispose();
-    }
     $setEntry(entryId, id, extensionId, name, text, tooltip, hasTooltipProvider, command, color, backgroundColor, alignLeft, priority, accessibilityInformation) {
         const tooltipOrTooltipProvider = hasTooltipProvider
             ? {
@@ -48,11 +46,12 @@ let MainThreadStatusBar = class MainThreadStatusBar {
             : tooltip;
         const kind = this.statusbarService.setOrUpdateEntry(entryId, id, extensionId, name, text, tooltipOrTooltipProvider, command, color, backgroundColor, alignLeft, priority, accessibilityInformation);
         if (kind === StatusBarUpdateKind.DidDefine) {
-            this._store.add(toDisposable(() => this.statusbarService.unsetEntry(entryId)));
+            const disposable = toDisposable(() => this.statusbarService.unsetEntry(entryId));
+            this._entryDisposables.set(entryId, disposable);
         }
     }
     $disposeEntry(entryId) {
-        this.statusbarService.unsetEntry(entryId);
+        this._entryDisposables.deleteAndDispose(entryId);
     }
 };
 MainThreadStatusBar = __decorate([

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

@@ -405,7 +405,7 @@ var TaskDTO;
         }
         command.presentation = TaskPresentationOptionsDTO.to(task.presentationOptions);
         const source = TaskSourceDTO.to(task.source, workspace);
-        const label = ( localize(2534, '{0}: {1}', source.label, task.name));
+        const label = ( localize(2553, '{0}: {1}', source.label, task.name));
         const definition = TaskDefinitionDTO.to(task.definition, executeOnly);
         const id = (CustomExecutionDTO.is(task.execution) && task._id) ? task._id : `${task.source.extensionId}.${definition._key}`;
         const result = ( new ContributedTask(

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

@@ -55,7 +55,7 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
             const instanceId = e.instance.instanceId;
             this._proxy.$shellExecutionStart(instanceId, instanceSupportsExecuteCommandApi(e.instance), e.data.command, convertToExtHostCommandLineConfidence(e.data), e.data.isTrusted, e.data.cwd);
             instanceDataListeners.get(instanceId)?.dispose();
-            instanceDataListeners.set(instanceId, Event.accumulate(e.instance.onData, 50, this._store)(events => {
+            instanceDataListeners.set(instanceId, Event.accumulate(e.instance.onData, 50, true, this._store)(events => {
                 this._proxy.$shellExecutionData(instanceId, events.join(''));
             }));
         }));

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

@@ -112,13 +112,13 @@ let MainThreadTunnelService = class MainThreadTunnelService extends Disposable {
     }
     async elevationPrompt(tunnelOptions, tunnel, source) {
         return this.notificationService.prompt(Severity.Info, ( localize(
-            2535,
+            2554,
             "The extension {0} has forwarded port {1}. You'll need to run as superuser to use port {2} locally.",
             source,
             tunnelOptions.remoteAddress.port,
             tunnelOptions.localAddressPort
         )), [{
-                label: ( localize(2536, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
+                label: ( localize(2555, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
                 run: async () => {
                     this.elevateionRetry = true;
                     await this.remoteExplorerService.close({ host: tunnel.tunnelRemoteHost, port: tunnel.tunnelRemotePort }, TunnelCloseReason.Other);

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

@@ -52,7 +52,7 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                 }
                 catch (e) {
                     if (!isCancellationError(e)) {
-                        const openDefaultAction = ( new Action('default', ( localize(2537, "Open using default opener")), undefined, undefined, async () => {
+                        const openDefaultAction = ( new Action('default', ( localize(2556, "Open using default opener")), undefined, undefined, async () => {
                             await this.openerService.open(uri, {
                                 allowTunneling: false,
                                 allowContributedOpeners: defaultExternalUriOpenerId,
@@ -61,7 +61,7 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                         openDefaultAction.tooltip = ( uri.toString());
                         this.notificationService.notify({
                             severity: Severity.Error,
-                            message: ( localize(2538, 'Could not open uri with \'{0}\': {1}', id, (e.toString()))),
+                            message: ( localize(2557, 'Could not open uri with \'{0}\': {1}', id, (e.toString()))),
                             actions: {
                                 primary: [
                                     openDefaultAction

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

@@ -19,6 +19,7 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ExtHostContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { reviveWebviewExtension, reviveWebviewContentOptions } from './mainThreadWebviews.js';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 
 class WebviewInputStore {
     constructor() {
@@ -264,6 +265,9 @@ function reviveWebviewIcon(value) {
     if (!value) {
         return undefined;
     }
+    if (ThemeIcon.isThemeIcon(value)) {
+        return value;
+    }
     return {
         light: URI.revive(value.light),
         dark: URI.revive(value.dark),

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

@@ -104,7 +104,7 @@ let MainThreadWebviews = class MainThreadWebviews extends Disposable {
 				<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 				<meta http-equiv="Content-Security-Policy" content="default-src 'none';">
 			</head>
-			<body>${( localize(2539, "An error occurred while loading view: {0}", escape(viewType)))}</body>
+			<body>${( localize(2558, "An error occurred while loading view: {0}", escape(viewType)))}</body>
 		</html>`;
     }
 };