Agent Skills: Implement Core Skill Infrastructure & Tiered Discovery (#15698)

2026-04-24 12:04:56 -07:00 · 2025-12-30 13:35:52 -08:00
parent ec11b8afbf
commit de1233b8ca
19 changed files with 1209 additions and 3 deletions
@@ -0,0 +1,227 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { skillsCommand } from './skillsCommand.js';
+import { MessageType } from '../types.js';
+import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
+import type { CommandContext } from './types.js';
+import type { Config } from '@google/gemini-cli-core';
+import { SettingScope, type LoadedSettings } from '../../config/settings.js';
+
+describe('skillsCommand', () => {
+  let context: CommandContext;
+
+  beforeEach(() => {
+    const skills = [
+      {
+        name: 'skill1',
+        description: 'desc1',
+        location: '/loc1',
+        body: 'body1',
+      },
+      {
+        name: 'skill2',
+        description: 'desc2',
+        location: '/loc2',
+        body: 'body2',
+      },
+    ];
+    context = createMockCommandContext({
+      services: {
+        config: {
+          getSkillManager: vi.fn().mockReturnValue({
+            getAllSkills: vi.fn().mockReturnValue(skills),
+            getSkill: vi
+              .fn()
+              .mockImplementation(
+                (name: string) => skills.find((s) => s.name === name) ?? null,
+              ),
+          }),
+        } as unknown as Config,
+        settings: {
+          merged: { skills: { disabled: [] } },
+          workspace: { path: '/workspace' },
+          setValue: vi.fn(),
+        } as unknown as LoadedSettings,
+      },
+    });
+  });
+
+  it('should add a SKILLS_LIST item to UI with descriptions by default', async () => {
+    await skillsCommand.action!(context, '');
+
+    expect(context.ui.addItem).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: MessageType.SKILLS_LIST,
+        skills: [
+          { name: 'skill1', description: 'desc1' },
+          { name: 'skill2', description: 'desc2' },
+        ],
+        showDescriptions: true,
+      }),
+      expect.any(Number),
+    );
+  });
+
+  it('should list skills when "list" subcommand is used', async () => {
+    const listCmd = skillsCommand.subCommands!.find((s) => s.name === 'list')!;
+    await listCmd.action!(context, '');
+
+    expect(context.ui.addItem).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: MessageType.SKILLS_LIST,
+        skills: [
+          { name: 'skill1', description: 'desc1' },
+          { name: 'skill2', description: 'desc2' },
+        ],
+        showDescriptions: true,
+      }),
+      expect.any(Number),
+    );
+  });
+
+  it('should disable descriptions if "nodesc" arg is provided to list', async () => {
+    const listCmd = skillsCommand.subCommands!.find((s) => s.name === 'list')!;
+    await listCmd.action!(context, 'nodesc');
+
+    expect(context.ui.addItem).toHaveBeenCalledWith(
+      expect.objectContaining({
+        showDescriptions: false,
+      }),
+      expect.any(Number),
+    );
+  });
+
+  describe('disable/enable', () => {
+    beforeEach(() => {
+      context.services.settings.merged.skills = { disabled: [] };
+      (
+        context.services.settings as unknown as { workspace: { path: string } }
+      ).workspace = {
+        path: '/workspace',
+      };
+    });
+
+    it('should disable a skill', async () => {
+      const disableCmd = skillsCommand.subCommands!.find(
+        (s) => s.name === 'disable',
+      )!;
+      await disableCmd.action!(context, 'skill1');
+
+      expect(context.services.settings.setValue).toHaveBeenCalledWith(
+        SettingScope.Workspace,
+        'skills.disabled',
+        ['skill1'],
+      );
+      expect(context.ui.addItem).toHaveBeenCalledWith(
+        expect.objectContaining({
+          type: MessageType.INFO,
+          text: expect.stringContaining('Skill "skill1" disabled'),
+        }),
+        expect.any(Number),
+      );
+    });
+
+    it('should enable a skill', async () => {
+      const enableCmd = skillsCommand.subCommands!.find(
+        (s) => s.name === 'enable',
+      )!;
+      context.services.settings.merged.skills = { disabled: ['skill1'] };
+      await enableCmd.action!(context, 'skill1');
+
+      expect(context.services.settings.setValue).toHaveBeenCalledWith(
+        SettingScope.Workspace,
+        'skills.disabled',
+        [],
+      );
+      expect(context.ui.addItem).toHaveBeenCalledWith(
+        expect.objectContaining({
+          type: MessageType.INFO,
+          text: expect.stringContaining('Skill "skill1" enabled'),
+        }),
+        expect.any(Number),
+      );
+    });
+
+    it('should show error if skill not found during disable', async () => {
+      const disableCmd = skillsCommand.subCommands!.find(
+        (s) => s.name === 'disable',
+      )!;
+      await disableCmd.action!(context, 'non-existent');
+
+      expect(context.ui.addItem).toHaveBeenCalledWith(
+        expect.objectContaining({
+          type: MessageType.ERROR,
+          text: 'Skill "non-existent" not found.',
+        }),
+        expect.any(Number),
+      );
+    });
+  });
+
+  describe('completions', () => {
+    it('should provide completions for disable (only enabled skills)', async () => {
+      const disableCmd = skillsCommand.subCommands!.find(
+        (s) => s.name === 'disable',
+      )!;
+      const skillManager = context.services.config!.getSkillManager();
+      const mockSkills = [
+        {
+          name: 'skill1',
+          description: 'desc1',
+          disabled: false,
+          location: '/loc1',
+          body: 'body1',
+        },
+        {
+          name: 'skill2',
+          description: 'desc2',
+          disabled: true,
+          location: '/loc2',
+          body: 'body2',
+        },
+      ];
+      vi.mocked(skillManager.getAllSkills).mockReturnValue(mockSkills);
+      vi.mocked(skillManager.getSkill).mockImplementation(
+        (name: string) => mockSkills.find((s) => s.name === name) ?? null,
+      );
+
+      const completions = await disableCmd.completion!(context, 'sk');
+      expect(completions).toEqual(['skill1']);
+    });
+
+    it('should provide completions for enable (only disabled skills)', async () => {
+      const enableCmd = skillsCommand.subCommands!.find(
+        (s) => s.name === 'enable',
+      )!;
+      const skillManager = context.services.config!.getSkillManager();
+      const mockSkills = [
+        {
+          name: 'skill1',
+          description: 'desc1',
+          disabled: false,
+          location: '/loc1',
+          body: 'body1',
+        },
+        {
+          name: 'skill2',
+          description: 'desc2',
+          disabled: true,
+          location: '/loc2',
+          body: 'body2',
+        },
+      ];
+      vi.mocked(skillManager.getAllSkills).mockReturnValue(mockSkills);
+      vi.mocked(skillManager.getSkill).mockImplementation(
+        (name: string) => mockSkills.find((s) => s.name === name) ?? null,
+      );
+
+      const completions = await enableCmd.completion!(context, 'sk');
+      expect(completions).toEqual(['skill2']);
+    });
+  });
+});