@deimoscloud/coreai 0.1.16 → 0.1.18

package/dist/cli/index.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 // src/cli/index.ts
-import { join as join14, dirname as dirname7 } from "path";
+import { join as join14, dirname as dirname8 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { Command } from "commander";
 
 // src/index.ts
 import { readFileSync as readFileSync7 } from "fs";
-import { dirname as dirname5, join as join8 } from "path";
+import { dirname as dirname6, join as join8 } from "path";
 import { fileURLToPath } from "url";
 
 // src/config/loader.ts
@@ -442,7 +442,7 @@ function resolveAgentDefinition(agent, config, options = {}) {
 
 // src/agents/compiler.ts
 import { existsSync as existsSync3, mkdirSync, readFileSync as readFileSync3, writeFileSync } from "fs";
-import { join as join3, dirname as dirname2, extname as extname2 } from "path";
+import { join as join3, dirname as dirname2, extname as extname2, isAbsolute } from "path";
 import { parse as parseYaml3, stringify as stringifyYaml } from "yaml";
 function buildAgentTools(agent, mcpServers) {
   const tools = agent.tools ? [...agent.tools] : [...DEFAULT_AGENT_TOOLS];
@@ -456,16 +456,44 @@ function buildAgentTools(agent, mcpServers) {
   }
   return tools.join(", ");
 }
+function processIncludes(template, templateDir, depth = 0, maxDepth = 3) {
+  if (depth > maxDepth) {
+    throw new Error(`Include depth exceeded maximum of ${maxDepth}`);
+  }
+  const includePattern = /<!--\s*include:\s*(\S+)\s*-->/g;
+  return template.replace(includePattern, (_match, includePath) => {
+    const resolvedPath = isAbsolute(includePath) ? includePath : join3(templateDir, includePath);
+    if (!existsSync3(resolvedPath)) {
+      throw new Error(`Include file not found: ${includePath} (resolved to ${resolvedPath})`);
+    }
+    const includedContent = readFileSync3(resolvedPath, "utf-8");
+    return processIncludes(includedContent, dirname2(resolvedPath), depth + 1, maxDepth);
+  });
+}
 function processAgentTemplate(templatePath, agent, config, mcpServers) {
   const template = readFileSync3(templatePath, "utf-8");
-  const context = { agent };
+  const templateDir = dirname2(templatePath);
+  const expandedTemplate = processIncludes(template, templateDir);
+  const earlyMatch = expandedTemplate.match(/^---\n([\s\S]*?)\n---\n?([\s\S]*)$/);
+  if (!earlyMatch) {
+    throw new Error(`Invalid markdown format in ${templatePath}: no frontmatter found`);
+  }
+  const earlyFrontmatter = parseYaml3(earlyMatch[1]);
+  const reservedKeys = /* @__PURE__ */ new Set(["name", "description", "tools"]);
+  const extendedAgent = { ...agent };
+  for (const [key, value] of Object.entries(earlyFrontmatter)) {
+    if (!reservedKeys.has(key) && !(key in extendedAgent)) {
+      extendedAgent[key] = value;
+    }
+  }
+  const context = { agent: extendedAgent };
   if (config) {
     context.config = config;
   }
-  const resolved = resolveString(template, context);
+  const resolved = resolveString(expandedTemplate, context);
   const frontmatterMatch = resolved.match(/^---\n([\s\S]*?)\n---\n?([\s\S]*)$/);
   if (!frontmatterMatch) {
-    throw new Error(`Invalid markdown format in ${templatePath}: no frontmatter found`);
+    throw new Error(`Invalid markdown format after resolution in ${templatePath}`);
   }
   const frontmatterYaml = frontmatterMatch[1];
   const body = frontmatterMatch[2] ?? "";
@@ -1876,469 +1904,123 @@ var CacheManager = class {
 
 // src/skills/generator.ts
 import { existsSync as existsSync5, mkdirSync as mkdirSync2, writeFileSync as writeFileSync2, readFileSync as readFileSync5, readdirSync as readdirSync2, statSync } from "fs";
-import { join as join6, basename as basename2 } from "path";
-
-// src/skills/templates.ts
-var checkInboxSkill = {
-  name: "check-inbox",
-  description: "Check your inbox for pending tasks and messages",
-  category: "core",
-  content: `---
-description: Check your inbox for pending tasks and messages
----
-
-# Check Inbox
-
-Check the inbox at \`KnowledgeLibrary/{{AGENT_NAME}}/inbox/\` for new messages.
-
-## Instructions
-
-1. Read all unprocessed messages in the inbox directory
-2. For each message:
-   - Parse the frontmatter (type, from, date, priority)
-   - Understand the request or task
-   - Take appropriate action based on message type
-3. After processing, move message to \`inbox/processed/\`
-4. Update your context file at \`KnowledgeLibrary/{{AGENT_NAME}}/context/current.txt\`
-
-## Message Types
-
-- **task-assignment**: New work assigned to you
-- **completion-report**: Another agent completed work
-- **review-request**: Code review needed
-- **feedback**: Response to your previous work
-
-## Output Format
-
-Report what messages were processed and actions taken.
-`
-};
-var delegateSkill = {
-  name: "delegate",
-  description: "Delegate a task to another agent via inbox messaging",
-  argumentHint: "<task-description> to <agent-name>",
-  category: "core",
-  content: `---
-description: Delegate a task to another agent via inbox messaging
-argument-hint: <task-description> to <agent-name>
----
-
-# Delegate Task
-
-Delegate work to another agent using the inbox-based messaging system.
-
-## CRITICAL: Do NOT use the Task tool
-
-Agent-to-agent delegation MUST use file-based messaging, not the Task tool.
-The Task tool spawns subagents that lose MCP access.
-
-## Instructions
-
-1. Parse the delegation request to identify:
-   - The task to delegate
-   - The target agent
-
-2. Create a message file in the target agent's inbox:
-   - Path: \`KnowledgeLibrary/<target-agent>/inbox/\`
-   - Filename: \`YYYYMMDD_HHMM-{{AGENT_NAME}}-<subject>.md\`
-
-3. Use this message format:
-\`\`\`markdown
----
-type: task-assignment
-from: {{AGENT_NAME}}
-to: <target-agent>
-date: YYYY-MM-DD HH:MM
-priority: P2
----
-
-## Task Assignment
-
-### Description
-<Clear description of what needs to be done>
-
-### Context
-<Any relevant context or background>
-
-### Expected Deliverables
-1. <Deliverable 1>
-2. <Deliverable 2>
-
-### Success Criteria
-- <Criterion 1>
-- <Criterion 2>
-\`\`\`
-
-4. Tell the user to invoke the target agent:
-   "Please invoke @<target-agent> to process this task."
-
-## Output
-
-Confirm the delegation message was created and instruct user to invoke the agent.
-`
-};
-var gitCommitSkill = {
-  name: "git-commit",
-  description: "Create a quality-gated git commit",
-  argumentHint: "<commit-message>",
-  category: "core",
-  dependencies: [{ type: "git", required: false, description: "For commit operations" }],
-  content: `---
-description: Create a quality-gated git commit
-argument-hint: <commit-message>
-optional: [git]
----
-
-# Git Commit
-
-Create a git commit after passing all quality gates.
-
-## Quality Gates
-
-Run these checks before committing:
-
-1. **Lint**: \`{{LINT_CMD}}\`
-2. **Tests**: \`{{TEST_CMD}}\`
-3. **Build**: \`{{BUILD_CMD}}\`
-
-## Instructions
-
-1. Stage the relevant files with \`git add\`
-2. Run all quality gate commands
-3. If any gate fails:
-   - Fix the issues
-   - Re-run the failed gate
-   - Continue only when all pass
-4. Create the commit with the provided message
-5. Format: Include ticket reference if applicable
-
-## Commit Message Format
-
-\`\`\`
-<type>(<scope>): <description>
-
-[optional body]
-
-[optional footer]
-\`\`\`
-
-Types: feat, fix, docs, style, refactor, test, chore
-
-## Fallbacks
-
-If quality gate commands are not configured:
-- Ask the user what commands to run
-- Or skip gates with user confirmation
-`
-};
-var prCreateSkill = {
-  name: "pr-create",
-  description: "Create a pull request with proper format",
-  argumentHint: "[branch-name]",
-  category: "core",
-  dependencies: [{ type: "git", required: true, description: "For PR creation" }],
-  content: `---
-description: Create a pull request with proper format
-argument-hint: [branch-name]
-requires: [git]
----
-
-# Create Pull Request
-
-Create a well-formatted pull request for the current branch.
-
-## Instructions
-
-1. Ensure all changes are committed
-2. Push the branch to remote
-3. Create PR with proper format:
-
-\`\`\`markdown
-## Summary
-<Brief description of changes>
-
-## Changes
-- <Change 1>
-- <Change 2>
-
-## Test Plan
-- [ ] <Test case 1>
-- [ ] <Test case 2>
-
-## Related Issues
-Closes {{JIRA_PROJECT}}-XXX
-\`\`\`
-
-4. Request reviewers if specified
-
-## Using GitHub CLI
-
-\`\`\`bash
-gh pr create --title "<title>" --body "<body>"
-\`\`\`
-
-## Output
-
-Provide the PR URL and summary of what was created.
-`
-};
-var reviewSkill = {
-  name: "review",
-  description: "Request or perform a code review",
-  argumentHint: "<pr-number-or-url>",
-  category: "core",
-  dependencies: [{ type: "git", required: true, description: "For PR review" }],
-  content: `---
-description: Request or perform a code review
-argument-hint: <pr-number-or-url>
-requires: [git]
----
-
-# Code Review
-
-Review a pull request or delegate review to a specialist.
-
-## Instructions
-
-### If you are reviewing:
-
-1. Fetch the PR details and diff
-2. Review for:
-   - Code quality and style
-   - Logic errors or bugs
-   - Security concerns
-   - Test coverage
-   - Documentation
-3. Provide feedback with specific line references
-4. Approve, request changes, or comment
-
-### If delegating to a reviewer:
-
-1. Identify the appropriate reviewer based on the changes
-2. Create a review request message in their inbox
-3. Include PR link and context
-
-## Review Checklist
-
-- [ ] Code follows project conventions
-- [ ] No obvious bugs or edge cases
-- [ ] Tests cover the changes
-- [ ] Documentation updated if needed
-- [ ] No security vulnerabilities
-
-## Output
-
-Provide review summary with actionable feedback.
-`
-};
-var sprintStatusSkill = {
-  name: "sprint-status",
-  description: "Get current sprint status and progress",
-  category: "optional",
-  dependencies: [{ type: "issue_tracker", required: true, description: "For sprint data" }],
-  content: `---
-description: Get current sprint status and progress
-requires: [issue_tracker]
----
-
-# Sprint Status
-
-Get the current sprint status and team progress.
-
-## Instructions
-
-1. Query the active sprint for project {{JIRA_PROJECT}}
-2. Gather metrics:
-   - Total story points committed
-   - Points completed
-   - Points in progress
-   - Points remaining
-3. List tickets by status
-4. Identify blockers or at-risk items
-
-## Output Format
-
-\`\`\`
-Sprint: <sprint-name>
-Progress: XX/YY points (ZZ%)
-
-## Completed
-- [{{JIRA_PROJECT}}-123] Task name (3 pts)
-
-## In Progress
-- [{{JIRA_PROJECT}}-124] Task name (5 pts) - @assignee
-
-## To Do
-- [{{JIRA_PROJECT}}-125] Task name (2 pts)
-
-## Blocked
-- [{{JIRA_PROJECT}}-126] Task name - Reason
-\`\`\`
-
-## Fallbacks
-
-If issue tracker is unavailable:
-- Report that sprint data cannot be fetched
-- Suggest checking the issue tracker directly at {{JIRA_URL}}
-`
-};
-var jiraCreateSkill = {
-  name: "jira-create",
-  description: "Create a new Jira ticket",
-  argumentHint: "<ticket-type> <summary>",
-  category: "optional",
-  dependencies: [{ type: "issue_tracker", required: true, description: "For ticket creation" }],
-  content: `---
-description: Create a new Jira ticket
-argument-hint: <ticket-type> <summary>
-requires: [issue_tracker]
----
-
-# Create Jira Ticket
-
-Create a new ticket in project {{JIRA_PROJECT}}.
-
-## Instructions
-
-1. Parse the ticket type and summary from arguments
-2. Gather additional details:
-   - Description
-   - Priority
-   - Labels
-   - Components (if applicable)
-3. Create the ticket via the issue tracker integration
-4. Return the ticket key and URL
-
-## Ticket Types
-
-- **Story**: User-facing feature
-- **Bug**: Defect to fix
-- **Task**: Technical work
-- **Spike**: Research/investigation
-
-## Output
-
-\`\`\`
-Created: {{JIRA_PROJECT}}-XXX
-URL: {{JIRA_URL}}/browse/{{JIRA_PROJECT}}-XXX
-Summary: <summary>
-Type: <type>
-\`\`\`
-
-## Fallbacks
-
-If issue tracker is unavailable:
-- Provide the user with manual creation instructions
-- Include all details they should enter
-`
-};
-var jiraTransitionSkill = {
-  name: "jira-transition",
-  description: "Transition a Jira ticket to a new status",
-  argumentHint: "<ticket-key> to <status>",
-  category: "optional",
-  dependencies: [{ type: "issue_tracker", required: true, description: "For ticket transitions" }],
-  content: `---
-description: Transition a Jira ticket to a new status
-argument-hint: <ticket-key> to <status>
-requires: [issue_tracker]
----
-
-# Transition Jira Ticket
-
-Update the status of a ticket in {{JIRA_PROJECT}}.
-
-## Status Mapping
-
-| Workflow Status | Jira Status |
-|-----------------|-------------|
-| BACKLOG | Backlog |
-| IN_PROGRESS | In Progress |
-| PR_CREATED | In Review |
-| IN_REVIEW | In Review |
-| APPROVED | Ready to Merge |
-| MERGED | Done |
-| DONE | Done |
-
-## Instructions
-
-1. Parse ticket key and target status
-2. Validate the transition is allowed
-3. Add a comment explaining the transition
-4. Execute the transition
-
-## Transition Comment Format
-
-\`\`\`
-Status updated to <status>.
-<optional context about why>
-\`\`\`
-
-## Fallbacks
-
-If issue tracker is unavailable:
-- Instruct user to manually transition at {{JIRA_URL}}
-- Provide the target status name
-`
-};
-var docsUpdateSkill = {
-  name: "docs-update",
-  description: "Update project documentation",
-  argumentHint: "<doc-path-or-topic>",
-  category: "optional",
-  dependencies: [{ type: "documentation", required: false, description: "For remote docs" }],
-  content: `---
-description: Update project documentation
-argument-hint: <doc-path-or-topic>
-optional: [documentation]
----
-
-# Update Documentation
-
-Update project documentation for a specific topic or file.
-
-## Instructions
-
-1. Identify the documentation to update:
-   - Local: \`{{DOCS_PATH}}/\`
-   - Remote: {{CONFLUENCE_SPACE}} (if configured)
-
-2. Make the necessary updates:
-   - Keep formatting consistent
-   - Update examples if code changed
-   - Add/update version information
-
-3. For remote documentation:
-   - Use the documentation integration
-   - Or provide content for manual update
-
-## Documentation Types
-
-- **README**: Project overview and setup
-- **API Docs**: Endpoint documentation
-- **Architecture**: Design decisions
-- **Runbooks**: Operational procedures
-
-## Fallbacks
-
-If documentation integration is unavailable:
-- Create/update local markdown files
-- Provide instructions for manual remote update
-`
-};
-var builtInSkills = [
-  checkInboxSkill,
-  delegateSkill,
-  gitCommitSkill,
-  prCreateSkill,
-  reviewSkill,
-  sprintStatusSkill,
-  jiraCreateSkill,
-  jiraTransitionSkill,
-  docsUpdateSkill
-];
-
-// src/skills/generator.ts
+import { join as join6, dirname as dirname5 } from "path";
+function getCoreSkillsDir() {
+  let currentDir = dirname5(import.meta.url.replace("file://", ""));
+  for (let i = 0; i < 5; i++) {
+    if (existsSync5(join6(currentDir, "package.json"))) {
+      return join6(currentDir, "skills");
+    }
+    currentDir = dirname5(currentDir);
+  }
+  return join6(dirname5(dirname5(dirname5(import.meta.url.replace("file://", "")))), "skills");
+}
+function discoverSkills(skillsDir) {
+  const templates = [];
+  if (!existsSync5(skillsDir)) {
+    return templates;
+  }
+  const categories = readdirSync2(skillsDir);
+  for (const category of categories) {
+    const categoryPath = join6(skillsDir, category);
+    const stat = statSync(categoryPath);
+    if (!stat.isDirectory()) continue;
+    if (category.startsWith(".") || category.startsWith("_")) continue;
+    const skillDirs = readdirSync2(categoryPath);
+    for (const skillName of skillDirs) {
+      const skillDir = join6(categoryPath, skillName);
+      const skillStat = statSync(skillDir);
+      if (!skillStat.isDirectory()) continue;
+      const skillFile = join6(skillDir, "SKILL.md");
+      if (!existsSync5(skillFile)) continue;
+      try {
+        const content = readFileSync5(skillFile, "utf-8");
+        const template = parseSkillFile(skillName, category, content);
+        templates.push(template);
+      } catch {
+      }
+    }
+  }
+  return templates;
+}
+function parseSkillFile(name, category, content) {
+  const template = {
+    name,
+    description: name,
+    category,
+    content
+  };
+  const frontmatterMatch = content.match(/^---\r?\n([\s\S]*?)\r?\n---\r?\n/);
+  if (!frontmatterMatch) {
+    return template;
+  }
+  const frontmatter = frontmatterMatch[1];
+  const lines = frontmatter.split(/\r?\n/);
+  const dependencies = [];
+  for (const line of lines) {
+    const colonIndex = line.indexOf(":");
+    if (colonIndex === -1) continue;
+    const key = line.slice(0, colonIndex).trim();
+    let value = line.slice(colonIndex + 1).trim();
+    if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
+      value = value.slice(1, -1);
+    }
+    switch (key) {
+      case "name":
+        template.name = value;
+        break;
+      case "description":
+        template.description = value;
+        break;
+      case "argument-hint":
+        template.argumentHint = value;
+        break;
+      case "requires":
+        if (value.startsWith("[") && value.endsWith("]")) {
+          const items = value.slice(1, -1).split(",").map((s) => s.trim().replace(/['"]/g, ""));
+          for (const item of items) {
+            if (item) {
+              dependencies.push({
+                type: mapIntegrationName(item),
+                required: true
+              });
+            }
+          }
+        }
+        break;
+      case "optional":
+        if (value.startsWith("[") && value.endsWith("]")) {
+          const items = value.slice(1, -1).split(",").map((s) => s.trim().replace(/['"]/g, ""));
+          for (const item of items) {
+            if (item) {
+              dependencies.push({
+                type: mapIntegrationName(item),
+                required: false
+              });
+            }
+          }
+        }
+        break;
+    }
+  }
+  if (dependencies.length > 0) {
+    template.dependencies = dependencies;
+  }
+  return template;
+}
+function mapIntegrationName(name) {
+  const lower = name.toLowerCase();
+  if (["jira", "linear", "issue_tracker", "issues", "github-issues"].includes(lower)) {
+    return "issue_tracker";
+  }
+  if (["git", "github", "gitlab", "bitbucket"].includes(lower)) {
+    return "git";
+  }
+  if (["docs", "documentation", "confluence", "notion", "wiki"].includes(lower)) {
+    return "documentation";
+  }
+  return "state";
+}
 function extractVariables2(config) {
   const vars = {};
   if (!config) {
@@ -2448,112 +2130,12 @@ function checkDependencies(skill, config) {
     missing
   };
 }
-function loadCustomTemplates(templatesDir) {
-  const templates = [];
-  if (!existsSync5(templatesDir)) {
-    return templates;
-  }
-  const files = readdirSync2(templatesDir);
-  for (const file of files) {
-    if (!file.endsWith(".md")) continue;
-    const filePath = join6(templatesDir, file);
-    const stat = statSync(filePath);
-    if (!stat.isFile()) continue;
-    try {
-      const content = readFileSync5(filePath, "utf-8");
-      const template = parseSkillTemplate(file, content);
-      templates.push(template);
-    } catch {
-    }
-  }
-  return templates;
-}
-function parseSkillTemplate(filename, content) {
-  const name = basename2(filename, ".md");
-  const frontmatterMatch = content.match(/^---\r?\n([\s\S]*?)\r?\n---\r?\n([\s\S]*)$/);
-  let description = name;
-  let argumentHint;
-  const dependencies = [];
-  if (frontmatterMatch) {
-    const frontmatter = frontmatterMatch[1] ?? "";
-    const lines = frontmatter.split(/\r?\n/);
-    for (const line of lines) {
-      const colonIndex = line.indexOf(":");
-      if (colonIndex === -1) continue;
-      const key = line.slice(0, colonIndex).trim();
-      let value = line.slice(colonIndex + 1).trim();
-      if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
-        value = value.slice(1, -1);
-      }
-      switch (key) {
-        case "description":
-          description = value;
-          break;
-        case "argument-hint":
-          argumentHint = value;
-          break;
-        case "requires":
-          if (value.startsWith("[") && value.endsWith("]")) {
-            const items = value.slice(1, -1).split(",").map((s) => s.trim().replace(/['"]/g, ""));
-            for (const item of items) {
-              if (item) {
-                dependencies.push({
-                  type: mapIntegrationName(item),
-                  required: true
-                });
-              }
-            }
-          }
-          break;
-        case "optional":
-          if (value.startsWith("[") && value.endsWith("]")) {
-            const items = value.slice(1, -1).split(",").map((s) => s.trim().replace(/['"]/g, ""));
-            for (const item of items) {
-              if (item) {
-                dependencies.push({
-                  type: mapIntegrationName(item),
-                  required: false
-                });
-              }
-            }
-          }
-          break;
-      }
-    }
-  }
-  const template = {
-    name,
-    description,
-    category: "custom",
-    content
-  };
-  if (argumentHint) {
-    template.argumentHint = argumentHint;
-  }
-  if (dependencies.length > 0) {
-    template.dependencies = dependencies;
-  }
-  return template;
-}
-function mapIntegrationName(name) {
-  const lower = name.toLowerCase();
-  if (["jira", "linear", "issue_tracker", "issues", "github-issues"].includes(lower)) {
-    return "issue_tracker";
-  }
-  if (["git", "github", "gitlab", "bitbucket"].includes(lower)) {
-    return "git";
-  }
-  if (["docs", "documentation", "confluence", "notion", "wiki"].includes(lower)) {
-    return "documentation";
-  }
-  return "state";
-}
 function generateSkills(config, options = {}) {
   const projectRoot = options.projectRoot ?? process.cwd();
-  const outputDir = options.outputDir ?? join6(projectRoot, ".claude", "commands");
+  const coreSkillsDir = options.coreSkillsDir ?? getCoreSkillsDir();
+  const outputDir = options.outputDir ?? join6(projectRoot, ".claude", "skills");
   const includeCoreSkills = options.includeCoreSkills ?? true;
-  const includeOptionalSkills = options.includeOptionalSkills ?? true;
-  const overwrite = options.overwrite ?? false;
+  const overwrite = options.overwrite ?? true;
   const result = {
     generated: [],
     errors: [],
@@ -2566,21 +2148,17 @@ function generateSkills(config, options = {}) {
   result.variables = variables;
   let templates = [];
   if (includeCoreSkills) {
-    templates.push(...builtInSkills.filter((s) => s.category === "core"));
-  }
-  if (includeOptionalSkills) {
-    templates.push(...builtInSkills.filter((s) => s.category === "optional"));
+    const discovered = discoverSkills(coreSkillsDir);
+    templates.push(...discovered);
   }
   if (options.customTemplatesDir && existsSync5(options.customTemplatesDir)) {
-    templates.push(...loadCustomTemplates(options.customTemplatesDir));
+    const custom = discoverSkills(options.customTemplatesDir);
+    templates.push(...custom);
   }
   if (options.skills && options.skills.length > 0) {
     const skillsToInclude = options.skills;
     templates = templates.filter((t) => skillsToInclude.includes(t.name));
   }
-  if (!existsSync5(outputDir)) {
-    mkdirSync2(outputDir, { recursive: true });
-  }
   for (const template of templates) {
     try {
       const generated = generateSkill(template, variables, config, outputDir, overwrite);
@@ -2595,7 +2173,8 @@ function generateSkills(config, options = {}) {
   return result;
 }
 function generateSkill(template, variables, config, outputDir, overwrite) {
-  const outputPath = join6(outputDir, `${template.name}.md`);
+  const skillDir = join6(outputDir, template.name);
+  const outputPath = join6(skillDir, "SKILL.md");
   if (existsSync5(outputPath) && !overwrite) {
     return {
       name: template.name,
@@ -2618,6 +2197,9 @@ function generateSkill(template, variables, config, outputDir, overwrite) {
   }
   const content = substituteVariables(template.content, variables);
   const isUpdate = existsSync5(outputPath);
+  if (!existsSync5(skillDir)) {
+    mkdirSync2(skillDir, { recursive: true });
+  }
   writeFileSync2(outputPath, content, "utf-8");
   return {
     name: template.name,
@@ -2661,7 +2243,7 @@ function formatGenerateResult(result) {
   }
   const total = created.length + updated.length;
   if (total > 0) {
-    lines.push(`Generated ${total} skill(s) to .claude/commands/`);
+    lines.push(`Generated ${total} skill(s) to .claude/skills/`);
   } else if (result.generated.length === 0 && result.errors.length === 0) {
     lines.push("No skills to generate.");
   }
@@ -2678,7 +2260,7 @@ import {
   renameSync,
   statSync as statSync2
 } from "fs";
-import { join as join7, basename as basename3 } from "path";
+import { join as join7, basename as basename2 } from "path";
 var DEFAULT_KNOWLEDGE_LIBRARY_PATH = "KnowledgeLibrary";
 var STANDARD_FILES = {
   context: "context.txt",
@@ -3091,8 +2673,8 @@ function getKnowledgeLibraryState(options = {}) {
 
 // src/index.ts
 function findPackageJson() {
-  let dir = dirname5(fileURLToPath(import.meta.url));
-  while (dir !== dirname5(dir)) {
+  let dir = dirname6(fileURLToPath(import.meta.url));
+  while (dir !== dirname6(dir)) {
     const pkgPath = join8(dir, "package.json");
     try {
       const content = readFileSync7(pkgPath, "utf-8");
@@ -3102,7 +2684,7 @@ function findPackageJson() {
       }
     } catch {
     }
-    dir = dirname5(dir);
+    dir = dirname6(dir);
   }
   return '{"version": "unknown"}';
 }
@@ -3380,7 +2962,7 @@ function formatSyncResult(result) {
 
 // src/cli/commands/init.ts
 import { existsSync as existsSync7, writeFileSync as writeFileSync4, mkdirSync as mkdirSync4, readFileSync as readFileSync8 } from "fs";
-import { join as join11, basename as basename4 } from "path";
+import { join as join11, basename as basename3 } from "path";
 import { execSync } from "child_process";
 function detectGitInfo() {
   try {
@@ -3417,7 +2999,7 @@ function detectProjectName(projectRoot) {
     } catch {
     }
   }
-  return basename4(projectRoot);
+  return basename3(projectRoot);
 }
 function generateConfigYaml(options) {
   let yaml = `# CoreAI Configuration
@@ -3614,6 +3196,14 @@ function build(options = {}) {
         warnings
       };
     }
+    let skillsResult;
+    if (!options.skipSkills) {
+      skillsResult = generateSkills(config, {
+        projectRoot,
+        skills: options.skills,
+        overwrite: true
+      });
+    }
     let knowledgeLibraryInitialized;
     if (options.initKnowledgeLibrary) {
       knowledgeLibraryInitialized = [];
@@ -3630,6 +3220,7 @@ function build(options = {}) {
     return {
       success: true,
       result,
+      skillsResult,
       config,
       warnings: warnings.length > 0 ? warnings : void 0,
       knowledgeLibraryInitialized,
@@ -3699,6 +3290,24 @@ function formatBuildResult(result) {
     }
     lines.push("");
   }
+  if (result.skillsResult) {
+    const created = result.skillsResult.generated.filter((g) => g.action === "created");
+    const updated = result.skillsResult.generated.filter((g) => g.action === "updated");
+    const total = created.length + updated.length;
+    if (total > 0) {
+      lines.push(`Generated ${total} skill(s):`);
+      for (const skill of [...created, ...updated]) {
+        lines.push(`  \u2713 ${skill.name} \u2192 ${skill.outputPath}`);
+      }
+      lines.push("");
+    }
+    if (result.skillsResult.errors.length > 0) {
+      for (const error of result.skillsResult.errors) {
+        lines.push(`  \u2717 skill ${error.name}: ${error.error}`);
+      }
+      lines.push("");
+    }
+  }
   if (result.mcpServers && result.mcpServers.length > 0) {
     lines.push(`MCP tools included: ${result.mcpServers.map((s) => `mcp__${s}`).join(", ")}`);
     lines.push("");
@@ -3943,8 +3552,7 @@ function skillsGenerate(options = {}) {
   const generateOptions = {
     projectRoot,
     includeCoreSkills: options.includeCoreSkills ?? true,
-    includeOptionalSkills: options.includeOptionalSkills ?? true,
-    overwrite: options.overwrite ?? false
+    overwrite: options.overwrite ?? true
   };
   if (options.outputDir) {
     generateOptions.outputDir = options.outputDir;
@@ -4010,11 +3618,11 @@ function formatSkillsGenerateResult(result) {
 function skillsList(options = {}) {
   try {
     const skills = [];
+    const coreSkillsDir = getCoreSkillsDir();
+    const discovered = discoverSkills(coreSkillsDir);
     const includeCoreSkills = options.includeCoreSkills ?? true;
-    const includeOptionalSkills = options.includeOptionalSkills ?? true;
-    for (const skill of builtInSkills) {
+    for (const skill of discovered) {
       if (skill.category === "core" && !includeCoreSkills) continue;
-      if (skill.category === "optional" && !includeOptionalSkills) continue;
       skills.push({
         name: skill.name,
         description: skill.description,
@@ -4024,7 +3632,7 @@ function skillsList(options = {}) {
       });
     }
     if (options.customTemplatesDir) {
-      const customSkills = loadCustomTemplates(options.customTemplatesDir);
+      const customSkills = discoverSkills(options.customTemplatesDir);
       for (const skill of customSkills) {
         skills.push({
           name: skill.name,
@@ -4056,7 +3664,6 @@ function formatSkillsListResult(result) {
   const lines = [];
   lines.push("Available skills:\n");
   const coreSkills = result.skills.filter((s) => s.category === "core");
-  const optionalSkills = result.skills.filter((s) => s.category === "optional");
   const customSkills = result.skills.filter((s) => s.category === "custom");
   if (coreSkills.length > 0) {
     lines.push("Core skills:");
@@ -4069,18 +3676,6 @@ function formatSkillsListResult(result) {
     }
     lines.push("");
   }
-  if (optionalSkills.length > 0) {
-    lines.push("Optional skills:");
-    for (const skill of optionalSkills) {
-      const deps = skill.dependencies?.length ? ` (requires: ${skill.dependencies.join(", ")})` : "";
-      lines.push(`  ${skill.name}${deps}`);
-      lines.push(`    ${skill.description}`);
-      if (skill.argumentHint) {
-        lines.push(`    Argument: ${skill.argumentHint}`);
-      }
-    }
-    lines.push("");
-  }
   if (customSkills.length > 0) {
     lines.push("Custom skills:");
     for (const skill of customSkills) {
@@ -4257,7 +3852,7 @@ function formatStatusResult(result) {
 
 // src/cli/commands/agents.ts
 import { readFileSync as readFileSync9, writeFileSync as writeFileSync5 } from "fs";
-import { join as join13, dirname as dirname6 } from "path";
+import { join as join13, dirname as dirname7 } from "path";
 import { parse as parseYaml4, stringify as stringifyYaml2 } from "yaml";
 function readConfigFile(configPath) {
   const content = readFileSync9(configPath, "utf-8");
@@ -4291,7 +3886,7 @@ function getAvailableAgents(coreAgentsDir, customAgentsDir) {
 }
 function agentsAdd(agents2, options = {}) {
   const projectRoot = options.projectRoot ?? process.cwd();
-  const coreAgentsDir = options.coreAgentsDir ?? join13(dirname6(dirname6(dirname6(__dirname))), "agents");
+  const coreAgentsDir = options.coreAgentsDir ?? join13(dirname7(dirname7(dirname7(__dirname))), "agents");
   const customAgentsDir = join13(projectRoot, "coreai", "agents");
   const configPath = findConfigFile(projectRoot);
   if (!configPath) {
@@ -4473,7 +4068,7 @@ function formatAgentsRemoveResult(result) {
 
 // src/cli/index.ts
 var __filename = fileURLToPath2(import.meta.url);
-var __dirname2 = dirname7(__filename);
+var __dirname2 = dirname8(__filename);
 function getCoreAgentsPath() {
   return join14(__dirname2, "..", "..", "agents");
 }
@@ -4783,7 +4378,7 @@ program.command("status").description("Show agent states and pending messages").
   }
 });
 var skillsCmd = program.command("skills").description("Manage Claude skills");
-skillsCmd.command("generate").description("Generate Claude skills from templates").option("-o, --output <dir>", "output directory (default: .claude/commands)").option("--skills <skills>", "comma-separated list of skills to generate").option("--no-core", "exclude core skills").option("--no-optional", "exclude optional skills").option("--overwrite", "overwrite existing skill files").option("--json", "output as JSON").action(
+skillsCmd.command("generate").description("Generate Claude skills from source files").option("-o, --output <dir>", "output directory (default: .claude/skills)").option("--skills <skills>", "comma-separated list of skills to generate").option("--no-core", "exclude core skills").option("--no-overwrite", "do not overwrite existing skill files").option("--json", "output as JSON").action(
   (options) => {
     console.log("Generating skills...\n");
     const result = skillsGenerate({
@@ -4791,8 +4386,7 @@ skillsCmd.command("generate").description("Generate Claude skills from templates
       outputDir: options.output,
       skills: options.skills?.split(",").map((s) => s.trim()),
       includeCoreSkills: options.core !== false,
-      includeOptionalSkills: options.optional !== false,
-      overwrite: options.overwrite
+      overwrite: options.overwrite !== false
     });
     if (options.json) {
       console.log(JSON.stringify(result, null, 2));
@@ -4804,11 +4398,10 @@ skillsCmd.command("generate").description("Generate Claude skills from templates
     }
   }
 );
-skillsCmd.command("list").description("List available skills").option("--no-core", "exclude core skills").option("--no-optional", "exclude optional skills").option("--json", "output as JSON").action((options) => {
+skillsCmd.command("list").description("List available skills").option("--no-core", "exclude core skills").option("--json", "output as JSON").action((options) => {
   const result = skillsList({
     projectRoot: process.cwd(),
-    includeCoreSkills: options.core !== false,
-    includeOptionalSkills: options.optional !== false
+    includeCoreSkills: options.core !== false
   });
   if (options.json) {
     console.log(JSON.stringify(result, null, 2));