@drunkcoding/agents-and-skills 0.0.19 → 0.0.23

package/plugins/team-superpower/hooks/task-completed.sh

@@ -1,20 +1,30 @@
 #!/usr/bin/env bash
-# TaskCompleted hook — gate implementation completions on plan approval and
-# validate any embedded escalation entries.
+# TaskCompleted hook — v5 gate for implementation completions.
 #
 # Accepts a JSON payload on stdin with at minimum:
 #   - task.title: string
-#   - task.metadata.plan_approved_at: string (ISO datetime), required for impl: tasks
-#   - task.metadata.blocked_questions: array of strings (optional)
-#   - task.metadata.commits: array of git SHAs (optional, used by v2 checks)
+#   - task.metadata.wave: string (e.g. "1.1", "1.rework", "qc-rework")
+#   - task.metadata.iteration_count: integer (optional)
+#   - task.metadata.reflection: string (optional, required when iteration_count > cap)
+#   - task.metadata.retrieval_requests: integer (optional)
+#   - task.metadata.commits: array of git SHAs (optional)
 #   - task.metadata.contract_files: array of paths (optional, for contract-publish)
 #
-# v2 rules added on top of v1:
-#   - impl:be-migration-* completions: refuse if another in-progress migration
-#     exists in the shared task list payload (anti-race).
-#   - impl:be-contract-publish-* completions: at least one commit on this task
-#     must touch a contracts file (default `contracts/` directory, or paths
-#     listed in metadata.contract_files). Verified via `git show --name-only`.
+# v5 checks (delta from v4):
+#   - REMOVED: per-task QA verification (qa_verified_at, QA-verified commit line, qa_rounds cap, trivial=true claims)
+#   - REMOVED: 6-field escalation template validation (Phase/Context/Options/Recommendation/Need from you/Peer attempts)
+#   - REMOVED: v4 wave format (single integer); v5 wave is dotted (e.g. "1.1") or rework label
+#   - ADDED: MISSING_STATIC_CHECKS — every impl:* task must have a .team-superpower/static-check-<task-id>.log
+#     containing exit=0 for all sections (lint, format, typecheck).
+#   - ADDED: MISSING_REWORK_REFERENCE — every impl:rework-* task must have a `Reworks: <orig-id>` line
+#     in at least one commit body.
+#
+# v5 preserved checks:
+#   - migration serialization (impl:*-migration-* anti-race)
+#   - contract-publish must touch a contracts file
+#   - AGENTS.md protection (no agent commit may touch docs/superpowers/AGENTS.md)
+#   - retrieval budget cap + premature Flagged-assumptions guard
+#   - MAX_ITERATIONS guardrail
 
 set -euo pipefail
 
@@ -37,48 +47,96 @@ if ! command -v jq >/dev/null 2>&1; then
 fi
 
 title="$(printf '%s' "$payload" | jq -r '.task.title // .title // ""' 2>/dev/null || echo "")"
-plan_approved_at="$(printf '%s' "$payload" | jq -r '.task.metadata.plan_approved_at // .metadata.plan_approved_at // ""' 2>/dev/null || echo "")"
 
-printf '{"ts":"%s","hook":"task-completed","title":%s,"plan_approved_at":%s}\n' \
+printf '{"ts":"%s","hook":"task-completed","title":%s}\n' \
   "$ts" \
   "$(printf '%s' "$title" | jq -Rs .)" \
-  "$(printf '%s' "$plan_approved_at" | jq -Rs .)" \
   >> "$LOG_FILE"
 
+# Resolve parse-claudemd.sh helper for limits.* lookups.
+parse_helper="${CLAUDE_PLUGIN_ROOT:-}/scripts/parse-claudemd.sh"
+if [ -z "${CLAUDE_PLUGIN_ROOT:-}" ]; then
+  hook_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+  parse_helper="$hook_dir/../scripts/parse-claudemd.sh"
+fi
+
+# v5: wave metadata. impl:* tasks must carry a `wave:` string. Accepted shapes:
+#   - "<plan-phase>.<wave>"  e.g. "1.1", "2.3"
+#   - "<plan-phase>.rework"  e.g. "1.rework"
+#   - "qc-rework"
 case "$title" in
   impl:*)
-    if [ -z "$plan_approved_at" ]; then
-      printf '{"ts":"%s","hook":"task-completed","warn":"no_plan_approval","title":%s}\n' "$ts" "$(printf '%s' "$title" | jq -Rs .)" >> "$LOG_FILE"
+    wave="$(printf '%s' "$payload" | jq -r '.task.metadata.wave // .metadata.wave // ""' 2>/dev/null || echo "")"
+    if [ -z "$wave" ] || ! printf '%s' "$wave" | grep -qE '^([0-9]+\.[0-9]+|[0-9]+\.rework|qc-rework)$'; then
+      printf '{"ts":"%s","hook":"task-completed","warn":"MISSING_WAVE_METADATA","title":%s,"wave":%s}\n' \
+        "$ts" \
+        "$(printf '%s' "$title" | jq -Rs .)" \
+        "$(printf '%s' "$wave" | jq -Rs .)" \
+        >> "$LOG_FILE"
     fi
     ;;
 esac
 
-# v3: wave metadata. impl:* tasks must carry a `wave:` integer (planner sets
-# it; the lead mirrors it into shared-task-list metadata at dispatch time).
+# v5 check 10: MISSING_STATIC_CHECKS. Every impl:* task must have a
+# .team-superpower/static-check-<task-id>.log with exit=0 across lint/format/typecheck.
 case "$title" in
   impl:*)
-    wave="$(printf '%s' "$payload" | jq -r '.task.metadata.wave // .metadata.wave // ""' 2>/dev/null || echo "")"
-    if [ -z "$wave" ] || ! printf '%s' "$wave" | grep -qE '^[0-9]+$'; then
-      printf '{"ts":"%s","hook":"task-completed","warn":"MISSING_WAVE_METADATA","title":%s}\n' \
-        "$ts" "$(printf '%s' "$title" | jq -Rs .)" >> "$LOG_FILE"
+    project_dir="${CLAUDE_PROJECT_DIR:-$PWD}"
+    static_log="$project_dir/.team-superpower/static-check-${title}.log"
+    if [ ! -f "$static_log" ]; then
+      printf '{"ts":"%s","hook":"task-completed","warn":"MISSING_STATIC_CHECKS","title":%s,"reason":"log file not found","path":%s}\n' \
+        "$ts" \
+        "$(printf '%s' "$title" | jq -Rs .)" \
+        "$(printf '%s' "$static_log" | jq -Rs .)" \
+        >> "$LOG_FILE"
+    else
+      # Any exit= line with a non-zero value fails the check.
+      if grep -E '^exit=' "$static_log" | grep -qvE '^exit=0$'; then
+        bad="$(grep -E '^exit=' "$static_log" | grep -vE '^exit=0$' | head -n1 || true)"
+        printf '{"ts":"%s","hook":"task-completed","warn":"MISSING_STATIC_CHECKS","title":%s,"reason":"non-zero exit","line":%s}\n' \
+          "$ts" \
+          "$(printf '%s' "$title" | jq -Rs .)" \
+          "$(printf '%s' "$bad" | jq -Rs .)" \
+          >> "$LOG_FILE"
+      fi
+    fi
+    ;;
+esac
+
+# v5 check 11: MISSING_REWORK_REFERENCE. impl:rework-* tasks must carry a
+# `Reworks: <orig-id-or-qc-issue-id>` line in at least one commit body.
+case "$title" in
+  impl:rework-*)
+    if command -v git >/dev/null 2>&1; then
+      rw_commits="$(printf '%s' "$payload" | jq -r '(.task.metadata.commits // .metadata.commits // [])[]?' 2>/dev/null || true)"
+      if [ -n "$rw_commits" ]; then
+        rw_found=0
+        while IFS= read -r sha; do
+          [ -z "$sha" ] && continue
+          body="$(git show --no-color --no-patch --format=%B "$sha" 2>/dev/null || true)"
+          if printf '%s\n' "$body" | grep -qE '^Reworks:[[:space:]]*[^[:space:]]+'; then
+            rw_found=1; break
+          fi
+        done <<< "$rw_commits"
+        if [ "$rw_found" -ne 1 ]; then
+          printf '{"ts":"%s","hook":"task-completed","warn":"MISSING_REWORK_REFERENCE","title":%s,"reason":"no Reworks: line in commit body"}\n' \
+            "$ts" "$(printf '%s' "$title" | jq -Rs .)" >> "$LOG_FILE"
+        fi
+      else
+        printf '{"ts":"%s","hook":"task-completed","warn":"MISSING_REWORK_REFERENCE","title":%s,"reason":"no commits recorded"}\n' \
+          "$ts" "$(printf '%s' "$title" | jq -Rs .)" >> "$LOG_FILE"
+      fi
     fi
     ;;
 esac
 
-# v3: MAX_ITERATIONS guardrail. impl:* completions whose iteration_count
-# exceeds the per-project cap (default 8) must carry a reflection: block.
+# MAX_ITERATIONS guardrail (preserved from v3/v4).
 case "$title" in
   impl:*)
     iteration_count="$(printf '%s' "$payload" | jq -r '.task.metadata.iteration_count // .metadata.iteration_count // 0' 2>/dev/null || echo 0)"
     reflection="$(printf '%s' "$payload" | jq -r '.task.metadata.reflection // .metadata.reflection // ""' 2>/dev/null || echo "")"
 
     cap=8
-    parse_helper="${CLAUDE_PLUGIN_ROOT:-}/scripts/parse-claudemd.sh"
-    if [ -z "${CLAUDE_PLUGIN_ROOT:-}" ]; then
-      # Fall back to a relative path the hook can find when CLAUDE_PLUGIN_ROOT is unset.
-      hook_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-      parse_helper="$hook_dir/../scripts/parse-claudemd.sh"
-    fi
     if [ -f "$parse_helper" ] && [ -f "${CLAUDE_PROJECT_DIR:-$PWD}/CLAUDE.md" ]; then
       configured="$(bash "$parse_helper" get limits.max_iterations_per_task "${CLAUDE_PROJECT_DIR:-$PWD}/CLAUDE.md" 2>/dev/null || true)"
       if [ -n "$configured" ] && printf '%s' "$configured" | grep -qE '^[0-9]+$'; then
@@ -97,111 +155,7 @@ case "$title" in
     ;;
 esac
 
-# v4: per-task QA verification. impl:* completions must carry
-# `qa_verified_at:` metadata AND a `QA-verified: round=N` line in at least one
-# commit message body (N ≤ max_qa_rounds_per_task, default 3). The hook also
-# rejects `trivial=true` claims for diffs >20 lines or new-file additions, and
-# rejects `qa_rounds: 3` escalations missing the cross-role fields.
-case "$title" in
-  impl:*)
-    qa_verified_at="$(printf '%s' "$payload" | jq -r '.task.metadata.qa_verified_at // .metadata.qa_verified_at // ""' 2>/dev/null || echo "")"
-    qa_rounds="$(printf '%s' "$payload" | jq -r '.task.metadata.qa_rounds // .metadata.qa_rounds // 0' 2>/dev/null || echo 0)"
-    trivial_claim="$(printf '%s' "$payload" | jq -r '.task.metadata.trivial // .metadata.trivial // false' 2>/dev/null || echo false)"
-
-    qa_cap=3
-    if [ -f "$parse_helper" ] && [ -f "${CLAUDE_PROJECT_DIR:-$PWD}/CLAUDE.md" ]; then
-      configured_qa="$(bash "$parse_helper" get limits.max_qa_rounds_per_task "${CLAUDE_PROJECT_DIR:-$PWD}/CLAUDE.md" 2>/dev/null || true)"
-      if [ -n "$configured_qa" ] && printf '%s' "$configured_qa" | grep -qE '^[0-9]+$'; then
-        qa_cap="$configured_qa"
-      fi
-    fi
-
-    # Check 7a: qa_verified_at metadata present.
-    if [ -z "$qa_verified_at" ]; then
-      printf '{"ts":"%s","hook":"task-completed","warn":"MISSING_QA_VERIFICATION","title":%s,"reason":"qa_verified_at metadata missing"}\n' \
-        "$ts" "$(printf '%s' "$title" | jq -Rs .)" >> "$LOG_FILE"
-    fi
-
-    # Check 7b: QA-verified: round=N commit body line, verified via git log if commits recorded.
-    if command -v git >/dev/null 2>&1; then
-      qa_commits="$(printf '%s' "$payload" | jq -r '(.task.metadata.commits // .metadata.commits // [])[]?' 2>/dev/null || true)"
-      if [ -n "$qa_commits" ]; then
-        qa_line_found=0
-        qa_round_observed=0
-        while IFS= read -r sha; do
-          [ -z "$sha" ] && continue
-          body="$(git show --no-color --no-patch --format=%B "$sha" 2>/dev/null || true)"
-          line="$(printf '%s\n' "$body" | grep -E '^QA-verified:[[:space:]]*round=[0-9]+' | head -n1 || true)"
-          if [ -n "$line" ]; then
-            qa_line_found=1
-            n="$(printf '%s' "$line" | sed -nE 's/^QA-verified:[[:space:]]*round=([0-9]+).*/\1/p')"
-            if [ -n "$n" ] && [ "$n" -gt "$qa_round_observed" ]; then
-              qa_round_observed="$n"
-            fi
-          fi
-        done <<< "$qa_commits"
-        if [ "$qa_line_found" -ne 1 ]; then
-          printf '{"ts":"%s","hook":"task-completed","warn":"MISSING_QA_VERIFICATION","title":%s,"reason":"no QA-verified line in commit body"}\n' \
-            "$ts" "$(printf '%s' "$title" | jq -Rs .)" >> "$LOG_FILE"
-        elif [ "$qa_round_observed" -gt "$qa_cap" ]; then
-          printf '{"ts":"%s","hook":"task-completed","warn":"QA_ROUND_OVER_CAP","title":%s,"round":%d,"cap":%d}\n' \
-            "$ts" "$(printf '%s' "$title" | jq -Rs .)" "$qa_round_observed" "$qa_cap" >> "$LOG_FILE"
-        fi
-      fi
-    fi
-
-    # Check 8: qa_rounds at cap requires §7 cross-role escalation.
-    if [ "${qa_rounds:-0}" -ge "$qa_cap" ] && [ -z "$qa_verified_at" ]; then
-      # An escalation entry tagged class:cross-role with qa_rounds, what_failed, one_change_to_fix must be present.
-      escalation_ok=0
-      escalation_entries="$(printf '%s' "$payload" | jq -c '(.task.metadata.blocked_questions // .metadata.blocked_questions // [])[]?' 2>/dev/null || true)"
-      if [ -n "$escalation_entries" ]; then
-        while IFS= read -r entry; do
-          [ -z "$entry" ] && continue
-          raw="$(printf '%s' "$entry" | jq -r '.' 2>/dev/null || printf '%s' "$entry")"
-          if printf '%s' "$raw" | grep -qE 'class[[:space:]]*:[[:space:]]*cross-role' \
-            && printf '%s' "$raw" | grep -qE 'qa_rounds[[:space:]]*:' \
-            && printf '%s' "$raw" | grep -qE 'what_failed[[:space:]]*:' \
-            && printf '%s' "$raw" | grep -qE 'one_change_to_fix[[:space:]]*:'; then
-            escalation_ok=1
-            break
-          fi
-        done <<< "$escalation_entries"
-      fi
-      if [ "$escalation_ok" -ne 1 ]; then
-        printf '{"ts":"%s","hook":"task-completed","warn":"QA_CAP_EXCEEDED","title":%s,"qa_rounds":%d,"cap":%d}\n' \
-          "$ts" "$(printf '%s' "$title" | jq -Rs .)" "$qa_rounds" "$qa_cap" >> "$LOG_FILE"
-      fi
-    fi
-
-    # Pre-check: INVALID_TRIVIAL_CLAIM — trivial=true requires diff ≤20 lines AND no new files.
-    if [ "$trivial_claim" = "true" ] && command -v git >/dev/null 2>&1; then
-      tc_commits="$(printf '%s' "$payload" | jq -r '(.task.metadata.commits // .metadata.commits // [])[]?' 2>/dev/null || true)"
-      tc_added=0
-      tc_lines=0
-      if [ -n "$tc_commits" ]; then
-        while IFS= read -r sha; do
-          [ -z "$sha" ] && continue
-          st="$(git show --no-color --name-status --pretty=format: "$sha" 2>/dev/null || true)"
-          if printf '%s\n' "$st" | grep -qE '^A[[:space:]]'; then
-            tc_added=1
-          fi
-          n="$(git show --no-color --shortstat --pretty=format: "$sha" 2>/dev/null | grep -oE '[0-9]+ insertion' | head -n1 | grep -oE '[0-9]+' || echo 0)"
-          tc_lines=$((tc_lines + ${n:-0}))
-        done <<< "$tc_commits"
-        if [ "$tc_added" -eq 1 ] || [ "$tc_lines" -gt 20 ]; then
-          printf '{"ts":"%s","hook":"task-completed","warn":"INVALID_TRIVIAL_CLAIM","title":%s,"added_files":%d,"insertions":%d}\n' \
-            "$ts" "$(printf '%s' "$title" | jq -Rs .)" "$tc_added" "$tc_lines" >> "$LOG_FILE"
-        fi
-      fi
-    fi
-    ;;
-esac
-
-# v4: retrieval budget. impl:* tasks may not exceed `retrieval_budget_per_task`
-# (default 2). Also: a `Flagged-assumptions:` line in a commit body is only
-# permitted when retrieval_requests == budget (cannot flag assumptions
-# prematurely without exhausting the budget).
+# Retrieval budget (preserved from v4).
 case "$title" in
   impl:*)
     retrieval_requests="$(printf '%s' "$payload" | jq -r '.task.metadata.retrieval_requests // .metadata.retrieval_requests // 0' 2>/dev/null || echo 0)"
@@ -238,10 +192,7 @@ case "$title" in
     ;;
 esac
 
-# v4: AGENTS.md protection. Agents never write to docs/superpowers/AGENTS.md.
-# Reviewer writes only to docs/superpowers/AGENTS.suggestions.md. If any commit
-# on this task touches AGENTS.md, warn AGENT_WROTE_AGENTS_MD — the owner is the
-# only role that may promote suggestions to AGENTS.md.
+# AGENTS.md protection (preserved from v4).
 if command -v git >/dev/null 2>&1; then
   agm_commits="$(printf '%s' "$payload" | jq -r '(.task.metadata.commits // .metadata.commits // [])[]?' 2>/dev/null || true)"
   if [ -n "$agm_commits" ]; then
@@ -256,27 +207,27 @@ if command -v git >/dev/null 2>&1; then
   fi
 fi
 
-# v2: migration serialization. If this is a migration task, verify no other
-# `impl:be-migration-*` task is currently in_progress in the shared task list
-# (payload.tasks[]). The lead also enforces this; the hook is a backstop.
+# Migration serialization (preserved). v5 widens the prefix match: any task
+# whose title contains the qualifier `-migration-` (e.g. impl:be-migration-*,
+# impl:rework-be-migration-*) is migration-class.
 case "$title" in
-  impl:be-migration-*)
+  *-migration-*)
     other_in_progress="$(printf '%s' "$payload" | jq -r --arg me "$title" '
       [ .tasks[]?
         | select((.title // "") != $me)
-        | select(((.title // "") | startswith("impl:be-migration-")))
+        | select(((.title // "") | contains("-migration-")))
         | select((.status // "") == "in_progress")
       ] | length' 2>/dev/null || echo 0)"
     if [ "${other_in_progress:-0}" -gt 0 ]; then
-      printf '{"ts":"%s","hook":"task-completed","warn":"migration_race","title":%s}\n' "$ts" "$(printf '%s' "$title" | jq -Rs .)" >> "$LOG_FILE"
+      printf '{"ts":"%s","hook":"task-completed","warn":"MIGRATION_RACE","title":%s}\n' "$ts" "$(printf '%s' "$title" | jq -Rs .)" >> "$LOG_FILE"
     fi
     ;;
 esac
 
-# v2: contract-publish must actually touch a contracts file in at least one
-# of its commits. Best-effort: skip if git unavailable or no commits recorded.
+# Contract-publish must touch a contracts file (preserved). v5 widens to any
+# task whose title contains the qualifier `-contract-publish-`.
 case "$title" in
-  impl:be-contract-publish-*)
+  *-contract-publish-*)
     if command -v git >/dev/null 2>&1; then
       commits="$(printf '%s' "$payload" | jq -r '(.task.metadata.commits // .metadata.commits // [])[]?' 2>/dev/null || true)"
       patterns="$(printf '%s' "$payload" | jq -r '(.task.metadata.contract_files // .metadata.contract_files // ["contracts/"])[]?' 2>/dev/null || echo "contracts/")"
@@ -293,44 +244,11 @@ case "$title" in
           done <<< "$patterns"
         done <<< "$commits"
         if [ "$touched" -ne 1 ]; then
-          printf '{"ts":"%s","hook":"task-completed","warn":"empty_contract_publish","title":%s}\n' "$ts" "$(printf '%s' "$title" | jq -Rs .)" >> "$LOG_FILE"
+          printf '{"ts":"%s","hook":"task-completed","warn":"EMPTY_CONTRACT_PUBLISH","title":%s}\n' "$ts" "$(printf '%s' "$title" | jq -Rs .)" >> "$LOG_FILE"
         fi
       fi
     fi
     ;;
 esac
 
-# Validate escalation entries if present.
-required_fields=("Phase" "Context" "Options" "Recommendation" "Need from you" "Peer attempts")
-missing_any=""
-entries="$(printf '%s' "$payload" | jq -c '(.task.metadata.blocked_questions // .metadata.blocked_questions // [])[]?' 2>/dev/null || true)"
-
-if [ -n "$entries" ]; then
-  while IFS= read -r entry; do
-    [ -z "$entry" ] && continue
-    raw="$(printf '%s' "$entry" | jq -r '.' 2>/dev/null || printf '%s' "$entry")"
-    missing=""
-    for field in "${required_fields[@]}"; do
-      if ! printf '%s' "$raw" | grep -qE "(^|[^A-Za-z])${field}[[:space:]]*:"; then
-        if [ -z "$missing" ]; then
-          missing="$field"
-        else
-          missing="$missing, $field"
-        fi
-      fi
-    done
-    if [ -n "$missing" ]; then
-      if [ -z "$missing_any" ]; then
-        missing_any="$missing"
-      else
-        missing_any="$missing_any | $missing"
-      fi
-    fi
-  done <<< "$entries"
-fi
-
-if [ -n "$missing_any" ]; then
-  printf '{"ts":"%s","hook":"task-completed","warn":"bad_escalation","missing":%s}\n' "$ts" "$(printf '%s' "$missing_any" | jq -Rs .)" >> "$LOG_FILE"
-fi
-
 exit 0

package/plugins/team-superpower/hooks/task-created.sh

@@ -1,21 +1,28 @@
 #!/usr/bin/env bash
-# TaskCreated hook — enforce title prefix on shared task list entries.
+# TaskCreated hook — v5 prefix + wave validation for shared task list entries.
 #
 # Accepts a JSON payload on stdin. Required field:
 #   - task.title: string
 #
-# Title MUST start with one of: impl:, review:, meta:, block:
-# v2 additions:
-#   - impl: tasks MUST carry a sub-prefix (be-, fe-, qa-fix-be-, qa-fix-fe-,
-#     review-fix-be-, review-fix-fe-, contract-update-, be-migration-,
-#     be-contract-publish-) — bare `impl:foo` is rejected.
-#   - Shape-marker file at docs/superpowers/sessions/<slug>.shape (written by
-#     the lead in phase 0) restricts which sub-prefixes are allowed:
-#       be-only      → only `impl:be-*`, `impl:contract-update-*` allowed
-#       fe-only      → only `impl:fe-*`, `impl:contract-update-*` allowed
-#       full-stack   → all sub-prefixes allowed
-#   - Slug is taken from .task.metadata.slug or .metadata.slug, with fallback
-#     to the most-recent .shape file when only one exists.
+# v5 changes (delta from v4):
+#   - ADDED: impl:rework-* allowed top-level. Rework tasks dispatched by
+#     team-leader (phase-end SOLID/DRY review) or qc-engineer (end-of-plan QC)
+#     do not carry a be-/fe- prefix; their original-task id is in the
+#     `Reworks:` line of the implementer's commit body and validated by
+#     task-completed.sh.
+#   - ADDED: INVALID_WAVE_REFERENCE — v5 waves are dotted strings, not single
+#     integers. Accepted shapes: "<plan-phase>.<wave>" (e.g. "1.1", "2.3"),
+#     "<plan-phase>.rework" (e.g. "1.rework"), or "qc-rework".
+#   - REMOVED: qa-fix-be-, qa-fix-fe-, review-fix-be-, review-fix-fe- prefixes
+#     (v4 QA loop is gone). Use impl:rework-* instead.
+#   - REMOVED: bare integer wave format.
+#
+# Preserved checks:
+#   - Top-level prefix must be impl: / review: / meta: / block:.
+#   - impl:* must carry a known sub-prefix per the shape file.
+#   - solo-mode guard: impl:* invalid when checkpoint mode is solo.
+#   - Shape-marker file at docs/superpowers/sessions/<slug>.shape restricts
+#     allowed sub-prefixes (be-only / fe-only / full-stack).
 
 set -euo pipefail
 
@@ -60,16 +67,12 @@ if [ -d "$SESSIONS_DIR" ]; then
 fi
 
 wave="$(printf '%s' "$payload" | jq -r '.task.metadata.wave // .metadata.wave // ""' 2>/dev/null || echo "")"
-wave_json="null"
-if printf '%s' "$wave" | grep -qE '^[0-9]+$'; then
-  wave_json="$wave"
-fi
 
 printf '{"ts":"%s","hook":"task-created","title":%s,"shape":%s,"wave":%s}\n' \
   "$ts" \
   "$(printf '%s' "$title" | jq -Rs .)" \
   "$(printf '%s' "$shape" | jq -Rs .)" \
-  "$wave_json" \
+  "$(printf '%s' "$wave" | jq -Rs .)" \
   >> "$LOG_FILE"
 
 # Top-level prefix check
@@ -78,18 +81,18 @@ case "$title" in
   impl:*) ;;
   "")
     printf '{"ts":"%s","hook":"task-created","warn":"bad_prefix","reason":"title missing"}\n' "$ts" >> "$LOG_FILE"
+    exit 0
     ;;
   *)
     printf '{"ts":"%s","hook":"task-created","warn":"bad_prefix","title":%s}\n' "$ts" "$(printf '%s' "$title" | jq -Rs .)" >> "$LOG_FILE"
+    exit 0
     ;;
 esac
 
-# v3: solo-mode guard. If checkpoint mode is solo, impl:* tasks are invalid
-# (solo means the lead does the work itself; no implementer is spawned).
+# v3: solo-mode guard. If checkpoint mode is solo, impl:* tasks are invalid.
 mode_meta="$(printf '%s' "$payload" | jq -r '.task.metadata.mode // .metadata.mode // ""' 2>/dev/null || echo "")"
 mode_marker=""
 if [ -z "$mode_meta" ] && [ -d "$SESSIONS_DIR" ]; then
-  # Look for a <slug>.mode file the lead writes when it picks a mode.
   marker_file=""
   if [ -n "$slug" ] && [ -f "$SESSIONS_DIR/$slug.mode" ]; then
     marker_file="$SESSIONS_DIR/$slug.mode"
@@ -105,27 +108,38 @@ if [ -z "$mode_meta" ] && [ -d "$SESSIONS_DIR" ]; then
 fi
 effective_mode="${mode_meta:-$mode_marker}"
 
-case "$title" in
-  impl:*)
-    if [ "$effective_mode" = "solo" ]; then
-      printf '{"ts":"%s","hook":"task-created","warn":"INVALID_FOR_SOLO_MODE","title":%s}\n' \
-        "$ts" "$(printf '%s' "$title" | jq -Rs .)" >> "$LOG_FILE"
-    fi
-    if [ -z "$wave" ]; then
-      printf '{"ts":"%s","hook":"task-created","warn":"MISSING_WAVE_METADATA","title":%s}\n' \
-        "$ts" "$(printf '%s' "$title" | jq -Rs .)" >> "$LOG_FILE"
-    fi
-    ;;
-esac
+if [ "$effective_mode" = "solo" ]; then
+  printf '{"ts":"%s","hook":"task-created","warn":"INVALID_FOR_SOLO_MODE","title":%s}\n' \
+    "$ts" "$(printf '%s' "$title" | jq -Rs .)" >> "$LOG_FILE"
+fi
+
+# v5 INVALID_WAVE_REFERENCE: wave metadata is required and must match the v5 shape.
+if [ -z "$wave" ]; then
+  printf '{"ts":"%s","hook":"task-created","warn":"INVALID_WAVE_REFERENCE","title":%s,"reason":"wave metadata missing"}\n' \
+    "$ts" "$(printf '%s' "$title" | jq -Rs .)" >> "$LOG_FILE"
+elif ! printf '%s' "$wave" | grep -qE '^([0-9]+\.[0-9]+|[0-9]+\.rework|qc-rework)$'; then
+  printf '{"ts":"%s","hook":"task-created","warn":"INVALID_WAVE_REFERENCE","title":%s,"wave":%s,"reason":"unrecognised wave shape"}\n' \
+    "$ts" \
+    "$(printf '%s' "$title" | jq -Rs .)" \
+    "$(printf '%s' "$wave" | jq -Rs .)" \
+    >> "$LOG_FILE"
+fi
 
 # At this point title starts with `impl:`. Strip prefix and require a known
-# sub-prefix.
+# v5 sub-prefix.
 rest="${title#impl:}"
 case "$rest" in
-  be-*|qa-fix-be-*|review-fix-be-*|be-migration-*|be-contract-publish-*)
+  rework-*)
+    # Rework tasks dispatched by team-leader (phase-end review) or qc-engineer
+    # (end-of-plan QC). The Reworks: <orig-id> line in the commit body is
+    # validated by task-completed.sh (MISSING_REWORK_REFERENCE). No shape check
+    # — rework inherits the originating task's scope.
+    sub="rework"
+    ;;
+  be-*|be-migration-*|be-contract-publish-*)
     sub="be"
     ;;
-  fe-*|qa-fix-fe-*|review-fix-fe-*)
+  fe-*)
     sub="fe"
     ;;
   contract-update-*)
@@ -133,10 +147,13 @@ case "$rest" in
     ;;
   *)
     printf '{"ts":"%s","hook":"task-created","warn":"bad_subprefix","title":%s}\n' "$ts" "$(printf '%s' "$title" | jq -Rs .)" >> "$LOG_FILE"
-    exit 0 ;;
+    exit 0
+    ;;
 esac
 
-# Shape-aware enforcement
+# Shape-aware enforcement. rework + contract-update are scope-neutral and
+# allowed under any shape — they inherit scope from the originating task or
+# from BE ownership of the contract.
 case "$shape" in
   be-only)
     if [ "$sub" = "fe" ]; then