cc-devflow 4.1.1 → 4.1.3

package/lib/compiler/emitters/cursor-emitter.js

@@ -21,6 +21,7 @@ const yaml = require('js-yaml');
 const matter = require('gray-matter');
 const BaseEmitter = require('./base-emitter.js');
 const { ContextExpander } = require('../context-expander.js');
+const { discoverSkillEntries } = require('../skill-discovery.js');
 
 class CursorEmitter extends BaseEmitter {
   get name() {
@@ -58,40 +59,19 @@ class CursorEmitter extends BaseEmitter {
       return results;
     }
 
-    // 扫描技能分组目录
-    const groupDirs = await fs.promises.readdir(sourceDir, { withFileTypes: true });
-
-    for (const groupEntry of groupDirs) {
-      if (!groupEntry.isDirectory() || groupEntry.name.startsWith('_')) {
-        continue;
-      }
-
-      const groupDir = path.join(sourceDir, groupEntry.name);
-      const skillEntries = await fs.promises.readdir(groupDir, { withFileTypes: true });
-
-      for (const skillEntry of skillEntries) {
-        if (!skillEntry.isDirectory() || skillEntry.name.startsWith('_')) {
-          continue;
-        }
-
-        const skillDir = path.join(groupDir, skillEntry.name);
-        const skillMdPath = path.join(skillDir, 'SKILL.md');
-
-        if (!fs.existsSync(skillMdPath)) {
-          continue;
-        }
-
-        try {
-          const result = await this._emitSkillAsRule(
-            skillEntry.name,
-            skillDir,
-            skillMdPath,
-            targetDir
-          );
-          results.push(result);
-        } catch (error) {
-          console.warn(`Warning: Failed to emit skill ${skillEntry.name}: ${error.message}`);
-        }
+    const skills = discoverSkillEntries(sourceDir);
+
+    for (const skill of skills) {
+      try {
+        const result = await this._emitSkillAsRule(
+          skill.name,
+          skill.skillDir,
+          skill.skillMdPath,
+          targetDir
+        );
+        results.push(result);
+      } catch (error) {
+        console.warn(`Warning: Failed to emit skill ${skill.name}: ${error.message}`);
       }
     }
 

package/lib/compiler/emitters/qwen-emitter.js

@@ -20,6 +20,7 @@ const toml = require('@iarna/toml');
 const matter = require('gray-matter');
 const BaseEmitter = require('./base-emitter.js');
 const { ContextExpander } = require('../context-expander.js');
+const { discoverSkillEntries } = require('../skill-discovery.js');
 
 class QwenEmitter extends BaseEmitter {
   get name() {
@@ -63,40 +64,19 @@ class QwenEmitter extends BaseEmitter {
       return results;
     }
 
-    // 扫描技能分组目录
-    const groupDirs = await fs.promises.readdir(sourceDir, { withFileTypes: true });
-
-    for (const groupEntry of groupDirs) {
-      if (!groupEntry.isDirectory() || groupEntry.name.startsWith('_')) {
-        continue;
-      }
-
-      const groupDir = path.join(sourceDir, groupEntry.name);
-      const skillEntries = await fs.promises.readdir(groupDir, { withFileTypes: true });
-
-      for (const skillEntry of skillEntries) {
-        if (!skillEntry.isDirectory() || skillEntry.name.startsWith('_')) {
-          continue;
-        }
-
-        const skillDir = path.join(groupDir, skillEntry.name);
-        const skillMdPath = path.join(skillDir, 'SKILL.md');
-
-        if (!fs.existsSync(skillMdPath)) {
-          continue;
-        }
-
-        try {
-          const result = await this._emitSkillAsToml(
-            skillEntry.name,
-            skillDir,
-            skillMdPath,
-            targetDir
-          );
-          results.push(result);
-        } catch (error) {
-          console.warn(`Warning: Failed to emit skill ${skillEntry.name}: ${error.message}`);
-        }
+    const skills = discoverSkillEntries(sourceDir);
+
+    for (const skill of skills) {
+      try {
+        const result = await this._emitSkillAsToml(
+          skill.name,
+          skill.skillDir,
+          skill.skillMdPath,
+          targetDir
+        );
+        results.push(result);
+      } catch (error) {
+        console.warn(`Warning: Failed to emit skill ${skill.name}: ${error.message}`);
       }
     }
 

package/lib/compiler/index.js

@@ -230,6 +230,110 @@ function getRulesTargetPath(platform, config) {
   return path.join(config.folder, rulesConfig.dir || 'rules');
 }
 
+function getHooksTargetDir(config) {
+  return config.folder;
+}
+
+// ============================================================
+// emitPlatformModules - 编译 Skills/Agents/Rules/Hooks 模块
+// ============================================================
+async function emitPlatformModules(sourceBaseDir, platforms, options = {}) {
+  const {
+    includeSkills = true,
+    includeAgents = true,
+    includeRules = true,
+    includeHooks = true,
+    verbose = false
+  } = options;
+
+  const summary = {
+    skillsEmitted: 0,
+    agentsEmitted: 0,
+    moduleRulesEmitted: 0,
+    hooksEmitted: 0,
+    errors: []
+  };
+
+  for (const platform of platforms) {
+    const emitter = getEmitter(platform);
+    const platformConfig = getPlatformConfig(platform);
+
+    if (includeSkills) {
+      try {
+        const skillsSourceDir = path.join(sourceBaseDir, 'skills');
+        const skillsTargetDir = getSkillsTargetDir(platform, platformConfig);
+
+        if (fs.existsSync(skillsSourceDir)) {
+          const skillResults = await emitter.emitSkills(skillsSourceDir, skillsTargetDir);
+          summary.skillsEmitted += skillResults.length;
+
+          if (verbose && skillResults.length > 0) {
+            console.log(`Emitted skills: ${platform} (${skillResults.length})`);
+          }
+        }
+      } catch (error) {
+        summary.errors.push(`${platform}/skills: ${error.message}`);
+      }
+    }
+
+    if (includeAgents) {
+      try {
+        const agentsSourceDir = path.join(sourceBaseDir, 'agents');
+        const agentsTargetPath = getAgentsTargetPath(platform, platformConfig);
+
+        if (fs.existsSync(agentsSourceDir)) {
+          const agentResults = await emitter.emitAgents(agentsSourceDir, agentsTargetPath);
+          summary.agentsEmitted += agentResults.length;
+
+          if (verbose && agentResults.length > 0) {
+            console.log(`Emitted agents: ${platform} (${agentResults.length})`);
+          }
+        }
+      } catch (error) {
+        summary.errors.push(`${platform}/agents: ${error.message}`);
+      }
+    }
+
+    if (includeRules) {
+      try {
+        const rulesSourceDir = path.join(sourceBaseDir, 'rules');
+        const rulesTargetPath = getRulesTargetPath(platform, platformConfig);
+
+        if (fs.existsSync(rulesSourceDir)) {
+          const ruleResults = await emitter.emitRules(rulesSourceDir, rulesTargetPath);
+          summary.moduleRulesEmitted += ruleResults.length;
+
+          if (verbose && ruleResults.length > 0) {
+            console.log(`Emitted module rules: ${platform} (${ruleResults.length})`);
+          }
+        }
+      } catch (error) {
+        summary.errors.push(`${platform}/rules: ${error.message}`);
+      }
+    }
+
+    if (includeHooks && isModuleSupported(platform, 'hooks')) {
+      try {
+        const hooksSourceDir = path.join(sourceBaseDir, 'hooks');
+        const hooksTargetDir = getHooksTargetDir(platformConfig);
+
+        if (fs.existsSync(hooksSourceDir)) {
+          const hookResults = await emitter.emitHooks(hooksSourceDir, hooksTargetDir);
+          summary.hooksEmitted += hookResults.length;
+
+          if (verbose && hookResults.length > 0) {
+            console.log(`Emitted hooks: ${platform} (${hookResults.length})`);
+          }
+        }
+      } catch (error) {
+        summary.errors.push(`${platform}/hooks: ${error.message}`);
+      }
+    }
+  }
+
+  return summary;
+}
+
 // ============================================================
 // compile - 编译主函数
 // ============================================================
@@ -259,6 +363,10 @@ async function compile(options = {}) {
     filesSkipped: 0,
     resourcesCopied: 0,
     resourcesSkipped: 0,
+    skillsEmitted: 0,
+    agentsEmitted: 0,
+    moduleRulesEmitted: 0,
+    hooksEmitted: 0,
     rulesGenerated: 0,
     skillsRegistered: 0,
     errors: []
@@ -307,6 +415,21 @@ async function compile(options = {}) {
     }
   }
 
+  // 编译多模块产物（skills / agents / rules / hooks）
+  const sourceBaseDir = path.resolve(path.dirname(sourceDir));
+  const moduleSummary = await emitPlatformModules(sourceBaseDir, platforms, {
+    includeSkills: skills,
+    includeAgents: true,
+    includeRules: rules,
+    includeHooks: true,
+    verbose
+  });
+  result.skillsEmitted = moduleSummary.skillsEmitted;
+  result.agentsEmitted = moduleSummary.agentsEmitted;
+  result.moduleRulesEmitted = moduleSummary.moduleRulesEmitted;
+  result.hooksEmitted = moduleSummary.hooksEmitted;
+  result.errors.push(...moduleSummary.errors);
+
   // 解析所有命令文件
   const absoluteSourceDir = path.resolve(sourceDir);
   let irs = [];
@@ -440,6 +563,7 @@ async function compile(options = {}) {
   manifest.generatedAt = new Date().toISOString();
   await saveManifest(manifest, manifestPath);
 
+  result.success = result.errors.length === 0;
   return result;
 }
 

package/lib/compiler/parser.js

@@ -225,18 +225,18 @@ function parseCommand(filePath) {
 async function parseAllCommands(dirPath) {
   const absoluteDir = path.resolve(dirPath);
 
-  // 读取目录中的所有文件
-  const files = fs.readdirSync(absoluteDir);
+  const mdFiles = collectMarkdownFiles(absoluteDir, absoluteDir);
 
-  // 过滤 .md 文件
-  const mdFiles = files.filter(file => file.endsWith('.md'));
-
-  // 解析每个文件
+  // 解析每个文件（保留相对路径，支持分层输出）
   const results = [];
-  for (const file of mdFiles) {
-    const filePath = path.join(absoluteDir, file);
+  for (const filePath of mdFiles) {
     try {
       const ir = parseCommand(filePath);
+
+      // 输出文件名使用 commands 根目录相对路径（不含扩展名）
+      const relativePath = path.relative(absoluteDir, filePath).replace(/\\/g, '/');
+      ir.source.filename = relativePath.replace(/\.md$/i, '');
+
       results.push(ir);
     } catch (error) {
       // 重新抛出以便调用者处理
@@ -247,9 +247,44 @@ async function parseAllCommands(dirPath) {
   return results;
 }
 
+// ============================================================
+// collectMarkdownFiles - 递归收集 Markdown 文件
+// ============================================================
+function collectMarkdownFiles(rootDir, currentDir) {
+  const results = [];
+  const entries = fs.readdirSync(currentDir, { withFileTypes: true });
+
+  for (const entry of entries) {
+    // 跳过隐藏目录与 "_" 前缀目录
+    if (entry.isDirectory()) {
+      if (entry.name.startsWith('.') || entry.name.startsWith('_')) {
+        continue;
+      }
+
+      const childFiles = collectMarkdownFiles(rootDir, path.join(currentDir, entry.name));
+      results.push(...childFiles);
+      continue;
+    }
+
+    if (!entry.isFile() || !entry.name.endsWith('.md')) {
+      continue;
+    }
+
+    results.push(path.join(currentDir, entry.name));
+  }
+
+  // 统一排序，确保输出稳定
+  if (currentDir === rootDir) {
+    results.sort((a, b) => a.localeCompare(b));
+  }
+
+  return results;
+}
+
 module.exports = {
   parseCommand,
   parseAllCommands,
+  collectMarkdownFiles,
   hashContent,
   detectPlaceholders,
   validateScriptAliases,

package/lib/compiler/resource-copier.js

@@ -120,6 +120,12 @@ function scanInlineClaudePaths(content) {
     let cleanPath = match[0];
     // 移除末尾的常见标点
     cleanPath = cleanPath.replace(/[,;:.\s]+$/, '');
+
+    // 跳过 glob 模式（例如 *.jsonl.template），避免误判为单文件资源
+    if (cleanPath.includes('*')) {
+      continue;
+    }
+
     paths.add(cleanPath);
   }
 

package/lib/compiler/skill-discovery.js

@@ -0,0 +1,68 @@
+/**
+ * T041: Skill Discovery Utility
+ *
+ * [INPUT]: .claude/skills/ 目录
+ * [OUTPUT]: SkillEntry[] (name, skillDir, skillMdPath)
+ * [POS]: Skills 扫描工具，统一发现分组与非分组 Skill
+ * [PROTOCOL]: 变更时更新此头部，然后检查 CLAUDE.md
+ *
+ * 规则:
+ * - 递归扫描所有子目录
+ * - 目录内存在 SKILL.md 即判定为 Skill
+ * - 跳过以下划线开头的目录（例如 _reference-implementations）
+ * - 扫描结果按 skillMdPath 排序，保证输出稳定
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+// ============================================================
+// discoverSkillEntries - 递归扫描 Skill 目录
+// ============================================================
+function discoverSkillEntries(skillsDir) {
+  const absoluteDir = path.resolve(skillsDir);
+
+  if (!fs.existsSync(absoluteDir)) {
+    return [];
+  }
+
+  const entries = [];
+  walkSkillDirs(absoluteDir, entries);
+
+  // 保证输出稳定，避免不同文件系统顺序差异
+  entries.sort((a, b) => a.skillMdPath.localeCompare(b.skillMdPath));
+  return entries;
+}
+
+// ============================================================
+// walkSkillDirs - 深度优先扫描
+// ============================================================
+function walkSkillDirs(dirPath, entries) {
+  const dirName = path.basename(dirPath);
+  if (dirName.startsWith('_')) {
+    return;
+  }
+
+  const skillMdPath = path.join(dirPath, 'SKILL.md');
+  if (fs.existsSync(skillMdPath)) {
+    entries.push({
+      name: dirName,
+      skillDir: dirPath,
+      skillMdPath
+    });
+    return;
+  }
+
+  const children = fs.readdirSync(dirPath, { withFileTypes: true });
+  for (const child of children) {
+    if (!child.isDirectory()) {
+      continue;
+    }
+
+    walkSkillDirs(path.join(dirPath, child.name), entries);
+  }
+}
+
+module.exports = {
+  discoverSkillEntries
+};

package/lib/compiler/skills-registry.js

@@ -11,6 +11,7 @@
 const fs = require('fs');
 const path = require('path');
 const matter = require('gray-matter');
+const { discoverSkillEntries } = require('./skill-discovery.js');
 
 // ============================================================
 // Constants
@@ -23,35 +24,18 @@ const REGISTRY_OUTPUT_PATH = 'devflow/.generated/skills-registry.json';
 // ============================================================
 function generateSkillsRegistry(skillsDir) {
   const registry = [];
-  const absoluteDir = path.resolve(skillsDir);
-
-  if (!fs.existsSync(absoluteDir)) {
-    return registry;
-  }
-
-  const entries = fs.readdirSync(absoluteDir, { withFileTypes: true });
-
-  for (const entry of entries) {
-    if (!entry.isDirectory() || entry.name.startsWith('_')) {
-      continue;
-    }
-
-    const skillDir = path.join(absoluteDir, entry.name);
-    const skillMdPath = path.join(skillDir, 'SKILL.md');
-
-    if (!fs.existsSync(skillMdPath)) {
-      continue;
-    }
+  const skillEntries = discoverSkillEntries(skillsDir);
 
+  for (const entry of skillEntries) {
     try {
-      const skillMdContent = fs.readFileSync(skillMdPath, 'utf8');
+      const skillMdContent = fs.readFileSync(entry.skillMdPath, 'utf8');
       const parsed = matter(skillMdContent);
 
       registry.push({
         name: parsed.data.name || entry.name,
         description: parsed.data.description || '',
         type: parsed.data.type || 'utility',
-        path: skillDir,
+        path: entry.skillDir,
         triggers: []
       });
     } catch (error) {
@@ -82,29 +66,12 @@ async function generateSkillsRegistryV2(skillsDir) {
     }
   }
 
-  // 扫描技能目录
-  if (!fs.existsSync(absoluteDir)) {
-    return createRegistry(skills);
-  }
-
-  const entries = fs.readdirSync(absoluteDir, { withFileTypes: true });
+  // 扫描技能目录（支持分组与非分组结构）
+  const entries = discoverSkillEntries(absoluteDir);
 
   for (const entry of entries) {
-    // 跳过非目录和 _ 前缀目录
-    if (!entry.isDirectory() || entry.name.startsWith('_')) {
-      continue;
-    }
-
-    const skillDir = path.join(absoluteDir, entry.name);
-    const skillMdPath = path.join(skillDir, 'SKILL.md');
-
-    // 必须有 SKILL.md
-    if (!fs.existsSync(skillMdPath)) {
-      continue;
-    }
-
     try {
-      const skillEntry = parseSkillEntry(entry.name, skillDir, skillMdPath, skillRules);
+      const skillEntry = parseSkillEntry(entry.name, entry.skillDir, entry.skillMdPath, skillRules);
       if (skillEntry) {
         skills.push(skillEntry);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "cc-devflow",
-    "version": "4.1.1",
+    "version": "4.1.3",
     "description": "DevFlow CLI tool",
     "main": "bin/cc-devflow.js",
     "bin": {