6aspec 3.0.0-dev.3 → 3.0.0-dev.30

package/lib/installer.js

@@ -12,11 +12,11 @@ class Installer {
   // 查找包目录（支持本地开发和 npm 安装）
   findPackageDir() {
     // 如果是本地开发，直接使用当前目录
-    if (fs.existsSync(path.join(__dirname, '../.6aspec')) || 
+    if (fs.existsSync(path.join(__dirname, '../.6aspec')) ||
         fs.existsSync(path.join(__dirname, '../.cursor'))) {
       return path.join(__dirname, '..');
     }
-    
+
     // 如果是 npm 安装，查找 node_modules
     let current = __dirname;
     while (current !== path.dirname(current)) {
@@ -27,7 +27,7 @@ class Installer {
       }
       current = path.dirname(current);
     }
-    
+
     throw new Error('未找到 .6aspec 或 .cursor 目录，请确保包已正确安装');
   }
 
@@ -75,7 +75,7 @@ class Installer {
     if (fs.existsSync(dest)) {
       this.removeDir(dest);
     }
-    
+
     // 重新创建目录并复制
     fs.mkdirSync(dest, { recursive: true });
 
@@ -150,7 +150,7 @@ class Installer {
   // 安装公共配置 (.6aspec)
   install6aspec() {
     this.log('开始安装公共配置 (.6aspec)...');
-    
+
     const sourceDir = path.join(this.packageDir, '.6aspec');
     const targetDir = path.join(this.targetDir, '.6aspec');
 
@@ -160,23 +160,23 @@ class Installer {
     }
 
     const targetExists = fs.existsSync(targetDir);
-    
+
     if (this.mergeMode && targetExists) {
       // 智能合并模式
       this.log('使用智能合并模式（保留用户自定义文件）...');
-      
+
       // 统计用户自定义文件
       const sourceFiles = new Set(this.getAllFiles(sourceDir, sourceDir));
       const targetFiles = this.getAllFiles(targetDir, targetDir);
       const customFiles = targetFiles.filter(f => !sourceFiles.has(f));
-      
+
       if (customFiles.length > 0) {
         this.log(`检测到 ${customFiles.length} 个用户自定义文件，将保留`, 'info');
       }
-      
+
       const result = this.mergeDir(sourceDir, targetDir);
       this.log(`更新了 ${result.updated} 个文件，新增了 ${result.added} 个文件`, 'info');
-      
+
       if (customFiles.length > 0) {
         this.log(`保留了 ${customFiles.length} 个用户自定义文件`, 'info');
       }
@@ -188,14 +188,14 @@ class Installer {
       this.log('复制公共配置文件...');
       this.copyDir(sourceDir, targetDir);
     }
-    
+
     this.log('✓ 公共配置安装完成！', 'success');
   }
 
   // 安装 Cursor 配置
   installCursor() {
     this.log('开始安装 Cursor 配置...');
-    
+
     const sourceDir = path.join(this.packageDir, '.cursor');
     const targetDir = path.join(this.targetDir, '.cursor');
 
@@ -204,11 +204,11 @@ class Installer {
     }
 
     const targetExists = fs.existsSync(targetDir);
-    
+
     if (this.mergeMode && targetExists) {
       // 智能合并模式
       this.log('使用智能合并模式（保留用户自定义文件）...');
-      
+
       // 只复制 commands 目录
       const commandsSourceDir = path.join(sourceDir, 'commands');
       if (fs.existsSync(commandsSourceDir)) {
@@ -216,33 +216,48 @@ class Installer {
         const result = this.mergeDir(commandsSourceDir, commandsTargetDir);
         this.log(`commands: 更新了 ${result.updated} 个文件，新增了 ${result.added} 个文件`, 'info');
       }
+
+      // 复制 agents 目录
+      const agentsSourceDir = path.join(sourceDir, 'agents');
+      if (fs.existsSync(agentsSourceDir)) {
+        const agentsTargetDir = path.join(targetDir, 'agents');
+        const result = this.mergeDir(agentsSourceDir, agentsTargetDir);
+        this.log(`agents: 更新了 ${result.updated} 个文件，新增了 ${result.added} 个文件`, 'info');
+      }
     } else {
       // 完全覆盖模式
       if (targetExists) {
         this.backupDir(targetDir);
       }
       this.log('复制 Cursor 配置文件...');
-      
+
       // 创建目标目录
       if (!fs.existsSync(targetDir)) {
         fs.mkdirSync(targetDir, { recursive: true });
       }
-      
+
       // 只复制 commands 目录
       const commandsSourceDir = path.join(sourceDir, 'commands');
       if (fs.existsSync(commandsSourceDir)) {
         const commandsTargetDir = path.join(targetDir, 'commands');
         this.copyDir(commandsSourceDir, commandsTargetDir);
       }
+
+      // 复制 agents 目录
+      const agentsSourceDir = path.join(sourceDir, 'agents');
+      if (fs.existsSync(agentsSourceDir)) {
+        const agentsTargetDir = path.join(targetDir, 'agents');
+        this.copyDir(agentsSourceDir, agentsTargetDir);
+      }
     }
-    
+
     this.log('✓ Cursor 配置安装完成！', 'success');
   }
 
   // 安装 Claude 配置
   installClaude() {
     this.log('开始安装 Claude 配置...');
-    
+
     const sourceDir = path.join(this.packageDir, '.claude');
     const targetDir = path.join(this.targetDir, '.claude');
 
@@ -252,7 +267,7 @@ class Installer {
     }
 
     const targetExists = fs.existsSync(targetDir);
-    
+
     // 创建目标目录结构
     if (!fs.existsSync(targetDir)) {
       fs.mkdirSync(targetDir, { recursive: true });
@@ -302,14 +317,46 @@ class Installer {
         this.copyDir(agentsDir, targetAgentsDir);
       }
     }
-    
+
     this.log('✓ Claude 配置安装完成！', 'success');
   }
 
+  // 安装 Codex CLI 配置（仅合并，不覆盖删除用户内容）
+  installCodex() {
+    this.log('开始安装 Codex CLI 配置...');
+
+    const agentsSourceDir = path.join(this.packageDir, '.agents');
+    const codexSourceDir = path.join(this.packageDir, '.codex');
+
+    const agentsTargetDir = path.join(this.targetDir, '.agents');
+    const codexTargetDir = path.join(this.targetDir, '.codex');
+
+    // 强制 merge 语义：绝不使用 copyDir（copyDir 会先 removeDir(dest)）
+    if (fs.existsSync(agentsSourceDir)) {
+      const result = this.mergeDir(agentsSourceDir, agentsTargetDir);
+      if (result.updated > 0 || result.added > 0) {
+        this.log(`.agents: 更新了 ${result.updated} 个文件，新增了 ${result.added} 个文件`, 'info');
+      }
+    } else {
+      this.log('未找到 .agents 源目录，跳过', 'warn');
+    }
+
+    if (fs.existsSync(codexSourceDir)) {
+      const result = this.mergeDir(codexSourceDir, codexTargetDir);
+      if (result.updated > 0 || result.added > 0) {
+        this.log(`.codex: 更新了 ${result.updated} 个文件，新增了 ${result.added} 个文件`, 'info');
+      }
+    } else {
+      this.log('未找到 .codex 源目录，跳过', 'warn');
+    }
+
+    this.log('✓ Codex CLI 配置安装完成！', 'success');
+  }
+
   // 主安装方法
   async install(tool = 'cursor', mergeMode = false) {
     this.mergeMode = mergeMode;
-    
+
     this.log(`6A-spec 安装工具`);
     this.log(`目标目录: ${this.targetDir}`);
     this.log(`工具: ${tool}`);
@@ -322,7 +369,7 @@ class Installer {
     try {
       // 无论安装哪个工具，都要先安装公共配置
       this.install6aspec();
-      
+
       switch (tool.toLowerCase()) {
         case 'cursor':
           this.installCursor();
@@ -330,12 +377,16 @@ class Installer {
         case 'claude':
           this.installClaude();
           break;
+        case 'codex':
+          this.installCodex();
+          break;
         case 'all':
           this.installCursor();
           this.installClaude();
+          this.installCodex();
           break;
         default:
-          throw new Error(`未知工具: ${tool}\n支持的工具: cursor, claude, all`);
+          throw new Error(`未知工具: ${tool}\n支持的工具: cursor, claude, codex, all`);
       }
 
       this.log('安装完成！', 'success');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "6aspec",
-  "version": "3.0.0-dev.3",
+  "version": "3.0.0-dev.30",
   "description": "6Aspec - 轻量级 spec 驱动开发框架，支持 Cursor 和 Claude Code",
   "main": "lib/installer.js",
   "bin": {
@@ -50,6 +50,8 @@
     ".cursor/",
     ".claude/",
     ".6aspec/",
+    ".agents/",
+    ".codex/",
     "README.md"
   ],
   "engines": {

package/.claude/agents/spec-compliance-reviewer.md

@@ -1,6 +0,0 @@
----
-name: spec-compliance-reviewer
-description: 检查实现是否符合 TASK 的验收标准和 specs.md 的 AC/Scenario，适用于 TASK 完成后的合规验收
----
-
-读取并严格遵循：`.6aspec/rules/brown/subagents/spec-compliance-reviewer.md`

package/.claude/commands/6aspec/brown/impact.md

@@ -1,11 +0,0 @@
----
-name: "6aspec:brown: Impact"
-description: Phase 2 - 影响面分析与非功能需求评估
-category: Workflow
-tags: [workflow, requirement, analysis]
----
-
-1. Immediate response upon activation: brown field requirement workflow - **Impact** has been activated
-2. **Read and strictly follow the brown field constitution**: `.6aspec/rules/brown/brown_constitution.md`
-3. Read file: `.6aspec/rules/brown/brown_impact_sop.md`
-4. Strictly follow the SOP defined in that file

package/.claude/commands/6aspec/brown/understand.md

@@ -1,11 +0,0 @@
----
-name: "6aspec:brown: Understand"
-description: Phase 1 - 需求理解与现状分析
-category: Workflow
-tags: [workflow, requirement, analysis]
----
-
-1. Immediate response upon activation: brown field requirement workflow - **Understand** has been activated
-2. **Read and strictly follow the brown field constitution**: `.6aspec/rules/brown/brown_constitution.md`
-3. Read file: `.6aspec/rules/brown/brown_understand_sop.md`
-4. Strictly follow the SOP defined in that file

package/.cursor/commands/6aspec/brown/understand.md

@@ -1,9 +0,0 @@
----
-description: Phase 1 - 需求理解与现状分析
-alwaysApply: false
----
-
-1. Immediate response upon activation: brown field requirement workflow - **Understand** has been activated
-2. **Read and strictly follow the brown field constitution**: `.6aspec/rules/brown/brown_constitution.md`
-3. Read file: `.6aspec/rules/brown/brown_understand_sop.md`
-4. Strictly follow the SOP defined in that file