@codingame/monaco-vscode-chat-service-override 34.1.2 → 35.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginRepositoryService.js

@@ -106,7 +106,7 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
             if (marketplace.kind === MarketplaceReferenceKind.LocalFileUri) {
                 throw ( new Error(`Local marketplace repository does not exist: ${repoDir.fsPath}`));
             }
-            const progressTitle = options?.progressTitle ?? ( localize(5250, "Preparing plugin marketplace '{0}'...", marketplace.displayLabel));
+            const progressTitle = options?.progressTitle ?? ( localize(5466, "Preparing plugin marketplace '{0}'...", marketplace.displayLabel));
             const failureLabel = options?.failureLabel ?? marketplace.displayLabel;
             await this._cloneRepository(
                 repoDir,
@@ -137,7 +137,7 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
             try {
                 return await this._progressService.withProgress({
                     location: ProgressLocation.Notification,
-                    title: ( localize(5251, "Updating plugin '{0}'...", updateLabel)),
+                    title: ( localize(5467, "Updating plugin '{0}'...", updateLabel)),
                     cancellable: true
                 }, () => this._pluginGit.pull(repoDir, cts.token), () => cts.dispose(true));
             } finally {
@@ -149,24 +149,73 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
                 err
             );
             if (!options?.silent) {
+                const primaryActions = [( new Action("showGitOutput", ( localize(5468, "Show Git Output")), undefined, true, () => this._commandService.executeCommand("git.showOutput")))];
+                const failureLabel = options?.failureLabel ?? updateLabel;
+                if (marketplace.kind !== MarketplaceReferenceKind.LocalFileUri) {
+                    primaryActions.push(( new Action("purgeAndRecloneMarketplace", ( localize(5469, "Purge Marketplace Cache and Reclone")), undefined, true, () => this._purgeAndRecloneMarketplace(marketplace, options?.marketplaceType, failureLabel))));
+                }
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        5252,
+                        5470,
                         "Failed to update plugin '{0}': {1}",
-                        options?.failureLabel ?? updateLabel,
+                        failureLabel,
                         err?.message ?? String(err)
                     )),
                     actions: {
-                        primary: [( new Action("showGitOutput", ( localize(5253, "Show Git Output")), undefined, true, () => {
-                            this._commandService.executeCommand("git.showOutput");
-                        }))]
+                        primary: primaryActions
                     }
                 });
             }
             throw err;
         }
     }
+    async _purgeAndRecloneMarketplace(marketplace, marketplaceType, label) {
+        if (marketplace.kind === MarketplaceReferenceKind.LocalFileUri) {
+            return;
+        }
+        const repoDir = this.getRepositoryUri(marketplace, marketplaceType);
+        try {
+            await this._progressService.withProgress({
+                location: ProgressLocation.Notification,
+                title: ( localize(5471, "Purging plugin marketplace '{0}'...", marketplace.displayLabel)),
+                cancellable: false
+            }, async () => {
+                const exists = await this._fileService.exists(repoDir);
+                if (exists) {
+                    await this._fileService.del(repoDir, {
+                        recursive: true,
+                        useTrash: false
+                    });
+                }
+                await this.ensureRepository(marketplace, {
+                    marketplaceType,
+                    progressTitle: ( localize(5472, "Recloning plugin marketplace '{0}'...", marketplace.displayLabel)),
+                    failureLabel: label
+                });
+            });
+            this._notificationService.info(( localize(
+                5473,
+                "Recloned plugin marketplace '{0}'. Try updating plugins again.",
+                marketplace.displayLabel
+            )));
+        } catch (err) {
+            this._notificationService.notify({
+                severity: Severity.Error,
+                message: ( localize(
+                    5474,
+                    "Failed to purge plugin marketplace '{0}': {1}",
+                    marketplace.displayLabel,
+                    err?.message ?? String(err)
+                )),
+                actions: {
+                    primary: [( new Action("showGitOutput", ( localize(5468, "Show Git Output")), undefined, true, () => {
+                        return this._commandService.executeCommand("git.showOutput");
+                    }))]
+                }
+            });
+        }
+    }
     _getRepoCacheDirForReference(reference) {
         return joinPath(this._cacheRoot, ...reference.cacheSegments);
     }
@@ -237,13 +286,13 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    5254,
+                    5475,
                     "Failed to install plugin '{0}': {1}",
                     failureLabel,
                     err?.message ?? String(err)
                 )),
                 actions: {
-                    primary: [( new Action("showGitOutput", ( localize(5253, "Show Git Output")), undefined, true, () => {
+                    primary: [( new Action("showGitOutput", ( localize(5468, "Show Git Output")), undefined, true, () => {
                         this._commandService.executeCommand("git.showOutput");
                     }))]
                 }

package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginsView.js

@@ -92,7 +92,7 @@ let UpdatePluginAction = class UpdatePluginAction extends Action {
         pluginInstallService,
         pluginMarketplaceService
     ) {
-        super(UpdatePluginAction_1.ID, ( localize(5255, "Update")), "extension-action label prominent install");
+        super(UpdatePluginAction_1.ID, ( localize(5476, "Update")), "extension-action label prominent install");
         this.plugin = plugin;
         this.liveMarketplacePlugin = liveMarketplacePlugin;
         this.pluginInstallService = pluginInstallService;
@@ -120,7 +120,7 @@ let ManagePluginAction = class ManagePluginAction extends Action {
         this.getActionGroups = getActionGroups;
         this.instantiationService = instantiationService;
         this._actionViewItem = null;
-        this.tooltip = ( localize(5256, "Manage"));
+        this.tooltip = ( localize(5477, "Manage"));
     }
     createActionViewItem(options) {
         this._actionViewItem = this.instantiationService.createInstance(DropDownActionViewItem, this, options);
@@ -357,7 +357,7 @@ let AgentPluginsListView = class AgentPluginsListView extends AbstractExtensions
                         return item?.name ?? "";
                     },
                     getWidgetAriaLabel() {
-                        return localize(5257, "Agent Plugins");
+                        return localize(5478, "Agent Plugins");
                     }
                 },
                 overrideStyles: getLocationBasedViewColors(this.viewDescriptorService.getViewLocationById(this.id)).listOverrideStyles
@@ -532,7 +532,7 @@ let AgentPluginsListView = class AgentPluginsListView extends AbstractExtensions
             this.bodyTemplate.pluginsList.classList.toggle("hidden", count === 0);
             this.bodyTemplate.messageContainer.classList.toggle("hidden", count > 0);
             if (count === 0 && this.isBodyVisible()) {
-                this.bodyTemplate.messageBox.textContent = ( localize(5258, "No agent plugins found."));
+                this.bodyTemplate.messageBox.textContent = ( localize(5479, "No agent plugins found."));
             }
         }
     }
@@ -542,8 +542,8 @@ class AgentPluginsBrowseCommand extends Action2 {
     constructor() {
         super({
             id: "workbench.agentPlugins.browse",
-            title: ( localize2(5259, "Agent Plugins")),
-            tooltip: ( localize2(5260, "Browse Agent Plugins")),
+            title: ( localize2(5480, "Agent Plugins")),
+            tooltip: ( localize2(5481, "Browse Agent Plugins")),
             icon: Codicon.search,
             precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))),
             menu: [{
@@ -566,8 +566,8 @@ class CheckForPluginUpdatesCommand extends Action2 {
     constructor() {
         super({
             id: "workbench.agentPlugins.checkForUpdates",
-            title: ( localize2(5261, "Update Plugins")),
-            category: ( localize2(5262, "Chat")),
+            title: ( localize2(5482, "Update Plugins")),
+            category: ( localize2(5483, "Chat")),
             precondition: ChatContextKeys.enabled,
             f1: true
         });
@@ -580,8 +580,8 @@ class ForceUpdatePluginsCommand extends Action2 {
     constructor() {
         super({
             id: "workbench.agentPlugins.forceUpdate",
-            title: ( localize2(5263, "Update Plugins (Force)")),
-            category: ( localize2(5262, "Chat")),
+            title: ( localize2(5484, "Update Plugins (Force)")),
+            category: ( localize2(5483, "Chat")),
             precondition: ChatContextKeys.enabled,
             f1: true
         });
@@ -607,7 +607,7 @@ let AgentPluginsViewsContribution = class AgentPluginsViewsContribution extends
         registerAction2(ForceUpdatePluginsCommand);
         ( Registry.as(Extensions.ViewsRegistry)).registerViews([{
             id: InstalledAgentPluginsViewId,
-            name: ( localize2(5264, "Agent Plugins - Installed")),
+            name: ( localize2(5485, "Agent Plugins - Installed")),
             ctorDescriptor: ( new SyncDescriptor(AgentPluginsListView, [{
                 installedOnly: true
             }])),
@@ -617,7 +617,7 @@ let AgentPluginsViewsContribution = class AgentPluginsViewsContribution extends
             canToggleVisibility: true
         }, {
             id: "workbench.views.agentPlugins.default.marketplace",
-            name: ( localize2(5265, "Agent Plugins")),
+            name: ( localize2(5486, "Agent Plugins")),
             ctorDescriptor: ( new SyncDescriptor(AgentPluginsListView, [{}])),
             when: ( ContextKeyExpr.and(DefaultViewsContext, ( HasInstalledAgentPluginsContext.toNegated()), ( ChatContextKeys.Setup.hidden.negate()))),
             weight: 30,
@@ -626,7 +626,7 @@ let AgentPluginsViewsContribution = class AgentPluginsViewsContribution extends
             hideByDefault: true
         }, {
             id: "workbench.views.agentPlugins.marketplace",
-            name: ( localize2(5265, "Agent Plugins")),
+            name: ( localize2(5486, "Agent Plugins")),
             ctorDescriptor: ( new SyncDescriptor(AgentPluginsListView, [{}])),
             when: ( ContextKeyExpr.and(SearchAgentPluginsContext, ( ChatContextKeys.Setup.hidden.negate())))
         }], VIEW_CONTAINER);

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostActiveClientService.d.ts

@@ -1,6 +1,5 @@
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
-import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import type { SessionActiveClient, ToolDefinition } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/state";
@@ -9,22 +8,35 @@ import { ICustomizationSyncProvider } from "@codingame/monaco-vscode-api/vscode/
 import { IAgentPluginService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service";
 import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
 import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
+import { IMcpService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service";
+import { IConfigurationResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/configurationResolver.service";
+import { IAgentHostToolSetEnablementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostToolSetEnablementService.service";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IAgentHostActiveClientService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostActiveClientService.service";
 /** The exposed `syncProvider` is the same instance the service uses to resolve customizations; the contribution wires it into its harness so opt-out toggles propagate. */
 export interface IAgentRegistration extends IDisposable {
     readonly syncProvider: ICustomizationSyncProvider;
 }
 export declare class AgentHostActiveClientService extends Disposable implements IAgentHostActiveClientService {
+    private readonly _toolsService;
     private readonly _promptsService;
     private readonly _agentPluginService;
     private readonly _storageService;
     private readonly _instantiationService;
+    private readonly _fileService;
+    private readonly _mcpService;
+    private readonly _configurationResolverService;
+    private readonly _toolSetEnablementService;
     readonly _serviceBrand: undefined;
     private readonly _customizationsByType;
-    readonly clientTools: IObservable<readonly ToolDefinition[]>;
-    constructor(toolsService: ILanguageModelToolsService, configurationService: IConfigurationService, _promptsService: IPromptsService, _agentPluginService: IAgentPluginService, _storageService: IStorageService, _instantiationService: IInstantiationService);
+    private readonly _allToolsObs;
+    private readonly _allToolSetsObs;
+    /** Cached per-`sessionType` advertised-tools observable, so callers (e.g. autoruns) reuse one stable derived. */
+    private readonly _clientToolsByType;
+    constructor(_toolsService: ILanguageModelToolsService, _promptsService: IPromptsService, _agentPluginService: IAgentPluginService, _storageService: IStorageService, _instantiationService: IInstantiationService, _fileService: IFileService, _mcpService: IMcpService, _configurationResolverService: IConfigurationResolverService, _toolSetEnablementService: IAgentHostToolSetEnablementService);
     registerForAgent(sessionType: string): IAgentRegistration;
     private _setCustomizations;
     getActiveClient(sessionType: string, clientId: string): SessionActiveClient;
     getCustomizations(sessionType: string): IObservable<readonly ClientPluginCustomization[]>;
+    getClientTools(sessionType: string): IObservable<readonly ToolDefinition[]>;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostActiveClientService.js

@@ -1,47 +1,56 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Delayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IAgentPluginService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
+import { IMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
+import { IConfigurationResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/configurationResolver.service';
 import { AgentCustomizationSyncProvider } from './agentCustomizationSyncProvider.js';
 import { resolveCustomizationRefs } from './agentHostLocalCustomizations.js';
 import { toolDataToDefinition } from './agentHostToolUtils.js';
+import { isToolEnabledInSet } from './agentHostToolSetEnablementService.js';
+import { IAgentHostToolSetEnablementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostToolSetEnablementService.service';
 import { SyncedCustomizationBundler } from './syncedCustomizationBundler.js';
+import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 
 let AgentHostActiveClientService = class AgentHostActiveClientService extends Disposable {
     constructor(
-        toolsService,
-        configurationService,
+        _toolsService,
         _promptsService,
         _agentPluginService,
         _storageService,
-        _instantiationService
+        _instantiationService,
+        _fileService,
+        _mcpService,
+        _configurationResolverService,
+        _toolSetEnablementService
     ) {
         super();
+        this._toolsService = _toolsService;
         this._promptsService = _promptsService;
         this._agentPluginService = _agentPluginService;
         this._storageService = _storageService;
         this._instantiationService = _instantiationService;
+        this._fileService = _fileService;
+        this._mcpService = _mcpService;
+        this._configurationResolverService = _configurationResolverService;
+        this._toolSetEnablementService = _toolSetEnablementService;
+        this._clientToolsByType = ( new Map());
         this._customizationsByType = observableValue("agentHostCustomizationsByType", ( new Map()));
-        const allToolsObs = toolsService.observeTools(undefined);
-        const allowlistObs = observableConfigValue(ChatConfiguration.AgentHostClientTools, [], configurationService);
-        this.clientTools = derived(reader => {
-            const allowlist = ( new Set(allowlistObs.read(reader)));
-            return ( allToolsObs.read(reader).filter(t => t.toolReferenceName !== undefined && ( allowlist.has(t.toolReferenceName))).map(toolDataToDefinition));
-        });
+        this._allToolsObs = this._toolsService.observeTools(undefined);
+        this._allToolSetsObs = this._toolsService.toolSets;
     }
     registerForAgent(sessionType) {
         const store = ( new DisposableStore());
@@ -55,9 +64,12 @@ let AgentHostActiveClientService = class AgentHostActiveClientService extends Di
             const seq = ++updateSeq;
             try {
                 const refs = await resolveCustomizationRefs(
+                    this._fileService,
                     this._promptsService,
                     syncProvider,
                     this._agentPluginService,
+                    this._mcpService,
+                    this._configurationResolverService,
                     bundler,
                     sessionType
                 );
@@ -72,14 +84,24 @@ let AgentHostActiveClientService = class AgentHostActiveClientService extends Di
                 onUnexpectedError(err);
             }
         };
-        store.add(syncProvider.onDidChange(() => updateCustomizations()));
+        const updateDelayer = store.add(( new Delayer(CUSTOMIZATION_UPDATE_DEBOUNCE_DELAY)));
+        const scheduleUpdate = () => {
+            updateDelayer.trigger(() => updateCustomizations()).catch(() => {});
+        };
+        store.add(syncProvider.onDidChange(() => scheduleUpdate()));
         store.add(Event.any(
             this._promptsService.onDidChangeCustomAgents,
             this._promptsService.onDidChangeSlashCommands,
             this._promptsService.onDidChangeSkills,
             this._promptsService.onDidChangeInstructions
-        )(() => updateCustomizations()));
-        updateCustomizations();
+        )(() => scheduleUpdate()));
+        store.add(autorun(reader => {
+            for (const server of this._mcpService.servers.read(reader)) {
+                server.enablement.read(reader);
+                server.readDefinitions().read(reader);
+            }
+            scheduleUpdate();
+        }));
         store.add(this._setCustomizations(sessionType, customizations));
         return {
             syncProvider,
@@ -103,7 +125,7 @@ let AgentHostActiveClientService = class AgentHostActiveClientService extends Di
     getActiveClient(sessionType, clientId) {
         return {
             clientId,
-            tools: [...this.clientTools.get()],
+            tools: [...this.getClientTools(sessionType).get()],
             customizations: [...(this._customizationsByType.get().get(sessionType)?.get() ?? [])]
         };
     }
@@ -112,8 +134,33 @@ let AgentHostActiveClientService = class AgentHostActiveClientService extends Di
             reader => this._customizationsByType.read(reader).get(sessionType)?.read(reader) ?? EMPTY_CUSTOMIZATIONS
         );
     }
+    getClientTools(sessionType) {
+        let obs = this._clientToolsByType.get(sessionType);
+        if (!obs) {
+            obs = derived(reader => {
+                const tools = this._allToolsObs.read(reader);
+                const toolSets = this._allToolSetsObs.read(reader);
+                const enablement = this._toolSetEnablementService.observe(sessionType).read(reader);
+                const enabledToolIds = ( new Set());
+                for (const ts of toolSets) {
+                    if (ts.deprecated) {
+                        continue;
+                    }
+                    for (const tool of ts.getTools(reader)) {
+                        if (isToolEnabledInSet(enablement, ts.id, tool.id)) {
+                            enabledToolIds.add(tool.id);
+                        }
+                    }
+                }
+                return ( tools.filter(t => ( enabledToolIds.has(t.id))).map(toolDataToDefinition));
+            });
+            this._clientToolsByType.set(sessionType, obs);
+        }
+        return obs;
+    }
 };
-AgentHostActiveClientService = ( __decorate([( __param(0, ILanguageModelToolsService)), ( __param(1, IConfigurationService)), ( __param(2, IPromptsService)), ( __param(3, IAgentPluginService)), ( __param(4, IStorageService)), ( __param(5, IInstantiationService))], AgentHostActiveClientService));
+AgentHostActiveClientService = ( __decorate([( __param(0, ILanguageModelToolsService)), ( __param(1, IPromptsService)), ( __param(2, IAgentPluginService)), ( __param(3, IStorageService)), ( __param(4, IInstantiationService)), ( __param(5, IFileService)), ( __param(6, IMcpService)), ( __param(7, IConfigurationResolverService)), ( __param(8, IAgentHostToolSetEnablementService))], AgentHostActiveClientService));
 const EMPTY_CUSTOMIZATIONS = ( Object.freeze([]));
+const CUSTOMIZATION_UPDATE_DEBOUNCE_DELAY = 50;
 
 export { AgentHostActiveClientService };

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationService.d.ts

@@ -1,7 +1,12 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
-import type { Customization } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/state";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { type Customization, type RootConfigState } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/state";
 import { AgentCustomization } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IMcpServerConfiguration } from "@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpPlatformTypes";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IAgentHostMcpServer } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostMcpServer";
 import { IAgentHostCustomizationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationService.service";
 export declare class NullAgentHostCustomizationService implements IAgentHostCustomizationService {
     readonly _serviceBrand: undefined;
@@ -10,4 +15,43 @@ export declare class NullAgentHostCustomizationService implements IAgentHostCust
     getCustomAgents(_sessionResource: URI): readonly AgentCustomization[];
     getCustomizations(_sessionResource: URI): readonly Customization[];
     getWorkingDirectory(sessionResource: URI): string | undefined;
+    getMcpServers(_sessionResource: URI): readonly IAgentHostMcpServer[];
+    addMcpServer(_sessionResource: URI, _name: string, _config: IMcpServerConfiguration): void;
+    authenticateMcpServer(_sessionResource: URI, _serverId: string): Promise<boolean>;
+}
+export interface IAgentHostCustomizationTarget {
+    readonly customizations: readonly Customization[];
+    readonly workingDirectory?: string;
+    readonly logOutputChannelId?: string;
+    readonly rootConfig?: RootConfigState;
+    authenticate(request: {
+        resource: string;
+        scopes?: readonly string[];
+        token: string;
+    }): Promise<unknown>;
+    setCustomizationEnabled(rawId: string, enabled: boolean): void;
+    setRootConfigValue(property: string, value: unknown): void;
+}
+export declare abstract class AbstractAgentHostCustomizationService extends Disposable implements IAgentHostCustomizationService {
+    protected readonly _instantiationService: IInstantiationService;
+    protected readonly _logService: ILogService;
+    readonly _serviceBrand: undefined;
+    private readonly _onDidChangeCustomAgents;
+    private readonly _onDidChangeCustomizations;
+    readonly onDidChangeCustomAgents: Event<void>;
+    readonly onDidChangeCustomizations: Event<void>;
+    protected constructor(_instantiationService: IInstantiationService, _logService: ILogService);
+    protected abstract _resolveTarget(sessionResource: URI): IAgentHostCustomizationTarget | undefined;
+    getCustomAgents(sessionResource: URI): readonly AgentCustomization[];
+    getCustomizations(sessionResource: URI): readonly Customization[];
+    getWorkingDirectory(sessionResource: URI): string | undefined;
+    getMcpServers(sessionResource: URI): readonly IAgentHostMcpServer[];
+    addMcpServer(sessionResource: URI, name: string, config: IMcpServerConfiguration): void;
+    authenticateMcpServer(sessionResource: URI, serverId: string): Promise<boolean>;
+    protected _fireCustomAgentsChanged(): void;
+    protected _fireCustomizationsChanged(): void;
+    private _flattenMcpServers;
+    private _findMcpServer;
+    protected _scopedMcpServerId(sessionResource: URI, rawId: string): string;
+    private _isScopedMcpServerIdForRawId;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationService.js

@@ -1,10 +1,13 @@
 
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '../../../../../../platform/agentHost/common/agentHostSchema.js';
 import '../../../../../../platform/agentHost/common/agentService.js';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/remoteAgentHostService';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-root/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-session/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-chat/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-terminal/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-changeset/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-resource-watch/state';
@@ -12,6 +15,11 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/p
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/oauth';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/charCode';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 
 class NullAgentHostCustomizationService {
     constructor() {
@@ -27,6 +35,13 @@ class NullAgentHostCustomizationService {
     getWorkingDirectory(sessionResource) {
         return undefined;
     }
+    getMcpServers(_sessionResource) {
+        return [];
+    }
+    addMcpServer(_sessionResource, _name, _config) {}
+    authenticateMcpServer(_sessionResource, _serverId) {
+        return Promise.resolve(false);
+    }
 }
 
 export { NullAgentHostCustomizationService };

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostLocalCustomizations.d.ts

@@ -7,7 +7,10 @@ import { PromptsStorage } from "@codingame/monaco-vscode-api/vscode/vs/workbench
 import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
 import { type ICustomizationSyncProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService";
 import { IAgentPluginService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service";
-import type { SyncedCustomizationBundler } from "./syncedCustomizationBundler.js";
+import { IMcpService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service";
+import { IConfigurationResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/configurationResolver.service";
+import type { ISyncableMcpServer, SyncedCustomizationBundler } from "./syncedCustomizationBundler.js";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 /**
  * Prompt types that participate in auto-sync to an agent host harness.
  *
@@ -35,7 +38,7 @@ export interface ILocalCustomizationFile {
  *
  * This is the single source of truth used by both the AI Customization view
  * (to render disable affordances) and the agent host wire (to compute the
- * `customizations` set published via `activeClientChanged`).
+ * `customizations` set published via `activeClientSet`).
  *
  * Built-in skills bundled with the Agents app (only present when the
  * sessions-aware prompts service is in play) are also enumerated so that
@@ -45,11 +48,28 @@ export interface ILocalCustomizationFile {
  */
 export declare function enumerateLocalCustomizationsForHarness(promptsService: IPromptsService, syncProvider: ICustomizationSyncProvider, sessionType: string, token: CancellationToken): Promise<readonly ILocalCustomizationFile[]>;
 /**
- * Resolves the customization refs to include in an `activeClientChanged`
+ * Enumerates MCP servers configured directly in VS Code — i.e. those that
+ * are not contributed by an agent plugin — so they can be bundled into the
+ * synthetic synced plugin. Plugin-sourced servers are excluded because they
+ * are already synced via their owning plugin's customization ref. Disabled
+ * servers and servers whose launch cannot be expressed declaratively are
+ * skipped.
+ *
+ * Workspace-discovered servers are also excluded by default: the agent host
+ * discovers workspace `.mcp.json` itself, so syncing them would duplicate. The
+ * exception is `.vscode/mcp.json`, which the agent host does not discover
+ * (despite what the SDK's `enableConfigDiscovery` docs imply) — those are
+ * synced, but only when their config can be resolved without requiring user
+ * interaction.
+ */
+export declare function collectNonPluginMcpServers(mcpService: IMcpService, configurationResolverService: IConfigurationResolverService): Promise<ISyncableMcpServer[]>;
+/**
+ * Resolves the customization refs to include in an `activeClientSet`
  * message.
  *
  * Every eligible local file is synced unless the user opted out. Files
  * belonging to installed plugins are de-duped to a single plugin ref;
- * remaining loose files are bundled into a synthetic Open Plugin.
+ * remaining loose files — together with MCP servers configured directly in
+ * VS Code — are bundled into a synthetic Open Plugin.
  */
-export declare function resolveCustomizationRefs(promptsService: IPromptsService, syncProvider: ICustomizationSyncProvider, agentPluginService: IAgentPluginService, bundler: SyncedCustomizationBundler, sessionType: string): Promise<ClientPluginCustomization[]>;
+export declare function resolveCustomizationRefs(fileService: IFileService, promptsService: IPromptsService, syncProvider: ICustomizationSyncProvider, agentPluginService: IAgentPluginService, mcpService: IMcpService, configurationResolverService: IConfigurationResolverService, bundler: SyncedCustomizationBundler, sessionType: string): Promise<ClientPluginCustomization[]>;