start-vibing 2.0.12 → 2.0.13

package/dist/cli.js

@@ -12,7 +12,14 @@ import { join, dirname } from "path";
 import { fileURLToPath } from "url";
 var __filename2 = fileURLToPath(import.meta.url);
 var __dirname2 = dirname(__filename2);
-var ALWAYS_OVERWRITE = ["agents/", "hooks/", "settings.json", "CLAUDE.md", "commands/"];
+var ALWAYS_OVERWRITE = [
+  "agents/",
+  "hooks/",
+  "settings.json",
+  "commands/",
+  "CLAUDE.md",
+  "README.md"
+];
 var NEVER_OVERWRITE = [
   "skills/codebase-knowledge/domains/",
   "skills/research-cache/cache/",
@@ -103,9 +110,19 @@ async function copyClaudeSetup(targetDir, options = {}) {
   }
   const claudeMdTemplate = join(templateDir, "CLAUDE.md");
   const claudeMdDest = join(targetDir, "CLAUDE.md");
+  const claudeTemplateDest = join(destDir, "CLAUDE.template.md");
   if (existsSync(claudeMdTemplate)) {
-    if (!existsSync(claudeMdDest) || options.force) {
+    if (!existsSync(claudeMdDest)) {
+      copyFileSync(claudeMdTemplate, claudeMdDest);
+      console.log("  \u2713 Created CLAUDE.md from template");
+    } else if (options.force) {
       copyFileSync(claudeMdTemplate, claudeMdDest);
+      console.log("  \u2713 Overwrote CLAUDE.md (force mode)");
+    } else {
+      copyFileSync(claudeMdTemplate, claudeTemplateDest);
+      console.log("  \u2713 Preserved your CLAUDE.md");
+      console.log("  \u2713 Created .claude/CLAUDE.template.md for smart merge");
+      console.log("  \u2192 The stop hook will help merge new rules on first run");
     }
   }
   return result;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "start-vibing",
-	"version": "2.0.12",
+	"version": "2.0.13",
 	"description": "Setup Claude Code agents, skills, and hooks in your project. Smart copy that preserves your custom domains and configurations.",
 	"type": "module",
 	"bin": {

package/template/.claude/hooks/stop-validator.ts

@@ -437,6 +437,64 @@ After editing, verify: wc -m CLAUDE.md
 	};
 }
 
+function validateClaudeMdTemplateMerge(): ValidationError | null {
+	const templatePath = join(PROJECT_DIR, '.claude', 'CLAUDE.template.md');
+
+	// Only check if template exists (created by start-vibing when user has existing CLAUDE.md)
+	if (!existsSync(templatePath)) return null;
+	if (!existsSync(CLAUDE_MD_PATH)) return null;
+
+	const userContent = readFileSync(CLAUDE_MD_PATH, 'utf8');
+	const templateContent = readFileSync(templatePath, 'utf8');
+
+	// Check if user's CLAUDE.md is missing required sections
+	const missingSections: string[] = [];
+	for (const section of REQUIRED_SECTIONS) {
+		if (!section.pattern.test(userContent)) {
+			missingSections.push(section.name);
+		}
+	}
+
+	// If user has all required sections, they're probably fine - skip merge suggestion
+	if (missingSections.length === 0) {
+		return null; // User's CLAUDE.md is well-structured, no merge needed
+	}
+
+	return {
+		type: 'CLAUDE_MD_TEMPLATE_MERGE_NEEDED',
+		message: `Your CLAUDE.md is missing ${missingSections.length} required section(s). A template with recommended structure is available.`,
+		action: `
+================================================================================
+SMART MERGE: COMBINE YOUR CLAUDE.MD WITH NEW TEMPLATE
+================================================================================
+
+Your CLAUDE.md is missing these sections:
+${missingSections.map((s) => `  - ${s}`).join('\n')}
+
+A template file exists at: .claude/CLAUDE.template.md
+
+REQUIRED ACTION:
+Perform a smart merge that:
+1. KEEPS all your existing project-specific content
+2. ADDS the missing required sections from the template
+3. PRESERVES your custom rules and configurations
+
+MERGE STEPS:
+1. Read your current CLAUDE.md content
+2. Read .claude/CLAUDE.template.md for structure reference
+3. Create a merged version that:
+   - Keeps your project title, overview, and custom rules
+   - Adds missing sections (${missingSections.join(', ')})
+   - Follows the template structure
+4. Write the merged content to CLAUDE.md
+5. Delete .claude/CLAUDE.template.md after successful merge
+
+IMPORTANT: Do NOT just overwrite - intelligently MERGE the content!
+After merging, delete the template file to mark merge as complete.
+================================================================================`,
+	};
+}
+
 function validateClaudeMdStructure(): ValidationError | null {
 	if (!existsSync(CLAUDE_MD_PATH)) return null;
 
@@ -762,6 +820,10 @@ async function main(): Promise<void> {
 	if (claudeMdExistsError) errors.push(claudeMdExistsError);
 
 	if (!claudeMdExistsError) {
+		// Check if there's a template pending merge (from start-vibing install)
+		const templateMergeError = validateClaudeMdTemplateMerge();
+		if (templateMergeError) errors.push(templateMergeError);
+
 		const sizeError = validateClaudeMdSize();
 		if (sizeError) errors.push(sizeError);