claude-sdlc 1.0.4 → 1.0.6

package/lib/installer.js

@@ -85,6 +85,11 @@ function mergeSettings(existing, template) {
   const hookTypes = ['PreToolUse', 'PostToolUse', 'Stop', 'PreCompact'];
   const result = JSON.parse(JSON.stringify(existing));
 
+  // 合并 $schema
+  if (template.$schema && !result.$schema) {
+    result.$schema = template.$schema;
+  }
+
   for (const type of hookTypes) {
     const existingHooks = result.hooks?.[type] || [];
     const newHooks = template.hooks?.[type] || [];
@@ -107,6 +112,46 @@ function mergeSettings(existing, template) {
   return result;
 }
 
+/**
+ * 从 CLAUDE.md 中提取 YAML 状态块（```yaml ... ``` 包裹的 SDLC 项目状态）
+ */
+function extractYamlState(content) {
+  const match = content.match(/```yaml\n# === SDLC 项目状态 ===\n[\s\S]*?```/);
+  return match ? match[0] : null;
+}
+
+/**
+ * 判断 YAML 状态块是否有实际项目数据（非空白模板）
+ */
+function hasActiveState(yamlBlock) {
+  if (!yamlBlock) return false;
+  // 检查 current_phase 是否不是 P0
+  if (/current_phase:\s*P[1-6]/.test(yamlBlock)) return true;
+  // 检查 task_description 是否非空
+  if (/task_description:\s*"[^"]+"/.test(yamlBlock)) return true;
+  // 检查 modified_files 是否有内容
+  if (/modified_files:\s*\n\s*-/.test(yamlBlock)) return true;
+  // 检查 prd 是否有实际条目（非注释）
+  if (/prd:\s*\n\s*-\s*id:/.test(yamlBlock)) return true;
+  return false;
+}
+
+/**
+ * 合并 CLAUDE.md — 更新模板指令，保留用户的 YAML 状态块
+ */
+function mergeClaudeMd(existingContent, templateContent) {
+  const existingState = extractYamlState(existingContent);
+  const templateState = extractYamlState(templateContent);
+
+  if (!existingState || !templateState) {
+    // 格式不匹配，无法合并，返回模板
+    return templateContent;
+  }
+
+  // 用旧的状态块替换新模板中的空白状态块
+  return templateContent.replace(templateState, existingState);
+}
+
 function copyFilesQuiet(srcDir, destDir, ext) {
   if (!fs.existsSync(srcDir)) return [];
   const files = fs.readdirSync(srcDir).filter(f => f.endsWith(ext));
@@ -146,13 +191,31 @@ function install(targetDir) {
   console.log(`  ${SYM.arrow} 目标  ${BOLD}${targetDir}${RESET}`);
   blank();
 
-  // Step 1: CLAUDE.md
+  // Step 1: CLAUDE.md（智能合并：更新模板指令，保留项目状态）
   step(1, STEPS, '安装核心控制文件');
-  fs.copyFileSync(
-    path.join(templateDir, 'CLAUDE.md'),
-    path.join(targetDir, 'CLAUDE.md')
-  );
-  fileLog(SYM.check, 'CLAUDE.md');
+  const targetClaudeMd = path.join(targetDir, 'CLAUDE.md');
+  const templateClaudeMd = path.join(templateDir, 'CLAUDE.md');
+  const templateContent = fs.readFileSync(templateClaudeMd, 'utf-8');
+
+  if (fs.existsSync(targetClaudeMd)) {
+    const existingContent = fs.readFileSync(targetClaudeMd, 'utf-8');
+    const existingState = extractYamlState(existingContent);
+
+    if (hasActiveState(existingState)) {
+      // 有活跃项目状态 → 更新指令模板，保留状态块
+      const merged = mergeClaudeMd(existingContent, templateContent);
+      fs.writeFileSync(targetClaudeMd, merged, 'utf-8');
+      fileLog(SYM.check, `CLAUDE.md ${DIM}(升级模板，保留项目状态)${RESET}`);
+    } else {
+      // 状态为空（P0）→ 直接覆盖
+      fs.writeFileSync(targetClaudeMd, templateContent, 'utf-8');
+      fileLog(SYM.check, 'CLAUDE.md');
+    }
+  } else {
+    // 首次安装
+    fs.writeFileSync(targetClaudeMd, templateContent, 'utf-8');
+    fileLog(SYM.check, 'CLAUDE.md');
+  }
 
   // Step 2: 目录结构
   step(2, STEPS, '创建目录结构');
@@ -296,6 +359,9 @@ function uninstall(targetDir) {
       if (settings.hooks) {
         delete settings.hooks;
       }
+      if (settings.$schema === 'https://json.schemastore.org/claude-code-settings.json') {
+        delete settings.$schema;
+      }
       if (Object.keys(settings).length === 0) {
         fs.unlinkSync(settingsPath);
         removed.push('settings.json');
@@ -332,4 +398,4 @@ function uninstall(targetDir) {
   blank();
 }
 
-module.exports = { install, uninstall, mergeSettings };
+module.exports = { install, uninstall, mergeSettings, extractYamlState, hasActiveState, mergeClaudeMd };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-sdlc",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "让 Claude Code 严格按 SDLC 规范开发 — 一条命令安装",
   "bin": {
     "claude-sdlc": "./bin/cli.js"

package/template/.claude/settings.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "https://json.schemastore.org/claude-code-settings.json",
   "hooks": {
     "PreToolUse": [
       {
@@ -6,7 +7,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "bash .claude/hooks/check-phase-write.sh"
+            "command": "bash \"$CLAUDE_PROJECT_DIR\"/.claude/hooks/check-phase-write.sh"
           }
         ]
       },
@@ -15,7 +16,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "bash .claude/hooks/check-phase-test.sh"
+            "command": "bash \"$CLAUDE_PROJECT_DIR\"/.claude/hooks/check-phase-test.sh"
           }
         ]
       }
@@ -25,8 +26,8 @@
         "matcher": "Write|Edit",
         "hooks": [
           {
-            "type": "prompt",
-            "prompt": "文件已修改。用 Edit 更新 CLAUDE.md：将文件路径追加到 modified_files（如未记录），更新 last_updated。必须执行，不可跳过。"
+            "type": "command",
+            "command": "echo '{\"decision\":\"block\",\"reason\":\"SDLC: File modified. Use Edit to update CLAUDE.md: append the modified file path to modified_files (if not already listed) and update last_updated. This is mandatory, do not skip.\"}'"
           }
         ]
       }
@@ -36,7 +37,7 @@
         "hooks": [
           {
             "type": "prompt",
-            "prompt": "You are evaluating whether Claude should stop working. Context: $ARGUMENTS\n\nCheck the conversation transcript and determine:\n1. Is there an active SDLC phase (P1-P6) with remaining work?\n2. For P3/P4/P5 auto-drive phases: has the /review been executed and passed?\n3. Are there uncompleted PRD requirements?\n4. Has CLAUDE.md YAML state been updated after the latest changes?\n\nRespond with JSON: {\"ok\": true} if all tasks are complete and Claude can stop, or {\"ok\": false, \"reason\": \"SDLC self-check: [describe what still needs to be done, e.g. run /review, update CLAUDE.md YAML, continue to next phase, etc.]\"} if Claude should continue working.",
+            "prompt": "You are evaluating whether Claude should stop working. Context: $ARGUMENTS\n\nIMPORTANT: First check if stop_hook_active is true in the context above. If it is true, respond immediately with {\"ok\": true} to prevent infinite loops.\n\nOtherwise, check the conversation transcript and determine:\n1. Is there an active SDLC phase (P1-P6) with remaining work?\n2. For P3/P4/P5 auto-drive phases: has the /review been executed and passed?\n3. Are there uncompleted PRD requirements?\n4. Has CLAUDE.md YAML state been updated after the latest changes?\n\nRespond with JSON: {\"ok\": true} if all tasks are complete and Claude can stop, or {\"ok\": false, \"reason\": \"SDLC self-check: [describe what still needs to be done, e.g. run /review, update CLAUDE.md YAML, continue to next phase, etc.]\"} if Claude should continue working.",
             "timeout": 30
           }
         ]