fix(cli): remove skill in .ai-devkit.json when skill is removed

Author: codeaholicguy

e2e/cli.e2e.ts

@@ -1,4 +1,4 @@
-import { existsSync, readFileSync } from 'fs';
+import { existsSync, mkdirSync, readFileSync } from 'fs';
 import { join } from 'path';
 import { run, createTempProject, cleanupTempProject, writeConfigFile } from './helpers';
 
@@ -331,6 +331,74 @@ describe('skill command', () => {
 
     cleanupTempProject(projectDir);
   });
+
+  describe('skill remove (issue #63)', () => {
+    let projectDir: string;
+
+    beforeEach(() => {
+      projectDir = createTempProject();
+    });
+
+    afterEach(() => {
+      cleanupTempProject(projectDir);
+    });
+
+    it('should remove the skill entry from .ai-devkit.json after removal', () => {
+      writeConfigFile(projectDir, {
+        version: '1.0.0',
+        environments: ['claude'],
+        phases: [],
+        skills: {
+          installed: [
+            { registry: 'codeaholicguy/ai-devkit', name: 'dev-lifecycle' }
+          ]
+        },
+        createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString()
+      });
+
+      // Create the skill directory so the remove command finds it
+      const skillDir = join(projectDir, '.claude', 'skills', 'dev-lifecycle');
+      mkdirSync(skillDir, { recursive: true });
+
+      const result = run('skill remove dev-lifecycle', { cwd: projectDir });
+      expect(result.exitCode).toBe(0);
+
+      // Skill directory should be gone
+      expect(existsSync(skillDir)).toBe(false);
+
+      // .ai-devkit.json should no longer list the skill
+      const config = JSON.parse(readFileSync(join(projectDir, '.ai-devkit.json'), 'utf-8'));
+      const installed = (config.skills?.installed ?? config.skills ?? []) as Array<{ name: string }>;
+      expect(installed.some((s) => s.name === 'dev-lifecycle')).toBe(false);
+    });
+
+    it('should preserve remaining skills in .ai-devkit.json when removing one', () => {
+      writeConfigFile(projectDir, {
+        version: '1.0.0',
+        environments: ['claude'],
+        phases: [],
+        skills: {
+          installed: [
+            { registry: 'codeaholicguy/ai-devkit', name: 'dev-lifecycle' },
+            { registry: 'codeaholicguy/ai-devkit', name: 'memory' }
+          ]
+        },
+        createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString()
+      });
+
+      const skillDir = join(projectDir, '.claude', 'skills', 'dev-lifecycle');
+      mkdirSync(skillDir, { recursive: true });
+
+      run('skill remove dev-lifecycle', { cwd: projectDir });
+
+      const config = JSON.parse(readFileSync(join(projectDir, '.ai-devkit.json'), 'utf-8'));
+      const installed = (config.skills?.installed ?? config.skills ?? []) as Array<{ name: string }>;
+      expect(installed.some((s) => s.name === 'dev-lifecycle')).toBe(false);
+      expect(installed.some((s) => s.name === 'memory')).toBe(true);
+    });
+  });
 });
 
 describe('Node.js compatibility', () => {

packages/cli/src/__tests__/lib/Config.test.ts

@@ -536,6 +536,121 @@ describe('ConfigManager', () => {
     });
   });
 
+  describe('removeSkill', () => {
+    it('removes the skill entry from the installed array', async () => {
+      const config: DevKitConfig = {
+        version: '1.0.0',
+        environments: ['claude'],
+        phases: [],
+        skills: {
+          installed: [
+            { registry: 'codeaholicguy/ai-devkit', name: 'dev-lifecycle' },
+            { registry: 'codeaholicguy/ai-devkit', name: 'memory' }
+          ]
+        },
+        createdAt: '2024-01-01T00:00:00.000Z',
+        updatedAt: '2024-01-01T00:00:00.000Z'
+      };
+
+      (mockFs.pathExists as any).mockResolvedValue(true);
+      (mockFs.readJson as any).mockResolvedValue(config);
+      (mockFs.writeJson as any).mockResolvedValue(undefined);
+
+      const result = await configManager.removeSkill('dev-lifecycle');
+
+      expect(result.skills).toEqual({
+        installed: [
+          { registry: 'codeaholicguy/ai-devkit', name: 'memory' }
+        ]
+      });
+      expect(mockFs.writeJson).toHaveBeenCalled();
+    });
+
+    it('removes skill when skills is an array', async () => {
+      const config: DevKitConfig = {
+        version: '1.0.0',
+        environments: ['claude'],
+        phases: [],
+        skills: [
+          { registry: 'codeaholicguy/ai-devkit', name: 'dev-lifecycle' },
+          { registry: 'codeaholicguy/ai-devkit', name: 'memory' }
+        ],
+        createdAt: '2024-01-01T00:00:00.000Z',
+        updatedAt: '2024-01-01T00:00:00.000Z'
+      };
+
+      (mockFs.pathExists as any).mockResolvedValue(true);
+      (mockFs.readJson as any).mockResolvedValue(config);
+      (mockFs.writeJson as any).mockResolvedValue(undefined);
+
+      const result = await configManager.removeSkill('dev-lifecycle');
+
+      expect(result.skills).toEqual({
+        installed: [
+          { registry: 'codeaholicguy/ai-devkit', name: 'memory' }
+        ]
+      });
+      expect(mockFs.writeJson).toHaveBeenCalled();
+    });
+
+    it('results in an empty installed array when last skill is removed', async () => {
+      const config: DevKitConfig = {
+        version: '1.0.0',
+        environments: ['claude'],
+        phases: [],
+        skills: {
+          installed: [
+            { registry: 'codeaholicguy/ai-devkit', name: 'dev-lifecycle' }
+          ]
+        },
+        createdAt: '2024-01-01T00:00:00.000Z',
+        updatedAt: '2024-01-01T00:00:00.000Z'
+      };
+
+      (mockFs.pathExists as any).mockResolvedValue(true);
+      (mockFs.readJson as any).mockResolvedValue(config);
+      (mockFs.writeJson as any).mockResolvedValue(undefined);
+
+      const result = await configManager.removeSkill('dev-lifecycle');
+
+      expect(result.skills).toEqual({ installed: [] });
+      expect(mockFs.writeJson).toHaveBeenCalled();
+    });
+
+    it('is a no-op when skill name does not exist in installed', async () => {
+      const config: DevKitConfig = {
+        version: '1.0.0',
+        environments: ['claude'],
+        phases: [],
+        skills: {
+          installed: [
+            { registry: 'codeaholicguy/ai-devkit', name: 'memory' }
+          ]
+        },
+        createdAt: '2024-01-01T00:00:00.000Z',
+        updatedAt: '2024-01-01T00:00:00.000Z'
+      };
+
+      (mockFs.pathExists as any).mockResolvedValue(true);
+      (mockFs.readJson as any).mockResolvedValue(config);
+      (mockFs.writeJson as any).mockResolvedValue(undefined);
+
+      const result = await configManager.removeSkill('nonexistent');
+
+      expect(result.skills).toEqual({
+        installed: [{ registry: 'codeaholicguy/ai-devkit', name: 'memory' }]
+      });
+    });
+
+    it('throws when config file is not found', async () => {
+      (mockFs.pathExists as any).mockResolvedValue(false);
+
+      await expect(configManager.removeSkill('dev-lifecycle')).rejects.toThrow(
+        'Config file not found'
+      );
+    });
+  });
+
   describe('normalizeSkillsConfig', () => {
     it('normalizes an array to SkillsConfig', () => {
       const result = configManager.normalizeSkillsConfig([

packages/cli/src/__tests__/lib/SkillManager.test.ts

@@ -891,6 +891,7 @@ describe("SkillManager", () => {
 
       (mockedFs.pathExists as any).mockResolvedValue(true);
       (mockedFs.remove as any).mockResolvedValue(undefined);
+      mockConfigManager.removeSkill.mockResolvedValue({} as any);
     });
 
     it("should validate skill name", async () => {
@@ -920,6 +921,20 @@ describe("SkillManager", () => {
       );
     });
 
+    it("should update config to remove skill entry after successful removal", async () => {
+      await skillManager.removeSkill(mockSkillName);
+
+      expect(mockConfigManager.removeSkill).toHaveBeenCalledWith(mockSkillName);
+    });
+
+    it("should not update config when skill files are not found", async () => {
+      (mockedFs.pathExists as any).mockResolvedValue(false);
+
+      await skillManager.removeSkill(mockSkillName);
+
+      expect(mockConfigManager.removeSkill).not.toHaveBeenCalled();
+    });
+
     it("should handle skill not found gracefully", async () => {
       (mockedFs.pathExists as any).mockResolvedValue(false);
 

packages/cli/src/lib/Config.ts

@@ -163,6 +163,19 @@ export class ConfigManager {
     return this.update({ skills: normalized });
   }
 
+  async removeSkill(skillName: string): Promise<DevKitConfig> {
+    const config = await this.read();
+    if (!config) {
+      throw new Error('Config file not found. Run ai-devkit init first.');
+    }
+
+    const normalized = this.normalizeSkillsConfig(config.skills);
+    const installed = normalized.installed || [];
+
+    normalized.installed = installed.filter(entry => entry.name !== skillName);
+    return this.update({ skills: normalized });
+  }
+
   async getSkillRegistries(): Promise<Record<string, string>> {
     const config = await this.read();
     if (!config) {

packages/cli/src/lib/SkillManager.ts

@@ -260,6 +260,7 @@ export class SkillManager {
       ui.warning(`Skill "${skillName}" not found. Nothing to remove.`);
       ui.info('Tip: Run "ai-devkit skill list" to see installed skills.');
     } else {
+      await this.configManager.removeSkill(skillName);
       ui.success(`Successfully removed from ${removedCount} location(s).`);
       ui.info(`Note: Cached copy in ~/.ai-devkit/skills/ preserved for other projects.`);
     }