Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 17:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into mrleemurray/inadequate-hamster-teal

Browse Source
This commit is contained in:
Lee Murray
2025-07-03 12:24:35 +01:00
committed by GitHub
parent 0589ee4a8b 6307b2e058
commit 61b5f7c6b9
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
-11
View File
@@ -47,7 +47,6 @@ import { IHostService } from '../../../../services/host/browser/host.js';
import { IWorkbenchLayoutService, Parts } from '../../../../services/layout/browser/layoutService.js';
import { IViewsService } from '../../../../services/views/common/viewsService.js';
import { EXTENSIONS_CATEGORY, IExtensionsWorkbenchService } from '../../../extensions/common/extensions.js';
import { McpCommandIds } from '../../../mcp/common/mcpCommandIds.js';
import { IChatAgentService } from '../../common/chatAgents.js';
import { ChatContextKeys } from '../../common/chatContextKeys.js';
import { IChatEditingSession, ModifiedFileEntryState } from '../../common/chatEditingService.js';
@@ -879,16 +878,6 @@ Update \`.github/copilot-instructions.md\` for the user, then ask for feedback o
icon: Codicon.settings,
order: 6
});
MenuRegistry.appendMenuItem(CHAT_CONFIG_MENU_ID, {
command: {
id: McpCommandIds.ShowInstalled,
title: localize2('mcp.servers', "MCP Servers")
},
when: ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.equals('view', ChatViewId)),
order: 14,
group: '0_level'
});
}
export function stringifyItem(item: IChatRequestViewModel | IChatResponseViewModel, includeName = true): string {
src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+8 -1
View File
@@ -33,7 +33,7 @@ import { IAccountQuery, IAuthenticationQueryService } from '../../../services/au
import { IAuthenticationService } from '../../../services/authentication/common/authentication.js';
import { IEditorService } from '../../../services/editor/common/editorService.js';
import { IViewsService } from '../../../services/views/common/viewsService.js';
import { IChatWidgetService } from '../../chat/browser/chat.js';
import { ChatViewId, IChatWidgetService } from '../../chat/browser/chat.js';
import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
import { ChatModeKind } from '../../chat/common/constants.js';
import { ILanguageModelsService } from '../../chat/common/languageModels.js';
@@ -54,6 +54,7 @@ import { IFileService } from '../../../../platform/files/common/files.js';
import { VSBuffer } from '../../../../base/common/buffer.js';
import { IProductService } from '../../../../platform/product/common/productService.js';
import { IOpenerService } from '../../../../platform/opener/common/opener.js';
import { CHAT_CONFIG_MENU_ID } from '../../chat/browser/actions/chatActions.js';
// acroynms do not get localized
const category: ILocalizedString = {
@@ -729,6 +730,12 @@ export class ShowInstalledMcpServersCommand extends Action2 {
category,
precondition: HasInstalledMcpServersContext,
f1: true,
menu: {
id: CHAT_CONFIG_MENU_ID,
when: ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.equals('view', ChatViewId)),
order: 14,
group: '0_level'
}
});
}