@codingame/monaco-vscode-mcp-service-override 36.2.6 → 37.0.0

package/vscode/src/vs/workbench/contrib/mcp/browser/mcpLanguageFeatures.js

@@ -4,12 +4,27 @@ import { computeLevenshteinDistance } from '@codingame/monaco-vscode-api/vscode/
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { MarkdownString, createMarkdownCommandLink } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { parseTree, findNodeAtLocation } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
-import { Disposable, MutableDisposable, dispose, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, MutableDisposable, DisposableStore, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { LOCAL_AGENT_HOST_SCHEME_PREFIX } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostConnectionsService';
+import { IAgentHostConnectionsService } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostConnectionsService.service';
+import { remoteAgentHostSessionTypeId } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostSessionType';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentService';
+import { isCustomizationEnabled } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/customizationEnablement';
+import { ActionType } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/common/actions';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-root/state';
+import { McpServerStatus, CustomizationType } from '@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';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-automation/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-automation-run/state';
+import { StateComponents } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState';
 import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { MarkerSeverity } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers';
 import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
@@ -17,12 +32,16 @@ import { ISecretStorageService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IConfigurationResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/configurationResolver.service';
 import { ConfigurationResolverExpression } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/configurationResolverExpression';
+import { IAgentHostCustomizationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationService.service';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { isContributionDisabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
 import { McpCommandIds } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpCommandIds';
 import { mcpConfigurationSection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { getActiveAgentHostMcpSessionResource, countRunningMcpServersInOtherSessions } from '../common/mcpEditorAffordanceState.js';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
-import { isContributionDisabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
 import { McpConnectionState, mcpOAuthClientSecretStorageKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { IMcpWorkbenchService, IMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
+import { AgentSession } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agent';
 
 const diagnosticOwner = "vscode.mcp";
 let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
@@ -31,6 +50,9 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
         _mcpRegistry,
         _mcpWorkbenchService,
         _mcpService,
+        _chatWidgetService,
+        _agentHostCustomizationService,
+        _agentHostConnectionsService,
         _markerService,
         _configurationResolverService,
         _secretStorageService
@@ -39,6 +61,9 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
         this._mcpRegistry = _mcpRegistry;
         this._mcpWorkbenchService = _mcpWorkbenchService;
         this._mcpService = _mcpService;
+        this._chatWidgetService = _chatWidgetService;
+        this._agentHostCustomizationService = _agentHostCustomizationService;
+        this._agentHostConnectionsService = _agentHostConnectionsService;
         this._markerService = _markerService;
         this._configurationResolverService = _configurationResolverService;
         this._secretStorageService = _secretStorageService;
@@ -55,14 +80,57 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
             onDidChange: onDidChangeCodeLens.event,
             provideCodeLenses: (model, range) => this._provideCodeLenses(model, () => onDidChangeCodeLens.fire(codeLensProvider))
         };
+        const refreshCodeLens = () => onDidChangeCodeLens.fire(codeLensProvider);
         this._register(
             languageFeaturesService.codeLensProvider.register(patterns, codeLensProvider)
         );
         this._register(this._secretStorageService.onDidChangeSecret(key => {
             if (key.startsWith("mcp.oauth.clientSecret:")) {
-                onDidChangeCodeLens.fire(codeLensProvider);
+                refreshCodeLens();
             }
         }));
+        const focusedWidgetViewModelListener = this._register(( new MutableDisposable()));
+        const updateFocusedWidgetViewModelListener = () => {
+            focusedWidgetViewModelListener.value = this._chatWidgetService.lastFocusedWidget?.onDidChangeViewModel(refreshCodeLens);
+            refreshCodeLens();
+        };
+        const connectionStateListeners = this._register(( new MutableDisposable()));
+        const updateConnectionStateListeners = () => {
+            const store = ( new DisposableStore());
+            for (const connectionInfo of this._agentHostConnectionsService.connections) {
+                const connection = connectionInfo.connection;
+                if (connection) {
+                    store.add(connection.onDidAction((
+                        {
+                            action
+                        }
+                    ) => {
+                        switch (action.type) {
+                        case ActionType.SessionCustomizationsChanged:
+                        case ActionType.SessionCustomizationUpdated:
+                        case ActionType.SessionCustomizationRemoved:
+                        case ActionType.SessionMcpServerStateChanged:
+                            refreshCodeLens();
+                            break;
+                        }
+                    }));
+                }
+            }
+            connectionStateListeners.value = store;
+            refreshCodeLens();
+        };
+        updateFocusedWidgetViewModelListener();
+        updateConnectionStateListeners();
+        this._register(
+            this._chatWidgetService.onDidChangeFocusedWidget(updateFocusedWidgetViewModelListener)
+        );
+        this._register(this._chatWidgetService.onDidChangeFocusedSession(refreshCodeLens));
+        this._register(
+            this._agentHostConnectionsService.onDidChangeConnections(updateConnectionStateListeners)
+        );
+        this._register(
+            this._agentHostCustomizationService.onDidChangeCustomizations(refreshCodeLens)
+        );
         this._register(languageFeaturesService.inlayHintsProvider.register(patterns, {
             onDidChangeInlayHints: _mcpRegistry.onDidChangeInputs,
             provideInlayHints: (model, range) => this._provideInlayHints(model, range)
@@ -134,7 +202,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     diagnostics.push({
                         severity: MarkerSeverity.Warning,
                         message: ( localize(
-                            11936,
+                            13691,
                             "Variable `{0}` not found, did you mean ${{1}}?",
                             name,
                             getClosestMatchingVariable(name) + (arg ? `:${arg}` : "")
@@ -182,174 +250,197 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
         if (!collection) {
             return lensList;
         }
-        const mcpServers = read(this._mcpService.servers).filter(s => s.collection.id === collection.id);
-        for (const node of serversNode.children || []) {
-            if (node.type !== "property" || node.children?.[0]?.type !== "string") {
-                continue;
-            }
-            const name = node.children[0].value;
-            const server = mcpServers.find(s => s.definition.label === name);
-            if (!server) {
-                continue;
-            }
-            const range = Range.fromPositions(model.getPositionAt(node.children[0].offset));
-            if (isContributionDisabled(read(server.enablement))) {
-                lenses.push({
-                    range,
-                    command: {
-                        id: McpCommandIds.ServerOptions,
-                        title: "$(circle-slash) " + ( localize(11937, "Disabled")),
-                        arguments: [server.definition.id]
-                    }
-                });
-                continue;
+        const agentHostSession = getActiveAgentHostMcpSessionResource(this._chatWidgetService.lastFocusedWidget?.viewModel?.sessionResource);
+        if (agentHostSession) {
+            const mcpServers = this._agentHostCustomizationService.getMcpServers(agentHostSession);
+            const otherRunningCounts = this._getOtherRunningAgentHostMcpServerCounts(agentHostSession);
+            for (const node of serversNode.children || []) {
+                if (node.type !== "property" || node.children?.[0]?.type !== "string") {
+                    continue;
+                }
+                const name = node.children[0].value;
+                const server = mcpServers.find(s => s.name === name);
+                if (!server) {
+                    continue;
+                }
+                this._addAgentHostServerCodeLenses(
+                    lenses,
+                    Range.fromPositions(model.getPositionAt(node.children[0].offset)),
+                    agentHostSession,
+                    server,
+                    otherRunningCounts.get(name) ?? 0
+                );
             }
-            const canDebug = !!server.readDefinitions().get().server?.devMode?.debug;
-            const state = read(server.connectionState).state;
-            switch (state) {
-            case McpConnectionState.Kind.Error:
-                lenses.push({
-                    range,
-                    command: {
-                        id: McpCommandIds.ShowOutput,
-                        title: "$(error) " + ( localize(11938, "Error")),
-                        arguments: [server.definition.id]
-                    }
-                }, {
-                    range,
-                    command: {
-                        id: McpCommandIds.RestartServer,
-                        title: ( localize(11939, "Restart")),
-                        arguments: [server.definition.id, {
-                            autoTrustChanges: true
-                        }]
-                    }
-                });
-                if (canDebug) {
+        } else {
+            const mcpServers = read(this._mcpService.servers).filter(s => s.collection.id === collection.id);
+            for (const node of serversNode.children || []) {
+                if (node.type !== "property" || node.children?.[0]?.type !== "string") {
+                    continue;
+                }
+                const name = node.children[0].value;
+                const server = mcpServers.find(s => s.definition.label === name);
+                if (!server) {
+                    continue;
+                }
+                const range = Range.fromPositions(model.getPositionAt(node.children[0].offset));
+                if (isContributionDisabled(read(server.enablement))) {
                     lenses.push({
                         range,
                         command: {
-                            id: McpCommandIds.RestartServer,
-                            title: ( localize(11940, "Debug")),
-                            arguments: [server.definition.id, {
-                                debug: true,
-                                autoTrustChanges: true
-                            }]
+                            id: McpCommandIds.ServerOptions,
+                            title: "$(circle-slash) " + ( localize(13692, "Disabled")),
+                            arguments: [server.definition.id]
                         }
                     });
+                    continue;
                 }
-                break;
-            case McpConnectionState.Kind.Starting:
-                lenses.push({
-                    range,
-                    command: {
-                        id: McpCommandIds.ShowOutput,
-                        title: "$(loading~spin) " + ( localize(11941, "Starting")),
-                        arguments: [server.definition.id]
-                    }
-                }, {
-                    range,
-                    command: {
-                        id: McpCommandIds.StopServer,
-                        title: ( localize(11942, "Cancel")),
-                        arguments: [server.definition.id]
-                    }
-                });
-                break;
-            case McpConnectionState.Kind.Running:
-                lenses.push({
-                    range,
-                    command: {
-                        id: McpCommandIds.ShowOutput,
-                        title: "$(check) " + ( localize(11943, "Running")),
-                        arguments: [server.definition.id]
-                    }
-                }, {
-                    range,
-                    command: {
-                        id: McpCommandIds.StopServer,
-                        title: ( localize(11944, "Stop")),
-                        arguments: [server.definition.id]
-                    }
-                }, {
-                    range,
-                    command: {
-                        id: McpCommandIds.RestartServer,
-                        title: ( localize(11939, "Restart")),
-                        arguments: [server.definition.id, {
-                            autoTrustChanges: true
-                        }]
-                    }
-                });
-                if (canDebug) {
+                const canDebug = !!server.readDefinitions().get().server?.devMode?.debug;
+                const state = read(server.connectionState).state;
+                switch (state) {
+                case McpConnectionState.Kind.Error:
                     lenses.push({
+                        range,
+                        command: {
+                            id: McpCommandIds.ShowOutput,
+                            title: "$(error) " + ( localize(13693, "Error")),
+                            arguments: [server.definition.id]
+                        }
+                    }, {
                         range,
                         command: {
                             id: McpCommandIds.RestartServer,
-                            title: ( localize(11940, "Debug")),
+                            title: ( localize(13694, "Restart")),
                             arguments: [server.definition.id, {
-                                autoTrustChanges: true,
-                                debug: true
+                                autoTrustChanges: true
                             }]
                         }
                     });
-                }
-                break;
-            case McpConnectionState.Kind.Stopped:
-                lenses.push({
-                    range,
-                    command: {
-                        id: McpCommandIds.StartServer,
-                        title: "$(debug-start) " + ( localize(11945, "Start")),
-                        arguments: [server.definition.id, {
-                            autoTrustChanges: true
-                        }]
+                    if (canDebug) {
+                        lenses.push({
+                            range,
+                            command: {
+                                id: McpCommandIds.RestartServer,
+                                title: ( localize(13695, "Debug")),
+                                arguments: [server.definition.id, {
+                                    debug: true,
+                                    autoTrustChanges: true
+                                }]
+                            }
+                        });
                     }
-                });
-                if (canDebug) {
+                    break;
+                case McpConnectionState.Kind.Starting:
                     lenses.push({
                         range,
                         command: {
-                            id: McpCommandIds.StartServer,
-                            title: ( localize(11940, "Debug")),
+                            id: McpCommandIds.ShowOutput,
+                            title: "$(loading~spin) " + ( localize(13696, "Starting")),
+                            arguments: [server.definition.id]
+                        }
+                    }, {
+                        range,
+                        command: {
+                            id: McpCommandIds.StopServer,
+                            title: ( localize(13697, "Cancel")),
+                            arguments: [server.definition.id]
+                        }
+                    });
+                    break;
+                case McpConnectionState.Kind.Running:
+                    lenses.push({
+                        range,
+                        command: {
+                            id: McpCommandIds.ShowOutput,
+                            title: "$(check) " + ( localize(13698, "Running")),
+                            arguments: [server.definition.id]
+                        }
+                    }, {
+                        range,
+                        command: {
+                            id: McpCommandIds.StopServer,
+                            title: ( localize(13699, "Stop")),
+                            arguments: [server.definition.id]
+                        }
+                    }, {
+                        range,
+                        command: {
+                            id: McpCommandIds.RestartServer,
+                            title: ( localize(13694, "Restart")),
                             arguments: [server.definition.id, {
-                                autoTrustChanges: true,
-                                debug: true
+                                autoTrustChanges: true
                             }]
                         }
                     });
-                }
-            }
-            if (state !== McpConnectionState.Kind.Error) {
-                const toolCount = read(server.tools).length;
-                if (toolCount) {
+                    if (canDebug) {
+                        lenses.push({
+                            range,
+                            command: {
+                                id: McpCommandIds.RestartServer,
+                                title: ( localize(13695, "Debug")),
+                                arguments: [server.definition.id, {
+                                    autoTrustChanges: true,
+                                    debug: true
+                                }]
+                            }
+                        });
+                    }
+                    break;
+                case McpConnectionState.Kind.Stopped:
                     lenses.push({
                         range,
                         command: {
-                            id: "",
-                            title: ( localize(11946, "{0} tools", toolCount))
+                            id: McpCommandIds.StartServer,
+                            title: "$(debug-start) " + ( localize(13700, "Start")),
+                            arguments: [server.definition.id, {
+                                autoTrustChanges: true
+                            }]
                         }
                     });
+                    if (canDebug) {
+                        lenses.push({
+                            range,
+                            command: {
+                                id: McpCommandIds.StartServer,
+                                title: ( localize(13695, "Debug")),
+                                arguments: [server.definition.id, {
+                                    autoTrustChanges: true,
+                                    debug: true
+                                }]
+                            }
+                        });
+                    }
                 }
-                const promptCount = read(server.prompts).length;
-                if (promptCount) {
+                if (state !== McpConnectionState.Kind.Error) {
+                    const toolCount = read(server.tools).length;
+                    if (toolCount) {
+                        lenses.push({
+                            range,
+                            command: {
+                                id: "",
+                                title: ( localize(13701, "{0} tools", toolCount))
+                            }
+                        });
+                    }
+                    const promptCount = read(server.prompts).length;
+                    if (promptCount) {
+                        lenses.push({
+                            range,
+                            command: {
+                                id: McpCommandIds.StartPromptForServer,
+                                title: ( localize(13702, "{0} prompts", promptCount)),
+                                arguments: [server]
+                            }
+                        });
+                    }
                     lenses.push({
                         range,
                         command: {
-                            id: McpCommandIds.StartPromptForServer,
-                            title: ( localize(11947, "{0} prompts", promptCount)),
-                            arguments: [server]
+                            id: McpCommandIds.ServerOptions,
+                            title: ( localize(13703, "More...")),
+                            arguments: [server.definition.id]
                         }
                     });
                 }
-                lenses.push({
-                    range,
-                    command: {
-                        id: McpCommandIds.ServerOptions,
-                        title: ( localize(11948, "More...")),
-                        arguments: [server.definition.id]
-                    }
-                });
             }
         }
         const candidates = [];
@@ -394,7 +485,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                 clientIdOffset
             } = candidates[i];
             const existing = existingSecrets[i];
-            const title = existing ? ( localize(11949, "Replace Client Secret")) : ( localize(11950, "Set Client Secret"));
+            const title = existing ? ( localize(13704, "Replace Client Secret")) : ( localize(13705, "Set Client Secret"));
             lenses.push({
                 range: Range.fromPositions(model.getPositionAt(clientIdOffset)),
                 command: {
@@ -406,6 +497,179 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
         }
         return lensList;
     }
+    _addAgentHostServerCodeLenses(lenses, range, agentHostSession, server, otherRunningSessionCount) {
+        const commandArg = {
+            agentHostSession,
+            serverId: server.id
+        };
+        if (!server.enabled) {
+            lenses.push({
+                range,
+                command: {
+                    id: McpCommandIds.AgentHostServerOptions,
+                    title: "$(circle-slash) " + ( localize(13692, "Disabled")),
+                    arguments: [agentHostSession, server.id]
+                }
+            });
+            return;
+        }
+        switch (server.status) {
+        case McpServerStatus.Error:
+            lenses.push({
+                range,
+                command: {
+                    id: McpCommandIds.AgentHostServerOptions,
+                    title: "$(error) " + ( localize(13693, "Error")),
+                    arguments: [agentHostSession, server.id]
+                }
+            });
+            lenses.push({
+                range,
+                command: {
+                    id: McpCommandIds.StartServer,
+                    title: ( localize(13700, "Start")),
+                    arguments: [commandArg]
+                }
+            });
+            break;
+        case McpServerStatus.Starting:
+            lenses.push({
+                range,
+                command: {
+                    id: McpCommandIds.AgentHostServerOptions,
+                    title: "$(loading~spin) " + ( localize(13696, "Starting")),
+                    arguments: [agentHostSession, server.id]
+                }
+            });
+            lenses.push({
+                range,
+                command: {
+                    id: McpCommandIds.StopServer,
+                    title: ( localize(13697, "Cancel")),
+                    arguments: [commandArg]
+                }
+            });
+            break;
+        case McpServerStatus.Ready:
+            lenses.push({
+                range,
+                command: {
+                    id: McpCommandIds.AgentHostServerOptions,
+                    title: "$(check) " + ( localize(13698, "Running")),
+                    arguments: [agentHostSession, server.id]
+                }
+            });
+            lenses.push({
+                range,
+                command: {
+                    id: McpCommandIds.StopServer,
+                    title: ( localize(13699, "Stop")),
+                    arguments: [commandArg]
+                }
+            });
+            break;
+        case McpServerStatus.AuthRequired:
+            lenses.push({
+                range,
+                command: {
+                    id: McpCommandIds.AgentHostServerOptions,
+                    title: "$(account) " + ( localize(13706, "Authentication Required")),
+                    arguments: [agentHostSession, server.id]
+                }
+            });
+            lenses.push({
+                range,
+                command: {
+                    id: McpCommandIds.StopServer,
+                    title: ( localize(13699, "Stop")),
+                    arguments: [commandArg]
+                }
+            });
+            break;
+        case McpServerStatus.Stopped:
+            lenses.push({
+                range,
+                command: {
+                    id: McpCommandIds.StartServer,
+                    title: "$(debug-start) " + ( localize(13700, "Start")),
+                    arguments: [commandArg]
+                }
+            });
+            break;
+        }
+        if (otherRunningSessionCount > 0) {
+            lenses.push({
+                range,
+                command: {
+                    id: "",
+                    title: otherRunningSessionCount === 1 ? ( localize(13707, "(Running in 1 session)")) : ( localize(13708, "(Running in {0} sessions)", otherRunningSessionCount))
+                }
+            });
+        }
+        if (server.status !== McpServerStatus.Error) {
+            lenses.push({
+                range,
+                command: {
+                    id: McpCommandIds.AgentHostServerOptions,
+                    title: ( localize(13703, "More...")),
+                    arguments: [agentHostSession, server.id]
+                }
+            });
+        }
+    }
+    _getOtherRunningAgentHostMcpServerCounts(agentHostSession) {
+        const sessionServers = [];
+        for (const connectionInfo of this._agentHostConnectionsService.connections) {
+            const connection = connectionInfo.connection;
+            if (!connection) {
+                continue;
+            }
+            for (const subscription of connection.getActiveSubscriptions()) {
+                if (subscription.kind !== StateComponents.Session) {
+                    continue;
+                }
+                const state = connection.getSubscriptionUnmanaged(StateComponents.Session, subscription.resource)?.value;
+                const resource = this._toAgentHostSessionResource(connectionInfo, subscription.resource);
+                if (!resource || !state || state instanceof Error) {
+                    continue;
+                }
+                sessionServers.push({
+                    resource,
+                    servers: this._getMcpServersFromSessionState(state)
+                });
+            }
+        }
+        return countRunningMcpServersInOtherSessions(agentHostSession, sessionServers);
+    }
+    _toAgentHostSessionResource(connectionInfo, backendSession) {
+        const provider = AgentSession.provider(backendSession);
+        if (!provider) {
+            return undefined;
+        }
+        const scheme = connectionInfo.isAmbient ? `${LOCAL_AGENT_HOST_SCHEME_PREFIX}${provider}` : remoteAgentHostSessionTypeId(connectionInfo.authority, provider);
+        return ( URI.from({
+            scheme,
+            path: backendSession.path
+        }));
+    }
+    _getMcpServersFromSessionState(state) {
+        const servers = [];
+        const collect = customizations => {
+            for (const customization of customizations ?? []) {
+                if (customization.type === CustomizationType.McpServer) {
+                    servers.push({
+                        name: customization.name,
+                        enabled: isCustomizationEnabled(customization),
+                        status: customization.state.kind
+                    });
+                } else if (customization.type === CustomizationType.Directory || customization.type === CustomizationType.Plugin) {
+                    collect(customization.children);
+                }
+            }
+        };
+        collect(state.customizations);
+        return servers;
+    }
     async _provideInlayHints(model, range) {
         const parsed = await this._parseModel(model);
         if (!parsed) {
@@ -473,19 +737,19 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
         function pushAnnotation(savedId, offset, saved) {
             const tooltip = ( new MarkdownString([createMarkdownCommandLink({
                 id: McpCommandIds.EditStoredInput,
-                text: ( localize(11951, "Edit")),
+                text: ( localize(13709, "Edit")),
                 arguments: [savedId, model.uri, mcpConfigurationSection, inConfig.target],
-                tooltip: ( localize(11952, "Edit saved value"))
+                tooltip: ( localize(13710, "Edit saved value"))
             }), createMarkdownCommandLink({
                 id: McpCommandIds.RemoveStoredInput,
-                text: ( localize(11953, "Clear")),
+                text: ( localize(13711, "Clear")),
                 arguments: [inConfig.scope, savedId],
-                tooltip: ( localize(11954, "Clear saved value"))
+                tooltip: ( localize(13712, "Clear saved value"))
             }), createMarkdownCommandLink({
                 id: McpCommandIds.RemoveStoredInput,
-                text: ( localize(11955, "Clear All")),
+                text: ( localize(13713, "Clear All")),
                 arguments: [inConfig.scope],
-                tooltip: ( localize(11956, "Clear all saved values"))
+                tooltip: ( localize(13714, "Clear all saved values"))
             })].join(" | "), {
                 isTrusted: true
             }));
@@ -500,7 +764,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
         }
     }
 };
-McpLanguageFeatures = ( __decorate([( __param(0, ILanguageFeaturesService)), ( __param(1, IMcpRegistry)), ( __param(2, IMcpWorkbenchService)), ( __param(3, IMcpService)), ( __param(4, IMarkerService)), ( __param(5, IConfigurationResolverService)), ( __param(6, ISecretStorageService))], McpLanguageFeatures));
+McpLanguageFeatures = ( __decorate([( __param(0, ILanguageFeaturesService)), ( __param(1, IMcpRegistry)), ( __param(2, IMcpWorkbenchService)), ( __param(3, IMcpService)), ( __param(4, IChatWidgetService)), ( __param(5, IAgentHostCustomizationService)), ( __param(6, IAgentHostConnectionsService)), ( __param(7, IMarkerService)), ( __param(8, IConfigurationResolverService)), ( __param(9, ISecretStorageService))], McpLanguageFeatures));
 function forEachPropertyWithReplacement(node, callback) {
     if (node.type === "string" && typeof node.value === "string" && node.value.includes(ConfigurationResolverExpression.VARIABLE_LHS)) {
         callback(node);