@codingame/monaco-vscode-extensions-service-override 26.2.2 → 28.0.0

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

@@ -1,8 +1,10 @@
 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 { 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 { 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";
 import { IAuthenticationMcpAccessService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationMcpAccessService.service";
@@ -25,13 +27,15 @@ export declare class MainThreadMcp extends Disposable implements MainThreadMcpSh
     private readonly _extensionService;
     private readonly _contextKeyService;
     private readonly _telemetryService;
+    private readonly _mcpGatewayService;
     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, _telemetryService: ITelemetryService);
+    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);
     private _publishServerDefinitions;
     $upsertMcpCollection(collection: McpCollectionDefinition.FromExtHost, serversDto: McpServerDefinition.Serialized[]): void;
     $deleteMcpCollection(collectionId: string): void;
@@ -44,6 +48,11 @@ export declare class MainThreadMcp extends Disposable implements MainThreadMcpSh
     private continueWithIncorrectAccountPrompt;
     private _onDidChangeAuthSessions;
     $logMcpAuthSetup(data: IAuthMetadataSource): void;
+    $startMcpGateway(): Promise<{
+        address: URI;
+        gatewayId: string;
+    } | undefined>;
+    $disposeMcpGateway(gatewayId: string): void;
     private loginPrompt;
     dispose(): void;
 }

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

@@ -8,6 +8,7 @@ import { Disposable, DisposableMap, DisposableStore, MutableDisposable } from '@
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -15,6 +16,7 @@ import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 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 { 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 { 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';
@@ -41,7 +43,8 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         _dynamicAuthenticationProviderStorageService,
         _extensionService,
         _contextKeyService,
-        _telemetryService
+        _telemetryService,
+        _mcpGatewayService
     ) {
         super();
         this._extHostContext = _extHostContext;
@@ -55,11 +58,13 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         this._extensionService = _extensionService;
         this._contextKeyService = _contextKeyService;
         this._telemetryService = _telemetryService;
+        this._mcpGatewayService = _mcpGatewayService;
         this._serverIdCounter = 0;
         this._servers = ( new Map());
         this._serverDefinitions = ( new Map());
         this._serverAuthTracking = ( new McpServerAuthTracker());
         this._collectionDefinitions = this._register(( new DisposableMap()));
+        this._gateways = this._register(( new DisposableMap()));
         this._register(
             _authenticationService.onDidChangeSessions(e => this._onDidChangeAuthSessions(e.providerId, e.label))
         );
@@ -322,9 +327,9 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2538, "Incorrect account detected")),
+            message: ( localize(2583, "Incorrect account detected")),
             detail: ( localize(
-                2539,
+                2584,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -332,10 +337,10 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             type: Severity.Warning,
             cancelButton: true,
             buttons: [{
-                label: ( localize(2540, "Keep {0}", chosenAccountLabel)),
+                label: ( localize(2585, "Keep {0}", chosenAccountLabel)),
                 run: () => chosenAccountLabel
             }, {
-                label: ( localize(2541, "Login with {0}", requestedAccountLabel)),
+                label: ( localize(2586, "Login with {0}", requestedAccountLabel)),
                 run: () => requestedAccountLabel
             }]
         });
@@ -367,7 +372,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             } catch (e) {
                 if (UserInteractionRequiredError.is(e)) {
                     server.pushLog(LogLevel.Warning, ( localize(
-                        2542,
+                        2587,
                         "Authentication session for {0} removed, stopping server",
                         providerLabel
                     )));
@@ -379,20 +384,39 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     $logMcpAuthSetup(data) {
         this._telemetryService.publicLog2("mcp/authSetup", data);
     }
+    async $startMcpGateway() {
+        const result = await this._mcpGatewayService.createGateway(this._extHostContext.extensionHostKind === ExtensionHostKind.Remote);
+        if (!result) {
+            return undefined;
+        }
+        if (this._store.isDisposed) {
+            result.dispose();
+            return undefined;
+        }
+        const gatewayId = generateUuid();
+        this._gateways.set(gatewayId, result);
+        return {
+            address: result.address,
+            gatewayId
+        };
+    }
+    $disposeMcpGateway(gatewayId) {
+        this._gateways.deleteAndDispose(gatewayId);
+    }
     async loginPrompt(mcpLabel, providerLabel, recreatingSession) {
         const message = recreatingSession ? ( localize(
-            2543,
+            2588,
             "The MCP Server Definition '{0}' wants you to authenticate to {1}.",
             mcpLabel,
             providerLabel
         )) : ( localize(
-            2544,
+            2589,
             "The MCP Server Definition '{0}' wants to authenticate to {1}.",
             mcpLabel,
             providerLabel
         ));
         const buttons = [{
-            label: ( localize(2545, "&&Allow")),
+            label: ( localize(2590, "&&Allow")),
             run() {
                 return true;
             }
@@ -417,7 +441,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         super.dispose();
     }
 };
-MainThreadMcp = __decorate([extHostNamedCustomer(MainContext.MainThreadMcp), ( __param(1, IMcpRegistry)), ( __param(2, IDialogService)), ( __param(3, IAuthenticationService)), ( __param(4, IAuthenticationMcpService)), ( __param(5, IAuthenticationMcpAccessService)), ( __param(6, IAuthenticationMcpUsageService)), ( __param(7, IDynamicAuthenticationProviderStorageService)), ( __param(8, IExtensionService)), ( __param(9, IContextKeyService)), ( __param(10, ITelemetryService))], MainThreadMcp);
+MainThreadMcp = __decorate([extHostNamedCustomer(MainContext.MainThreadMcp), ( __param(1, IMcpRegistry)), ( __param(2, IDialogService)), ( __param(3, IAuthenticationService)), ( __param(4, IAuthenticationMcpService)), ( __param(5, IAuthenticationMcpAccessService)), ( __param(6, IAuthenticationMcpUsageService)), ( __param(7, IDynamicAuthenticationProviderStorageService)), ( __param(8, IExtensionService)), ( __param(9, IContextKeyService)), ( __param(10, ITelemetryService)), ( __param(11, IWorkbenchMcpGatewayService))], MainThreadMcp);
 class ExtHostMcpServerLaunch extends Disposable {
     pushLog(level, message) {
         this._onDidLog.fire({

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(2546, "Extension"));
+                source = ( localize(2591, "Extension"));
             }
             const secondaryActions = [];
             if (options.source) {
                 secondaryActions.push(toAction({
                     id: options.source.identifier.value,
-                    label: ( localize(2547, "Manage Extension")),
+                    label: ( localize(2592, "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(2548, "Cancel")),
+                    label: ( localize(2593, "Cancel")),
                     run: () => undefined
                 };
             } else {
                 cancelButton = {
-                    label: ( localize(2549, "&&OK")),
+                    label: ( localize(2594, "&&OK")),
                     run: () => undefined
                 };
             }

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

@@ -0,0 +1,9 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IMeteredConnectionService } from "@codingame/monaco-vscode-api/vscode/vs/platform/meteredConnection/common/meteredConnection.service";
+import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { MainThreadMeteredConnectionShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+export declare class MainThreadMeteredConnection extends Disposable implements MainThreadMeteredConnectionShape {
+    private readonly meteredConnectionService;
+    private readonly _proxy;
+    constructor(extHostContext: IExtHostContext, meteredConnectionService: IMeteredConnectionService);
+}

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

@@ -0,0 +1,26 @@
+
+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 { IMeteredConnectionService } from '@codingame/monaco-vscode-api/vscode/vs/platform/meteredConnection/common/meteredConnection.service';
+import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
+
+let MainThreadMeteredConnection = class MainThreadMeteredConnection extends Disposable {
+    constructor(extHostContext, meteredConnectionService) {
+        super();
+        this.meteredConnectionService = meteredConnectionService;
+        this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostMeteredConnection));
+        this._proxy.$initializeIsConnectionMetered(this.meteredConnectionService.isConnectionMetered);
+        this._register(
+            this.meteredConnectionService.onDidChangeIsConnectionMetered(isMetered => {
+                this._proxy.$onDidChangeIsConnectionMetered(isMetered);
+            })
+        );
+    }
+};
+MainThreadMeteredConnection = __decorate([
+    extHostNamedCustomer(MainContext.MainThreadMeteredConnection),
+    ( __param(1, IMeteredConnectionService))
+], MainThreadMeteredConnection);
+
+export { MainThreadMeteredConnection };

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(2550, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
+            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2595, "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(2551, "Show Output")),
+            name: ( localize(2596, "Show Output")),
             text: "$(output)",
-            ariaLabel: ( localize(2552, "Show {0} Output Channel", channel.label)),
+            ariaLabel: ( localize(2597, "Show {0} Output Channel", channel.label)),
             command: `workbench.action.output.show.${channel.id}`,
-            tooltip: ( localize(2553, "Show {0} Output Channel", channel.label)),
+            tooltip: ( localize(2598, "Show {0} Output Channel", channel.label)),
             kind: "prominent"
         };
         if (!this._outputStatusItem.value) {

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

@@ -0,0 +1,16 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { MainThreadPowerShape, PowerSaveBlockerType, PowerSystemIdleState, PowerThermalState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+import { IPowerService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/power/common/powerService.service";
+export declare class MainThreadPower extends Disposable implements MainThreadPowerShape {
+    private readonly powerService;
+    private readonly proxy;
+    constructor(extHostContext: IExtHostContext, powerService: IPowerService);
+    $getSystemIdleState(idleThreshold: number): Promise<PowerSystemIdleState>;
+    $getSystemIdleTime(): Promise<number>;
+    $getCurrentThermalState(): Promise<PowerThermalState>;
+    $isOnBatteryPower(): Promise<boolean>;
+    $startPowerSaveBlocker(type: PowerSaveBlockerType): Promise<number>;
+    $stopPowerSaveBlocker(id: number): Promise<boolean>;
+    $isPowerSaveBlockerStarted(id: number): Promise<boolean>;
+}

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

@@ -0,0 +1,54 @@
+
+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 { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
+import { IPowerService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/power/common/powerService.service';
+
+let MainThreadPower = class MainThreadPower extends Disposable {
+    constructor(extHostContext, powerService) {
+        super();
+        this.powerService = powerService;
+        this.proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostPower));
+        this._register(this.powerService.onDidSuspend(this.proxy.$onDidSuspend, this.proxy));
+        this._register(this.powerService.onDidResume(this.proxy.$onDidResume, this.proxy));
+        this._register(
+            this.powerService.onDidChangeOnBatteryPower(this.proxy.$onDidChangeOnBatteryPower, this.proxy)
+        );
+        this._register(
+            this.powerService.onDidChangeThermalState(state => this.proxy.$onDidChangeThermalState(state), this)
+        );
+        this._register(
+            this.powerService.onDidChangeSpeedLimit(this.proxy.$onDidChangeSpeedLimit, this.proxy)
+        );
+        this._register(this.powerService.onWillShutdown(this.proxy.$onWillShutdown, this.proxy));
+        this._register(this.powerService.onDidLockScreen(this.proxy.$onDidLockScreen, this.proxy));
+        this._register(
+            this.powerService.onDidUnlockScreen(this.proxy.$onDidUnlockScreen, this.proxy)
+        );
+    }
+    async $getSystemIdleState(idleThreshold) {
+        return this.powerService.getSystemIdleState(idleThreshold);
+    }
+    async $getSystemIdleTime() {
+        return this.powerService.getSystemIdleTime();
+    }
+    async $getCurrentThermalState() {
+        return this.powerService.getCurrentThermalState();
+    }
+    async $isOnBatteryPower() {
+        return this.powerService.isOnBatteryPower();
+    }
+    async $startPowerSaveBlocker(type) {
+        return this.powerService.startPowerSaveBlocker(type);
+    }
+    async $stopPowerSaveBlocker(id) {
+        return this.powerService.stopPowerSaveBlocker(id);
+    }
+    async $isPowerSaveBlockerStarted(id) {
+        return this.powerService.isPowerSaveBlockerStarted(id);
+    }
+};
+MainThreadPower = __decorate([extHostNamedCustomer(MainContext.MainThreadPower), ( __param(1, IPowerService))], MainThreadPower);
+
+export { MainThreadPower };

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(2554, "Manage Extension")),
+                    label: ( localize(2599, "Manage Extension")),
                     run: () => this._commandService.executeCommand("_extensions.manage", extensionId)
                 })]
             };

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

@@ -471,6 +471,7 @@ class MainThreadSCMProvider {
             const artifactProvider = ( new MainThreadSCMArtifactProvider(this.proxy, this.handle));
             this._artifactProvider.set(artifactProvider, undefined);
         } else if (features.hasArtifactProvider === false && this.artifactProvider.get()) {
+            this._artifactProvider.get()?.dispose();
             this._artifactProvider.set(undefined, undefined);
         }
         if (features.hasHistoryProvider && !this.historyProvider.get()) {
@@ -607,6 +608,9 @@ class MainThreadSCMProvider {
         };
     }
     dispose() {
+        this._onDidChangeResourceGroups.dispose();
+        this._onDidChangeResources.dispose();
+        this._artifactProvider.get()?.dispose();
         this._stagedQuickDiff?.dispose();
         this._quickDiff?.dispose();
     }

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(2555, "Aborted onWillSaveTextDocument-event after 1750ms"))))), 1750);
+            setTimeout(() => reject(( new Error(( localize(2600, "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(2556, "{0}: {1}", source.label, task.name));
+        const label = ( localize(2601, "{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/mainThreadTerminalService.js

@@ -179,7 +179,8 @@ let MainThreadTerminalService = class MainThreadTerminalService extends Disposab
             isExtensionOwnedTerminal: launchConfig.isExtensionOwnedTerminal,
             useShellEnvironment: launchConfig.useShellEnvironment,
             isTransient: launchConfig.isTransient,
-            shellIntegrationNonce: launchConfig.shellIntegrationNonce
+            shellIntegrationNonce: launchConfig.shellIntegrationNonce,
+            titleTemplate: launchConfig.titleTemplate
         };
         const terminal = Promises.withAsyncBody(async r => {
             const terminal = await this._terminalService.createTerminal({
@@ -418,7 +419,8 @@ let MainThreadTerminalService = class MainThreadTerminalService extends Disposab
             cwd: terminalInstance.shellLaunchConfig.cwd,
             env: terminalInstance.shellLaunchConfig.env,
             hideFromUser: terminalInstance.shellLaunchConfig.hideFromUser,
-            tabActions: terminalInstance.shellLaunchConfig.tabActions
+            tabActions: terminalInstance.shellLaunchConfig.tabActions,
+            titleTemplate: terminalInstance.shellLaunchConfig.titleTemplate
         };
         this._proxy.$acceptTerminalOpened(
             terminalInstance.instanceId,

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

@@ -40,7 +40,7 @@ export declare class MainThreadTreeViews extends Disposable implements MainThrea
     $setBadge(treeViewId: string, badge: IViewBadge | undefined): void;
     $resolveDropFileData(destinationViewId: string, requestId: number, dataItemId: string): Promise<VSBuffer>;
     $disposeTree(treeViewId: string): Promise<void>;
-    $logResolveTreeNodeRetry(extensionId: string, retryCount: number, exhausted: boolean): void;
+    $logResolveTreeNodeFailure(extensionId: string): void;
     private reveal;
     private registerListeners;
     private getTreeView;

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

@@ -10,7 +10,9 @@ import { isUndefinedOrNull, isNumber } from '@codingame/monaco-vscode-api/vscode
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { VSDataTransfer, createStringDataTransferItem } from '@codingame/monaco-vscode-api/vscode/vs/base/common/dataTransfer';
+import { VSDataTransfer, UriList, createStringDataTransferItem } from '@codingame/monaco-vscode-api/vscode/vs/base/common/dataTransfer';
+import { Mimes } from '@codingame/monaco-vscode-api/vscode/vs/base/common/mime';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { DataTransferFileCache } from '../common/shared/dataTransferCache.js';
 import { DataTransfer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHostTypeConverters';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
@@ -139,11 +141,9 @@ let MainThreadTreeViews = class MainThreadTreeViews extends Disposable {
         }
         this._dataProviders.deleteAndDispose(treeViewId);
     }
-    $logResolveTreeNodeRetry(extensionId, retryCount, exhausted) {
-        this.telemetryService.publicLog2("treeView.resolveRetry", {
-            extensionId,
-            retryCount,
-            exhausted
+    $logResolveTreeNodeFailure(extensionId) {
+        this.telemetryService.publicLog2("treeView.resolveFailure", {
+            extensionId
         });
     }
     async reveal(treeView, dataProvider, itemIn, parentChain, options) {
@@ -280,7 +280,8 @@ class TreeViewDragAndDropController {
         }
         const additionalDataTransfer = ( new VSDataTransfer());
         additionalDataTransferDTO.items.forEach(([type, item]) => {
-            additionalDataTransfer.replace(type, createStringDataTransferItem(item.asString));
+            const value = type === Mimes.uriList && item.uriListData ? UriList.create(( item.uriListData.map(part => typeof part === "string" ? part : URI.revive(part)))) : item.asString;
+            additionalDataTransfer.replace(type, createStringDataTransferItem(value));
         });
         return additionalDataTransfer;
     }

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(
-            2557,
+            2602,
             "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(2558, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
+            label: ( localize(2603, "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(2559, "Open using default opener")), undefined, undefined, async () => {
+                        const openDefaultAction = ( new Action("default", ( localize(2604, "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(2560, "Could not open uri with '{0}': {1}", id, (e.toString()))),
+                            message: ( localize(2605, "Could not open uri with '{0}': {1}", id, (e.toString()))),
                             actions: {
                                 primary: [openDefaultAction]
                             }

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

@@ -5,7 +5,7 @@ import { URI, UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IExtensionUrlHandler } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/browser/extensionUrlHandler.service";
 import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";
-import { ITrustedDomainService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/url/browser/trustedDomainService.service";
+import { ITrustedDomainService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/url/browser/trustedDomainService";
 export declare class MainThreadUrls extends Disposable implements MainThreadUrlsShape {
     private readonly urlService;
     private readonly extensionUrlHandler;

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

@@ -6,7 +6,8 @@ import { IURLService } from '@codingame/monaco-vscode-api/vscode/vs/platform/url
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IExtensionUrlHandler } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/browser/extensionUrlHandler.service';
 import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
-import { ITrustedDomainService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/url/browser/trustedDomainService.service';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/url/browser/trustedDomainService';
+import { ITrustedDomainService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/url/common/trustedDomainService.service';
 
 class ExtensionUrlHandler {
     constructor(proxy, handle, extensionId, extensionDisplayName) {

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

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

@@ -12,7 +12,7 @@ import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/l
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { IRequestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service';
 import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
-import { WorkbenchState, isUntitledWorkspace } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
+import { isUntitledWorkspace } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { checkGlobFileExists } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/workspaceContains';
@@ -106,10 +106,10 @@ let MainThreadWorkspace = class MainThreadWorkspace {
         const wantsToDelete = removeCount > 0;
         if (wantsToAdd && !wantsToDelete) {
             if (addCount === 1) {
-                message = ( localize(2562, "Extension '{0}' added 1 folder to the workspace", extensionName));
+                message = ( localize(2607, "Extension '{0}' added 1 folder to the workspace", extensionName));
             } else {
                 message = ( localize(
-                    2563,
+                    2608,
                     "Extension '{0}' added {1} folders to the workspace",
                     extensionName,
                     addCount
@@ -118,10 +118,10 @@ let MainThreadWorkspace = class MainThreadWorkspace {
         }
         else if (wantsToDelete && !wantsToAdd) {
             if (removeCount === 1) {
-                message = ( localize(2564, "Extension '{0}' removed 1 folder from the workspace", extensionName));
+                message = ( localize(2609, "Extension '{0}' removed 1 folder from the workspace", extensionName));
             } else {
                 message = ( localize(
-                    2565,
+                    2610,
                     "Extension '{0}' removed {1} folders from the workspace",
                     extensionName,
                     removeCount
@@ -129,7 +129,7 @@ let MainThreadWorkspace = class MainThreadWorkspace {
             }
         }
         else {
-            message = ( localize(2566, "Extension '{0}' changed folders of the workspace", extensionName));
+            message = ( localize(2611, "Extension '{0}' changed folders of the workspace", extensionName));
         }
         return message;
     }
@@ -137,7 +137,7 @@ let MainThreadWorkspace = class MainThreadWorkspace {
         this._proxy.$acceptWorkspaceData(this.getWorkspaceData(this._contextService.getWorkspace()));
     }
     getWorkspaceData(workspace) {
-        if (this._contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
+        if (!this._contextService.hasWorkspaceData()) {
             return null;
         }
         return {
@@ -146,8 +146,7 @@ let MainThreadWorkspace = class MainThreadWorkspace {
             folders: workspace.folders,
             id: workspace.id,
             name: this._labelService.getWorkspaceLabel(workspace),
-            transient: workspace.transient,
-            isAgentSessionsWorkspace: workspace.isAgentSessionsWorkspace
+            transient: workspace.transient
         };
     }
     $startFileSearch(_includeFolder, options, token) {

package/vscode/src/vs/workbench/api/common/shared/tasks.d.ts

@@ -4,7 +4,7 @@ import type { Dto } from "@codingame/monaco-vscode-api/vscode/vs/workbench/servi
 import { ITaskExecution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/tasks";
 export interface ITaskDefinitionDTO {
     type: string;
-    [name: string]: any;
+    [name: string]: unknown;
 }
 export interface ITaskPresentationOptionsDTO {
     reveal?: number;

package/vscode/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.js

@@ -60,7 +60,7 @@ let CustomTextEditorModel = CustomTextEditorModel_1 = class CustomTextEditorMode
         }));
         this._register(extensionService.onWillStop(e => {
             e.veto(true, ( localize(
-                6930,
+                7723,
                 "An extension provided text editor for '{0}' is still open that would close otherwise.",
                 this.name
             )));