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

packages/cli/src/config/settings.test.ts

@@ -428,8 +428,11 @@ describe('Settings Loading and Merging', () => {
         '/workspace/dir',
       ]);
 
-      // Verify excludeTools are overwritten by workspace
-      expect(settings.merged.tools?.exclude).toEqual(['workspace-tool']);
+      // Verify excludeTools are concatenated and de-duped
+      expect(settings.merged.tools?.exclude).toEqual([
+        'user-tool',
+        'workspace-tool',
+      ]);
 
       // Verify excludedProjectEnvVars are concatenated and de-duped
       expect(settings.merged.advanced?.excludedEnvVars).toEqual(

packages/cli/src/config/settingsSchema.ts

@@ -662,6 +662,7 @@ const SETTINGS_SCHEMA = {
         default: undefined as string[] | undefined,
         description: 'Tool names to exclude from discovery.',
         showInDialog: false,
+        mergeStrategy: MergeStrategy.UNION,
       },
       discoveryCommand: {
         type: 'string',