vrr/qwen-code
2
0
Fork 0
mirror of https://github.com/QwenLM/qwen-code.git synced 2026-04-29 20:20:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 31

fix: remove redundant scope field from MCP server display and add CONCAT merge strategy for mcp allowed/excluded lists

Browse source
This commit is contained in:
LaZzyMan 2026-03-09 21:38:42 +08:00
parent 817f24e0ea
commit d32dcab5db
6 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

15
packages/cli/src/ui/components/mcp/MCPManagementDialog.tsx
View file

@ -95,16 +95,10 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
let source: 'user' | 'project' | 'extension' = 'user';
if (serverConfig.extensionName) {
source = 'extension';
}
// Determine the scope of the configuration
let scope: 'user' | 'workspace' | 'extension' = 'user';
if (serverConfig.extensionName) {
scope = 'extension';
} else if (workspaceSettings.mcpServers?.[name]) {
scope = 'workspace';
source = 'project';
} else if (userSettings.mcpServers?.[name]) {
scope = 'user';
source = 'user';
}
// Use config.isMcpServerDisabled() to check if server is disabled
@ -119,7 +113,6 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
name,
status,
source,
scope,
config: serverConfig,
toolCount: serverTools.length,
invalidToolCount,
@ -343,7 +336,7 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
// Determine the scope based on server configuration location
let targetScope: 'user' | 'workspace' = 'user';
if (server.scope === 'extension') {
if (server.source === 'extension') {
// Extension servers should not be disabled through user/workspace settings
// Show error message and return
debugLogger.warn(
@ -351,7 +344,7 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
);
setIsLoading(false);
return;
} else if (server.scope === 'workspace') {
} else if (server.source === 'project') {
targetScope = 'workspace';
}

4
packages/cli/src/ui/components/mcp/steps/ServerDetailStep.tsx
View file

@ -136,9 +136,9 @@ export const ServerDetailStep: React.FC<ServerDetailStepProps> = ({
</Box>
<Box>
<Text color={theme.text.primary}>
{server.scope === 'user'
{server.source === 'user'
? t('User Settings')
: server.scope === 'workspace'
: server.source === 'project'
? t('Workspace Settings')
: t('Extension')}
</Text>

2
packages/cli/src/ui/components/mcp/types.ts
View file

@ -34,8 +34,6 @@ export interface MCPServerDisplayInfo {
status: MCPServerStatus;
/** 来源类型 */
source: 'user' | 'project' | 'extension';
/** 配置所在的 scope */
scope: 'user' | 'workspace' | 'extension';
/** 配置文件路径 */
configPath?: string;
/** 服务器配置 */

2
packages/cli/src/ui/components/mcp/utils.test.ts
View file

@ -25,7 +25,6 @@ describe('MCP utils', () => {
name: 'server1',
status: MCPServerStatus.CONNECTED,
source: 'user',
scope: 'user',
config: { command: 'cmd1' },
toolCount: 1,
promptCount: 0,
@ -35,7 +34,6 @@ describe('MCP utils', () => {
name: 'server2',
status: MCPServerStatus.CONNECTED,
source: 'extension',
scope: 'extension',
config: { command: 'cmd2' },
toolCount: 2,
promptCount: 0,