Support for Built-in Agent Skills (#16045)

packages/cli/src/commands/skills/list.test.ts

@@ -65,7 +65,7 @@ describe('skills list command', () => {
       };
       mockLoadCliConfig.mockResolvedValue(mockConfig as unknown as Config);
 
-      await handleList();
+      await handleList({});
 
       expect(emitConsoleLog).toHaveBeenCalledWith(
         'log',
@@ -96,7 +96,7 @@ describe('skills list command', () => {
       };
       mockLoadCliConfig.mockResolvedValue(mockConfig as unknown as Config);
 
-      await handleList();
+      await handleList({});
 
       expect(emitConsoleLog).toHaveBeenCalledWith(
         'log',
@@ -120,10 +120,63 @@ describe('skills list command', () => {
       );
     });
 
+    it('should filter built-in skills by default and show them with { all: true }', async () => {
+      const skills = [
+        {
+          name: 'regular',
+          description: 'desc1',
+          disabled: false,
+          location: '/loc1',
+        },
+        {
+          name: 'builtin',
+          description: 'desc2',
+          disabled: false,
+          location: '/loc2',
+          isBuiltin: true,
+        },
+      ];
+      const mockConfig = {
+        initialize: vi.fn().mockResolvedValue(undefined),
+        getSkillManager: vi.fn().mockReturnValue({
+          getAllSkills: vi.fn().mockReturnValue(skills),
+        }),
+      };
+      mockLoadCliConfig.mockResolvedValue(mockConfig as unknown as Config);
+
+      // Default
+      await handleList({ all: false });
+      expect(emitConsoleLog).toHaveBeenCalledWith(
+        'log',
+        expect.stringContaining('regular'),
+      );
+      expect(emitConsoleLog).not.toHaveBeenCalledWith(
+        'log',
+        expect.stringContaining('builtin'),
+      );
+
+      vi.clearAllMocks();
+
+      // With all: true
+      await handleList({ all: true });
+      expect(emitConsoleLog).toHaveBeenCalledWith(
+        'log',
+        expect.stringContaining('regular'),
+      );
+      expect(emitConsoleLog).toHaveBeenCalledWith(
+        'log',
+        expect.stringContaining('builtin'),
+      );
+      expect(emitConsoleLog).toHaveBeenCalledWith(
+        'log',
+        expect.stringContaining(chalk.gray(' [Built-in]')),
+      );
+    });
+
     it('should throw an error when listing fails', async () => {
       mockLoadCliConfig.mockRejectedValue(new Error('List failed'));
 
-      await expect(handleList()).rejects.toThrow('List failed');
+      await expect(handleList({})).rejects.toThrow('List failed');
     });
   });
 

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

@@ -11,7 +11,7 @@ import { loadCliConfig, type CliArgs } from '../../config/config.js';
 import { exitCli } from '../utils.js';
 import chalk from 'chalk';
 
-export async function handleList() {
+export async function handleList(args: { all?: boolean }) {
   const workspaceDir = process.cwd();
   const settings = loadSettings(workspaceDir);
 
@@ -28,7 +28,17 @@ export async function handleList() {
   await config.initialize();
 
   const skillManager = config.getSkillManager();
-  const skills = skillManager.getAllSkills();
+  const skills = args.all
+    ? skillManager.getAllSkills()
+    : skillManager.getAllSkills().filter((s) => !s.isBuiltin);
+
+  // Sort skills: non-built-in first, then alphabetically by name
+  skills.sort((a, b) => {
+    if (a.isBuiltin === b.isBuiltin) {
+      return a.name.localeCompare(b.name);
+    }
+    return a.isBuiltin ? 1 : -1;
+  });
 
   if (skills.length === 0) {
     debugLogger.log('No skills discovered.');
@@ -43,7 +53,9 @@ export async function handleList() {
       ? chalk.red('[Disabled]')
       : chalk.green('[Enabled]');
 
-    debugLogger.log(`${chalk.bold(skill.name)} ${status}`);
+    const builtinSuffix = skill.isBuiltin ? chalk.gray(' [Built-in]') : '';
+
+    debugLogger.log(`${chalk.bold(skill.name)} ${status}${builtinSuffix}`);
     debugLogger.log(`  Description: ${skill.description}`);
     debugLogger.log(`  Location:    ${skill.location}`);
     debugLogger.log('');
@@ -53,9 +65,14 @@ export async function handleList() {
 export const listCommand: CommandModule = {
   command: 'list',
   describe: 'Lists discovered agent skills.',
-  builder: (yargs) => yargs,
-  handler: async () => {
-    await handleList();
+  builder: (yargs) =>
+    yargs.option('all', {
+      type: 'boolean',
+      description: 'Show all skills, including built-in ones.',
+      default: false,
+    }),
+  handler: async (argv) => {
+    await handleList({ all: argv['all'] as boolean });
     await exitCli();
   },
 };