@windyroad/itil 0.7.1-preview.122 → 0.7.2-preview.127

package/.claude-plugin/plugin.json

@@ -1,5 +1,5 @@
 {
   "name": "wr-itil",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "ITIL-aligned IT service management for Claude Code"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@windyroad/itil",
-  "version": "0.7.1-preview.122",
+  "version": "0.7.2-preview.127",
   "description": "ITIL-aligned IT service management for Claude Code (problem, and future incident/change skills)",
   "bin": {
     "windyroad-itil": "./bin/install.mjs"

package/skills/manage-problem/SKILL.md

@@ -153,7 +153,13 @@ local_max=$(ls docs/problems/*.md 2>/dev/null | sed 's/.*\///' | grep -oE '^[0-9
 # without requiring a fetch in this step (Step 0 preflight is the place
 # where the fetch happens). Default base is `main`; if the user is on
 # another branch, swap accordingly.
-origin_max=$(git ls-tree origin/main docs/problems/ 2>/dev/null | grep -oE '[0-9]{3}' | sort -n | tail -1)
+#
+# `--name-only` is required (P056): without it, each ls-tree line is
+# `<mode> <type> <sha>\t<path>` and the 40-char blob SHA can contain
+# three-digit runs that `grep -oE '[0-9]{3}'` false-matches (observed
+# `origin_max=997` on 2026-04-20 opening P055). `sed` strips the path
+# prefix so the anchored `grep -oE '^[0-9]+'` only picks up filename IDs.
+origin_max=$(git ls-tree --name-only origin/main docs/problems/ 2>/dev/null | sed 's|^docs/problems/||' | grep -oE '^[0-9]+' | sort -n | tail -1)
 
 # Take the max of the two and increment.
 next=$(printf '%03d' $(( $(echo -e "${local_max:-0}\n${origin_max:-0}" | sort -n | tail -1) + 1 )))
@@ -271,8 +277,12 @@ Pre-flight checks before allowing transition:
 
 If any check fails, report which checks failed and ask the user to address them before transitioning.
 
+> **Staging trap (P057).** `git mv` stages only the rename — it does NOT pick up subsequent `Edit`-tool content changes. After the `Edit` tool modifies the renamed file (Status field, `## Fix Released` section, etc.), re-stage it explicitly: `git add <new>`. Without the explicit re-stage, the transition commit captures the rename-only change and the content edit leaks into the next commit, corrupting the audit trail. This rule applies to every `git mv` block below (Open → Known Error, Known Error → Verification Pending, Verification Pending → Closed) and to the supersession rename in `create-adr` Step 6.
+
 ```bash
 git mv docs/problems/<NNN>-<title>.open.md docs/problems/<NNN>-<title>.known-error.md
+# ... use the Edit tool to update the Status field ...
+git add docs/problems/<NNN>-<title>.known-error.md
 ```
 
 Update the "Status" field in the file to "Known Error".
@@ -283,12 +293,16 @@ When the fix for a Known Error ships, transition the ticket in a single commit:
 
 ```bash
 git mv docs/problems/<NNN>-<title>.known-error.md docs/problems/<NNN>-<title>.verifying.md
+# ... use the Edit tool to update Status and add the `## Fix Released` section ...
+git add docs/problems/<NNN>-<title>.verifying.md
 ```
 
 Then edit the file:
 - Update the "Status" field to "Verification Pending"
 - Add a `## Fix Released` section with: release marker (version, commit SHA, or date), one-sentence fix summary, "Awaiting user verification" line, and any exercise evidence from the releasing session.
 
+Re-stage the `.verifying.md` file explicitly after the `Edit` tool runs (P057). The second `git add` above is NOT redundant — `git mv` alone stages only the rename, not the subsequent content edit.
+
 Both the `git mv` and the file edits belong in the same commit as the fix implementation per ADR-014 (governance skills commit their own work). The `.verifying.md` suffix signals to every downstream consumer (work-problems classifier, review step 9d, README rendering) that the remaining work is user-side verification — no file-body scan needed.
 
 **Verification Pending → Closed** (user confirms):
@@ -297,9 +311,11 @@ Only the user can make this call. When they explicitly confirm the fix works in
 
 ```bash
 git mv docs/problems/<NNN>-<title>.verifying.md docs/problems/<NNN>-<title>.closed.md
+# ... use the Edit tool to update the Status field to "Closed" ...
+git add docs/problems/<NNN>-<title>.closed.md
 ```
 
-Update the "Status" field to "Closed". Reference the problem ID in the closure commit message (e.g., "Closes P008"). Step 9d's verification prompt is the structured path that fires this transition during `manage-problem review`.
+Update the "Status" field to "Closed". Reference the problem ID in the closure commit message (e.g., "Closes P008"). Step 9d's verification prompt is the structured path that fires this transition during `manage-problem review`. Re-stage the `.closed.md` file explicitly after the Edit (P057 staging trap).
 
 ### 8. For list: Show summary
 
@@ -462,7 +478,7 @@ After any operation, report:
 - Any quality check warnings
 
 Commit the completed work per ADR-014 (governance skills commit their own work):
-1. `git add` all created/modified files for this operation
+1. `git add` all created/modified files for this operation — **including any file renamed via `git mv` that was then modified by the `Edit` tool** (P057 staging trap — `git mv` alone stages only the rename, not the subsequent content edit). `git add -u` is a safe catch-all for tracked modifications.
 2. Satisfy the commit gate — two paths are valid (either produces a bypass marker):
    - **Primary**: delegate to the `wr-risk-scorer:pipeline` subagent-type via the Agent tool (subagent_type: `wr-risk-scorer:pipeline`)
    - **Fallback**: if the `wr-risk-scorer:pipeline` subagent-type is not available in the current tool set (e.g., this skill is itself running inside a spawned subagent), invoke the `/wr-risk-scorer:assess-release` skill via the Skill tool. Per ADR-015 it wraps the same pipeline subagent and the `PostToolUse:Agent` hook writes an equivalent bypass marker. Do not silently skip the gate because the primary path is unavailable — the fallback exists specifically to close this gap (see P035).

package/skills/manage-problem/test/manage-problem-git-mv-restage-reminder.bats

@@ -0,0 +1,48 @@
+#!/usr/bin/env bats
+# Doc-lint guard: manage-problem SKILL.md must document the re-stage-after-Edit
+# requirement for every `git mv` block that is followed by a content edit.
+#
+# Structural assertion — Permitted Exception to the source-grep ban (ADR-005 / P011).
+# The tests assert that the skill specification document warns authors that
+# `git mv` alone stages only the rename, and subsequent Edit-tool modifications
+# must be re-staged explicitly (`git add <new>`) before commit — otherwise the
+# commit captures a rename-only change and the content edit leaks into the
+# next commit, corrupting the audit trail (P054 / P046 incident, 2026-04-19).
+#
+# Cross-reference:
+#   P057: docs/problems/057-git-mv-plus-edit-staging-ordering-trap.*.md
+#   ADR-014: docs/decisions/014-governance-skills-commit-their-own-work.proposed.md
+#   ADR-022: docs/decisions/022-problem-lifecycle-verification-pending-status.proposed.md
+#   @jtbd JTBD-002 (ship with confidence — audit trail)
+#   @jtbd JTBD-006 (progress the backlog while I'm away — audit trail)
+
+setup() {
+  TEST_DIR="$(cd "$(dirname "$BATS_TEST_FILENAME")" && pwd)"
+  REPO_ROOT="$(cd "${TEST_DIR}/../../../../.." && pwd)"
+  SKILL_FILE="${REPO_ROOT}/packages/itil/skills/manage-problem/SKILL.md"
+}
+
+@test "manage-problem SKILL.md exists (P057 precondition)" {
+  [ -f "$SKILL_FILE" ]
+}
+
+@test "manage-problem SKILL.md warns that git mv stages only the rename (P057)" {
+  # The document must explicitly state that `git mv` stages the rename into
+  # the index but does NOT pick up subsequent Edit-tool content changes.
+  run grep -inE "git mv.*(only the rename|rename only|not .*content|stages only)" "$SKILL_FILE"
+  [ "$status" -eq 0 ]
+}
+
+@test "manage-problem SKILL.md instructs re-staging the renamed file after Edit (P057)" {
+  # Authors must be told to run `git add <new>` (or equivalent) after editing
+  # the renamed file, before commit.
+  run grep -inE "re-stage|re‑stage|\`git add\`.*after|after.*\`git add\`|git add <new>|git add .*\.verifying\.md|git add .*\.known-error\.md" "$SKILL_FILE"
+  [ "$status" -eq 0 ]
+}
+
+@test "manage-problem SKILL.md cites P057 on the re-stage requirement (P057)" {
+  # Traceability: the new guidance must cite P057 so reviewers can chase
+  # the fix back to the incident that motivated it.
+  run grep -n "P057" "$SKILL_FILE"
+  [ "$status" -eq 0 ]
+}

package/skills/manage-problem/test/manage-problem-next-id-origin-lookup.bats

@@ -0,0 +1,50 @@
+#!/usr/bin/env bats
+# Doc-lint guard: manage-problem SKILL.md Step 3 origin-max lookup must use
+# `git ls-tree --name-only` to avoid false-matching blob SHA digits (P056).
+#
+# Structural assertion — Permitted Exception to the source-grep ban
+# (ADR-005 / P011). Default `git ls-tree` output shape is
+# `<mode> <type> <sha>\t<path>`. A `grep -oE '[0-9]{3}'` over that line
+# can match digits inside the 40-char blob SHA and return a wrong
+# `origin_max` (observed 997 on 2026-04-20 when opening P055). `--name-only`
+# drops mode/type/SHA columns leaving only the path, restoring the
+# invariant ADR-019 and P043 presume.
+#
+# Cross-reference:
+#   P056: docs/problems/056-ticket-creator-next-id-lookup-blob-sha-false-match.*.md
+#   P043 (closed): next-ID collision guard in ticket-creator skills
+#   ADR-019: docs/decisions/019-afk-orchestrator-preflight.*.md
+#   @jtbd JTBD-002 (ship with confidence — audit trail)
+#   @jtbd JTBD-006 (progress the backlog while I'm away — collision-free IDs)
+
+setup() {
+  TEST_DIR="$(cd "$(dirname "$BATS_TEST_FILENAME")" && pwd)"
+  REPO_ROOT="$(cd "${TEST_DIR}/../../../../.." && pwd)"
+  SKILL_FILE="${REPO_ROOT}/packages/itil/skills/manage-problem/SKILL.md"
+}
+
+@test "manage-problem SKILL.md exists (P056 precondition)" {
+  [ -f "$SKILL_FILE" ]
+}
+
+@test "manage-problem SKILL.md origin-max lookup uses git ls-tree --name-only (P056)" {
+  # The fix: `git ls-tree --name-only` drops mode/type/SHA columns so the
+  # digit-extraction regex cannot match SHA hex runs.
+  run grep -nE "git ls-tree --name-only .* docs/problems" "$SKILL_FILE"
+  [ "$status" -eq 0 ]
+}
+
+@test "manage-problem SKILL.md does not keep the buggy bare git ls-tree pattern (P056)" {
+  # Regression guard: `git ls-tree <ref> docs/problems/` without `--name-only`
+  # piped directly into a digit regex is the bug. Any remaining pipeline of
+  # this shape in a bash code block is a regression.
+  run grep -nE "git ls-tree [^-].* docs/problems/ .*\| *grep -oE '\[0-9\]\{3\}'" "$SKILL_FILE"
+  [ "$status" -ne 0 ]
+}
+
+@test "manage-problem SKILL.md cites P056 on the origin-max fix (P056)" {
+  # Traceability: the fix must cite P056 so reviewers can chase the
+  # correction back to the incident that motivated it.
+  run grep -n "P056" "$SKILL_FILE"
+  [ "$status" -eq 0 ]
+}