@windyroad/itil 0.47.2 → 0.47.4-preview.539

package/.claude-plugin/plugin.json

@@ -497,5 +497,5 @@
     }
   },
   "name": "wr-itil",
-  "version": "0.47.2"
+  "version": "0.47.4"
 }

package/package.json

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

package/scripts/classify-readme-drift.sh

@@ -75,23 +75,78 @@ if [ -z "$DRIFT_IDS" ]; then
   exit 2
 fi
 
-# ── Build set of IDs covered by staged renames in the working tree ──────────
-# `git status --porcelain` v1 emits rename lines as:
-#   R  <old-path> -> <new-path>
-#   RM <old-path> -> <new-path>   (rename + unstaged modification)
+# ── Build set of IDs covered by in-flight ticket renames in the working tree
+# `git status --porcelain` v1 emits same-session rename evidence in two shapes:
+#
+#   1. R / RM rename entries (git's rename-detection matched the old + new path)
+#        R  <old-path> -> <new-path>
+#        RM <old-path> -> <new-path>   (rename + unstaged modification)
+#
+#   2. Same-ID D + (A or ??) pair (substantial-body edit defeated rename-
+#      detection so the move renders as delete + add for the same ticket ID
+#      — P306). We treat such a pair as equivalent to an R entry for drift-
+#      coverage purposes: the in-flow P094/P062 refresh will reconcile the
+#      README in the upcoming commit per ADR-014.
+#
 # We match the destination path's ticket ID — the post-rename status is what
-# the in-flow P094/P062 refresh will reconcile in the upcoming commit.
+# the in-flow refresh will reconcile.
 RENAMED_IDS=""
 if git rev-parse --git-dir >/dev/null 2>&1; then
-  RENAMED_IDS="$(
-    git status --porcelain "$PROBLEMS_DIR" 2>/dev/null \
+  # `-u` (= `--untracked-files=all`) expands untracked directories so the
+  # `??` side of a D + `??` rename pair lists individual files, not the
+  # collapsed parent directory.
+  STATUS_LINES="$(git status --porcelain -u "$PROBLEMS_DIR" 2>/dev/null)"
+
+  # Shape 1: R / RM rename entries — extract destination-path ticket ID.
+  R_IDS="$(
+    printf '%s\n' "$STATUS_LINES" \
       | awk '/^R/' \
       | sed 's|.*-> ||' \
       | sed "s|^${PROBLEMS_DIR}/||" \
       | grep -oE '^[0-9]{3}' \
+      | awk '{ printf "P%s\n", $0 }'
+  )"
+
+  # Shape 2: same-ID D + (A or ??) pair — intersect deleted-IDs with added-
+  # IDs. `git status --porcelain` emits one entry per file:
+  #   ` D <path>`  staged delete (note: column 1 is space, column 2 is `D`)
+  #   `D  <path>`  staged delete (alternate form when also touched in index)
+  #   `A  <path>`  staged add
+  #   `?? <path>`  untracked add
+  # We treat any 3-char prefix line whose 1st-or-2nd column is `D`/`A`/`?`
+  # as candidate, then extract the leading `<NNN>` from the basename.
+  DELETED_IDS="$(
+    printf '%s\n' "$STATUS_LINES" \
+      | awk 'substr($0,1,2) ~ /D / || substr($0,1,2) ~ /^ D/' \
+      | sed 's|^...||' \
+      | sed "s|^${PROBLEMS_DIR}/||" \
+      | grep -oE '^[0-9]{3}' \
       | awk '{ printf "P%s\n", $0 }' \
       | sort -u
   )"
+  ADDED_IDS="$(
+    printf '%s\n' "$STATUS_LINES" \
+      | awk 'substr($0,1,2) ~ /A / || substr($0,1,2) == "??"' \
+      | sed 's|^...||' \
+      | sed "s|^${PROBLEMS_DIR}/||" \
+      | grep -oE '^[0-9]{3}' \
+      | awk '{ printf "P%s\n", $0 }' \
+      | sort -u
+  )"
+  DA_PAIR_IDS=""
+  if [ -n "$DELETED_IDS" ] && [ -n "$ADDED_IDS" ]; then
+    DA_PAIR_IDS="$(
+      comm -12 \
+        <(printf '%s\n' "$DELETED_IDS") \
+        <(printf '%s\n' "$ADDED_IDS")
+    )"
+  fi
+
+  RENAMED_IDS="$(
+    { printf '%s\n' "$R_IDS"; printf '%s\n' "$DA_PAIR_IDS"; } \
+      | grep -v '^$' \
+      | sort -u
+  )"
 fi
 
 # ── Cross-reference each drift ID against the renamed set ───────────────────

package/scripts/reconcile-rfcs.sh

@@ -251,8 +251,16 @@ if [ -d "$PROBLEMS_DIR" ]; then
   # problem_rfc_ids["P168"] = "RFC-001 RFC-002 ..."
   declare -A problem_rfc_rows
   declare -A problem_rfc_ids
+  # P312 / ADR-031: scan both flat docs/problems/<NNN>-*.md AND per-state
+  # subdir docs/problems/<state>/<NNN>-*.md layouts so the reverse-trace
+  # remains valid post-migration. Mirrors reconcile-readme.sh lines 74-110.
   shopt -s nullglob
-  for pf in "$PROBLEMS_DIR"/[0-9][0-9][0-9]-*.md; do
+  problem_files=( "$PROBLEMS_DIR"/[0-9][0-9][0-9]-*.md )
+  for ticket_status in open known-error verifying closed parked; do
+    problem_files+=( "$PROBLEMS_DIR"/"$ticket_status"/[0-9][0-9][0-9]-*.md )
+  done
+  shopt -u nullglob
+  for pf in "${problem_files[@]}"; do
     pbase="$(basename "$pf")"
     pnum="${pbase%%-*}"
     pid="P${pnum}"
@@ -274,7 +282,6 @@ if [ -d "$PROBLEMS_DIR" ]; then
     done < <(awk -v start="$sec_start" 'NR>start { if (/^## /) exit; print }' "$pf")
     problem_rfc_ids["$pid"]="$rfcs_in_p"
   done
-  shopt -u nullglob
 
   # 1. MISSING_REVERSE_TRACE: RFC claims P, P does not list RFC.
   for rfc_id in "${!rfc_problems_claim[@]}"; do

package/scripts/test/classify-readme-drift.bats

@@ -132,6 +132,136 @@ EOF
   echo "$output" | grep -q "covered=1"
 }
 
+# ── P306: same-ID D+A pair coverage (substantial-body in-flight rename) ─────
+# When `git mv` is followed by a substantial body edit, git's rename-detection
+# may not match the old/new paths and emits a delete+add pair instead of an R
+# entry. The classifier must recognise a same-ID D+A pair as same-session
+# coverage — equivalent to an R/RM entry — and return INLINE_REFRESH.
+
+@test "classify-readme-drift: same-ID D+A pair (substantial-body rename) → INLINE_REFRESH" {
+  # Seed an open ticket, commit, then `git mv` + substantial-body edit. With
+  # rename-detection thresholds, git may emit `D ` + `A ` (or `??`) rather
+  # than `R `. We force the D+A shape by writing wholly different content to
+  # the destination path.
+  cat > docs/problems/306-foo.open.md <<'EOF'
+# Problem 306: Foo
+
+**Status**: Open
+
+Original body — short.
+EOF
+  git add docs/problems/306-foo.open.md
+  git commit -q -m "init"
+
+  # Create the new file at the verifying path with substantially different
+  # body BEFORE removing the old path (avoid empty-dir prune). git's
+  # rename-detection then sees delete + add as distinct entries rather than
+  # an R-rename, because the bodies are wholly different.
+  cat > docs/problems/306-foo.verifying.md <<'EOF'
+# Problem 306: Foo
+
+**Status**: Verification Pending
+
+Wholly rewritten body so git rename-detection does not match the source.
+This is a multi-paragraph substantive rewrite that exercises the D+A path.
+
+## Fix Released
+
+Deployed in vX.Y.Z. Adds a behavioural fixture that exercises the
+classifier across the D+A coverage gap that P306 captured.
+EOF
+  git rm -q docs/problems/306-foo.open.md
+  git add docs/problems/306-foo.verifying.md
+
+  cat > drift.txt <<'EOF'
+DRIFT    P306 wsjf-rankings: claims=open actual=verifying
+MISSING  P306 verification-queue: actual=verifying
+EOF
+
+  run "$SCRIPT" drift.txt docs/problems
+  [ "$status" -eq 0 ]
+  echo "$output" | grep -q "INLINE_REFRESH"
+  echo "$output" | grep -q "covered=1"
+}
+
+@test "classify-readme-drift: same-ID D+A pair with untracked add (D + ??) → INLINE_REFRESH" {
+  # Variant: the new path is untracked (not yet `git add`-ed). git status
+  # emits `D ` for the old path and `??` for the new path. The classifier
+  # must still recognise the same-ID pair as same-session coverage.
+  cat > docs/problems/307-bar.open.md <<'EOF'
+# Problem 307: Bar
+**Status**: Open
+EOF
+  git add docs/problems/307-bar.open.md
+  git commit -q -m "init"
+
+  cat > docs/problems/307-bar.verifying.md <<'EOF'
+# Problem 307: Bar
+
+**Status**: Verification Pending
+
+Untracked add side of the D+?? pair.
+EOF
+  git rm -q docs/problems/307-bar.open.md
+
+  cat > drift.txt <<'EOF'
+DRIFT    P307 wsjf-rankings: claims=open actual=verifying
+EOF
+
+  run "$SCRIPT" drift.txt docs/problems
+  [ "$status" -eq 0 ]
+  echo "$output" | grep -q "INLINE_REFRESH"
+  echo "$output" | grep -q "covered=1"
+}
+
+@test "classify-readme-drift: D-only (no matching A for same ID) → HALT_ROUTE_RECONCILE" {
+  # Negative case: a delete without a corresponding add for the same ID is
+  # NOT a rename — it is a genuine deletion. Must HALT.
+  cat > docs/problems/308-baz.open.md <<'EOF'
+# Problem 308: Baz
+**Status**: Open
+EOF
+  git add docs/problems/308-baz.open.md
+  git commit -q -m "init"
+
+  git rm -q docs/problems/308-baz.open.md
+
+  cat > drift.txt <<'EOF'
+DRIFT    P308 wsjf-rankings: claims=open actual=verifying
+EOF
+
+  run "$SCRIPT" drift.txt docs/problems
+  [ "$status" -eq 1 ]
+  echo "$output" | grep -q "HALT_ROUTE_RECONCILE"
+  echo "$output" | grep -q "uncovered=1"
+}
+
+@test "classify-readme-drift: mismatched D + A (different IDs) → HALT_ROUTE_RECONCILE" {
+  # Negative case: a delete for one ID + an add for a different ID is NOT a
+  # rename of either ticket — both are uncovered.
+  cat > docs/problems/309-alpha.open.md <<'EOF'
+# Problem 309: Alpha
+**Status**: Open
+EOF
+  git add docs/problems/309-alpha.open.md
+  git commit -q -m "init"
+
+  cat > docs/problems/310-beta.open.md <<'EOF'
+# Problem 310: Beta
+**Status**: Open
+EOF
+  git rm -q docs/problems/309-alpha.open.md
+  git add docs/problems/310-beta.open.md
+
+  cat > drift.txt <<'EOF'
+DRIFT    P309 wsjf-rankings: claims=open actual=verifying
+EOF
+
+  run "$SCRIPT" drift.txt docs/problems
+  [ "$status" -eq 1 ]
+  echo "$output" | grep -q "HALT_ROUTE_RECONCILE"
+}
+
 # ── Exit 1 (HALT_ROUTE_RECONCILE): committed cross-session drift ────────────
 
 @test "classify-readme-drift: single drift ID not covered by any rename → HALT_ROUTE_RECONCILE" {

package/scripts/test/reconcile-rfcs.bats

@@ -131,6 +131,40 @@ EOF
   fi
 }
 
+# Helper: write a problem ticket under the per-state subdir layout per
+# ADR-031 (state is the parent directory; filename has NO `.state.md` suffix).
+# Args: <pid-num> <slug> <state> <rfcs-rows-block>
+# Used to regression-test P312 — reconcile-rfcs reverse-trace must traverse
+# docs/problems/<state>/<NNN>-*.md, not just flat docs/problems/<NNN>-*.<state>.md.
+write_problem_subdir() {
+  local num="$1" slug="$2" state="$3" rfcs_rows="${4:-}"
+  mkdir -p "$PROBLEMS_DIR/$state"
+  local file="$PROBLEMS_DIR/$state/${num}-${slug}.md"
+  cat > "$file" <<EOF
+# Problem ${num}: ${slug}
+
+**Status**: ${state}
+
+## Description
+
+stub
+
+## Related
+
+stub
+EOF
+  if [ -n "$rfcs_rows" ]; then
+    cat >> "$file" <<EOF
+
+## RFCs
+
+| RFC | Status | Title |
+|-----|--------|-------|
+${rfcs_rows}
+EOF
+  fi
+}
+
 # ── Existence + executable ──────────────────────────────────────────────────
 
 @test "reconcile-rfcs: script exists" {
@@ -413,6 +447,35 @@ EOF
   done <<< "$output"
 }
 
+# ── P312: per-state subdir reverse-trace (ADR-031 layout) ───────────────────
+# Closes P312 — reconcile-rfcs reported spurious MISSING_REVERSE_TRACE for
+# tickets that live under docs/problems/<state>/<NNN>-*.md because the
+# reverse-trace pass only globbed the flat docs/problems/<NNN>-*.md layout.
+# RFC-002-class dual-tolerant-glob fix mirroring the sibling already shipped
+# in reconcile-readme.sh (P118).
+
+@test "P312: reverse-trace clean when problem ticket lives in per-state subdir" {
+  write_rfc "001" "foo" "accepted"
+  write_minimal_readme "| 2.0 | RFC-001 | foo | 3 Med | Accepted | M | 2026-05-05 |"
+  # Ticket lives under docs/problems/verifying/168-p168.md (no .state suffix).
+  write_problem_subdir "168" "p168" "verifying" "| RFC-001 | accepted | foo |"
+  run bash "$SCRIPT" "$FIXTURE_DIR" "$PROBLEMS_DIR"
+  [ "$status" -eq 0 ]
+  [[ "$output" != *"MISSING_REVERSE_TRACE"* ]]
+}
+
+@test "P312: reverse-trace detects missing trace when problem ticket lives in per-state subdir" {
+  write_rfc "001" "foo" "accepted"
+  write_minimal_readme "| 2.0 | RFC-001 | foo | 3 Med | Accepted | M | 2026-05-05 |"
+  # Subdir ticket WITHOUT a `## RFCs` section → MISSING_REVERSE_TRACE must fire.
+  write_problem_subdir "168" "p168" "verifying" ""
+  run bash "$SCRIPT" "$FIXTURE_DIR" "$PROBLEMS_DIR"
+  [ "$status" -eq 1 ]
+  [[ "$output" == *"MISSING_REVERSE_TRACE"* ]]
+  [[ "$output" == *"RFC-001"* ]]
+  [[ "$output" == *"P168"* ]]
+}
+
 # ── ADR-049 bin shim contract ───────────────────────────────────────────────
 
 @test "wr-itil-reconcile-rfcs bin shim exists" {