MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-05-13 05:12:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(settings): use union merge for excludeTools (#7842)

Browse Source
This commit is contained in:
Spencer Schrock
2025-09-10 12:28:29 -06:00
committed by GitHub
parent 30b13c6357
commit ff705ec286
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/cli/src/config/settings.test.ts
+5 -2
View File
@@ -428,8 +428,11 @@ describe('Settings Loading and Merging', () => {
'/workspace/dir', '/workspace/dir',
]); ]);
// Verify excludeTools are overwritten by workspace // Verify excludeTools are concatenated and de-duped
expect(settings.merged.tools?.exclude).toEqual(['workspace-tool']); expect(settings.merged.tools?.exclude).toEqual([
'user-tool',
'workspace-tool',
]);
// Verify excludedProjectEnvVars are concatenated and de-duped // Verify excludedProjectEnvVars are concatenated and de-duped
expect(settings.merged.advanced?.excludedEnvVars).toEqual( expect(settings.merged.advanced?.excludedEnvVars).toEqual(
packages/cli/src/config/settingsSchema.ts
+1
View File
@@ -662,6 +662,7 @@ const SETTINGS_SCHEMA = {
default: undefined as string[] | undefined, default: undefined as string[] | undefined,
description: 'Tool names to exclude from discovery.', description: 'Tool names to exclude from discovery.',
showInDialog: false, showInDialog: false,
mergeStrategy: MergeStrategy.UNION,
}, },
discoveryCommand: { discoveryCommand: {
type: 'string', type: 'string',