From 3806f3c2c33f073480110ca7361bfe5213ef9912 Mon Sep 17 00:00:00 2001
From: Hoang Nguyen <hoangnn93@gmail.com>
Date: Wed, 5 Aug 2026 13:56:32 +0000
Subject: [PATCH] fix(init): compose templates with built-in skills

---
 .../cli/src/__tests__/commands/init.test.ts     | 17 ++++++++++++-----
 packages/cli/src/commands/init.ts               |  4 +++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/packages/cli/src/__tests__/commands/init.test.ts b/packages/cli/src/__tests__/commands/init.test.ts
index 300e8b6a..f5ded21a 100644
--- a/packages/cli/src/__tests__/commands/init.test.ts
+++ b/packages/cli/src/__tests__/commands/init.test.ts
@@ -89,6 +89,7 @@ vi.mock('../../util/terminal.js', () => ({
 }));
 
 import { initCommand } from '../../commands/init.js';
+import { BUILTIN_SKILL_NAMES, BUILTIN_SKILL_REGISTRY } from '../../constants.js';
 
 function confirmCallsMatching(pattern: RegExp): any[] {
   return mockConfirm.mock.calls.filter(([config]: any[]) =>
@@ -211,7 +212,7 @@ describe('init command', () => {
       expect(mockConfigManager.setEnvironments).not.toHaveBeenCalled();
     });
 
-    it('silently ignores --built-in when the template declares skills', async () => {
+    it('installs template skills and all built-in skills when both options are provided', async () => {
       mockLoadInitTemplate.mockResolvedValue({
         environments: ['codex'],
         phases: ['requirements'],
@@ -220,13 +221,16 @@ describe('init command', () => {
 
       await initCommand({ template: './init.yaml', builtIn: true });
 
-      expect(mockSkillManager.addSkill).toHaveBeenCalledTimes(1);
-      expect(mockSkillManager.addSkill).toHaveBeenCalledWith('codeaholicguy/ai-devkit', 'debug');
+      expect(mockSkillManager.addSkill).toHaveBeenCalledTimes(BUILTIN_SKILL_NAMES.length + 1);
+      expect(mockSkillManager.addSkill).toHaveBeenCalledWith(BUILTIN_SKILL_REGISTRY, 'debug');
+      for (const skill of BUILTIN_SKILL_NAMES) {
+        expect(mockSkillManager.addSkill).toHaveBeenCalledWith(BUILTIN_SKILL_REGISTRY, skill);
+      }
       const builtinPrompts = confirmCallsMatching(/Install AI DevKit built-in skills/);
       expect(builtinPrompts).toHaveLength(0);
     });
 
-    it('silently ignores --built-in when the template has no skills declared', async () => {
+    it('installs all built-in skills when the template has no skills declared', async () => {
       mockLoadInitTemplate.mockResolvedValue({
         environments: ['codex'],
         phases: ['requirements']
@@ -234,7 +238,10 @@ describe('init command', () => {
 
       await initCommand({ template: './init.yaml', builtIn: true });
 
-      expect(mockSkillManager.addSkill).not.toHaveBeenCalled();
+      expect(mockSkillManager.addSkill).toHaveBeenCalledTimes(BUILTIN_SKILL_NAMES.length);
+      for (const skill of BUILTIN_SKILL_NAMES) {
+        expect(mockSkillManager.addSkill).toHaveBeenCalledWith(BUILTIN_SKILL_REGISTRY, skill);
+      }
       const builtinPrompts = confirmCallsMatching(/Install AI DevKit built-in skills/);
       expect(builtinPrompts).toHaveLength(0);
     });
diff --git a/packages/cli/src/commands/init.ts b/packages/cli/src/commands/init.ts
index ea452d5e..ba4e1e4c 100644
--- a/packages/cli/src/commands/init.ts
+++ b/packages/cli/src/commands/init.ts
@@ -352,7 +352,9 @@ export async function initCommand(options: InitOptions) {
         ui.warning(`${result.registry}/${result.skill}: ${result.reason || 'Unknown error'}`);
       });
     }
-  } else if (!hasTemplate) {
+  }
+
+  if (options.builtIn || !hasTemplate) {
     const shouldInstall = await shouldInstallBuiltinSkills(options);
 
     if (shouldInstall) {