cc-discipline 2.10.3 → 2.11.0

package/init.sh

@@ -365,20 +365,13 @@ cp "$SCRIPT_DIR/templates/.claude/agents/investigator.md" .claude/agents/
 
 # ─── Install skills ───
 echo -e "${GREEN}Installing skills...${NC}"
-cp -r "$SCRIPT_DIR/templates/.claude/skills/commit" .claude/skills/
-cp -r "$SCRIPT_DIR/templates/.claude/skills/self-check" .claude/skills/
-cp -r "$SCRIPT_DIR/templates/.claude/skills/evaluate" .claude/skills/
-cp -r "$SCRIPT_DIR/templates/.claude/skills/think" .claude/skills/
-cp -r "$SCRIPT_DIR/templates/.claude/skills/retro" .claude/skills/
-cp -r "$SCRIPT_DIR/templates/.claude/skills/summary" .claude/skills/
-cp -r "$SCRIPT_DIR/templates/.claude/skills/investigate" .claude/skills/
-echo "   ✓ /commit — smart commit (test → update memory → commit)"
-echo "   ✓ /self-check — periodic discipline check (use with /loop 10m /self-check)"
-echo "   ✓ /evaluate — evaluate external review/advice against codebase context"
-echo "   ✓ /think — stop and think before coding (ask → propose → wait)"
-echo "   ✓ /retro — post-task retrospective (project + framework feedback)"
-echo "   ✓ /summary — write high-quality compact option before /compact"
-echo "   ✓ /investigate — multi-agent cross-investigation and proposal review"
+# Install every skill directory under templates/ — no per-skill enumeration,
+# so adding a new skill needs zero changes here.
+for skill_dir in "$SCRIPT_DIR"/templates/.claude/skills/*/; do
+    [ -d "$skill_dir" ] || continue
+    cp -r "$skill_dir" .claude/skills/
+    echo "   ✓ /$(basename "$skill_dir")"
+done
 
 # ─── Handle CLAUDE.md ───
 if [ ! -f "CLAUDE.md" ]; then
@@ -534,13 +527,7 @@ if [ "$INSTALL_MODE" = "fresh" ]; then
     echo -e "  ${GREEN}.claude/rules/${NC}               ← Auto-injected rules"
     echo -e "  ${GREEN}.claude/hooks/${NC}               ← 7 discipline hooks (edit guard, streak breaker, git guard, phase gate, action counter, error remind, session start)"
     echo -e "  ${GREEN}.claude/agents/${NC}              ← Reviewer & investigator subagents"
-    echo -e "  ${GREEN}.claude/skills/commit/${NC}       ← /commit smart commit"
-    echo -e "  ${GREEN}.claude/skills/self-check/${NC}   ← /self-check periodic discipline check"
-    echo -e "  ${GREEN}.claude/skills/evaluate/${NC}     ← /evaluate assess external review advice"
-    echo -e "  ${GREEN}.claude/skills/think/${NC}        ← /think stop and think before coding"
-    echo -e "  ${GREEN}.claude/skills/retro/${NC}        ← /retro post-task retrospective"
-    echo -e "  ${GREEN}.claude/skills/summary/${NC} ← /summary before compacting"
-    echo -e "  ${GREEN}.claude/skills/investigate/${NC} ← /investigate multi-agent cross-investigation"
+    echo -e "  ${GREEN}.claude/skills/${NC}              ← Skills (run 'npx cc-discipline status' to list)"
     echo -e "  ${GREEN}.claude/settings.json${NC}        ← Hooks configuration"
     echo -e "  ${GREEN}docs/progress.md${NC}             ← Progress log (maintained by Claude)"
     echo -e "  ${GREEN}docs/debug-log.md${NC}            ← Debug log (maintained by Claude)"
@@ -556,13 +543,7 @@ else
     echo -e "  ${GREEN}.claude/rules/${NC}               ← Discipline rules installed/updated"
     echo -e "  ${GREEN}.claude/hooks/${NC}               ← Hook scripts installed/updated"
     echo -e "  ${GREEN}.claude/agents/${NC}              ← Subagents installed/updated"
-    echo -e "  ${GREEN}.claude/skills/commit/${NC}       ← /commit skill installed/updated"
-    echo -e "  ${GREEN}.claude/skills/self-check/${NC}   ← /self-check discipline check installed"
-    echo -e "  ${GREEN}.claude/skills/evaluate/${NC}     ← /evaluate external review assessment"
-    echo -e "  ${GREEN}.claude/skills/think/${NC}        ← /think stop and think before coding"
-    echo -e "  ${GREEN}.claude/skills/retro/${NC}        ← /retro post-task retrospective"
-    echo -e "  ${GREEN}.claude/skills/summary/${NC} ← /summary before compacting"
-    echo -e "  ${GREEN}.claude/skills/investigate/${NC} ← /investigate multi-agent cross-investigation"
+    echo -e "  ${GREEN}.claude/skills/${NC}              ← Skills installed/updated (run 'npx cc-discipline status' to list)"
     if [ ! -f "$BACKUP_DIR/settings.json" ] || [ -f ".claude/.cc-discipline-settings-template.json" ]; then
         echo -e "  ${YELLOW}.claude/settings.json${NC}        ← See notes above"
     else

package/lib/doctor.sh

@@ -95,13 +95,13 @@ done
 # 6. Skills
 echo ""
 echo "Skills:"
-for skill in commit self-check evaluate think retro summary investigate; do
-    if [ -d ".claude/skills/${skill}" ]; then
-        ok "/${skill}"
-    else
-        warn "Missing /${skill} skill (optional)"
-    fi
+SKILL_FOUND=0
+for skill_dir in .claude/skills/*/; do
+    [ -d "$skill_dir" ] || continue
+    ok "/$(basename "$skill_dir")"
+    SKILL_FOUND=$((SKILL_FOUND + 1))
 done
+[ "$SKILL_FOUND" -eq 0 ] && warn "No skills installed (optional)"
 
 # 7. jq
 echo ""

package/lib/status.sh

@@ -66,15 +66,12 @@ echo -e "${GREEN}${AGENT_COUNT}/2${NC} (${AGENTS% })"
 # Skills
 echo -n "Skills:   "
 SKILLS=""
-[ -d ".claude/skills/commit" ] && SKILLS="${SKILLS}/commit "
-[ -d ".claude/skills/self-check" ] && SKILLS="${SKILLS}/self-check "
-[ -d ".claude/skills/evaluate" ] && SKILLS="${SKILLS}/evaluate "
-[ -d ".claude/skills/think" ] && SKILLS="${SKILLS}/think "
-[ -d ".claude/skills/retro" ] && SKILLS="${SKILLS}/retro "
-[ -d ".claude/skills/summary" ] && SKILLS="${SKILLS}/summary "
-[ -d ".claude/skills/investigate" ] && SKILLS="${SKILLS}/investigate "
+for skill_dir in .claude/skills/*/; do
+    [ -d "$skill_dir" ] || continue
+    SKILLS="${SKILLS}/$(basename "$skill_dir") "
+done
 SKILL_COUNT=$(echo "$SKILLS" | wc -w | tr -d ' ')
-echo -e "${GREEN}${SKILL_COUNT}/7${NC} (${SKILLS% })"
+echo -e "${GREEN}${SKILL_COUNT}${NC} (${SKILLS% })"
 
 # Settings
 echo -n "Settings: "

package/package.json

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

package/templates/.claude/hooks/action-counter.sh

@@ -6,10 +6,17 @@
 THRESHOLD=25
 
 INPUT=$(cat)
-SESSION_ID=$(echo "$INPUT" | jq -r '.session_id // "unknown"' 2>/dev/null)
-if [ -z "$SESSION_ID" ] || [ "$SESSION_ID" = "null" ]; then
-    SESSION_ID="unknown"
+# Extract session_id with a grep fallback for when jq is unavailable (e.g.
+# Windows Git Bash). Without this fallback, every session collapsed to the
+# literal "unknown" and shared ONE never-resetting global counter — which
+# permanently disabled the early-action phase check (count never restarted
+# at 1) and made the periodic reflection fire off a global tally. (fixed 2026-06-05)
+if command -v jq &>/dev/null; then
+    SESSION_ID=$(echo "$INPUT" | jq -r '.session_id // empty' 2>/dev/null)
+else
+    SESSION_ID=$(echo "$INPUT" | grep -o '"session_id":\s*"[^"]*"' | head -1 | sed 's/"session_id":\s*"//;s/"//')
 fi
+SESSION_ID="${SESSION_ID:-unknown}"
 
 COUNT_DIR="/tmp/cc-discipline-${SESSION_ID}"
 COUNT_FILE="${COUNT_DIR}/action-count"

package/templates/.claude/hooks/pre-edit-guard.sh

@@ -90,11 +90,9 @@ JSONEOF
     fi
 fi
 
-# ─── Bug-fix sanity check ───
-# Inject a lightweight reminder on source file edits:
-# "If this is a bug fix, have you eliminated alternative hypotheses?"
-# Uses additionalContext (non-blocking) so it doesn't slow down normal edits.
-cat <<JSONEOF
-{"hookSpecificOutput":{"hookEventName":"PreToolUse","additionalContext":"If this edit is a bug fix: have you listed >=3 possible causes and eliminated >=2 with evidence? Thorough elimination before fixing prevents wasted cycles. Use 'possible cause' until elimination evidence confirms the root cause."}}
-JSONEOF
+# Normal source edit: stay silent (exit 0, no output).
+# The "list >=3 causes before a bug fix" guidance already lives in the
+# always-injected rules (00-core §6, 01-debugging), the hard debug-log block
+# above, and post-error-remind. Re-injecting it on EVERY edit fired even on
+# planned feature/registration work — redundant noise, removed 2026-06-05.
 exit 0

package/templates/.claude/skills/finish/SKILL.md

@@ -0,0 +1,44 @@
+---
+name: finish
+description: Drive a task to completion with the quality bar — solid, comprehensive, fully tested; "not run" never counts as done. Use when you're ready to execute to the end (standalone, or as the handoff after /think approval).
+---
+
+You are in **finish mode**: the task is understood and approved — now drive it to completion without stopping early. This is the opposite stance from /think (which aligns and waits). Here you execute, persist, and hold a high quality bar.
+
+## Step 1: Lock the completion conditions
+
+State explicitly — in one short block — what "done" means for this task:
+- The concrete deliverables (what must exist / work when finished)
+- The quality bar below, applied to each
+- Anything you'll treat as "blocked, must report" rather than silently skip
+
+If invoked standalone (no prior /think) and the scope is genuinely unclear, ask ONE tight round of questions, then commit. Don't turn finish mode into a planning session — the point is to execute.
+
+## Step 2: The quality bar (definition of done)
+
+Hold all of these. They are the standard, not aspirations:
+
+- **扎实 (solid)** — Fix the root cause, not symptoms. Handle edge cases (empty / null / error paths). No TODO, stub, or workaround left standing in as "the solution."
+- **全面 (comprehensive)** — Cover the full scope, not just the happy path. Update related call sites, docs, and `docs/progress.md`. Don't leave half the task for "later."
+- **完备测试 (fully tested)** — Write tests AND run them. Per 07-integrity §2, "verified" requires actual execution output — paste the command and result. Untested code is not done.
+- **诚实 (honest)** — If something is blocked by an external resource, mark it "⚠️ code ready, verification pending: [reason]" — never ✅ it. Distinguish done from blocked.
+
+## Step 3: Drive
+
+Keep going until the completion conditions are met. While driving:
+- Make reasonable decisions and keep moving — note them, don't stop to ask about trivia.
+- The discipline rules still apply: 3 consecutive failures → pause and regroup; scope changes → re-align; anything irreversible or outward-facing → confirm first.
+- Don't declare partial success to exit early. If you feel the urge to stop before the bar is met, that urge is the signal to push through or report the specific blocker — not to lower the bar.
+
+## Step 4: Report on completion
+
+When the completion conditions are met, give a short close-out:
+
+```
+FINISH — [task]
+Done: [each deliverable + how it was verified — paste key command output]
+Quality bar: 扎实 [✓/note] · 全面 [✓/note] · 完备测试 [✓/note]
+Blocked (if any): [item — why, what's needed]
+```
+
+If any part is blocked rather than done, say so plainly. A truthful "90% done, X blocked on Y" beats a false ✅.

package/templates/.claude/skills/self-check/SKILL.md

@@ -2,6 +2,7 @@
 name: self-check
 description: Periodic self-check — reflect on alignment, progress, and quality. Use with /loop for continuous monitoring.
 disable-model-invocation: true
+disallowed-tools: AskUserQuestion
 ---
 
 Pause and honestly answer every question below.
@@ -59,7 +60,7 @@ Pause and honestly answer every question below.
 - **Gotchas** — what went wrong or was surprising
 - **Verification** — how it was confirmed working (test output, manual check)
 
-If any of the above are stale or incomplete: **update docs/progress.md now before continuing.** This takes 2 minutes and saves hours of re-discovery after compact.
+If any of the above are stale or incomplete: **update docs/progress.md now, automatically — don't ask for permission.** Keeping progress.md current is always-correct maintenance, not a decision that needs sign-off. Just do it, then note "updated now" in the status line. This takes 2 minutes and saves hours of re-discovery after compact.
 
 ## 6. Am I using the project's scaffolding?
 
@@ -105,7 +106,7 @@ Going well: [one thing]
 Issues found: [list, or "none"]
 ```
 
-If any issues were found, pause and report to the user before continuing.
+If any issues were found, pause and report to the user before continuing. (Routine progress.md updates from §5 don't count as "issues" — you already made them silently; just report "updated now". Reserve the pause for alignment, rigor, or scope problems that genuinely need the user.)
 
 ## Reminder
 

package/templates/.claude/skills/think/SKILL.md

@@ -106,3 +106,12 @@ When the user confirms an approach, transition to implementation. You now have:
 - Known risks flagged upfront
 
 Carry these forward. If scope changes during implementation, pause and re-align rather than silently expanding.
+
+## Downstream: what the user appended
+
+The user may steer what happens after alignment by appending a directive to the invocation:
+
+- **`/think and plan`** — after alignment, produce the plan (in plan mode, present it for approval via ExitPlanMode).
+- **`/think and finish`** (or `and goal`) — after the user approves the approach, transition into **/finish**: drive to completion with its quality bar (solid, comprehensive, fully tested). Do NOT start before approval — 05-phase-discipline still applies; "and finish" declares the post-approval execution stance, it does not bypass the gate.
+
+If no directive was appended, stop and wait as usual (Step 5).