cc-discipline 2.12.0 → 2.12.2

package/init.sh

@@ -367,12 +367,102 @@ cp "$SCRIPT_DIR/templates/.claude/agents/investigator.md" .claude/agents/
 echo -e "${GREEN}Installing skills...${NC}"
 # Install every skill directory under templates/ — no per-skill enumeration,
 # so adding a new skill needs zero changes here.
+#
+# Copy into an EXPLICIT destination directory. Do not use `cp -r "$skill_dir"
+# .claude/skills/` here: the `*/` glob gives $skill_dir a trailing slash, and
+# GNU and BSD cp disagree about what that means. GNU copies the directory;
+# BSD (macOS) copies its *contents*, so every skill's SKILL.md landed on top of
+# the previous one at .claude/skills/SKILL.md and no skill was ever updated.
+# Shipped broken in v2.11.0 (the "directory-driven install" change) and fixed in
+# v2.12.1. Symptom on an affected machine: a stray .claude/skills/SKILL.md plus
+# skill dirs frozen at their first-install date. status/doctor could not catch
+# it because they glob `skills/*/` and a bare file is not a directory.
+# Skills are NOT force-overwritten. Users legitimately tune them per repo
+# (/self-check's "Project-specific Checks" section exists precisely to be filled
+# in), and until v2.12.2 every upgrade silently replaced those edits — a 73KB
+# hand-written self-check was wiped twice in one day before this was fixed.
+#
+# The dpkg-conffile approach: remember the hash of the template WE installed. On
+# the next upgrade, if the file on disk still matches that hash the user never
+# touched it and we can update freely; if it differs the user owns it, so we keep
+# their file and drop the new template beside it as SKILL.md.new.
+#
+# The manifest hash is always set to the template we shipped this run, including
+# in the preserved case. That is what makes adoption self-healing: if the user
+# later replaces their file with the .new one, the next run sees disk == manifest
+# and resumes silent updates.
+SKILLS_MANIFEST=".claude/.cc-discipline-skills.manifest"
+NEW_MANIFEST=$(mktemp 2>/dev/null || echo ".claude/.skills-manifest.tmp")
+PRESERVED_SKILLS=""
+
+_cc_hash() {
+    if command -v sha256sum >/dev/null 2>&1; then sha256sum "$1" | cut -d' ' -f1
+    elif command -v shasum >/dev/null 2>&1; then shasum -a 256 "$1" | cut -d' ' -f1
+    elif command -v md5sum >/dev/null 2>&1; then md5sum "$1" | cut -d' ' -f1
+    elif command -v md5 >/dev/null 2>&1; then md5 -q "$1"
+    else cksum "$1" | cut -d' ' -f1; fi
+}
+
 for skill_dir in "$SCRIPT_DIR"/templates/.claude/skills/*/; do
     [ -d "$skill_dir" ] || continue
-    cp -r "$skill_dir" .claude/skills/
-    echo "   ✓ /$(basename "$skill_dir")"
+    skill_name=$(basename "$skill_dir")
+    mkdir -p ".claude/skills/$skill_name"
+    skill_status="updated"
+
+    for src in "$skill_dir"*; do
+        [ -f "$src" ] || continue
+        base=$(basename "$src")
+        rel="$skill_name/$base"
+        dst=".claude/skills/$rel"
+        tpl_hash=$(_cc_hash "$src")
+
+        if [ ! -f "$dst" ]; then
+            cp "$src" "$dst"                       # new file — nothing to protect
+        else
+            disk_hash=$(_cc_hash "$dst")
+            recorded=$(grep "^$rel " "$SKILLS_MANIFEST" 2>/dev/null | head -1 | cut -d' ' -f2)
+            if [ "$disk_hash" = "$tpl_hash" ]; then
+                :                                  # already current
+            elif [ -n "$recorded" ] && [ "$disk_hash" = "$recorded" ]; then
+                cp "$src" "$dst"                   # pristine older version — safe
+            elif [ -z "$recorded" ]; then
+                # No manifest yet (first run on an existing install) and the file
+                # differs from the template. Cannot tell "older version" from
+                # "user edited", so assume the user's work matters.
+                cp "$src" "$dst.new"
+                skill_status="preserved"
+            else
+                cp "$src" "$dst.new"               # user-modified — keep theirs
+                skill_status="preserved"
+            fi
+        fi
+        echo "$rel $tpl_hash" >> "$NEW_MANIFEST"
+    done
+
+    if [ "$skill_status" = "preserved" ]; then
+        PRESERVED_SKILLS="$PRESERVED_SKILLS $skill_name"
+        echo -e "   ${YELLOW}~ /$skill_name (your version kept; new template at SKILL.md.new)${NC}"
+    else
+        echo "   ✓ /$skill_name"
+    fi
 done
 
+[ -f "$NEW_MANIFEST" ] && mv "$NEW_MANIFEST" "$SKILLS_MANIFEST"
+
+if [ -n "$PRESERVED_SKILLS" ]; then
+    echo -e "   ${YELLOW}Locally modified skills were not overwritten:${PRESERVED_SKILLS}${NC}"
+    echo -e "   ${YELLOW}Compare with: diff .claude/skills/<name>/SKILL.md{,.new}${NC}"
+    echo -e "   ${YELLOW}Take the new one with: mv .claude/skills/<name>/SKILL.md{.new,}${NC}"
+fi
+
+# Clean up the stray file left behind by the v2.11.0–v2.12.0 bug above. A bare
+# SKILL.md directly under skills/ is never a valid skill (skills live in
+# subdirectories), so this only ever removes that debris.
+if [ -f ".claude/skills/SKILL.md" ]; then
+    rm -f ".claude/skills/SKILL.md"
+    echo -e "   ${YELLOW}✓ removed stray .claude/skills/SKILL.md (v2.11.0 macOS install bug)${NC}"
+fi
+
 # ─── Handle CLAUDE.md ───
 if [ ! -f "CLAUDE.md" ]; then
     # No CLAUDE.md exists — generate from template

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-discipline",
-  "version": "2.12.0",
+  "version": "2.12.2",
   "description": "Discipline framework for Claude Code — rules, hooks, and agents that keep AI on track",
   "bin": {
     "cc-discipline": "bin/cli.js"