cc-discipline 2.15.2 → 2.16.1

package/init.sh

@@ -541,7 +541,24 @@ echo -e "${GREEN}Installing skills...${NC}"
 # 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.
+#
+# The flip side: an older template that was once misjudged as edited stays
+# "edited" for good, because the manifest names the newer template and the file
+# never matches it. That happened on every install from before 2.12.2, which had
+# no manifest at all: 7 installs carried a never-edited 2026-04 /think until
+# 2026-09-28, with a fresh .new beside it after every upgrade. So a file that
+# matches any version we ever shipped (lib/skill-hashes, frozen) is also
+# treated as ours, and a .new left beside a file that is now current is removed.
 SKILLS_MANIFEST=".claude/.cc-discipline-skills.manifest"
+KNOWN_SKILL_HASHES="$SCRIPT_DIR/lib/skill-hashes"
+_cc_skill_shipped() {   # $1=file  $2=path under .claude/skills/  ->  0 if we once shipped it
+    [ -f "$1" ] && [ -f "$KNOWN_SKILL_HASHES" ] || return 1
+    _sa=$(_cc_algo)
+    [ "$(_cc_label "$_sa")" = sha256 ] || return 1
+    # CRs stripped first: a CRLF checkout of this list must not flag every skill
+    tr -d '\r' < "$KNOWN_SKILL_HASHES" | grep -q "^$2 sha256:$(_cc_digest_with "$_sa" "$1" norm)\$"
+}
+STALE_NEW=""
 NEW_MANIFEST=$(mktemp 2>/dev/null || echo ".claude/.skills-manifest.tmp")
 PRESERVED_SKILLS=""
 RETIRED_SKILLS=""
@@ -565,6 +582,7 @@ for skill_dir in "$SCRIPT_DIR"/templates/.claude/skills/*/; do
         rel="$skill_name/$base"
         dst=".claude/skills/$rel"
         tpl_hash=$(_cc_hash "$src")
+        kept=false
 
         if [ ! -f "$dst" ]; then
             cp "$src" "$dst"                       # new file — nothing to protect
@@ -574,17 +592,26 @@ for skill_dir in "$SCRIPT_DIR"/templates/.claude/skills/*/; do
                 :                                  # already current
             elif _cc_hash_matches "$dst" "$recorded"; then
                 cp "$src" "$dst"                   # pristine older version — safe
+            elif _cc_skill_shipped "$dst" "$rel"; then
+                cp "$src" "$dst"                   # a version we shipped, never edited
             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.
+                # No manifest yet (first run on an existing install), and the file
+                # matches no version we ever shipped: someone edited it.
                 cp "$src" "$dst.new"
-                skill_status="preserved"
+                skill_status="preserved"; kept=true
             else
                 cp "$src" "$dst.new"               # user-modified — keep theirs
-                skill_status="preserved"
+                skill_status="preserved"; kept=true
             fi
         fi
+        # A .new from an earlier run is stale once the file itself is current.
+        # Remove it only when it is one of ours: a file the user saved under
+        # that name is theirs.
+        if [ "$kept" = false ] && [ -f "$dst.new" ] && \
+           { _cc_hash_matches "$dst.new" "$tpl_hash" || _cc_skill_shipped "$dst.new" "$rel"; }; then
+            rm -f "$dst.new"
+            STALE_NEW="$STALE_NEW $rel.new"
+        fi
         echo "$rel $tpl_hash" >> "$NEW_MANIFEST"
     done
 
@@ -652,6 +679,9 @@ if [ -n "$KEPT_RETIRED" ]; then
     echo -e "   ${YELLOW}Delete by hand once you no longer need them.${NC}"
 fi
 
+if [ -n "$STALE_NEW" ]; then
+    echo "   ✓ removed templates left from earlier upgrades (the skill is current now):$STALE_NEW"
+fi
 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}"

package/lib/skill-hashes

@@ -0,0 +1,45 @@
+# sha256 of every version of each framework skill file ever shipped: every
+# version committed to templates/, plus every skill file in every version
+# published to npm (git history does not hold the files 2.2.0-2.10.0 shipped).
+# Up to 2.16.0, CRs stripped before hashing (sed 's/\r$//', as init.sh does).
+# init.sh uses it to tell an older shipped skill from a locally edited one.
+# Without it, an install that predates the skills manifest (before 2.12.2) had
+# every older skill kept as "edited", and because the manifest then records the
+# new template's hash, the misjudgement repeated on every upgrade: 7 installs
+# carried a never-edited 2026-04 /think until 2026-09-28. Includes the retired
+# /finish and /retro. Frozen: do not regenerate. Generated 2026-09-28.
+ask-me/SKILL.md sha256:b8635eec4ff11e7e252feb00845edc58c93b8afaf35b8fcef4066215e7450077
+commit/SKILL.md sha256:908d81cd310a3e67f6dbace6358cb0cd261513650e127ccedc584914deb9aa30
+commit/SKILL.md sha256:d57ca8d8fa5b8bfa9c11e4fa112e96e232dd427137bcac4c6ea1fa9f8ad5e1a0
+commit/SKILL.md sha256:d9fe08f5e76f26942c833d1ce1fe88334035dc2190c75132f0761b618e0a37e1
+commit/SKILL.md sha256:dc9ccfe019d818d3e401b04700224e05b0818a9264ab08353efbf4c4e5146c3f
+coplan/SKILL.md sha256:1186ddc4e188fffeb445c65e8f51fb0f5d0f7ba64292a38febe36905cbd21afa
+coplan/SKILL.md sha256:334b6df4f172a7762fbf276068bdce08b5fe43081bfaf2c48fc02665bb57f9f9
+coplan/SKILL.md sha256:77946c2d14a7ac487cfe748047b7d36db58a0c8eb769a62e2e19bf0b5cfaf2c3
+coplan/SKILL.md sha256:cff387e308819e20b5f54967ff3f912dde65e93e7c28d09571ee8e1ea2cc40de
+evaluate/SKILL.md sha256:1f453d38ca1280074ea6e0461ace61aea40c99fe40e518a9afda07e4d061ab6e
+finish/SKILL.md sha256:1013f03c0e65ce52e7dd5ff0d15eb6bf4fdb093635e00103b63aedfb0db4e84c
+investigate/SKILL.md sha256:7768d38e43f8ca2ce394207b5d0236ecd3ce36e7d0517a545cf7fb130e73a24e
+investigate/SKILL.md sha256:a4e376040c878fd50d4cd24ee20565aac90e1f2b185c80092b6cbac69b86e760
+retro/SKILL.md sha256:87ff53378b2bcbdd023466935856b821c7da9309935c502024cb08f68858caae
+retro/SKILL.md sha256:fea6183280de35424a2f3c4aa21f8b81f108f9ec0ad69b9666e95cce7058be39
+self-check/SKILL.md sha256:34b8847e013d7b64b9de13ccbe850384ea003dfe0ae7188b41efd3e6b99b2061
+self-check/SKILL.md sha256:512e13b28b1f31c7f8e46c10583dafd633ecbdced44187c962625dc6a91135ac
+self-check/SKILL.md sha256:5fa6f562ba74a6f46cbfa7910ecf2351101030900618cdcc58df044260d86b4e
+self-check/SKILL.md sha256:6e8e91889cd7b3753026d8213528712013fd96c6a076453dea51bd4cd4564276
+self-check/SKILL.md sha256:75a915cbaecd98a2befdf3981110bde89fc02e7d82d34f22c2cb92470aa07f34
+self-check/SKILL.md sha256:8f0903c3bb68529b07d61c0ccb7471b760a6fa09cb7fe2ca77b99671b7273380
+self-check/SKILL.md sha256:9dbfbb4112459fcbde0aae1cc016f24b6c66bfa770f1e5399cc703bc3c070ae9
+self-check/SKILL.md sha256:c83e23a5abad31367d8b2d19200686e4140ef1ee94a55bd366141a0152588407
+self-check/SKILL.md sha256:c99ebd040235efc435ae45e835badbd061524d61a0303ba8577ac6ddf67a53f3
+self-check/SKILL.md sha256:d31b2a40d45759b882611dd6768e8d176e8c630863444602a27d500a9bf2f5df
+summary/SKILL.md sha256:a3ac35c409cd3bff3286e365bb6bc973f9703c0312f49c22c5bc273c0f2bab4c
+summary/SKILL.md sha256:ccf598d2f3c777894bd674a74791e5d2b50de6d017fe555a2d63e7016432210a
+think/SKILL.md sha256:29597a4e7151f9ea9f6990988e05e44172620c2aea9708d91ec039ac85f92fb4
+think/SKILL.md sha256:3d91e093d2de30d4c98196f14c1d653297ebd51958ec1e6fc791959ee5390619
+think/SKILL.md sha256:6acca4f5055c3c7556ffb30c29558eb24aa509473bcd12ad0960f6c7c29a8600
+think/SKILL.md sha256:7f7738d61a207b89399c45730d9a7f9f93e3cf0213866292affbe5127b026e15
+think/SKILL.md sha256:92a82a23d247e9681715b151d0bef4786524c64a625e9aa8775e2256d9f673a7
+think/SKILL.md sha256:9686da003338b2181bd63143acc9c4fdf7652f0197e04ae4aff510c4c54eb36c
+think/SKILL.md sha256:b63832f82415aa4a56a3e9a2d35489861ba5317705f8ce52bc2e41ee9cee3b8f
+think/SKILL.md sha256:ec136443d668e47ce15484643192c1f9e7865b31d1c0c91d24e99b40117b0107

package/package.json

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

package/templates/.claude/skills/ask-me/SKILL.md

@@ -0,0 +1,53 @@
+---
+name: ask-me
+description: Put a decision to the user so they can answer in one step — a few lines of background, then a single- or multi-select question with the recommended option first.
+when_to_use: When the user types /ask-me or says "带着背景和选项问我" / "带着选项问我" / "ask me with options". On your own, only when you are blocked on something that is the user's call (scope, approach, a trade-off, anything irreversible or outward-facing) or on intent or environment that no file or command can tell you. Not for what the code, the docs or a conventional default settles.
+---
+
+Ask the user a question they can answer in one step.
+
+This replaces two failures. One is a wall of text with the real question buried at the end. The other is a bare open question the user cannot answer, because the context needed to answer it is in your head, not theirs.
+
+## 1. Decide what actually needs asking
+
+- **Topic.** If the user gave arguments, that is the topic. Otherwise it is whatever decision is pending in the conversation: the thing you would otherwise ask in prose, or quietly guess.
+- **Settle what you can first.** Read the file, run the command, check `docs/progress.md` and `docs/todo.md`. Ask only what is left, which should be the user's preferences and direction, or facts only they know. A question whose answer is in the repo wastes the user's turn.
+- **Nothing pending?** If nothing is actually open, say so in one line and stop. Do not invent a question so that the skill has something to do.
+
+## 2. Background first, in plain text, briefly
+
+Write three to six lines before the question, covering only what the user needs in order to choose:
+
+- what is already settled;
+- where things are stuck, and why it is the user's call: a trade-off, a preference, a risk;
+- anything you checked that changes the options, with `file:line` when it helps.
+
+Save the analysis of each option for that option's description. If the background runs past about six lines, you are explaining too much or asking too early.
+
+## 3. Ask with AskUserQuestion
+
+- **Questions.** Ask one to four per call, and only ones whose answer changes what you do next. Put related questions in the same call rather than drip-feeding them. Write them in the user's language.
+- **Options.**
+  - Give two to four per question, and make them genuinely different.
+  - Do not add an "Other" option; the tool provides one.
+  - Put your recommendation first and mark it in the user's language, "（推荐）" or "(Recommended)". Its description says why in one sentence.
+  - If you have no basis for recommending one, say that in the background rather than marking one at random.
+- **Descriptions.** Each option's description says what happens if it is chosen and what that costs. Do not restate the label.
+- **Header.** At most 12 characters.
+- **multiSelect.** Use it only when the choices combine, for example which items to include. An empty multi-select answer is ambiguous: ask again rather than assume.
+- **preview.** Use it when the user needs to compare concrete artifacts: code, configuration, layouts. It works for single-select questions only.
+
+## 4. After the answer
+
+- **Act on what was answered, and only that.** An answer to "which approach" chooses the approach. It is not approval for irreversible or outward-facing steps, such as publishing, pushing or deleting; those still get their own confirmation.
+- **"Other" with free text.** Treat it as the user's own words. If it changes the premise, re-plan instead of squeezing it into one of your options.
+- **Question rejected or interrupted.** Stop and wait: the user is about to tell you something. Do not re-ask the same questions. When they reply, work out which of your assumptions their correction overturns.
+
+## When the tool is unavailable
+
+Some contexts block the question tool: `/self-check` lists it under `disallowed-tools`, and non-interactive runs have no UI. Fall back to text:
+
+1. Give the same background.
+2. Number the questions and letter the options, recommendation first and marked, so the user can reply "1A 2B".
+
+Keep it as short as the tool version would be.

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

@@ -28,15 +28,14 @@ State your assessment: "This looks [small/medium/large] because [reason]."
 
 ## Step 2: Understand
 
-Ask 2-3 clarifying questions about the task. Focus on:
+Ask only what Step 0 could not settle. After the research, what is left should be preference and direction, not facts you could have read. A question asked before looking is one the user should never have had to answer. Focus on:
 - What exactly should change? (scope)
 - What should NOT change? (boundaries)
 - How will we know it's done? (success criteria)
 
 Rules:
-- One message, all questions at once (don't drip-feed)
-- Prefer multiple-choice over open-ended when possible
-- Reference what you learned in Step 0 — ask about gaps in your understanding, not things you can read yourself
+- Ask them the `/ask-me` way: a few lines of background from Step 0, then the question tool, with your recommendation first
+- As many questions as the task needs, up to four per call, all at once rather than drip-fed
 - If the task is already crystal clear from Step 0, say so and skip to Step 3
 
 ## Step 3: Propose
@@ -91,6 +90,8 @@ If self-review reveals issues, revise your proposals before presenting. Don't sh
 
 **Stop here. Do not proceed until the user picks an approach or gives a green light.**
 
+Ask for the pick the `/ask-me` way: one question, the approaches from Step 3 as its options, your recommendation first. The write-up from Step 3 is the background. If `/coplan` is stacked, it writes the plan and offers the review first, and the pick comes after.
+
 Do not:
 - Start coding "while waiting"
 - Create files or scaffolding — **except** writing the plan itself to disk, which is not implementation. `/coplan` does exactly that and is designed to stack here.