merge main

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

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,
},
},
},