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

merge main

Browse source
This commit is contained in:
DennisYu07 2026-03-10 00:29:08 -07:00
commit 98fb607ad1
73 changed files with 5287 additions and 1246 deletions
Download patch file Download diff file Expand all files Collapse all files

6
packages/cli/src/config/settings.test.ts
View file

@ -348,7 +348,7 @@ describe('Settings Loading and Merging', () => {
fileName: 'WORKSPACE_CONTEXT.md',
},
mcp: {
allowed: ['server1', 'server2'],
allowed: ['server1', 'server2', 'server3', 'server1', 'server2'],
},
});
});
@ -1474,8 +1474,8 @@ describe('Settings Loading and Merging', () => {
const settings = loadSettings(MOCK_WORKSPACE_DIR);
expect(settings.merged.mcp).toEqual({
allowed: ['system-allowed'],
excluded: ['workspace-excluded'],
allowed: ['user-allowed', 'workspace-allowed', 'system-allowed'],
excluded: ['user-excluded', 'workspace-excluded'],
});
});

2
packages/cli/src/config/settingsSchema.ts
View file

@ -998,6 +998,7 @@ const SETTINGS_SCHEMA = {
default: undefined as string[] | undefined,
description: 'A list of MCP servers to allow.',
showInDialog: false,
mergeStrategy: MergeStrategy.CONCAT,
},
excluded: {
type: 'array',
@ -1007,6 +1008,7 @@ const SETTINGS_SCHEMA = {
default: undefined as string[] | undefined,
description: 'A list of MCP servers to exclude.',
showInDialog: false,
mergeStrategy: MergeStrategy.CONCAT,
},
},
},