@codingame/monaco-vscode-extensions-service-override 28.4.1 → 29.0.0

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(
-                                2563,
+                                2571,
                                 "Extension '{0}' wants to make refactoring changes with this file creation",
                                 data.extensionNames[0]
                             ));
                         } else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2564,
+                                2572,
                                 "Extension '{0}' wants to make refactoring changes with this file copy",
                                 data.extensionNames[0]
                             ));
                         } else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2565,
+                                2573,
                                 "Extension '{0}' wants to make refactoring changes with this file move",
                                 data.extensionNames[0]
                             ));
                         } else  {
                             message = ( localize(
-                                2566,
+                                2574,
                                 "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(
-                                2567,
+                                2575,
                                 "{0} extensions want to make refactoring changes with this file creation",
                                 data.extensionNames.length
                             ));
                         } else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2568,
+                                2576,
                                 "{0} extensions want to make refactoring changes with this file copy",
                                 data.extensionNames.length
                             ));
                         } else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2569,
+                                2577,
                                 "{0} extensions want to make refactoring changes with this file move",
                                 data.extensionNames.length
                             ));
                         } else  {
                             message = ( localize(
-                                2570,
+                                2578,
                                 "{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(2571, "Show &&Preview")),
-                            cancelButton: ( localize(2572, "Skip Changes"))
+                            primaryButton: ( localize(2579, "Show &&Preview")),
+                            cancelButton: ( localize(2580, "Skip Changes"))
                         });
                         showPreview = true;
                         if (!confirmed) {
@@ -171,18 +171,18 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                             type: Severity.Info,
                             message,
                             buttons: [{
-                                label: ( localize(2573, "&&OK")),
+                                label: ( localize(2581, "&&OK")),
                                 run: () => Choice.OK
                             }, {
-                                label: ( localize(2571, "Show &&Preview")),
+                                label: ( localize(2579, "Show &&Preview")),
                                 run: () => Choice.Preview
                             }],
                             cancelButton: {
-                                label: ( localize(2572, "Skip Changes")),
+                                label: ( localize(2580, "Skip Changes")),
                                 run: () => Choice.Cancel
                             },
                             checkbox: {
-                                label: ( localize(2574, "Do not ask me again"))
+                                label: ( localize(2582, "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(2575, "Running 'File Create' participants...");
+                    return localize(2583, "Running 'File Create' participants...");
                 case FileOperation.MOVE:
-                    return localize(2576, "Running 'File Rename' participants...");
+                    return localize(2584, "Running 'File Rename' participants...");
                 case FileOperation.COPY:
-                    return localize(2577, "Running 'File Copy' participants...");
+                    return localize(2585, "Running 'File Copy' participants...");
                 case FileOperation.DELETE:
-                    return localize(2578, "Running 'File Delete' participants...");
+                    return localize(2586, "Running 'File Delete' participants...");
                 case FileOperation.WRITE:
-                    return localize(2579, "Running 'File Write' participants...");
+                    return localize(2587, "Running 'File Write' participants...");
                 }
             }
         })();
@@ -307,7 +307,7 @@ registerAction2(class ResetMemento extends Action2 {
         super({
             id: "files.participants.resetChoice",
             title: {
-                value: ( localize(2580, "Reset choice for 'File operation needs preview'")),
+                value: ( localize(2588, "Reset choice for 'File operation needs preview'")),
                 original: `Reset choice for 'File operation needs preview'`
             },
             f1: true

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

@@ -1,7 +1,7 @@
 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 { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { IGitExtensionDelegate, GitRef, GitRefQuery, IGitRepository } from "../../contrib/git/common/gitService.js";
+import { IGitExtensionDelegate, GitRef, GitRefQuery, GitDiffChange, IGitRepository } from "../../contrib/git/common/gitService.js";
 import { IGitService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/git/common/gitService.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { MainThreadGitExtensionShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
@@ -17,5 +17,7 @@ export declare class MainThreadGitExtensionService extends Disposable implements
     private _getRepositoryByUri;
     openRepository(uri: URI): Promise<IGitRepository | undefined>;
     getRefs(root: URI, query: GitRefQuery, token?: CancellationToken): Promise<GitRef[]>;
+    diffBetweenWithStats(root: URI, ref1: string, ref2: string, path?: string): Promise<GitDiffChange[]>;
+    diffBetweenWithStats2(root: URI, ref: string, path?: string): Promise<GitDiffChange[]>;
     $onDidChangeRepository(handle: number): Promise<void>;
 }

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

@@ -22,6 +22,15 @@ function toGitRefType(type) {
         throw ( new Error(`Unknown GitRefType: ${type}`));
     }
 }
+function toGitDiffChange(dto) {
+    return {
+        uri: URI.revive(dto.uri),
+        originalUri: dto.originalUri ? URI.revive(dto.originalUri) : undefined,
+        modifiedUri: dto.modifiedUri ? URI.revive(dto.modifiedUri) : undefined,
+        insertions: dto.insertions,
+        deletions: dto.deletions
+    };
+}
 function toGitRepositoryState(dto) {
     return {
         HEAD: dto?.HEAD ? {
@@ -29,10 +38,31 @@ function toGitRepositoryState(dto) {
             name: dto.HEAD.name,
             commit: dto.HEAD.commit,
             remote: dto.HEAD.remote,
+            base: dto.HEAD.base,
             upstream: dto.HEAD.upstream,
             ahead: dto.HEAD.ahead,
             behind: dto.HEAD.behind
-        } : undefined
+        } : undefined,
+        mergeChanges: dto?.mergeChanges?.map(c => ({
+            uri: URI.revive(c.uri),
+            originalUri: c.originalUri ? URI.revive(c.originalUri) : undefined,
+            modifiedUri: c.modifiedUri ? URI.revive(c.modifiedUri) : undefined
+        })) ?? [],
+        indexChanges: dto?.indexChanges?.map(c => ({
+            uri: URI.revive(c.uri),
+            originalUri: c.originalUri ? URI.revive(c.originalUri) : undefined,
+            modifiedUri: c.modifiedUri ? URI.revive(c.modifiedUri) : undefined
+        })) ?? [],
+        workingTreeChanges: dto?.workingTreeChanges?.map(c => ({
+            uri: URI.revive(c.uri),
+            originalUri: c.originalUri ? URI.revive(c.originalUri) : undefined,
+            modifiedUri: c.modifiedUri ? URI.revive(c.modifiedUri) : undefined
+        })) ?? [],
+        untrackedChanges: dto?.untrackedChanges?.map(c => ({
+            uri: URI.revive(c.uri),
+            originalUri: c.originalUri ? URI.revive(c.originalUri) : undefined,
+            modifiedUri: c.modifiedUri ? URI.revive(c.modifiedUri) : undefined
+        })) ?? []
     };
 }
 let MainThreadGitExtensionService = class MainThreadGitExtensionService extends Disposable {
@@ -94,6 +124,22 @@ let MainThreadGitExtensionService = class MainThreadGitExtensionService extends
             type: toGitRefType(ref.type)
         })));
     }
+    async diffBetweenWithStats(root, ref1, ref2, path) {
+        const handle = this._repositoryHandles.get(root);
+        if (handle === undefined) {
+            return [];
+        }
+        const result = await this._proxy.$diffBetweenWithStats(handle, ref1, ref2, path);
+        return ( result.map(toGitDiffChange));
+    }
+    async diffBetweenWithStats2(root, ref, path) {
+        const handle = this._repositoryHandles.get(root);
+        if (handle === undefined) {
+            return [];
+        }
+        const result = await this._proxy.$diffBetweenWithStats2(handle, ref, path);
+        return ( result.map(toGitDiffChange));
+    }
     async $onDidChangeRepository(handle) {
         const repository = this._repositories.get(handle);
         if (!repository) {

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

@@ -2,6 +2,7 @@ import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/c
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 import { IToolInvocation, IToolProgressStep, IToolResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
 import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
@@ -10,10 +11,11 @@ import { IToolDataDto, IToolDefinitionDto, MainThreadLanguageModelToolsShape } f
 export declare class MainThreadLanguageModelTools extends Disposable implements MainThreadLanguageModelToolsShape {
     private readonly _languageModelToolsService;
     private readonly _logService;
+    private readonly _productService;
     private readonly _proxy;
     private readonly _tools;
     private readonly _runningToolCalls;
-    constructor(extHostContext: IExtHostContext, _languageModelToolsService: ILanguageModelToolsService, _logService: ILogService);
+    constructor(extHostContext: IExtHostContext, _languageModelToolsService: ILanguageModelToolsService, _logService: ILogService, _productService: IProductService);
     private getToolDtos;
     $getTools(): Promise<IToolDataDto[]>;
     $invokeTool(dto: Dto<IToolInvocation>, token?: CancellationToken): Promise<Dto<IToolResult> | SerializableObjectWithBuffers<Dto<IToolResult>>>;

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

@@ -5,19 +5,22 @@ import { Disposable, DisposableMap, DisposableStore } from '@codingame/monaco-vs
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { isUriComponents, URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { toToolSetKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution';
-import { toolResultHasBuffers, ToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
+import { toolResultHasBuffers, ToolDataSource, ToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { SerializableObjectWithBuffers } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 
 let MainThreadLanguageModelTools = class MainThreadLanguageModelTools extends Disposable {
-    constructor(extHostContext, _languageModelToolsService, _logService) {
+    constructor(extHostContext, _languageModelToolsService, _logService, _productService) {
         super();
         this._languageModelToolsService = _languageModelToolsService;
         this._logService = _logService;
+        this._productService = _productService;
         this._tools = this._register(( new DisposableMap()));
         this._runningToolCalls = ( new Map());
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostLanguageModelTools));
@@ -101,7 +104,8 @@ let MainThreadLanguageModelTools = class MainThreadLanguageModelTools extends Di
                 };
             }
         }
-        const source = revive(definition.source);
+        const isBuiltinTool = this._productService.defaultChatAgent?.chatExtensionId ? ExtensionIdentifier.equals(extensionId, this._productService.defaultChatAgent.chatExtensionId) : false;
+        const source = isBuiltinTool ? ToolDataSource.Internal : revive(definition.source);
         const toolData = {
             id: definition.id,
             displayName: definition.displayName,
@@ -154,7 +158,8 @@ let MainThreadLanguageModelTools = class MainThreadLanguageModelTools extends Di
 MainThreadLanguageModelTools = __decorate([
     extHostNamedCustomer(MainContext.MainThreadLanguageModelTools),
     ( __param(1, ILanguageModelToolsService)),
-    ( __param(2, ILogService))
+    ( __param(2, ILogService)),
+    ( __param(3, IProductService))
 ], MainThreadLanguageModelTools);
 
 export { MainThreadLanguageModelTools };

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

@@ -178,7 +178,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         if (this._authenticationService.getProviderIds().includes(authProviderId)) {
             return Disposable.None;
         }
-        const accountLabel = auth.accountLabel ?? ( localize(2581, "Language Models"));
+        const accountLabel = auth.accountLabel ?? ( localize(2589, "Language Models"));
         const disposables = ( new DisposableStore());
         const provider = ( new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel));
         this._authenticationService.registerAuthenticationProvider(authProviderId, provider);
@@ -261,7 +261,7 @@ class LanguageModelAccessAuthProvider {
     }
     confirmation(extensionName, _recreatingSession) {
         return localize(
-            2582,
+            2590,
             "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

@@ -49,7 +49,10 @@ export declare class MainThreadMcp extends Disposable implements MainThreadMcpSh
     private _onDidChangeAuthSessions;
     $logMcpAuthSetup(data: IAuthMetadataSource): void;
     $startMcpGateway(): Promise<{
-        address: URI;
+        servers: {
+            label: string;
+            address: URI;
+        }[];
         gatewayId: string;
     } | undefined>;
     $disposeMcpGateway(gatewayId: string): void;

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

@@ -327,9 +327,9 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2583, "Incorrect account detected")),
+            message: ( localize(2591, "Incorrect account detected")),
             detail: ( localize(
-                2584,
+                2592,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -337,10 +337,10 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             type: Severity.Warning,
             cancelButton: true,
             buttons: [{
-                label: ( localize(2585, "Keep {0}", chosenAccountLabel)),
+                label: ( localize(2593, "Keep {0}", chosenAccountLabel)),
                 run: () => chosenAccountLabel
             }, {
-                label: ( localize(2586, "Login with {0}", requestedAccountLabel)),
+                label: ( localize(2594, "Login with {0}", requestedAccountLabel)),
                 run: () => requestedAccountLabel
             }]
         });
@@ -372,7 +372,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             } catch (e) {
                 if (UserInteractionRequiredError.is(e)) {
                     server.pushLog(LogLevel.Warning, ( localize(
-                        2587,
+                        2595,
                         "Authentication session for {0} removed, stopping server",
                         providerLabel
                     )));
@@ -394,9 +394,20 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             return undefined;
         }
         const gatewayId = generateUuid();
-        this._gateways.set(gatewayId, result);
+        const store = ( new DisposableStore());
+        store.add(result);
+        store.add(result.onDidChangeServers(servers => {
+            this._proxy.$onDidChangeGatewayServers(gatewayId, ( servers.map(s => ({
+                label: s.label,
+                address: s.address
+            }))));
+        }));
+        this._gateways.set(gatewayId, store);
         return {
-            address: result.address,
+            servers: ( result.servers.map(s => ({
+                label: s.label,
+                address: s.address
+            }))),
             gatewayId
         };
     }
@@ -405,18 +416,18 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     }
     async loginPrompt(mcpLabel, providerLabel, recreatingSession) {
         const message = recreatingSession ? ( localize(
-            2588,
+            2596,
             "The MCP Server Definition '{0}' wants you to authenticate to {1}.",
             mcpLabel,
             providerLabel
         )) : ( localize(
-            2589,
+            2597,
             "The MCP Server Definition '{0}' wants to authenticate to {1}.",
             mcpLabel,
             providerLabel
         ));
         const buttons = [{
-            label: ( localize(2590, "&&Allow")),
+            label: ( localize(2598, "&&Allow")),
             run() {
                 return true;
             }

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

@@ -66,13 +66,13 @@ let MainThreadMessageService = class MainThreadMessageService {
                 sourceIsUrgent = MainThreadMessageService_1.URGENT_NOTIFICATION_SOURCES.includes(source.id);
             }
             if (!source) {
-                source = ( localize(2591, "Extension"));
+                source = ( localize(2599, "Extension"));
             }
             const secondaryActions = [];
             if (options.source) {
                 secondaryActions.push(toAction({
                     id: options.source.identifier.value,
-                    label: ( localize(2592, "Manage Extension")),
+                    label: ( localize(2600, "Manage Extension")),
                     run: () => {
                         return this._commandService.executeCommand("_extensions.manage", options.source.identifier.value);
                     }
@@ -111,12 +111,12 @@ let MainThreadMessageService = class MainThreadMessageService {
         if (!cancelButton) {
             if (buttons.length > 0) {
                 cancelButton = {
-                    label: ( localize(2593, "Cancel")),
+                    label: ( localize(2601, "Cancel")),
                     run: () => undefined
                 };
             } else {
                 cancelButton = {
-                    label: ( localize(2594, "&&OK")),
+                    label: ( localize(2602, "&&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(2595, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
+            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2603, "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

@@ -94,11 +94,11 @@ let MainThreadOutputService = class MainThreadOutputService extends Disposable {
     }
     _showChannelQuietly(channel) {
         const statusProperties = {
-            name: ( localize(2596, "Show Output")),
+            name: ( localize(2604, "Show Output")),
             text: "$(output)",
-            ariaLabel: ( localize(2597, "Show {0} Output Channel", channel.label)),
+            ariaLabel: ( localize(2605, "Show {0} Output Channel", channel.label)),
             command: `workbench.action.output.show.${channel.id}`,
-            tooltip: ( localize(2598, "Show {0} Output Channel", channel.label)),
+            tooltip: ( localize(2606, "Show {0} Output Channel", channel.label)),
             kind: "prominent"
         };
         if (!this._outputStatusItem.value) {

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

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

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(2600, "Aborted onWillSaveTextDocument-event after 1750ms"))))), 1750);
+            setTimeout(() => reject(( new Error(( localize(2608, "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/mainThreadTask.js

@@ -397,7 +397,7 @@ var TaskDTO;
         }
         command.presentation = TaskPresentationOptionsDTO.to(task.presentationOptions);
         const source = TaskSourceDTO.to(task.source, workspace);
-        const label = ( localize(2601, "{0}: {1}", source.label, task.name));
+        const label = ( localize(2609, "{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/mainThreadTunnelService.js

@@ -116,13 +116,13 @@ let MainThreadTunnelService = class MainThreadTunnelService extends Disposable {
     }
     async elevationPrompt(tunnelOptions, tunnel, source) {
         return this.notificationService.prompt(Severity.Info, ( localize(
-            2602,
+            2610,
             "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(2603, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
+            label: ( localize(2611, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
             run: async () => {
                 this.elevateionRetry = true;
                 await this.remoteExplorerService.close({

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

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

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

@@ -118,7 +118,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(2606, "An error occurred while loading view: {0}", escape(viewType)))}</body>
+            <body>${( localize(2614, "An error occurred while loading view: {0}", escape(viewType)))}</body>
         </html>`;
     }
 };

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

@@ -1,4 +1,5 @@
 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 { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
@@ -21,7 +22,7 @@ import { ITextSearchComplete, MainThreadWorkspaceShape, ResourceTrustRequestOpti
 import { IEditSessionIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/editSessions.service";
 import { ICanonicalUriService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/canonicalUri.service";
 import { ITextFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service";
-export declare class MainThreadWorkspace implements MainThreadWorkspaceShape {
+export declare class MainThreadWorkspace extends Disposable implements MainThreadWorkspaceShape {
     private readonly _searchService;
     private readonly _contextService;
     private readonly _editSessionIdentityService;
@@ -36,7 +37,6 @@ export declare class MainThreadWorkspace implements MainThreadWorkspaceShape {
     private readonly _workspaceTrustManagementService;
     private readonly _workspaceTrustRequestService;
     private readonly _textFileService;
-    private readonly _toDispose;
     private readonly _activeCancelTokens;
     private readonly _proxy;
     private readonly _queryBuilder;