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

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

@@ -23,17 +23,27 @@ import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls'
 import { IActionViewItemService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/actionViewItemService.service';
 import { MenuEntryActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { Action2, MenuId, MenuItemAction, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { getCustomizationScopeEnablement } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/customizationEnablement';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-root/state';
+import { McpServerStatus, CustomizationEnablementKind } 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 { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { mcpAutoStartConfig, McpAutoStartValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement';
+import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { ISecretStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/secrets/common/secrets.service';
 import { defaultCheckboxStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
-import { spinningLoading } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/actions/workspaceCommands';
 import { ResourceContextKey, ActiveEditorContext, RemoteNameContext, WorkspaceFolderCountContext, WorkbenchStateContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
@@ -41,20 +51,14 @@ import { IAuthenticationService } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { IAuthenticationQueryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authenticationQuery.service';
 import { WORKSPACE_STANDALONE_CONFIGURATIONS, MCP_CONFIGURATION_KEY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configuration/common/configuration';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { IOutputService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/output/common/output.service';
 import { IRemoteUserDataProfilesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles.service';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-root/state';
-import { McpServerStatus } 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 { CHAT_CONFIG_MENU_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { IAgentHostCustomizationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationService.service';
+import { setAgentHostPluginEnablement } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentPluginActions';
+import { IAICustomizationWorkspaceService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.service';
+import { IAgentPluginService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { ChatModeKind, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { isContributionDisabled, ContributionEnablementState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
@@ -87,7 +91,7 @@ class ListMcpServerCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ListServer,
-            title: ( localize2(11764, "List Servers")),
+            title: ( localize2(13511, "List Servers")),
             icon: Codicon.server,
             category,
             f1: true,
@@ -106,7 +110,9 @@ class ListMcpServerCommand extends Action2 {
             agentHostCustomizations: accessor.get(IAgentHostCustomizationService),
             mcpService: accessor.get(IMcpService),
             commandService: accessor.get(ICommandService),
-            quickInput: accessor.get(IQuickInputService)
+            quickInput: accessor.get(IQuickInputService),
+            notificationService: accessor.get(INotificationService),
+            logService: accessor.get(ILogService)
         };
         return this._runWithMode(services, undefined);
     }
@@ -138,7 +144,7 @@ class ListMcpServerCommand extends Action2 {
         const pick = quickInput.createQuickPick({
             useSeparators: true
         });
-        pick.placeholder = ( localize(11765, "Select an MCP Server"));
+        pick.placeholder = ( localize(13512, "Select an MCP Server"));
         mcpService.activateCollections();
         store.add(pick);
         store.add(autorun(reader => {
@@ -147,10 +153,11 @@ class ListMcpServerCommand extends Action2 {
                 s => s.collection.id
             );
             const firstRun = pick.items.length === 0;
+            const previousActiveId = pick.activeItems[0]?.id;
             pick.items = [{
                 id: "$add",
-                label: ( localize(11766, "Add Server")),
-                description: ( localize(11767, "Add a new server configuration")),
+                label: ( localize(13513, "Add Server")),
+                description: ( localize(13514, "Add a new server configuration")),
                 alwaysShow: true,
                 iconClass: ThemeIcon.asClassName(Codicon.add)
             }, ...( Object.values(servers)).filter(s => s.length).flatMap(servers => [{
@@ -162,9 +169,16 @@ class ListMcpServerCommand extends Action2 {
                 return {
                     id: server.definition.id,
                     label: server.definition.label,
-                    description: disabled ? ( localize(11768, "Disabled")) : ( McpConnectionState.toString(server.connectionState.read(reader)))
+                    description: disabled ? ( localize(13515, "Disabled")) : ( McpConnectionState.toString(server.connectionState.read(reader)))
                 };
             }))])];
+            if (previousActiveId) {
+                const previousItem = pick.items.find(item => !("type" in item) && item.id === previousActiveId);
+                if (previousItem) {
+                    pick.activeItems = [previousItem];
+                    return;
+                }
+            }
             if (firstRun && pick.items.length > 3) {
                 pick.activeItems = pick.items.slice(2, 3);
             }
@@ -197,34 +211,56 @@ class ListMcpServerCommand extends Action2 {
         const pick = quickInput.createQuickPick({
             useSeparators: true
         });
-        pick.placeholder = ( localize(11769, "Select an MCP Server for this session"));
+        pick.placeholder = ( localize(13516, "Select an MCP Server for this session"));
         store.add(pick);
         const refresh = () => {
             const firstRun = pick.items.length === 0;
+            const previousActiveId = pick.activeItems[0]?.id;
             const servers = agentHostCustomizations.getMcpServers(agentHostSession);
             pick.items = [...(servers.length === 0 ? [{
                 id: "$empty",
-                label: ( localize(11770, "No MCP servers")),
-                description: ( localize(11771, "This session does not expose any MCP servers")),
+                label: ( localize(13517, "No MCP servers")),
+                description: ( localize(13518, "This session does not expose any MCP servers")),
                 alwaysShow: true
             }] : ( servers.map(server => ({
                 id: server.id,
+                server,
                 label: server.name,
-                description: server.enabled ? mcpServerStatusToLabel(server.status) : ( localize(11768, "Disabled"))
+                description: server.enabled ? mcpServerStatusToLabel(server.status) : ( localize(13515, "Disabled")),
+                buttons: getAgentHostMcpServerButtons(server)
             })))), {
                 type: "separator"
             }, {
                 id: BACK_ID,
-                label: ( localize(11772, "Show locally configured servers...")),
+                label: ( localize(13519, "Show locally configured servers...")),
                 iconClass: ThemeIcon.asClassName(Codicon.arrowLeft),
                 alwaysShow: true
             }];
+            if (previousActiveId) {
+                const previousItem = pick.items.find(item => !("type" in item) && item.id === previousActiveId);
+                if (previousItem) {
+                    pick.activeItems = [previousItem];
+                    return;
+                }
+            }
             if (firstRun && servers.length > 0) {
                 pick.activeItems = [pick.items[0]];
             }
         };
         refresh();
         store.add(agentHostCustomizations.onDidChangeCustomizations(() => refresh()));
+        store.add(pick.onDidTriggerItemButton(async event => {
+            if (!isAgentHostMcpServerButton(event.button) || !event.item.server) {
+                return;
+            }
+            pick.busy = true;
+            try {
+                await runAgentHostMcpServerLifecycleAction(event.item.server, event.button.action, services);
+                refresh();
+            } finally {
+                pick.busy = false;
+            }
+        }));
         const picked = await ( new Promise(resolve => {
             store.add(pick.onDidAccept(() => {
                 resolve(pick.activeItems[0]);
@@ -245,27 +281,141 @@ class ListMcpServerCommand extends Action2 {
         return undefined;
     }
 }
+function isAgentHostMcpServerButton(button) {
+    return "action" in button && (button.action === "start" || button.action === "stop");
+}
+const startAgentHostMcpServerButton = {
+    iconClass: ThemeIcon.asClassName(Codicon.play),
+    tooltip: ( localize(13520, "Start Server")),
+    action: "start"
+};
+const stopAgentHostMcpServerButton = {
+    iconClass: ThemeIcon.asClassName(Codicon.debugStop),
+    tooltip: ( localize(13521, "Stop Server")),
+    action: "stop"
+};
+function getAgentHostMcpServerButtons(server) {
+    if (canStartAgentHostMcpServer(server)) {
+        return [startAgentHostMcpServerButton];
+    }
+    if (canStopAgentHostMcpServer(server)) {
+        return [stopAgentHostMcpServerButton];
+    }
+    return [];
+}
+function canStartAgentHostMcpServer(server) {
+    return server.enabled && (server.status === McpServerStatus.Stopped || server.status === McpServerStatus.Error);
+}
+function canStopAgentHostMcpServer(server) {
+    return server.enabled && (server.status === McpServerStatus.Starting || server.status === McpServerStatus.Ready || server.status === McpServerStatus.AuthRequired);
+}
+async function runAgentHostMcpServerLifecycleAction(server, action, services) {
+    try {
+        if (action === "start" && canStartAgentHostMcpServer(server)) {
+            await server.start();
+        } else if (action === "stop" && canStopAgentHostMcpServer(server)) {
+            await server.stop();
+        }
+    } catch (error) {
+        services.logService.error(`Failed to ${action} MCP server '${server.name}'`, error);
+        const message = error instanceof Error ? error.message : String(error);
+        services.notificationService.error(action === "start" ? ( localize(13522, "Failed to start MCP server '{0}': {1}", server.name, message)) : ( localize(13523, "Failed to stop MCP server '{0}': {1}", server.name, message)));
+    }
+}
 function mcpServerStatusToLabel(status) {
     switch (status) {
     case McpServerStatus.Starting:
-        return localize(11773, "Starting");
+        return localize(13524, "Starting");
     case McpServerStatus.Ready:
-        return localize(11774, "Running");
+        return localize(13525, "Running");
     case McpServerStatus.AuthRequired:
-        return localize(11775, "Authentication required");
+        return localize(13526, "Authentication required");
     case McpServerStatus.Error:
-        return localize(11776, "Error");
+        return localize(13527, "Error");
     case McpServerStatus.Stopped:
-        return localize(11777, "Stopped");
+        return localize(13528, "Stopped");
     default:
         return "";
     }
 }
+function getAgentHostMcpServerEnablementItems(server, hasWorkspace, scopes = ["global", "workspace", "session"]) {
+    const enablement = getCustomizationScopeEnablement(server);
+    const items = [];
+    if (scopes.includes("global")) {
+        items.push({
+            label: enablement.global ? ( localize(13529, "Disable")) : ( localize(13530, "Enable")),
+            action: enablement.global ? "disableProfile" : "enableProfile"
+        });
+    }
+    if (scopes.includes("workspace") && hasWorkspace) {
+        items.push({
+            label: enablement.workspace ? ( localize(13531, "Disable (Workspace)")) : ( localize(13532, "Enable (Workspace)")),
+            action: enablement.workspace ? "disableWorkspace" : "enableWorkspace"
+        });
+    }
+    if (scopes.includes("session")) {
+        items.push({
+            label: enablement.session ? ( localize(13533, "Disable (Session)")) : ( localize(13534, "Enable (Session)")),
+            action: enablement.session ? "disableSession" : "enableSession"
+        });
+    }
+    return items;
+}
+function getLocalMcpServerEnablementItems(disabled, isEmptyWorkbench, includeWorkspace = true) {
+    const items = [];
+    if (disabled) {
+        items.push({
+            label: ( localize(13530, "Enable")),
+            action: "enableProfile"
+        });
+        if (includeWorkspace && !isEmptyWorkbench) {
+            items.push({
+                label: ( localize(13532, "Enable (Workspace)")),
+                action: "enableWorkspace"
+            });
+        }
+    } else {
+        items.push({
+            label: ( localize(13529, "Disable")),
+            action: "disableProfile"
+        });
+        if (includeWorkspace && !isEmptyWorkbench) {
+            items.push({
+                label: ( localize(13531, "Disable (Workspace)")),
+                action: "disableWorkspace"
+            });
+        }
+    }
+    return items;
+}
+function enablementStateForAction(action) {
+    switch (action) {
+    case "enableProfile":
+        return ContributionEnablementState.EnabledProfile;
+    case "disableProfile":
+        return ContributionEnablementState.DisabledProfile;
+    case "enableWorkspace":
+        return ContributionEnablementState.EnabledWorkspace;
+    case "disableWorkspace":
+        return ContributionEnablementState.DisabledWorkspace;
+    }
+}
+function findLocalMcpServer(mcpService, server) {
+    const servers = mcpService.servers.get();
+    const separator = server.id.indexOf("/");
+    const rawId = separator >= 0 ? server.id.slice(separator + 1) : server.id;
+    const idMatches = servers.filter(candidate => candidate.definition.id === rawId);
+    if (idMatches.length === 1) {
+        return idMatches[0];
+    }
+    const nameMatches = servers.filter(candidate => candidate.definition.label === server.name);
+    return nameMatches.length === 1 ? nameMatches[0] : undefined;
+}
 class McpAgentHostServerOptionsCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.AgentHostServerOptions,
-            title: ( localize2(11778, "Agent Host Server Options")),
+            title: ( localize2(13535, "Agent Host Server Options")),
             category,
             f1: false
         });
@@ -273,33 +423,69 @@ class McpAgentHostServerOptionsCommand extends Action2 {
     async run(accessor, agentHostSession, customizationId) {
         const agentHostCustomizations = accessor.get(IAgentHostCustomizationService);
         const quickInputService = accessor.get(IQuickInputService);
-        const outputService = accessor.get(IOutputService);
+        const notificationService = accessor.get(INotificationService);
+        const logService = accessor.get(ILogService);
+        const aiCustomizationWorkspaceService = accessor.get(IAICustomizationWorkspaceService);
+        const agentPluginService = accessor.get(IAgentPluginService);
+        const mcpService = accessor.get(IMcpService);
         const server = agentHostCustomizations.getMcpServers(agentHostSession).find(s => s.id === customizationId);
         if (!server) {
             return;
         }
-        const logOutputChannelId = server.logOutputChannelId;
         const items = [{
             type: "separator",
-            label: ( localize(11779, "Status"))
-        }, {
-            label: server.enabled ? ( localize(11780, "Disable Server")) : ( localize(11781, "Enable Server")),
-            description: server.enabled ? mcpServerStatusToLabel(server.status) : ( localize(11768, "Disabled")),
-            action: "toggle"
+            label: ( localize(13536, "Status"))
         }];
-        if (server.state.kind === McpServerStatus.AuthRequired) {
+        if (canStartAgentHostMcpServer(server)) {
             items.push({
-                label: ( localize(11782, "Authenticate")),
-                description: server.state.resource.resource,
-                action: "authenticate"
+                label: ( localize(13520, "Start Server")),
+                description: mcpServerStatusToLabel(server.status),
+                action: "start"
             });
+        } else if (canStopAgentHostMcpServer(server)) {
+            items.push({
+                label: ( localize(13521, "Stop Server")),
+                description: mcpServerStatusToLabel(server.status),
+                action: "stop"
+            });
+        }
+        const pluginDisabled = server.disabledReason?.source === "plugin";
+        const localServer = findLocalMcpServer(mcpService, server);
+        const durableProfileDisabled = localServer !== undefined && !mcpService.enablementModel.readProfileEnabled(localServer.definition.id);
+        const isEmptyWorkbench = aiCustomizationWorkspaceService.getActiveProjectRoot() === undefined;
+        items.push({
+            type: "separator",
+            label: ( localize(13537, "Enablement"))
+        });
+        if (pluginDisabled) {
+            items.push({
+                label: ( localize(13538, "Enable Plugin")),
+                action: "enablePlugin"
+            });
+        } else {
+            items.push(...(localServer ? [
+                ...getLocalMcpServerEnablementItems(durableProfileDisabled, isEmptyWorkbench, false),
+                ...getAgentHostMcpServerEnablementItems(
+                    server,
+                    agentHostCustomizations.getWorkingDirectories(agentHostSession).length > 0,
+                    ["workspace", "session"]
+                )
+            ] : getAgentHostMcpServerEnablementItems(
+                server,
+                agentHostCustomizations.getWorkingDirectories(agentHostSession).length > 0
+            )));
         }
-        if (logOutputChannelId) {
+        if (server.enabled && server.state.kind === McpServerStatus.AuthRequired) {
             items.push({
-                label: ( localize(11783, "Show Output")),
-                action: "showOutput"
+                label: ( localize(13539, "Authenticate")),
+                description: server.state.resource.resource,
+                action: "authenticate"
             });
         }
+        items.push({
+            label: ( localize(13540, "Show Output")),
+            action: "showOutput"
+        });
         const picked = await quickInputService.pick(items, {
             placeHolder: server.name
         });
@@ -309,25 +495,52 @@ class McpAgentHostServerOptionsCommand extends Action2 {
             return;
         }
         if (picked.action === "showOutput") {
-            if (logOutputChannelId) {
-                await outputService.showChannel(logOutputChannelId);
-            }
+            agentHostCustomizations.showMcpServerLog(agentHostSession, server.id);
             return;
         }
         if (picked.action === "authenticate") {
             await agentHostCustomizations.authenticateMcpServer(agentHostSession, server.id);
             return;
         }
-        if (picked.action === "toggle") {
-            server.setEnabled(!server.enabled);
+        if (picked.action === "start" || picked.action === "stop") {
+            await runAgentHostMcpServerLifecycleAction(server, picked.action, {
+                notificationService,
+                logService
+            });
+            return;
         }
+        if (picked.action === "enablePlugin") {
+            const reason = server.disabledReason;
+            if (reason?.source === "plugin") {
+                const decision = reason.plugin.enablement?.[0];
+                if (decision) {
+                    setAgentHostPluginEnablement(
+                        agentHostCustomizations,
+                        agentPluginService,
+                        agentHostSession,
+                        reason.plugin,
+                        decision.kind,
+                        true
+                    );
+                }
+            }
+            return;
+        }
+        if (localServer && (picked.action === "enableProfile" || picked.action === "disableProfile")) {
+            const state = enablementStateForAction(picked.action);
+            mcpService.enablementModel.setEnabled(localServer.definition.id, state);
+            return;
+        }
+        const scope = picked.action === "enableProfile" || picked.action === "disableProfile" ? CustomizationEnablementKind.Global : picked.action === "enableWorkspace" || picked.action === "disableWorkspace" ? CustomizationEnablementKind.Workspace : CustomizationEnablementKind.Session;
+        const enabled = picked.action === "enableProfile" || picked.action === "enableWorkspace" || picked.action === "enableSession";
+        agentHostCustomizations.setCustomizationEnablement(agentHostSession, server.id, server.enablement, scope, enabled);
     }
 }
 class McpConfirmationServerOptionsCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ServerOptionsInConfirmation,
-            title: ( localize2(11784, "Server Options")),
+            title: ( localize2(13541, "Server Options")),
             category,
             icon: Codicon.settingsGear,
             f1: false,
@@ -358,7 +571,7 @@ class McpServerOptionsCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ServerOptions,
-            title: ( localize2(11784, "Server Options")),
+            title: ( localize2(13541, "Server Options")),
             category,
             f1: false
         });
@@ -383,25 +596,25 @@ class McpServerOptionsCommand extends Action2 {
         const disabled = isContributionDisabled(server.enablement.get());
         items.push({
             type: "separator",
-            label: ( localize(11779, "Status"))
+            label: ( localize(13536, "Status"))
         });
         if (disabled) {
             items.push({
-                label: ( localize(11785, "Enable Server (Workspace)")),
+                label: ( localize(13542, "Enable Server (Workspace)")),
                 action: "enable"
             });
         } else if (McpConnectionState.canBeStarted(serverState.state)) {
             items.push({
-                label: ( localize(11786, "Start Server")),
+                label: ( localize(13520, "Start Server")),
                 action: "start"
             });
         } else {
             items.push({
-                label: ( localize(11787, "Stop Server")),
+                label: ( localize(13521, "Stop Server")),
                 action: "stop"
             });
             items.push({
-                label: ( localize(11788, "Restart Server")),
+                label: ( localize(13543, "Restart Server")),
                 action: "restart"
             });
         }
@@ -409,26 +622,26 @@ class McpServerOptionsCommand extends Action2 {
         const configTarget = serverDefinition?.presentation?.origin || collection?.presentation?.origin;
         if (configTarget) {
             items.push({
-                label: ( localize(11789, "Show Configuration")),
+                label: ( localize(13544, "Show Configuration")),
                 action: "config"
             });
         }
         items.push({
-            label: ( localize(11783, "Show Output")),
+            label: ( localize(13540, "Show Output")),
             action: "showOutput"
         });
         items.push({
             type: "separator",
-            label: ( localize(11790, "Sampling"))
+            label: ( localize(13545, "Sampling"))
         }, {
-            label: ( localize(11791, "Configure Model Access")),
-            description: ( localize(11792, "Set the models the server can use via MCP sampling")),
+            label: ( localize(13546, "Configure Model Access")),
+            description: ( localize(13547, "Set the models the server can use via MCP sampling")),
             action: "configSampling"
         });
         if (samplingService.hasLogs(server)) {
             items.push({
-                label: ( localize(11793, "Show Sampling Requests")),
-                description: ( localize(11794, "Show the sampling requests for this server")),
+                label: ( localize(13548, "Show Sampling Requests")),
+                description: ( localize(13549, "Show the sampling requests for this server")),
                 action: "samplingLog"
             });
         }
@@ -436,15 +649,15 @@ class McpServerOptionsCommand extends Action2 {
         if (capabilities === undefined || (capabilities & McpCapability.Resources)) {
             items.push({
                 type: "separator",
-                label: ( localize(11795, "Resources"))
+                label: ( localize(13550, "Resources"))
             });
             items.push({
-                label: ( localize(11796, "Browse Resources")),
+                label: ( localize(13551, "Browse Resources")),
                 action: "resources"
             });
         }
         const pick = await quickInputService.pick(items, {
-            placeHolder: ( localize(11797, "Select action for '{0}'", server.definition.label))
+            placeHolder: ( localize(13552, "Select action for '{0}'", server.definition.label))
         });
         if (!pick) {
             return;
@@ -495,7 +708,7 @@ class McpServerOptionsCommand extends Action2 {
             editorService.openEditor({
                 resource: undefined,
                 contents: samplingService.getLogText(server),
-                label: ( localize(11798, "MCP Sampling: {0}", server.definition.label))
+                label: ( localize(13553, "MCP Sampling: {0}", server.definition.label))
             });
             break;
         default:
@@ -512,14 +725,14 @@ class McpServerOptionsCommand extends Action2 {
             if (accountQuery.entities().getEntityCount().total > 1) {
                 result.push({
                     action: "disconnect",
-                    label: ( localize(11799, "Disconnect Account")),
+                    label: ( localize(13554, "Disconnect Account")),
                     description: `(${accountName})`,
                     accountQuery
                 });
             } else {
                 result.push({
                     action: "signout",
-                    label: ( localize(11800, "Sign Out")),
+                    label: ( localize(13555, "Sign Out")),
                     description: `(${accountName})`,
                     accountQuery
                 });
@@ -635,15 +848,21 @@ let MCPServerActionRendering = class MCPServerActionRendering extends Disposable
                             stateIndicator.className = "chat-mcp-state-indicator";
                             if (state === DisplayedState.NewTools) {
                                 stateIndicator.style.display = "block";
-                                stateIndicator.classList.add("chat-mcp-state-new", ...ThemeIcon.asClassNameArray(Codicon.refresh));
+                                stateIndicator.classList.add(
+                                    "chat-mcp-state-new",
+                                    ...ThemeIcon.asClassNameArray(Codicon.refreshCompact)
+                                );
                             } else if (state === DisplayedState.Error) {
                                 stateIndicator.style.display = "block";
-                                stateIndicator.classList.add("chat-mcp-state-error", ...ThemeIcon.asClassNameArray(Codicon.warning));
+                                stateIndicator.classList.add(
+                                    "chat-mcp-state-error",
+                                    ...ThemeIcon.asClassNameArray(Codicon.warningCompact)
+                                );
                             } else if (state === DisplayedState.Refreshing) {
                                 stateIndicator.style.display = "block";
                                 stateIndicator.classList.add(
                                     "chat-mcp-state-refreshing",
-                                    ...ThemeIcon.asClassNameArray(spinningLoading)
+                                    ...ThemeIcon.asClassNameArray(ThemeIcon.modify(Codicon.loadingCompact, "spin"))
                                 );
                             } else {
                                 stateIndicator.style.display = "none";
@@ -688,24 +907,24 @@ let MCPServerActionRendering = class MCPServerActionRendering extends Disposable
                             text: s.definition.label,
                             id: McpCommandIds.ServerOptions,
                             arguments: [s.definition.id],
-                            tooltip: ( localize(11801, "Show server options for {0}", s.definition.label))
+                            tooltip: ( localize(13556, "Show server options for {0}", s.definition.label))
                         });
                         const single = servers.length === 1;
                         const names = ( ( servers.map(s => isServer(s) ? link(s) : "`" + s.label + "`")).map(l => single ? l : `- ${l}`)).join("\n");
                         let markdown;
                         if (state === DisplayedState.NewTools) {
                             markdown = ( new MarkdownString(single ? ( localize(
-                                11802,
+                                13557,
                                 "MCP server {0} has been updated and may have new tools available.",
                                 names
                             )) : ( localize(
-                                11803,
+                                13558,
                                 "MCP servers have been updated and may have new tools available:\n\n{0}",
                                 names
                             ))));
                         } else if (state === DisplayedState.Error) {
-                            markdown = ( new MarkdownString(single ? ( localize(11804, "MCP server {0} was unable to start successfully.", names)) : ( localize(
-                                11805,
+                            markdown = ( new MarkdownString(single ? ( localize(13559, "MCP server {0} was unable to start successfully.", names)) : ( localize(
+                                13560,
                                 "Multiple MCP servers were unable to start successfully:\n\n{0}",
                                 names
                             ))));
@@ -732,7 +951,7 @@ let MCPServerActionRendering = class MCPServerActionRendering extends Disposable
                                 const divider = $("hr.mcp-hover-divider");
                                 container.appendChild(divider);
                                 const checkboxContainer = $("div.mcp-hover-setting");
-                                const settingLabelStr = ( localize(11806, "Automatically start MCP servers when sending a chat message"));
+                                const settingLabelStr = ( localize(13561, "Automatically start MCP servers when sending a chat message"));
                                 const checkbox = store.add(( new Checkbox(settingLabelStr, config.get() !== McpAutoStartValue.Never, {
                                     ...defaultCheckboxStyles
                                 })));
@@ -760,11 +979,11 @@ let MCPServerActionRendering = class MCPServerActionRendering extends Disposable
                         } = displayedStateCurrent.get()
                     ) {
                         if (state === DisplayedState.NewTools) {
-                            return localize(11807, "New tools available ({0})", servers.length || 1);
+                            return localize(13562, "New tools available ({0})", servers.length || 1);
                         } else if (state === DisplayedState.Error) {
-                            return localize(11808, "Error loading {0} tool(s)", servers.length || 1);
+                            return localize(13563, "Error loading {0} tool(s)", servers.length || 1);
                         } else if (state === DisplayedState.Refreshing) {
-                            return localize(11809, "Discovering tools...");
+                            return localize(13564, "Discovering tools...");
                         } else {
                             return null;
                         }
@@ -782,7 +1001,7 @@ class ResetMcpTrustCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ResetTrust,
-            title: ( localize2(11810, "Reset Trust")),
+            title: ( localize2(13565, "Reset Trust")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(McpContextKeys.toolsCount.greater(0), ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate())))
@@ -797,7 +1016,7 @@ class ResetMcpCachedTools extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ResetCachedTools,
-            title: ( localize2(11811, "Reset Cached Tools")),
+            title: ( localize2(13566, "Reset Cached Tools")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(McpContextKeys.toolsCount.greater(0), ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate())))
@@ -812,9 +1031,9 @@ class AddConfigurationAction extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.AddConfiguration,
-            title: ( localize2(11812, "Add Server...")),
+            title: ( localize2(13567, "Add Server...")),
             metadata: {
-                description: ( localize2(11813, "Installs a new Model Context protocol to the mcp.json settings"))
+                description: ( localize2(13568, "Installs a new Model Context protocol to the mcp.json settings"))
             },
             category,
             f1: true,
@@ -836,9 +1055,9 @@ class InstallFromManifestAction extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.InstallFromManifest,
-            title: ( localize2(11814, "Install Server from Manifest...")),
+            title: ( localize2(13569, "Install Server from Manifest...")),
             metadata: {
-                description: ( localize2(11815, "Install an MCP server from a JSON manifest file"))
+                description: ( localize2(13570, "Install an MCP server from a JSON manifest file"))
             },
             category,
             f1: true,
@@ -854,7 +1073,7 @@ class RemoveStoredInput extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.RemoveStoredInput,
-            title: ( localize2(11811, "Reset Cached Tools")),
+            title: ( localize2(13566, "Reset Cached Tools")),
             category,
             f1: false
         });
@@ -867,7 +1086,7 @@ class EditStoredInput extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.EditStoredInput,
-            title: ( localize2(11816, "Edit Stored Input")),
+            title: ( localize2(13571, "Edit Stored Input")),
             category,
             f1: false
         });
@@ -881,7 +1100,7 @@ class SetOAuthClientSecret extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.SetOAuthClientSecret,
-            title: ( localize2(11817, "Set OAuth Client Secret")),
+            title: ( localize2(13572, "Set OAuth Client Secret")),
             category,
             f1: false
         });
@@ -893,21 +1112,21 @@ class SetOAuthClientSecret extends Action2 {
         const existing = await secretStorageService.get(key);
         const deleteButton = {
             iconClass: ThemeIcon.asClassName(Codicon.trash),
-            tooltip: ( localize(11818, "Delete stored client secret"))
+            tooltip: ( localize(13573, "Delete stored client secret"))
         };
         const revealButton = {
             iconClass: ThemeIcon.asClassName(Codicon.eye),
-            tooltip: ( localize(11819, "Show client secret"))
+            tooltip: ( localize(13574, "Show client secret"))
         };
         const hideButton = {
             iconClass: ThemeIcon.asClassName(Codicon.eyeClosed),
-            tooltip: ( localize(11820, "Hide client secret"))
+            tooltip: ( localize(13575, "Hide client secret"))
         };
         const result = await ( new Promise(resolve => {
             const input = quickInputService.createInputBox();
-            input.title = existing ? ( localize(11821, "Replace Client Secret for {0}", serverName)) : ( localize(11822, "Set Client Secret for {0}", serverName));
-            input.prompt = ( localize(11823, "Enter the client secret for OAuth client '{0}'.", clientId));
-            input.placeholder = existing ? ( localize(11824, "Enter a new client secret to replace the stored value")) : ( localize(11825, "Enter client secret"));
+            input.title = existing ? ( localize(13576, "Replace Client Secret for {0}", serverName)) : ( localize(13577, "Set Client Secret for {0}", serverName));
+            input.prompt = ( localize(13578, "Enter the client secret for OAuth client '{0}'.", clientId));
+            input.placeholder = existing ? ( localize(13579, "Enter a new client secret to replace the stored value")) : ( localize(13580, "Enter client secret"));
             input.password = true;
             input.ignoreFocusOut = true;
             if (existing) {
@@ -967,7 +1186,7 @@ class ShowConfiguration extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ShowConfiguration,
-            title: ( localize2(11826, "Show Configuration")),
+            title: ( localize2(13581, "Show Configuration")),
             category,
             f1: false
         });
@@ -997,7 +1216,7 @@ class ShowOutput extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ShowOutput,
-            title: ( localize2(11827, "Show Output")),
+            title: ( localize2(13582, "Show Output")),
             category,
             f1: false
         });
@@ -1006,16 +1225,34 @@ class ShowOutput extends Action2 {
         accessor.get(IMcpService).servers.get().find(s => s.definition.id === serverId)?.showOutput();
     }
 }
+function isAgentHostMcpServerCommandArg(arg) {
+    return typeof arg !== "string" && URI.isUri(arg.agentHostSession) && typeof arg.serverId === "string";
+}
+function getAgentHostMcpServer(accessor, arg) {
+    return accessor.get(IAgentHostCustomizationService).getMcpServers(arg.agentHostSession).find(server => server.id === arg.serverId);
+}
 class RestartServer extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.RestartServer,
-            title: ( localize2(11828, "Restart Server")),
+            title: ( localize2(13583, "Restart Server")),
             category,
             f1: false
         });
     }
     async run(accessor, serverId, opts) {
+        if (isAgentHostMcpServerCommandArg(serverId)) {
+            const server = getAgentHostMcpServer(accessor, serverId);
+            accessor.get(ILogService).warn(
+                `Restarting MCP server '${server?.name ?? serverId.serverId}' is not supported for agent-host servers`
+            );
+            accessor.get(INotificationService).warn(( localize(
+                13584,
+                "Restarting MCP server '{0}' is not supported for agent-host servers. Stop and start the server instead.",
+                server?.name ?? serverId.serverId
+            )));
+            return;
+        }
         const s = accessor.get(IMcpService).servers.get().find(s => s.definition.id === serverId);
         s?.showOutput();
         await s?.stop();
@@ -1029,12 +1266,16 @@ class StartServer extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.StartServer,
-            title: ( localize2(11829, "Start Server")),
+            title: ( localize2(13585, "Start Server")),
             category,
             f1: false
         });
     }
     async run(accessor, serverId, opts) {
+        if (isAgentHostMcpServerCommandArg(serverId)) {
+            await getAgentHostMcpServer(accessor, serverId)?.start();
+            return;
+        }
         let servers = accessor.get(IMcpService).servers.get();
         if (serverId !== "*") {
             servers = servers.filter(s => s.definition.id === serverId);
@@ -1054,12 +1295,16 @@ class StopServer extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.StopServer,
-            title: ( localize2(11830, "Stop Server")),
+            title: ( localize2(13586, "Stop Server")),
             category,
             f1: false
         });
     }
     async run(accessor, serverId) {
+        if (isAgentHostMcpServerCommandArg(serverId)) {
+            await getAgentHostMcpServer(accessor, serverId)?.stop();
+            return;
+        }
         const s = accessor.get(IMcpService).servers.get().find(s => s.definition.id === serverId);
         await s?.stop();
     }
@@ -1068,8 +1313,8 @@ class McpBrowseCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.Browse,
-            title: ( localize2(11831, "MCP Servers")),
-            tooltip: ( localize2(11832, "Browse MCP Servers")),
+            title: ( localize2(13587, "MCP Servers")),
+            tooltip: ( localize2(13588, "Browse MCP Servers")),
             category,
             icon: Codicon.search,
             precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))),
@@ -1092,7 +1337,7 @@ class McpBrowseCommand extends Action2 {
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: McpCommandIds.Browse,
-        title: ( localize2(11833, "Browse MCP Servers")),
+        title: ( localize2(13589, "Browse MCP Servers")),
         category,
         precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate())))
     }
@@ -1101,7 +1346,7 @@ class ShowInstalledMcpServersCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ShowInstalled,
-            title: ( localize2(11834, "Show Installed Servers")),
+            title: ( localize2(13590, "Show Installed Servers")),
             category,
             precondition: ( ContextKeyExpr.and(HasInstalledMcpServersContext, ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))),
             f1: true
@@ -1116,15 +1361,6 @@ class ShowInstalledMcpServersCommand extends Action2 {
         }
     }
 }
-MenuRegistry.appendMenuItem(CHAT_CONFIG_MENU_ID, {
-    command: {
-        id: McpCommandIds.ShowInstalled,
-        title: ( localize2(11835, "MCP Servers"))
-    },
-    when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.equals("view", ChatViewId)))),
-    order: 10,
-    group: "2_level"
-});
 class OpenMcpResourceCommand extends Action2 {
     async run(accessor) {
         const fileService = accessor.get(IFileService);
@@ -1144,7 +1380,7 @@ class OpenUserMcpResourceCommand extends OpenMcpResourceCommand {
     constructor() {
         super({
             id: McpCommandIds.OpenUserMcp,
-            title: ( localize2(11836, "Open User Configuration")),
+            title: ( localize2(13591, "Open User Configuration")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate())))
@@ -1159,7 +1395,7 @@ class OpenRemoteUserMcpResourceCommand extends OpenMcpResourceCommand {
     constructor() {
         super({
             id: McpCommandIds.OpenRemoteUserMcp,
-            title: ( localize2(11837, "Open Remote User Configuration")),
+            title: ( localize2(13592, "Open Remote User Configuration")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))), ( RemoteNameContext.notEqualsTo(""))))
@@ -1176,7 +1412,7 @@ class OpenWorkspaceFolderMcpResourceCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.OpenWorkspaceFolderMcp,
-            title: ( localize2(11838, "Open Workspace Folder MCP Configuration")),
+            title: ( localize2(13593, "Open Workspace Folder MCP Configuration")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))), ( WorkspaceFolderCountContext.notEqualsTo(0))))
@@ -1199,7 +1435,7 @@ class OpenWorkspaceMcpResourceCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.OpenWorkspaceMcp,
-            title: ( localize2(11839, "Open Workspace MCP Configuration")),
+            title: ( localize2(13594, "Open Workspace MCP Configuration")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))), ( WorkbenchStateContext.isEqualTo("workspace"))))
@@ -1220,7 +1456,7 @@ class McpBrowseResourcesCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.BrowseResources,
-            title: ( localize2(11840, "Browse Resources...")),
+            title: ( localize2(13595, "Browse Resources...")),
             category,
             precondition: ( ContextKeyExpr.and(McpContextKeys.serverCount.greater(0), ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))),
             f1: true
@@ -1238,7 +1474,7 @@ class McpConfigureSamplingModels extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ConfigureSamplingModels,
-            title: ( localize2(11841, "Configure SamplingModel")),
+            title: ( localize2(13596, "Configure SamplingModel")),
             category
         });
     }
@@ -1264,7 +1500,7 @@ class McpConfigureSamplingModels extends Action2 {
         );
         const picked = await quickInputService.pick(allItems, {
             placeHolder: ( localize(
-                11842,
+                13597,
                 "Pick the models {0} can access via MCP sampling",
                 server.definition.label
             )),
@@ -1280,7 +1516,7 @@ class McpStartPromptingServerCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.StartPromptForServer,
-            title: ( localize2(11843, "Start Prompting Server")),
+            title: ( localize2(13598, "Start Prompting Server")),
             category,
             f1: false
         });
@@ -1310,7 +1546,7 @@ class McpSkipCurrentAutostartCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.SkipCurrentAutostart,
-            title: ( localize2(11844, "Skip Current Autostart")),
+            title: ( localize2(13599, "Skip Current Autostart")),
             category,
             f1: false
         });
@@ -1320,4 +1556,4 @@ class McpSkipCurrentAutostartCommand extends Action2 {
     }
 }
 
-export { AddConfigurationAction, EditStoredInput, InstallFromManifestAction, ListMcpServerCommand, MCPServerActionRendering, McpAgentHostServerOptionsCommand, McpBrowseCommand, McpBrowseResourcesCommand, McpConfigureSamplingModels, McpConfirmationServerOptionsCommand, McpServerOptionsCommand, McpSkipCurrentAutostartCommand, McpStartPromptingServerCommand, OpenRemoteUserMcpResourceCommand, OpenUserMcpResourceCommand, OpenWorkspaceFolderMcpResourceCommand, OpenWorkspaceMcpResourceCommand, RemoveStoredInput, ResetMcpCachedTools, ResetMcpTrustCommand, RestartServer, SetOAuthClientSecret, ShowConfiguration, ShowInstalledMcpServersCommand, ShowOutput, StartServer, StopServer };
+export { AddConfigurationAction, EditStoredInput, InstallFromManifestAction, ListMcpServerCommand, MCPServerActionRendering, McpAgentHostServerOptionsCommand, McpBrowseCommand, McpBrowseResourcesCommand, McpConfigureSamplingModels, McpConfirmationServerOptionsCommand, McpServerOptionsCommand, McpSkipCurrentAutostartCommand, McpStartPromptingServerCommand, OpenRemoteUserMcpResourceCommand, OpenUserMcpResourceCommand, OpenWorkspaceFolderMcpResourceCommand, OpenWorkspaceMcpResourceCommand, RemoveStoredInput, ResetMcpCachedTools, ResetMcpTrustCommand, RestartServer, SetOAuthClientSecret, ShowConfiguration, ShowInstalledMcpServersCommand, ShowOutput, StartServer, StopServer, findLocalMcpServer };