@codingame/monaco-vscode-api 28.4.1 → 29.1.0

package/vscode/src/vs/workbench/api/common/extHostGitExtensionService.js

@@ -30,6 +30,7 @@ function toGitBranchDto(branch) {
         commit: branch.commit,
         type: toGitRefTypeDto(branch.type),
         remote: branch.remote,
+        base: branch.base,
         upstream: branch.upstream ? toGitUpstreamRefDto(branch.upstream) : undefined,
         ahead: branch.ahead,
         behind: branch.behind
@@ -42,6 +43,49 @@ function toGitUpstreamRefDto(upstream) {
         commit: upstream.commit
     };
 }
+var GitStatus;
+(function(GitStatus) {
+    GitStatus[GitStatus["INDEX_ADDED"] = 1] = "INDEX_ADDED";
+    GitStatus[GitStatus["INDEX_DELETED"] = 2] = "INDEX_DELETED";
+    GitStatus[GitStatus["INDEX_RENAMED"] = 3] = "INDEX_RENAMED";
+    GitStatus[GitStatus["MODIFIED"] = 5] = "MODIFIED";
+    GitStatus[GitStatus["DELETED"] = 6] = "DELETED";
+    GitStatus[GitStatus["UNTRACKED"] = 7] = "UNTRACKED";
+    GitStatus[GitStatus["INTENT_TO_ADD"] = 9] = "INTENT_TO_ADD";
+    GitStatus[GitStatus["INTENT_TO_RENAME"] = 10] = "INTENT_TO_RENAME";
+})(GitStatus || (GitStatus = {}));
+function toGitChangeDto(change) {
+    switch (change.status) {
+    case GitStatus.INDEX_ADDED:
+    case GitStatus.UNTRACKED:
+    case GitStatus.INTENT_TO_ADD:
+        return {
+            uri: change.uri,
+            originalUri: undefined,
+            modifiedUri: change.uri
+        };
+    case GitStatus.INDEX_DELETED:
+    case GitStatus.DELETED:
+        return {
+            uri: change.uri,
+            originalUri: change.uri,
+            modifiedUri: undefined
+        };
+    case GitStatus.INDEX_RENAMED:
+    case GitStatus.INTENT_TO_RENAME:
+        return {
+            uri: change.uri,
+            originalUri: change.originalUri,
+            modifiedUri: change.renameUri
+        };
+    default:
+        return {
+            uri: change.uri,
+            originalUri: change.originalUri,
+            modifiedUri: change.uri
+        };
+    }
+}
 var GitRefType;
 (function(GitRefType) {
     GitRefType[GitRefType["Head"] = 0] = "Head";
@@ -79,12 +123,11 @@ let ExtHostGitExtensionService = class ExtHostGitExtensionService extends Dispos
         }
         const existingHandle = this._repositoryByUri.get(repository.rootUri);
         if (existingHandle !== undefined) {
+            const state = await this._getRepositoryState(repository);
             return {
                 handle: existingHandle,
                 rootUri: repository.rootUri,
-                state: {
-                    HEAD: repository.state.HEAD ? toGitBranchDto(repository.state.HEAD) : undefined
-                }
+                state
             };
         }
         let repositoryState = repository.state;
@@ -98,12 +141,11 @@ let ExtHostGitExtensionService = class ExtHostGitExtensionService extends Dispos
         this._disposables.add(repository.state.onDidChange(() => {
             this._proxy.$onDidChangeRepository(handle);
         }));
+        const state = await this._getRepositoryState(repository);
         return {
             handle,
             rootUri: repository.rootUri,
-            state: {
-                HEAD: repository.state.HEAD ? toGitBranchDto(repository.state.HEAD) : undefined
-            }
+            state
         };
     }
     async $getRefs(handle, query, token) {
@@ -135,11 +177,69 @@ let ExtHostGitExtensionService = class ExtHostGitExtensionService extends Dispos
         if (!repository) {
             return undefined;
         }
+        return this._getRepositoryState(repository);
+    }
+    async _getRepositoryState(repository) {
+        const state = repository.state;
+        const base = await this._getBranchBase(repository);
+        return {
+            HEAD: state.HEAD ? toGitBranchDto({
+                ...state.HEAD,
+                base
+            }) : undefined,
+            mergeChanges: ( state.mergeChanges.map(toGitChangeDto)),
+            indexChanges: ( state.indexChanges.map(toGitChangeDto)),
+            workingTreeChanges: ( state.workingTreeChanges.map(toGitChangeDto)),
+            untrackedChanges: ( state.untrackedChanges.map(toGitChangeDto))
+        };
+    }
+    async _getBranchBase(repository) {
         const state = repository.state;
+        if (!state.HEAD?.name) {
+            return undefined;
+        }
+        const baseBranch = await repository.getBranchBase(state.HEAD.name);
+        if (!baseBranch?.name) {
+            return undefined;
+        }
+        const isProtected = repository.isBranchProtected(baseBranch);
         return {
-            HEAD: state.HEAD ? toGitBranchDto(state.HEAD) : undefined
+            name: baseBranch.name,
+            isProtected
         };
     }
+    async $diffBetweenWithStats(handle, ref1, ref2, path) {
+        const repository = this._repositories.get(handle);
+        if (!repository) {
+            return [];
+        }
+        try {
+            const changes = await repository.diffBetweenWithStats(ref1, ref2, path);
+            return ( changes.map(c => ({
+                ...toGitChangeDto(c),
+                insertions: c.insertions,
+                deletions: c.deletions
+            })));
+        } catch {
+            return [];
+        }
+    }
+    async $diffBetweenWithStats2(handle, ref, path) {
+        const repository = this._repositories.get(handle);
+        if (!repository) {
+            return [];
+        }
+        try {
+            const changes = await repository.diffBetweenWithStats2(ref, path);
+            return ( changes.map(c => ({
+                ...toGitChangeDto(c),
+                insertions: c.insertions,
+                deletions: c.deletions
+            })));
+        } catch {
+            return [];
+        }
+    }
     async _ensureGitApi() {
         if (this._gitApi) {
             return this._gitApi;

package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js

@@ -466,8 +466,8 @@ class CodeActionAdapter {
                     edit: toConvert.edit && WorkspaceEdit.from(toConvert.edit, undefined),
                     kind: toConvert.kind && toConvert.kind.value,
                     isPreferred: toConvert.isPreferred,
-                    isAI: isProposedApiEnabled(this._extension, "codeActionAI") ? toConvert.isAI : false,
-                    ranges: isProposedApiEnabled(this._extension, "codeActionRanges") ? coalesce(( range.map(Range.from))) : undefined,
+                    isAI: isProposedApiEnabled(this._extension) ? toConvert.isAI : false,
+                    ranges: isProposedApiEnabled(this._extension) ? coalesce(( range.map(Range.from))) : undefined,
                     disabled: toConvert.disabled?.reason
                 });
             }
@@ -574,7 +574,7 @@ class DocumentPasteEditProvider {
         return (edits.map((edit, i) => ({
             _cacheId: [cacheId, i],
             title: edit.title ?? ( localize(
-                2741,
+                2749,
                 "Paste using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),
@@ -1147,16 +1147,16 @@ class InlineCompletionAdapter {
             [InlineCompletionTriggerKind$1.Automatic]: InlineCompletionTriggerKind.Automatic,
             [InlineCompletionTriggerKind$1.Explicit]: InlineCompletionTriggerKind.Invoke
         };
-        this._isAdditionsProposedApiEnabled = isProposedApiEnabled(this._extension, "inlineCompletionsAdditions");
+        this._isAdditionsProposedApiEnabled = isProposedApiEnabled(this._extension);
     }
     get supportsHandleEvents() {
-        return isProposedApiEnabled(this._extension, "inlineCompletionsAdditions") && (typeof this._provider.handleDidShowCompletionItem === "function" || typeof this._provider.handleDidPartiallyAcceptCompletionItem === "function" || typeof this._provider.handleDidRejectCompletionItem === "function" || typeof this._provider.handleEndOfLifetime === "function");
+        return isProposedApiEnabled(this._extension) && (typeof this._provider.handleDidShowCompletionItem === "function" || typeof this._provider.handleDidPartiallyAcceptCompletionItem === "function" || typeof this._provider.handleDidRejectCompletionItem === "function" || typeof this._provider.handleEndOfLifetime === "function");
     }
     get supportsSetModelId() {
-        return isProposedApiEnabled(this._extension, "inlineCompletionsAdditions") && typeof this._provider.setCurrentModelId === "function";
+        return isProposedApiEnabled(this._extension) && typeof this._provider.setCurrentModelId === "function";
     }
     get supportsSetProviderOption() {
-        return isProposedApiEnabled(this._extension, "inlineCompletionsAdditions") && typeof this._provider.setProviderOptionValue === "function";
+        return isProposedApiEnabled(this._extension) && typeof this._provider.setProviderOptionValue === "function";
     }
     get modelInfo() {
         if (!this._isAdditionsProposedApiEnabled) {
@@ -1832,7 +1832,7 @@ class DocumentDropEditAdapter {
         return (editsArray.map((edit, i) => ({
             _cacheId: [cacheId, i],
             title: edit.title ?? ( localize(
-                2742,
+                2750,
                 "Drop using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),
@@ -2503,21 +2503,21 @@ class ExtHostLanguageFeatures extends Disposable {
         const adapter = ( new InlineCompletionAdapter(extension, this._documents, provider, this._commands.converter));
         const handle = this._addNewAdapter(adapter, extension);
         let result = this._createDisposable(handle);
-        const supportsOnDidChange = isProposedApiEnabled(extension, "inlineCompletionsAdditions") && typeof provider.onDidChange === "function";
+        const supportsOnDidChange = isProposedApiEnabled(extension) && typeof provider.onDidChange === "function";
         if (supportsOnDidChange) {
             const subscription = provider.onDidChange(e => this._proxy.$emitInlineCompletionsChange(handle, e ? {
                 data: e.data
             } : undefined));
             result = Disposable$1.from(result, subscription);
         }
-        const supportsOnDidChangeModelInfo = isProposedApiEnabled(extension, "inlineCompletionsAdditions") && typeof provider.onDidChangeModelInfo === "function";
+        const supportsOnDidChangeModelInfo = isProposedApiEnabled(extension) && typeof provider.onDidChangeModelInfo === "function";
         if (supportsOnDidChangeModelInfo) {
             const subscription = provider.onDidChangeModelInfo(
                 _ => this._proxy.$emitInlineCompletionModelInfoChange(handle, adapter.modelInfo)
             );
             result = Disposable$1.from(result, subscription);
         }
-        const supportsOnDidChangeProviderOptions = isProposedApiEnabled(extension, "inlineCompletionsAdditions") && typeof provider.onDidChangeProviderOptions === "function";
+        const supportsOnDidChangeProviderOptions = isProposedApiEnabled(extension) && typeof provider.onDidChangeProviderOptions === "function";
         if (supportsOnDidChangeProviderOptions) {
             const subscription = provider.onDidChangeProviderOptions(
                 _ => this._proxy.$emitInlineCompletionProviderOptionsChange(handle, adapter.providerOptions)

package/vscode/src/vs/workbench/api/common/extHostLanguageModelTools.js

@@ -6,6 +6,7 @@ import { toDisposable } from '../../../base/common/lifecycle.js';
 import { revive } from '../../../base/common/marshalling.js';
 import { generateUuid } from '../../../base/common/uuid.js';
 import { isToolInvocationContext } from '../../contrib/chat/common/tools/languageModelToolsService.js';
+import { computeCombinationKey } from '../../contrib/chat/common/tools/languageModelToolsConfirmationService.js';
 import { InternalEditToolId, ExtensionEditToolId } from '../../contrib/chat/common/tools/builtinTools/editFileTool.js';
 import { InternalFetchWebPageToolId } from '../../contrib/chat/common/tools/builtinTools/tools.js';
 import { SearchExtensionsToolId } from '../../contrib/extensions/common/searchExtensionsTool.js';
@@ -119,7 +120,7 @@ class ExtHostLanguageModelTools {
         }
     }
     getTools(extension) {
-        const hasParticipantAdditions = isProposedApiEnabled(extension, "chatParticipantPrivate");
+        const hasParticipantAdditions = isProposedApiEnabled(extension);
         return ( Array.from(( this._allTools.values())).map(
             tool => hasParticipantAdditions ? tool.apiObjectWithChatParticipantAdditions : tool.apiObject
         )).filter(tool => {
@@ -128,7 +129,7 @@ class ExtHostLanguageModelTools {
             case ExtensionEditToolId:
             case InternalFetchWebPageToolId:
             case SearchExtensionsToolId:
-                return isProposedApiEnabled(extension, "chatParticipantPrivate");
+                return isProposedApiEnabled(extension);
             default:
                 return true;
             }
@@ -143,16 +144,16 @@ class ExtHostLanguageModelTools {
             input: dto.parameters,
             toolInvocationToken: revive(dto.context)
         };
-        if (isProposedApiEnabled(item.extension, "chatParticipantPrivate")) {
+        if (isProposedApiEnabled(item.extension)) {
             options.chatRequestId = dto.chatRequestId;
             options.chatInteractionId = dto.chatInteractionId;
             options.chatSessionResource = URI.revive(dto.context?.sessionResource);
             options.subAgentInvocationId = dto.subAgentInvocationId;
         }
-        if (isProposedApiEnabled(item.extension, "chatParticipantAdditions") && dto.modelId) {
+        if (isProposedApiEnabled(item.extension) && dto.modelId) {
             options.model = await this.getModel(dto.modelId, item.extension);
         }
-        if (isProposedApiEnabled(item.extension, "chatParticipantAdditions") && dto.chatStreamToolCallId) {
+        if (isProposedApiEnabled(item.extension) && dto.chatStreamToolCallId) {
             options.chatStreamToolCallId = dto.chatStreamToolCallId;
         }
         if (dto.tokenBudget !== undefined) {
@@ -162,7 +163,7 @@ class ExtHostLanguageModelTools {
             };
         }
         let progress;
-        if (isProposedApiEnabled(item.extension, "toolProgress")) {
+        if (isProposedApiEnabled(item.extension)) {
             let lastProgress;
             progress = {
                 report: value => {
@@ -241,10 +242,19 @@ class ExtHostLanguageModelTools {
             if (result.pastTenseMessage || result.presentation) {
                 checkProposedApiEnabled(item.extension, "chatParticipantPrivate");
             }
+            if (result.confirmationMessages?.approveCombination !== undefined) {
+                checkProposedApiEnabled(item.extension, "toolInvocationApproveCombination");
+            }
+            const approveCombinationLabel = result.confirmationMessages?.approveCombination ? MarkdownString.fromStrict(result.confirmationMessages.approveCombination) : undefined;
+            const approveCombinationKey = approveCombinationLabel ? await computeCombinationKey(toolId, context.parameters) : undefined;
             return {
                 confirmationMessages: result.confirmationMessages ? {
                     title: typeof result.confirmationMessages.title === "string" ? result.confirmationMessages.title : MarkdownString.from(result.confirmationMessages.title),
-                    message: typeof result.confirmationMessages.message === "string" ? result.confirmationMessages.message : MarkdownString.from(result.confirmationMessages.message)
+                    message: typeof result.confirmationMessages.message === "string" ? result.confirmationMessages.message : MarkdownString.from(result.confirmationMessages.message),
+                    approveCombination: approveCombinationLabel && approveCombinationKey ? {
+                        label: approveCombinationLabel,
+                        key: approveCombinationKey
+                    } : undefined
                 } : undefined,
                 invocationMessage: MarkdownString.fromStrict(result.invocationMessage),
                 pastTenseMessage: MarkdownString.fromStrict(result.pastTenseMessage),

package/vscode/src/vs/workbench/api/common/extHostLanguageModels.d.ts

@@ -6,7 +6,7 @@ import { IDisposable } from "../../../base/common/lifecycle.js";
 import { UriComponents } from "../../../base/common/uri.js";
 import { ExtensionIdentifier, IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
 import { ILogService } from "../../../platform/log/common/log.service.js";
-import { IChatMessage, IChatResponsePart, ILanguageModelChatInfoOptions, ILanguageModelChatMetadataAndIdentifier } from "../../contrib/chat/common/languageModels.js";
+import { IChatMessage, IChatResponsePart, ILanguageModelChatInfoOptions, ILanguageModelChatMetadataAndIdentifier, ILanguageModelChatRequestOptions } from "../../contrib/chat/common/languageModels.js";
 import { SerializableObjectWithBuffers } from "../../services/extensions/common/proxyIdentifier.js";
 import { ExtHostLanguageModelsShape } from "./extHost.protocol.js";
 import { IExtHostAuthentication } from "./extHostAuthentication.js";
@@ -37,7 +37,7 @@ export declare class ExtHostLanguageModels implements ExtHostLanguageModelsShape
     private toModelIdentifier;
     private getVendorFromModelIdentifier;
     $provideLanguageModelChatInfo(vendor: string, options: ILanguageModelChatInfoOptions, token: CancellationToken): Promise<ILanguageModelChatMetadataAndIdentifier[]>;
-    $startChatRequest(modelId: string, requestId: number, from: ExtensionIdentifier | undefined, messages: SerializableObjectWithBuffers<IChatMessage[]>, options: vscode.LanguageModelChatRequestOptions, token: CancellationToken): Promise<void>;
+    $startChatRequest(modelId: string, requestId: number, from: ExtensionIdentifier | undefined, messages: SerializableObjectWithBuffers<IChatMessage[]>, options: ILanguageModelChatRequestOptions, token: CancellationToken): Promise<void>;
     $provideTokenLength(modelId: string, value: string, token: CancellationToken): Promise<number>;
     getDefaultLanguageModel(extension: IExtensionDescription, forceResolveModels?: boolean): Promise<vscode.LanguageModelChat | undefined>;
     getLanguageModelByIdentifier(extension: IExtensionDescription, modelId: string | undefined): Promise<vscode.LanguageModelChat | undefined>;

package/vscode/src/vs/workbench/api/common/extHostLanguageModels.js

@@ -145,7 +145,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         }, token)) ?? [];
         const modelMetadataAndIdentifier = ( modelInformation.map(m => {
             let auth;
-            if (m.requiresAuthorization && isProposedApiEnabled(data.extension, "chatProvider")) {
+            if (m.requiresAuthorization && isProposedApiEnabled(data.extension)) {
                 auth = {
                     providerLabel: data.extension.displayName || data.extension.name,
                     accountLabel: typeof m.requiresAuthorization === "object" ? m.requiresAuthorization.label : undefined
@@ -155,7 +155,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
                 checkProposedApiEnabled(data.extension, "chatProvider");
             }
             const isDefaultForLocation = {};
-            if (isProposedApiEnabled(data.extension, "chatProvider")) {
+            if (isProposedApiEnabled(data.extension)) {
                 if (m.isDefault === true) {
                     for (const key of ( Object.values(ChatAgentLocation))) {
                         if (typeof key === "string") {
@@ -188,6 +188,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
                     isUserSelectable: m.isUserSelectable,
                     statusIcon: m.statusIcon,
                     targetChatSessionType: m.targetChatSessionType,
+                    configurationSchema: m.configurationSchema,
                     modelPickerCategory: m.category ?? DEFAULT_MODEL_PICKER_CATEGORY,
                     capabilities: m.capabilities ? {
                         vision: m.capabilities.imageInput,
@@ -289,6 +290,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             {
                 ...options,
                 modelOptions: options.modelOptions ?? {},
+                modelConfiguration: options.configuration,
                 requestInitiator: from ? ExtensionIdentifier.toKey(from) : "core",
                 toolMode: options.toolMode ?? LanguageModelChatToolMode.Auto
             }, progress, token);
@@ -489,7 +491,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             return false;
         }
         try {
-            const detail = justification ? ( localize(2743, "Justification: {1}", to.displayName, justification)) : undefined;
+            const detail = justification ? ( localize(2751, "Justification: {1}", to.displayName, justification)) : undefined;
             await this._extHostAuthentication.getSession(from, providerId, [], {
                 forceNewSession: {
                     detail

package/vscode/src/vs/workbench/api/common/extHostLogService.js

@@ -8,7 +8,7 @@ import { IExtHostInitDataService } from './extHostInitDataService.js';
 let ExtHostLogService = class ExtHostLogService extends LogService {
     constructor(isWorker, loggerService, initData) {
         const id = initData.remote.isRemote ? "remoteexthost" : isWorker ? "workerexthost" : "exthost";
-        const name = initData.remote.isRemote ? ( localize(2744, "Extension Host (Remote)")) : isWorker ? ( localize(2745, "Extension Host (Worker)")) : ( localize(2746, "Extension Host"));
+        const name = initData.remote.isRemote ? ( localize(2752, "Extension Host (Remote)")) : isWorker ? ( localize(2753, "Extension Host (Worker)")) : ( localize(2754, "Extension Host"));
         super(loggerService.createLogger(id, {
             name
         }));

package/vscode/src/vs/workbench/api/common/extHostMcp.d.ts

@@ -19,7 +19,7 @@ export interface IExtHostMpcService extends ExtHostMcpShape {
     readonly onDidChangeMcpServerDefinitions: Event<void>;
     /** Returns all MCP server definitions known to the editor. */
     readonly mcpServerDefinitions: readonly vscode.McpServerDefinition[];
-    /** Starts an MCP gateway that exposes MCP servers via an HTTP endpoint. */
+    /** Starts an MCP gateway that exposes MCP servers via HTTP endpoints. */
     startMcpGateway(): Promise<vscode.McpGateway | undefined>;
 }
 export declare class ExtHostMcpService extends Disposable implements IExtHostMpcService {
@@ -34,6 +34,7 @@ export declare class ExtHostMcpService extends Disposable implements IExtHostMpc
     private readonly _onDidChangeMcpServerDefinitions;
     readonly onDidChangeMcpServerDefinitions: Event<void>;
     private _mcpServerDefinitions;
+    private readonly _activeGateways;
     constructor(extHostRpc: IExtHostRpcService, _logService: ILogService, _extHostInitData: IExtHostInitDataService, _workspaceService: IExtHostWorkspace, _variableResolver: IExtHostVariableResolverProvider);
     /** Returns all MCP server definitions known to the editor. */
     get mcpServerDefinitions(): readonly vscode.McpServerDefinition[];
@@ -51,6 +52,11 @@ export declare class ExtHostMcpService extends Disposable implements IExtHostMpc
     registerMcpConfigurationProvider(extension: IExtensionDescription, id: string, provider: vscode.McpServerDefinitionProvider): IDisposable;
     /** {@link vscode.lm.startMcpGateway} */
     startMcpGateway(): Promise<vscode.McpGateway | undefined>;
+    /** Called by main thread to notify that a gateway's server set has changed. */
+    $onDidChangeGatewayServers(gatewayId: string, newServers: {
+        label: string;
+        address: UriComponents;
+    }[]): void;
 }
 /**
  * Implementation of both MCP HTTP Streaming as well as legacy SSE.

package/vscode/src/vs/workbench/api/common/extHostMcp.js

@@ -63,6 +63,7 @@ let ExtHostMcpService = class ExtHostMcpService extends Disposable {
         this._onDidChangeMcpServerDefinitions = this._register(( new Emitter()));
         this.onDidChangeMcpServerDefinitions = this._onDidChangeMcpServerDefinitions.event;
         this._mcpServerDefinitions = [];
+        this._activeGateways = ( new Map());
         this._proxy = ( extHostRpc.getProxy(MainContext.MainThreadMcp));
     }
     get mcpServerDefinitions() {
@@ -163,7 +164,7 @@ let ExtHostMcpService = class ExtHostMcpService extends Disposable {
                 }
                 let staticMetadata;
                 const castAs2 = item;
-                if (isProposedApiEnabled(extension, "mcpToolDefinitions") && castAs2.metadata) {
+                if (isProposedApiEnabled(extension) && castAs2.metadata) {
                     staticMetadata = {
                         capabilities: castAs2.metadata.capabilities,
                         instructions: castAs2.metadata.instructions,
@@ -211,15 +212,41 @@ let ExtHostMcpService = class ExtHostMcpService extends Disposable {
         if (!result) {
             return undefined;
         }
-        const address = URI.revive(result.address);
         const gatewayId = result.gatewayId;
+        const servers = ( result.servers.map(s => ({
+            label: s.label,
+            address: URI.revive(s.address)
+        })));
+        const onDidChangeServers = ( new Emitter());
+        this._activeGateways.set(gatewayId, {
+            servers,
+            onDidChangeServers
+        });
         return {
-            address,
+            get servers() {
+                return servers;
+            },
+            onDidChangeServers: onDidChangeServers.event,
             dispose: () => {
+                this._activeGateways.delete(gatewayId);
+                onDidChangeServers.dispose();
                 this._proxy.$disposeMcpGateway(gatewayId);
             }
         };
     }
+    $onDidChangeGatewayServers(gatewayId, newServers) {
+        const gateway = this._activeGateways.get(gatewayId);
+        if (!gateway) {
+            return;
+        }
+        const servers = ( newServers.map(s => ({
+            label: s.label,
+            address: URI.revive(s.address)
+        })));
+        gateway.servers.length = 0;
+        gateway.servers.push(...servers);
+        gateway.onDidChangeServers.fire(servers);
+    }
 };
 ExtHostMcpService = ( __decorate([( __param(0, IExtHostRpcService)), ( __param(1, ILogService)), ( __param(2, IExtHostInitDataService)), ( __param(3, IExtHostWorkspace)), ( __param(4, IExtHostVariableResolverProvider))], ExtHostMcpService));
 var HttpMode;

package/vscode/src/vs/workbench/api/common/extHostNotebook.js

@@ -276,7 +276,7 @@ class ExtHostNotebookController {
                 ));
             }
             if (!this._extHostFileSystem.value.isWritableFileSystem(uri.scheme)) {
-                throw new FileOperationError(( localize(2747, "Unable to modify read-only file '{0}'", this._resourceForError(uri))), FileOperationResult.FILE_PERMISSION_DENIED);
+                throw new FileOperationError(( localize(2755, "Unable to modify read-only file '{0}'", this._resourceForError(uri))), FileOperationResult.FILE_PERMISSION_DENIED);
             }
             const data = {
                 metadata: filter(
@@ -472,7 +472,7 @@ class ExtHostNotebookController {
             mtime: options.mtime ,
             size: stat.size
         })) {
-            throw new FileOperationError(( localize(2748, "File Modified Since")), FileOperationResult.FILE_MODIFIED_SINCE, options);
+            throw new FileOperationError(( localize(2756, "File Modified Since")), FileOperationResult.FILE_MODIFIED_SINCE, options);
         }
         return;
     }

package/vscode/src/vs/workbench/api/common/extHostSCM.js

@@ -421,7 +421,7 @@ class ExtHostSourceControlResourceGroup {
                         this._resourceStatesCommandsMap.set(handle, r.command);
                     }
                 }
-                const hasScmMultiDiffEditorProposalEnabled = isProposedApiEnabled(this._extension, "scmMultiDiffEditor");
+                const hasScmMultiDiffEditorProposalEnabled = isProposedApiEnabled(this._extension);
                 const multiFileDiffEditorOriginalUri = hasScmMultiDiffEditorProposalEnabled ? r.multiDiffEditorOriginalUri : undefined;
                 const multiFileDiffEditorModifiedUri = hasScmMultiDiffEditorProposalEnabled ? r.multiFileDiffEditorModifiedUri : undefined;
                 const icon = getIconResource(r.decorations);
@@ -536,7 +536,7 @@ class ExtHostSourceControl {
     set quickDiffProvider(quickDiffProvider) {
         this._quickDiffProvider = quickDiffProvider;
         let quickDiffLabel = undefined;
-        if (isProposedApiEnabled(this._extension, "quickDiffProvider")) {
+        if (isProposedApiEnabled(this._extension)) {
             quickDiffLabel = quickDiffProvider?.label;
         }
         this.#proxy.$updateSourceControl(this.handle, {
@@ -753,7 +753,7 @@ class ExtHostSourceControl {
         this.onDidDisposeParent = _parent ? _parent.onDidDispose : Event.None;
     }
     createResourceGroup(id, label, options) {
-        const multiDiffEditorEnableViewChanges = isProposedApiEnabled(this._extension, "scmMultiDiffEditor") && options?.multiDiffEditorEnableViewChanges === true;
+        const multiDiffEditorEnableViewChanges = isProposedApiEnabled(this._extension) && options?.multiDiffEditorEnableViewChanges === true;
         const group = ( new ExtHostSourceControlResourceGroup(
             this.#proxy,
             this._commands,

package/vscode/src/vs/workbench/api/common/extHostStatusBar.js

@@ -195,7 +195,7 @@ class ExtHostStatusBarEntry {
                 name = this._name;
             } else {
                 name = ( localize(
-                    2749,
+                    2757,
                     "{0} (Extension)",
                     this._extension.displayName || this._extension.name
                 ));
@@ -248,7 +248,7 @@ class StatusBarMessage {
             StatusBarAlignment.Left,
             Number.MIN_VALUE
         );
-        this._item.name = ( localize(2750, "Extension Status"));
+        this._item.name = ( localize(2758, "Extension Status"));
     }
     dispose() {
         this._messages.length = 0;

package/vscode/src/vs/workbench/api/common/extHostTask.js

@@ -333,6 +333,9 @@ var TaskDTO;
         if (value.presentationOptions) {
             result.presentationOptions = TaskPresentationOptionsDTO.to(value.presentationOptions);
         }
+        if (value.runOptions) {
+            result.runOptions = value.runOptions;
+        }
         if (value._id) {
             result._id = value._id;
         }

package/vscode/src/vs/workbench/api/common/extHostTelemetry.js

@@ -30,7 +30,7 @@ let ExtHostTelemetry = class ExtHostTelemetry extends Disposable {
         const id = initData.remote.isRemote ? "remoteExtHostTelemetry" : isWorker ? "workerExtHostTelemetry" : "extHostTelemetry";
         this._outputLogger = this._register(loggerService.createLogger(id, {
             name: ( localize(
-                2751,
+                2759,
                 "Extension Telemetry{0}",
                 this._inLoggingOnlyMode ? " (Not Sent)" : ""
             )),

package/vscode/src/vs/workbench/api/common/extHostTerminalService.d.ts

@@ -10,6 +10,7 @@ import { IEnvironmentVariableCollectionDescription, IEnvironmentVariableMutator,
 import { ICreateContributedTerminalProfileOptions, IShellLaunchConfigDto, ITerminalChildProcess, ITerminalLaunchError, ITerminalProfile, TerminalIcon, TerminalLocation, TerminalShellType } from "../../../platform/terminal/common/terminal.js";
 import { ThemeColor } from "../../../base/common/themables.js";
 import { IExtHostCommands } from "./extHostCommands.js";
+import { IExtHostInitDataService } from "./extHostInitDataService.js";
 export interface IExtHostTerminalService extends ExtHostTerminalServiceShape, IDisposable {
     readonly _serviceBrand: undefined;
     activeTerminal: vscode.Terminal | undefined;
@@ -218,7 +219,8 @@ declare class UnifiedEnvironmentVariableCollection extends Disposable {
     private clearDescription;
 }
 export declare class WorkerExtHostTerminalService extends BaseExtHostTerminalService {
-    constructor(extHostCommands: IExtHostCommands, extHostRpc: IExtHostRpcService);
+    private readonly _hasRemoteAuthority;
+    constructor(extHostCommands: IExtHostCommands, extHostRpc: IExtHostRpcService, initData: IExtHostInitDataService);
     createTerminal(name?: string, shellPath?: string, shellArgs?: string[] | string): vscode.Terminal;
     createTerminalFromOptions(options: vscode.TerminalOptions, internalOptions?: ITerminalInternalOptions): vscode.Terminal;
 }

package/vscode/src/vs/workbench/api/common/extHostTerminalService.js

@@ -18,6 +18,7 @@ import { ThemeColor } from '../../../base/common/themables.js';
 import { Promises } from '../../../base/common/async.js';
 import { ViewColumn, TerminalCompletionList, TerminalQuickFix } from './extHostTypeConverters.js';
 import { IExtHostCommands } from './extHostCommands.js';
+import { IExtHostInitDataService } from './extHostInitDataService.js';
 import { MarshalledId } from '../../../base/common/marshallingIds.js';
 import { isWindows } from '../../../base/common/platform.js';
 import { hasKey } from '../../../base/common/types.js';
@@ -550,7 +551,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         const terminal = this.getTerminalById(id);
         if (!terminal) {
             return {
-                message: ( localize(2752, "Could not find the terminal with id {0} on the extension host", id))
+                message: ( localize(2760, "Could not find the terminal with id {0} on the extension host", id))
             };
         }
         if (!terminal.isOpen) {
@@ -746,7 +747,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         })) {
             throw ( new Error(`No terminal profile options provided for id "${id}"`));
         }
-        const hasTerminalTitleProposal = isProposedApiEnabled(profileProviderData.extension, "terminalTitle");
+        const hasTerminalTitleProposal = isProposedApiEnabled(profileProviderData.extension);
         if (!hasTerminalTitleProposal && profile.options.titleTemplate !== undefined) {
             console.error(
                 `[${profileProviderData.extension.identifier.value}] \`titleTemplate\` returned from TerminalProfileProvider is ignored because the \`terminalTitle\` proposed API is not enabled.`
@@ -1132,17 +1133,31 @@ class ScopedEnvironmentVariableCollection {
     }
 }
 let WorkerExtHostTerminalService = class WorkerExtHostTerminalService extends BaseExtHostTerminalService {
-    constructor(extHostCommands, extHostRpc) {
+    constructor(extHostCommands, extHostRpc, initData) {
         super(false, extHostCommands, extHostRpc);
+        this._hasRemoteAuthority = !!initData.remote.authority;
     }
     createTerminal(name, shellPath, shellArgs) {
-        throw ( new NotSupportedError());
+        if (!this._hasRemoteAuthority) {
+            throw ( new NotSupportedError());
+        }
+        return this.createTerminalFromOptions({
+            name,
+            shellPath,
+            shellArgs
+        });
     }
     createTerminalFromOptions(options, internalOptions) {
-        throw ( new NotSupportedError());
+        if (!this._hasRemoteAuthority) {
+            throw ( new NotSupportedError());
+        }
+        const terminal = ( new ExtHostTerminal(this._proxy, generateUuid(), options, options.name));
+        this._terminals.push(terminal);
+        terminal.create(options, this._serializeParentTerminal(options, internalOptions));
+        return terminal.value;
     }
 };
-WorkerExtHostTerminalService = ( __decorate([( __param(0, IExtHostCommands)), ( __param(1, IExtHostRpcService))], WorkerExtHostTerminalService));
+WorkerExtHostTerminalService = ( __decorate([( __param(0, IExtHostCommands)), ( __param(1, IExtHostRpcService)), ( __param(2, IExtHostInitDataService))], WorkerExtHostTerminalService));
 function asTerminalIcon(iconPath) {
     if (!iconPath || typeof iconPath === "string") {
         return undefined;

package/vscode/src/vs/workbench/api/common/extHostTimeline.js

@@ -18,7 +18,7 @@ class ExtHostTimeline {
         commands.registerArgumentProcessor({
             processArgument: (arg, extension) => {
                 if (arg && arg.$mid === MarshalledId.TimelineActionContext) {
-                    if (this._providers.get(arg.source) && extension && isProposedApiEnabled(extension, "timeline")) {
+                    if (this._providers.get(arg.source) && extension && isProposedApiEnabled(extension)) {
                         const uri = arg.uri === undefined ? undefined : URI.revive(arg.uri);
                         return this._itemsBySourceAndUriMap.get(arg.source)?.get(getUriKey(uri))?.get(arg.handle);
                     } else {