[Skills] Multi-scope skill enablement and shadowing fix (#15953)

packages/cli/src/commands/skills/enable.ts

@@ -5,11 +5,7 @@
  */
 
 import type { CommandModule } from 'yargs';
-import {
-  loadSettings,
-  SettingScope,
-  type LoadableSettingScope,
-} from '../../config/settings.js';
+import { loadSettings } from '../../config/settings.js';
 import { debugLogger } from '@google/gemini-cli-core';
 import { exitCli } from '../utils.js';
 import { enableSkill } from '../../utils/skillSettings.js';
@@ -17,15 +13,14 @@ import { renderSkillActionFeedback } from '../../utils/skillUtils.js';
 
 interface EnableArgs {
   name: string;
-  scope: LoadableSettingScope;
 }
 
 export async function handleEnable(args: EnableArgs) {
-  const { name, scope } = args;
+  const { name } = args;
   const workspaceDir = process.cwd();
   const settings = loadSettings(workspaceDir);
 
-  const result = enableSkill(settings, name, scope);
+  const result = enableSkill(settings, name);
   debugLogger.log(renderSkillActionFeedback(result, (label, _path) => label));
 }
 
@@ -33,25 +28,14 @@ export const enableCommand: CommandModule = {
   command: 'enable <name>',
   describe: 'Enables an agent skill.',
   builder: (yargs) =>
-    yargs
-      .positional('name', {
-        describe: 'The name of the skill to enable.',
-        type: 'string',
-        demandOption: true,
-      })
-      .option('scope', {
-        alias: 's',
-        describe: 'The scope to enable the skill in (user or project).',
-        type: 'string',
-        default: 'user',
-        choices: ['user', 'project'],
-      }),
+    yargs.positional('name', {
+      describe: 'The name of the skill to enable.',
+      type: 'string',
+      demandOption: true,
+    }),
   handler: async (argv) => {
-    const scope: LoadableSettingScope =
-      argv['scope'] === 'project' ? SettingScope.Workspace : SettingScope.User;
     await handleEnable({
       name: argv['name'] as string,
-      scope,
     });
     await exitCli();
   },