@codingame/monaco-vscode-extensions-service-override 21.6.0 → 22.0.1

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

@@ -9,7 +9,7 @@ import { DisposableStore, DisposableMap, Disposable, toDisposable } from '@codin
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { resizeImage } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { resizeImage } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
 import { ILanguageModelIgnoredFilesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/ignoredFiles.service';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { IAuthenticationAccessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationAccessService.service';
@@ -43,45 +43,51 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         this._store.dispose();
     }
     $registerLanguageModelProvider(vendor) {
-        const dipsosables = ( new DisposableStore());
-        dipsosables.add(this._chatProviderService.registerLanguageModelProvider(vendor, {
-            onDidChange: Event.filter(this._lmProviderChange.event, e => e.vendor === vendor, dipsosables),
-            provideLanguageModelChatInfo: async (options, token) => {
-                const modelsAndIdentifiers = await this._proxy.$provideLanguageModelChatInfo(vendor, options, token);
-                modelsAndIdentifiers.forEach(m => {
-                    if (m.metadata.auth) {
-                        dipsosables.add(this._registerAuthenticationProvider(m.metadata.extension, m.metadata.auth));
+        const disposables = ( new DisposableStore());
+        try {
+            disposables.add(this._chatProviderService.registerLanguageModelProvider(vendor, {
+                onDidChange: Event.filter(this._lmProviderChange.event, e => e.vendor === vendor, disposables),
+                provideLanguageModelChatInfo: async (options, token) => {
+                    const modelsAndIdentifiers = await this._proxy.$provideLanguageModelChatInfo(vendor, options, token);
+                    modelsAndIdentifiers.forEach(m => {
+                        if (m.metadata.auth) {
+                            disposables.add(this._registerAuthenticationProvider(m.metadata.extension, m.metadata.auth));
+                        }
+                    });
+                    return modelsAndIdentifiers;
+                },
+                sendChatRequest: async (modelId, messages, from, options, token) => {
+                    const requestId = (Math.random() * 1e6) | 0;
+                    const defer = ( new DeferredPromise());
+                    const stream = ( new AsyncIterableSource());
+                    try {
+                        this._pendingProgress.set(requestId, { defer, stream });
+                        await Promise.all(( messages.flatMap(msg => msg.content)
+                            .filter(part => part.type === 'image_url')
+                            .map(async (part) => {
+                            part.value.data = VSBuffer.wrap(await resizeImage(part.value.data.buffer));
+                        })));
+                        await this._proxy.$startChatRequest(modelId, requestId, from, ( new SerializableObjectWithBuffers(messages)), options, token);
                     }
-                });
-                return modelsAndIdentifiers;
-            },
-            sendChatRequest: async (modelId, messages, from, options, token) => {
-                const requestId = (Math.random() * 1e6) | 0;
-                const defer = ( new DeferredPromise());
-                const stream = ( new AsyncIterableSource());
-                try {
-                    this._pendingProgress.set(requestId, { defer, stream });
-                    await Promise.all(( messages.flatMap(msg => msg.content)
-                        .filter(part => part.type === 'image_url')
-                        .map(async (part) => {
-                        part.value.data = VSBuffer.wrap(await resizeImage(part.value.data.buffer));
-                    })));
-                    await this._proxy.$startChatRequest(modelId, requestId, from, ( new SerializableObjectWithBuffers(messages)), options, token);
-                }
-                catch (err) {
-                    this._pendingProgress.delete(requestId);
-                    throw err;
-                }
-                return {
-                    result: defer.p,
-                    stream: stream.asyncIterable
-                };
-            },
-            provideTokenCount: (modelId, str, token) => {
-                return this._proxy.$provideTokenLength(modelId, str, token);
-            },
-        }));
-        this._providerRegistrations.set(vendor, dipsosables);
+                    catch (err) {
+                        this._pendingProgress.delete(requestId);
+                        throw err;
+                    }
+                    return {
+                        result: defer.p,
+                        stream: stream.asyncIterable
+                    };
+                },
+                provideTokenCount: (modelId, str, token) => {
+                    return this._proxy.$provideTokenLength(modelId, str, token);
+                },
+            }));
+            this._providerRegistrations.set(vendor, disposables);
+        }
+        catch (err) {
+            disposables.dispose();
+            throw err;
+        }
     }
     $onLMProviderChange(vendor) {
         this._lmProviderChange.fire({ vendor });
@@ -154,7 +160,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         if (this._authenticationService.getProviderIds().includes(authProviderId)) {
             return Disposable.None;
         }
-        const accountLabel = auth.accountLabel ?? ( localize(2483, 'Language Models'));
+        const accountLabel = auth.accountLabel ?? ( localize(2489, 'Language Models'));
         const disposables = ( new DisposableStore());
         this._authenticationService.registerAuthenticationProvider(authProviderId, ( new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel)));
         disposables.add(toDisposable(() => {
@@ -230,7 +236,7 @@ class LanguageModelAccessAuthProvider {
     }
     confirmation(extensionName, _recreatingSession) {
         return localize(
-            2484,
+            2490,
             "The extension '{0}' wants to access the language models provided by {1}.",
             extensionName,
             this.label

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

@@ -1,6 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IAuthorizationProtectedResourceMetadata, IAuthorizationServerMetadata } from "@codingame/monaco-vscode-api/vscode/vs/base/common/oauth";
 import { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { LogLevel } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log";
 import { IMcpRegistry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service";
@@ -9,6 +10,7 @@ import { IAuthenticationMcpAccessService } from "@codingame/monaco-vscode-api/vs
 import { IAuthenticationMcpService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationMcpService.service";
 import { IAuthenticationMcpUsageService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationMcpUsageService.service";
 import { IAuthenticationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service";
+import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { MainThreadMcpShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 export declare class MainThreadMcp extends Disposable implements MainThreadMcpShape {
@@ -19,18 +21,20 @@ export declare class MainThreadMcp extends Disposable implements MainThreadMcpSh
     private readonly authenticationMcpServersService;
     private readonly authenticationMCPServerAccessService;
     private readonly authenticationMCPServerUsageService;
+    private readonly _extensionService;
+    private readonly _contextKeyService;
     private _serverIdCounter;
     private readonly _servers;
     private readonly _serverDefinitions;
     private readonly _proxy;
     private readonly _collectionDefinitions;
-    constructor(_extHostContext: IExtHostContext, _mcpRegistry: IMcpRegistry, dialogService: IDialogService, _authenticationService: IAuthenticationService, authenticationMcpServersService: IAuthenticationMcpService, authenticationMCPServerAccessService: IAuthenticationMcpAccessService, authenticationMCPServerUsageService: IAuthenticationMcpUsageService);
+    constructor(_extHostContext: IExtHostContext, _mcpRegistry: IMcpRegistry, dialogService: IDialogService, _authenticationService: IAuthenticationService, authenticationMcpServersService: IAuthenticationMcpService, authenticationMCPServerAccessService: IAuthenticationMcpAccessService, authenticationMCPServerUsageService: IAuthenticationMcpUsageService, _extensionService: IExtensionService, _contextKeyService: IContextKeyService);
     $upsertMcpCollection(collection: McpCollectionDefinition.FromExtHost, serversDto: McpServerDefinition.Serialized[]): void;
     $deleteMcpCollection(collectionId: string): void;
     $onDidChangeState(id: number, update: McpConnectionState): void;
     $onDidPublishLog(id: number, level: LogLevel, log: string): void;
     $onDidReceiveMessage(id: number, message: string): void;
-    $getTokenFromServerMetadata(id: number, authServerComponents: UriComponents, serverMetadata: IAuthorizationServerMetadata, resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined): Promise<string | undefined>;
+    $getTokenFromServerMetadata(id: number, authServerComponents: UriComponents, serverMetadata: IAuthorizationServerMetadata, resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined, errorOnUserInteraction?: boolean): Promise<string | undefined>;
     private continueWithIncorrectAccountPrompt;
     private loginPrompt;
     dispose(): void;

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

@@ -1,29 +1,33 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { mapFindFirst } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arraysFind';
 import { disposableTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableMap, DisposableStore, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { 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';
 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 { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
-import { McpServerTransportType, McpServerDefinition, McpServerTrust, McpServerLaunch, McpConnectionState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
+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';
 import { IAuthenticationMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationMcpService.service';
 import { IAuthenticationMcpUsageService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationMcpUsageService.service';
 import { IAuthenticationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
 import { ExtensionHostKind, extensionHostKindToString } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostKind';
+import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
 let MainThreadMcp = class MainThreadMcp extends Disposable {
-    constructor(_extHostContext, _mcpRegistry, dialogService, _authenticationService, authenticationMcpServersService, authenticationMCPServerAccessService, authenticationMCPServerUsageService) {
+    constructor(_extHostContext, _mcpRegistry, dialogService, _authenticationService, authenticationMcpServersService, authenticationMCPServerAccessService, authenticationMCPServerUsageService, _extensionService, _contextKeyService) {
         super();
         this._extHostContext = _extHostContext;
         this._mcpRegistry = _mcpRegistry;
@@ -32,6 +36,8 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         this.authenticationMcpServersService = authenticationMcpServersService;
         this.authenticationMCPServerAccessService = authenticationMCPServerAccessService;
         this.authenticationMCPServerUsageService = authenticationMCPServerUsageService;
+        this._extensionService = _extensionService;
+        this._contextKeyService = _contextKeyService;
         this._serverIdCounter = 0;
         this._servers = ( new Map());
         this._serverDefinitions = ( new Map());
@@ -51,7 +57,11 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
                 }
                 return true;
             },
-            start: (_collection, serverDefiniton, resolveLaunch) => {
+            async substituteVariables(serverDefinition, launch) {
+                const ser = await proxy.$substituteVariables(serverDefinition.variableReplacement?.folder?.uri, McpServerLaunch.toSerialized(launch));
+                return McpServerLaunch.fromSerialized(ser);
+            },
+            start: (_collection, serverDefiniton, resolveLaunch, options) => {
                 const id = ++this._serverIdCounter;
                 const launch = ( new ExtHostMcpServerLaunch(
                     _extHostContext.extensionHostKind,
@@ -60,7 +70,11 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
                 ));
                 this._servers.set(id, launch);
                 this._serverDefinitions.set(id, serverDefiniton);
-                proxy.$startMcp(id, resolveLaunch);
+                proxy.$startMcp(id, {
+                    launch: resolveLaunch,
+                    defaultCwd: serverDefiniton.variableReplacement?.folder?.uri,
+                    errorOnUserInteraction: options?.errorOnUserInteraction,
+                });
                 return launch;
             },
         }));
@@ -73,21 +87,44 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         }
         else {
             const serverDefinitions = observableValue('mcpServers', servers);
-            const handle = this._mcpRegistry.registerCollection({
-                ...collection,
-                source: ( new ExtensionIdentifier(collection.extensionId)),
-                resolveServerLanch: collection.canResolveLaunch ? (async (def) => {
-                    const r = await this._proxy.$resolveMcpLaunch(collection.id, def.label);
-                    return r ? McpServerLaunch.fromSerialized(r) : undefined;
-                }) : undefined,
-                trustBehavior: collection.isTrustedByDefault ? McpServerTrust.Kind.Trusted : McpServerTrust.Kind.TrustedOnNonce,
-                remoteAuthority: this._extHostContext.remoteAuthority,
-                serverDefinitions,
-            });
+            const extensionId = ( new ExtensionIdentifier(collection.extensionId));
+            const store = ( new DisposableStore());
+            const handle = ( new MutableDisposable());
+            const register = () => {
+                handle.value ??= this._mcpRegistry.registerCollection({
+                    ...collection,
+                    source: extensionId,
+                    resolveServerLanch: collection.canResolveLaunch ? (async (def) => {
+                        const r = await this._proxy.$resolveMcpLaunch(collection.id, def.label);
+                        return r ? McpServerLaunch.fromSerialized(r) : undefined;
+                    }) : undefined,
+                    trustBehavior: collection.isTrustedByDefault ? McpServerTrust.Kind.Trusted : McpServerTrust.Kind.TrustedOnNonce,
+                    remoteAuthority: this._extHostContext.remoteAuthority,
+                    serverDefinitions,
+                });
+            };
+            const whenClauseStr = mapFindFirst(this._extensionService.extensions, e => ExtensionIdentifier.equals(extensionId, e.identifier)
+                ? e.contributes?.mcpServerDefinitionProviders?.find(p => extensionPrefixedIdentifier(extensionId, p.id) === collection.id)?.when
+                : undefined);
+            const whenClause = whenClauseStr && ContextKeyExpr.deserialize(whenClauseStr);
+            if (!whenClause) {
+                register();
+            }
+            else {
+                const evaluate = () => {
+                    if (this._contextKeyService.contextMatchesRules(whenClause)) {
+                        register();
+                    }
+                    else {
+                        handle.clear();
+                    }
+                };
+                store.add(this._contextKeyService.onDidChangeContext(evaluate));
+                evaluate();
+            }
             this._collectionDefinitions.set(collection.id, {
-                fromExtHost: collection,
                 servers: serverDefinitions,
-                dispose: () => handle.dispose(),
+                dispose: () => store.dispose(),
             });
         }
     }
@@ -116,7 +153,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     $onDidReceiveMessage(id, message) {
         this._servers.get(id)?.pushMessage(message);
     }
-    async $getTokenFromServerMetadata(id, authServerComponents, serverMetadata, resourceMetadata) {
+    async $getTokenFromServerMetadata(id, authServerComponents, serverMetadata, resourceMetadata, errorOnUserInteraction) {
         const server = this._serverDefinitions.get(id);
         if (!server) {
             return undefined;
@@ -149,16 +186,25 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
                 return sessions[0].accessToken;
             }
         }
+        if (errorOnUserInteraction) {
+            throw ( new UserInteractionRequiredError('authentication'));
+        }
         const isAllowed = await this.loginPrompt(server.label, provider.label, false);
         if (!isAllowed) {
             throw ( new Error('User did not consent to login.'));
         }
         if (sessions.length) {
+            if (provider.supportsMultipleAccounts && errorOnUserInteraction) {
+                throw ( new UserInteractionRequiredError('authentication'));
+            }
             session = provider.supportsMultipleAccounts
                 ? await this.authenticationMcpServersService.selectSession(providerId, server.id, server.label, scopesSupported, sessions)
                 : sessions[0];
         }
         else {
+            if (errorOnUserInteraction) {
+                throw ( new UserInteractionRequiredError('authentication'));
+            }
             const accountToCreate = matchingAccountPreferenceSession?.account;
             do {
                 session = await this._authenticationService.createSession(providerId, scopesSupported, {
@@ -177,9 +223,9 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2485, "Incorrect account detected")),
+            message: ( localize(2491, "Incorrect account detected")),
             detail: ( localize(
-                2486,
+                2492,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -188,11 +234,11 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             cancelButton: true,
             buttons: [
                 {
-                    label: ( localize(2487, 'Keep {0}', chosenAccountLabel)),
+                    label: ( localize(2493, 'Keep {0}', chosenAccountLabel)),
                     run: () => chosenAccountLabel
                 },
                 {
-                    label: ( localize(2488, 'Login with {0}', requestedAccountLabel)),
+                    label: ( localize(2494, 'Login with {0}', requestedAccountLabel)),
                     run: () => requestedAccountLabel
                 }
             ],
@@ -205,20 +251,20 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     async loginPrompt(mcpLabel, providerLabel, recreatingSession) {
         const message = recreatingSession
             ? ( localize(
-            2489,
+            2495,
             "The MCP Server Definition '{0}' wants you to authenticate to {1}.",
             mcpLabel,
             providerLabel
         ))
             : ( localize(
-            2490,
+            2496,
             "The MCP Server Definition '{0}' wants to authenticate to {1}.",
             mcpLabel,
             providerLabel
         ));
         const buttons = [
             {
-                label: ( localize(2491, "&&Allow")),
+                label: ( localize(2497, "&&Allow")),
                 run() {
                     return true;
                 },
@@ -248,7 +294,9 @@ MainThreadMcp = __decorate([
     ( __param(3, IAuthenticationService)),
     ( __param(4, IAuthenticationMcpService)),
     ( __param(5, IAuthenticationMcpAccessService)),
-    ( __param(6, IAuthenticationMcpUsageService))
+    ( __param(6, IAuthenticationMcpUsageService)),
+    ( __param(7, IExtensionService)),
+    ( __param(8, IContextKeyService))
 ], 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(2492, "Extension"));
+                source = ( localize(2498, "Extension"));
             }
             const secondaryActions = [];
             if (options.source) {
                 secondaryActions.push(toAction({
                     id: options.source.identifier.value,
-                    label: ( localize(2493, "Manage Extension")),
+                    label: ( localize(2499, "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(2494, "Cancel")),
+                    label: ( localize(2500, "Cancel")),
                     run: () => undefined
                 };
             }
             else {
                 cancelButton = {
-                    label: ( localize(2495, "&&OK")),
+                    label: ( localize(2501, "&&OK")),
                     run: () => undefined
                 };
             }

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

@@ -8,7 +8,7 @@ import { MainThreadNotebookDocuments } from './mainThreadNotebookDocuments.js';
 import { NotebookDto } from './mainThreadNotebookDto.js';
 import { MainThreadNotebookEditors } from './mainThreadNotebookEditors.js';
 import { extHostCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { editorGroupToColumn } from '@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { editorGroupToColumn } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';

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

@@ -7,7 +7,7 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { EditorActivation } from '@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor';
 import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
-import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ExtHostContext, NotebookEditorRevealType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';

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(2496, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
+            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2502, "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(2497, "Show Output")),
+            name: ( localize(2503, "Show Output")),
             text: '$(output)',
-            ariaLabel: ( localize(2498, "Show {0} Output Channel", channel.label)),
+            ariaLabel: ( localize(2504, "Show {0} Output Channel", channel.label)),
             command: `workbench.action.output.show.${channel.id}`,
-            tooltip: ( localize(2499, "Show {0} Output Channel", channel.label)),
+            tooltip: ( localize(2505, "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(2500, "Manage Extension")),
+                        label: ( localize(2506, "Manage Extension")),
                         run: () => this._commandService.executeCommand('_extensions.manage', extensionId)
                     })]
             };

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

@@ -12,7 +12,7 @@ import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/c
 import { MarshalledId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { IQuickDiffService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
-import { ResourceTree } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/base/common/resourceTree';
+import { ResourceTree } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/base/common/resourceTree';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
@@ -21,7 +21,7 @@ import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/com
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { structuralEquals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/equals';
-import { historyItemRefColor, historyItemRemoteRefColor, historyItemBaseRefColor } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/scm/browser/scmHistory';
+import { historyItemRefColor, historyItemRemoteRefColor, historyItemBaseRefColor } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/scm/browser/scmHistory';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValueOpts';
 import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
@@ -163,9 +163,16 @@ class MainThreadSCMHistoryProvider {
         }, undefined);
         this._historyItemRefChanges = observableValue(this, { added: [], modified: [], removed: [], silent: false });
     }
+    async resolveHistoryItem(historyItemId, token) {
+        const historyItem = await this.proxy.$resolveHistoryItem(this.handle, historyItemId, token ?? CancellationToken.None);
+        return historyItem ? toISCMHistoryItem(historyItem) : undefined;
+    }
     async resolveHistoryItemChatContext(historyItemId, token) {
         return this.proxy.$resolveHistoryItemChatContext(this.handle, historyItemId, token ?? CancellationToken.None);
     }
+    async resolveHistoryItemChangeRangeChatContext(historyItemId, historyItemParentId, path, token) {
+        return this.proxy.$resolveHistoryItemChangeRangeChatContext(this.handle, historyItemId, historyItemParentId, path, token ?? CancellationToken.None);
+    }
     async resolveHistoryItemRefsCommonAncestor(historyItemRefs, token) {
         return this.proxy.$resolveHistoryItemRefsCommonAncestor(this.handle, historyItemRefs, token ?? CancellationToken.None);
     }

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

@@ -10,7 +10,7 @@ import { SearchProviderType, QueryType } from '@codingame/monaco-vscode-api/vsco
 import { ISearchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
-import { SearchContext } from '@codingame/monaco-vscode-4dda7789-5a25-5e8b-b2de-c2f11b1b96e5-common/vscode/vs/workbench/contrib/search/common/constants';
+import { SearchContext } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/search/common/constants';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 
 let MainThreadSearch = class MainThreadSearch {

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(2502, '{0}: {1}', source.label, task.name));
+        const label = ( localize(2508, '{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

@@ -228,13 +228,27 @@ let MainThreadTerminalService = class MainThreadTerminalService {
             id,
             provideCompletions: async (commandLine, cursorPosition, allowFallbackCompletions, token) => {
                 const completions = await this._proxy.$provideTerminalCompletions(id, { commandLine, cursorPosition, allowFallbackCompletions }, token);
-                return {
-                    items: completions?.items.map(c => ({
-                        provider: `ext:${id}`,
-                        ...c,
-                    })),
-                    resourceRequestConfig: completions?.resourceRequestConfig
-                };
+                if (!completions) {
+                    return undefined;
+                }
+                if (completions.resourceRequestConfig) {
+                    const { cwd, globPattern, ...rest } = completions.resourceRequestConfig;
+                    return {
+                        items: completions.items?.map(c => ({
+                            provider: `ext:${id}`,
+                            ...c,
+                        })),
+                        resourceRequestConfig: {
+                            ...rest,
+                            cwd,
+                            globPattern
+                        }
+                    };
+                }
+                return completions.items?.map(c => ({
+                    provider: `ext:${id}`,
+                    ...c,
+                }));
             }
         }, ...triggerCharacters));
     }

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

@@ -39,6 +39,7 @@ export declare class MainThreadTunnelService extends Disposable implements MainT
     $getTunnels(): Promise<TunnelDescription[]>;
     $onFoundNewCandidates(candidates: CandidatePort[]): Promise<void>;
     $setTunnelProvider(features: TunnelProviderFeatures | undefined, isResolver: boolean): Promise<void>;
+    $hasTunnelProvider(): Promise<boolean>;
     $setCandidateFilter(): Promise<void>;
     $setCandidatePortSource(source: CandidatePortSource): Promise<void>;
 }

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(
-            2503,
+            2509,
             "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(2504, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
+                label: ( localize(2510, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
                 run: async () => {
                     this.elevateionRetry = true;
                     await this.remoteExplorerService.close({ host: tunnel.tunnelRemoteHost, port: tunnel.tunnelRemotePort }, TunnelCloseReason.Other);
@@ -189,6 +189,9 @@ let MainThreadTunnelService = class MainThreadTunnelService extends Disposable {
             this.contextKeyService.createKey(forwardedPortsFeaturesEnabled.key, true);
         }
     }
+    async $hasTunnelProvider() {
+        return this.tunnelService.hasTunnelProvider;
+    }
     async $setCandidateFilter() {
         this.remoteExplorerService.setCandidateFilter((candidates) => {
             return this._proxy.$applyCandidateFilter(candidates);