create-sdd-project 0.17.3 → 0.18.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/template/.claude/commands/audit-merge.md +156 -2
  3. package/template/.gemini/commands/audit-merge-instructions.md +153 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "create-sdd-project",
3
- "version": "0.17.3",
3
+ "version": "0.18.0",
4
4
  "description": "Create a new SDD DevFlow project with AI-assisted development workflow",
5
5
  "bin": {
6
6
  "create-sdd-project": "bin/cli.js"
package/template/.claude/commands/audit-merge.md CHANGED
@@ -48,13 +48,130 @@ If DIVERGED, flag as FAIL with instruction to merge target branch first.
48
48
 
49
49
  Run only if `git diff origin/<target-branch>..HEAD --name-only` shows `.json` files in seed-data or fixtures directories.
50
50
 
51
+ ### Drift Checks (added v0.18.0) — ADVISORY, not blocking
52
+
53
+ Eleven empirically-validated drift patterns. Failures are NOT blockers for the compliance verdict, but MUST be refreshed before requesting user authorization (the user will otherwise catch them during audit and send the PR back). Each check has a concrete shell recipe — use BSD-grep-compatible regex (no `\K`).
54
+
55
+ **12. P1 — PR body test count stale.** The PR body's "npm test" line should match the terminal test count in the ticket (AC / DoD / Completion Log last entry). Agents commonly open the PR at Step 4 and add tests during Step 5 review — the PR body number becomes stale.
56
+ ```bash
57
+ PR_BODY=$(gh pr view --json body -q .body)
58
+ PR_TESTS=$(echo "$PR_BODY" | grep -iE "(npm test|tests?.*(pass|green))" | grep -oE "[0-9]+/[0-9]+" | head -1)
59
+ TICKET_TESTS=$(grep -iE "(npm test|tests?.*(pass|green))" "$TICKET" | grep -oE "[0-9]+/[0-9]+" | tail -1)
60
+ [ -n "$PR_TESTS" ] && [ -n "$TICKET_TESTS" ] && [ "$PR_TESTS" != "$TICKET_TESTS" ] && flag "P1 drift: PR body $PR_TESTS vs ticket $TICKET_TESTS"
61
+ ```
62
+
63
+ **13. P2 — Merge Checklist Evidence rows aspirational.** Rows marked `[x]` with future-tense Evidence ("will land", "to be created", "pending", "next commit", "TBD") — the row claims done but the work hasn't happened yet.
64
+ ```bash
65
+ awk '/^## Merge Checklist Evidence/,/^## /' "$TICKET" \
66
+ | grep -E '^\|.*\[x\].*(to be |will |pending|TBD|Will be |to be created|next commit|aspirational)' \
67
+ && flag "P2 drift: aspirational row(s) found"
68
+ ```
69
+
70
+ **14. P3 — Post-merge actions not logged** (only fires if PR is MERGED and ticket Status is Done). Items marked as post-merge operator actions (AC / DoD / Test plan unchecked with post-merge keywords) should have a Completion Log row documenting execution.
71
+ ```bash
72
+ # Strip checkbox prefix before comparison; use grep -Fq fixed-string match.
73
+ grep -E "^- \[ \].*(post-merge|operator|prod rollout|pending verification)" "$TICKET" \
74
+ | sed -E 's/^- \[ \] //' > /tmp/pm_items.txt
75
+ COMPLETION=$(awk '/^## Completion Log/,/^## Merge Checklist/' "$TICKET")
76
+ while IFS= read -r item; do
77
+ [ -z "$item" ] && continue
78
+ KEY=$(echo "$item" | cut -c1-40)
79
+ echo "$COMPLETION" | grep -Fq "$KEY" || flag "P3 drift: post-merge '$item' not in Completion Log"
80
+ done < /tmp/pm_items.txt
81
+ ```
82
+
83
+ **15. P4 — Remote branch orphan after "deleted".** Workflow Step 6 claims `[x] branch deleted` but origin still has the branch.
84
+ ```bash
85
+ BRANCH=$(grep -E "^\*\*[Bb]ranch:\*\*" "$TICKET" | head -1 | sed -E 's/^\*\*[Bb]ranch:\*\*[[:space:]]*([^[:space:]|]+).*/\1/')
86
+ git fetch origin --prune --quiet
87
+ git ls-remote --heads origin "$BRANCH" 2>/dev/null | grep -q refs/heads && flag "P4 drift: remote branch $BRANCH still exists (run: git push origin --delete $BRANCH)"
88
+ ```
89
+
90
+ **16. P5 — Frozen ticket Status post-merge.** Scan all tickets in `docs/tickets/`; flag any with Status ≠ Done whose ticket-ID appears in `git log --all --grep`. Multi-word Status values like "Ready for Merge" must be handled (use `sed -E` char class, not `\w+`).
91
+ ```bash
92
+ FROZEN_COUNT=0
93
+ for t in docs/tickets/*.md; do
94
+ status=$(grep -E "^\*\*Status:\*\*" "$t" | head -1 | sed -E 's/^\*\*Status:\*\*[[:space:]]*([A-Za-z ]+)[[:space:]]*\|.*/\1/' | sed -E 's/[[:space:]]+$//')
95
+ [ "$status" = "Done" ] && continue
96
+ ticket_id=$(basename "$t" .md | sed -E 's/-[a-z].*//')
97
+ git log --all --oneline --grep="$ticket_id" | grep -q . && FROZEN_COUNT=$((FROZEN_COUNT+1))
98
+ done
99
+ [ "$FROZEN_COUNT" -ge 2 ] && flag "P5 drift (SYSTEMIC): $FROZEN_COUNT frozen tickets — Status not updated post-merge"
100
+ [ "$FROZEN_COUNT" -eq 1 ] && flag "P5 drift: 1 frozen ticket"
101
+ ```
102
+
103
+ **17. P6 — AC count off-by-N.** Merge Checklist Evidence row 1 claim ("all N marked" / "AC: X/Y") diverges from actual count of `[x]` + `[ ]` in `## Acceptance Criteria`.
104
+ ```bash
105
+ ACTUAL=$(awk '/^## Acceptance Criteria/,/^## Definition of Done/' "$TICKET" | grep -cE "^- \[[x ]\]")
106
+ CLAIMED=$(grep -oE 'all [0-9]+ marked|AC: [0-9]+/[0-9]+' "$TICKET" | head -1 | grep -oE "[0-9]+" | head -1)
107
+ [ -n "$CLAIMED" ] && [ "$CLAIMED" != "$ACTUAL" ] && [ $((ACTUAL - CLAIMED)) -ge 2 -o $((CLAIMED - ACTUAL)) -ge 2 ] \
108
+ && flag "P6 drift: claim '$CLAIMED' vs actual AC count $ACTUAL"
109
+ ```
110
+
111
+ **18. P7 — Test count drift within ticket (final-sections only).** Only flag AC / DoD / tracker Active-Session numbers diverging from Completion Log terminal. Intermediate rows are legitimate.
112
+ ```bash
113
+ TERMINAL=$(awk '/^## Completion Log/,/^## Merge Checklist/' "$TICKET" | grep -iE "(test|pass|green)" | grep -oE "[0-9]+/[0-9]+" | tail -1)
114
+ AC=$(awk '/^## Acceptance Criteria/,/^## Definition of Done/' "$TICKET")
115
+ DOD=$(awk '/^## Definition of Done/,/^## Workflow Checklist/' "$TICKET")
116
+ FINAL_NUMS=$(printf '%s\n%s\n' "$AC" "$DOD" | grep -iE "(test|pass|green)" | grep -oE "[0-9]+/[0-9]+" | sort -u)
117
+ for n in $FINAL_NUMS; do
118
+ [ -n "$TERMINAL" ] && [ "$n" != "$TERMINAL" ] && flag "P7 drift: final-section count $n vs terminal $TERMINAL"
119
+ done
120
+ ```
121
+
122
+ **19. P8 — Completion Log gap vs Workflow Checklist.** Each `[x]` Step N in Workflow should have ≥1 Completion Log row mentioning "Step N". Use `while-read` on unique step numbers (not `for-in` which splits on whitespace).
123
+ ```bash
124
+ WORKFLOW=$(awk '/^## Workflow Checklist/,/^## Completion Log/' "$TICKET")
125
+ COMPLETION=$(awk '/^## Completion Log/,/^## Merge Checklist/' "$TICKET")
126
+ CHECKED_STEPS=$(echo "$WORKFLOW" | grep -E "^- \[x\] Step [0-9]+:" | sed -E 's/^- \[x\] Step ([0-9]+):.*/\1/' | sort -u)
127
+ while read -r step_num; do
128
+ [ -z "$step_num" ] && continue
129
+ echo "$COMPLETION" | grep -qE "Step[[:space:]]+$step_num([^0-9]|$)" || flag "P8 drift: Step $step_num [x] but no Completion Log entry"
130
+ done <<< "$CHECKED_STEPS"
131
+ ```
132
+
133
+ **20. P9 — Tracker header "Last Updated" stale.** The `**Last Updated:**` header and the `**Active Feature:**` detail should agree on step number (e.g., both say 5/6). Mismatch suggests the header wasn't refreshed after state transitions.
134
+ ```bash
135
+ TRACKER=docs/project_notes/product-tracker.md
136
+ HEADER_STEP=$(grep -oE 'Step [0-9]+/6' "$TRACKER" | head -1)
137
+ DETAIL_STEP=$(grep -A 1 '^\*\*Active Feature:\*\*' "$TRACKER" | grep -oE 'Step [0-9]+/6' | head -1)
138
+ [ -n "$HEADER_STEP" ] && [ -n "$DETAIL_STEP" ] && [ "$HEADER_STEP" != "$DETAIL_STEP" ] \
139
+ && flag "P9 drift: tracker header says $HEADER_STEP, Active Feature says $DETAIL_STEP"
140
+ ```
141
+
142
+ **21. P10 — Duplicate Completion Log rows.** Hash `date | action | first-80-of-notes`. Duplicates suggest copy-paste error during editing.
143
+ ```bash
144
+ awk -F'|' '/^\| [0-9]{4}-[0-9]{2}-[0-9]{2}/ {
145
+ key = $2 "|" $3 "|" substr($4, 1, 80)
146
+ gsub(/^[[:space:]]+|[[:space:]]+$/, "", key)
147
+ print key
148
+ }' "$TICKET" | sort | uniq -d \
149
+ | while read -r dup; do flag "P10 drift: duplicate Completion Log row: $dup"; done
150
+ ```
151
+
152
+ **22. P11 — Tracker Features table status vs ticket Status mismatch.** Ticket Status=Ready for Merge / Review → tracker expects `in-progress`. Ticket Status=Done → tracker expects `done`. Mismatch means one side wasn't updated after the state change.
153
+ ```bash
154
+ TICKET_STATUS=$(grep -E "^\*\*Status:\*\*" "$TICKET" | head -1 | sed -E 's/^\*\*Status:\*\*[[:space:]]*([A-Za-z ]+)[[:space:]]*\|.*/\1/' | sed -E 's/[[:space:]]+$//')
155
+ FEATURE_ID=$(basename "$TICKET" .md | sed -E 's/-[a-z].*//')
156
+ TRACKER_STATUS=$(grep -F "$FEATURE_ID" docs/project_notes/product-tracker.md | grep -oE "\| (in-progress|done|pending|blocked) \|" | head -1 | sed -E 's/\| ([a-z-]+) \|/\1/')
157
+ case "$TICKET_STATUS" in
158
+ "Ready for Merge"|"Review"|"In Progress"|"Planning"|"Spec") EXPECTED="in-progress" ;;
159
+ "Done") EXPECTED="done" ;;
160
+ *) EXPECTED="" ;;
161
+ esac
162
+ [ -n "$EXPECTED" ] && [ -n "$TRACKER_STATUS" ] && [ "$TRACKER_STATUS" != "$EXPECTED" ] \
163
+ && flag "P11 drift: ticket Status='$TICKET_STATUS' expects tracker='$EXPECTED' but tracker='$TRACKER_STATUS'"
164
+ ```
165
+
51
166
  ### Output Format
52
167
 
53
- Report as a compliance table:
168
+ Report two tables — one for **structural (blocking)** compliance, one for **drift (advisory)**. Emit two verdicts plus a combined summary line.
54
169
 
55
170
  ```
56
171
  ## Merge Compliance Audit — [FEATURE-ID]
57
172
 
173
+ ### Structural (1-11) — blocking merge gate
174
+
58
175
  | # | Check | Status | Detail |
59
176
  |---|-------|:------:|--------|
60
177
  | 1 | Ticket Status | PASS | "Ready for Merge" |
@@ -69,7 +186,31 @@ Report as a compliance table:
69
186
  | 10 | Working Tree | PASS | Clean |
70
187
  | 11 | Data Files | PASS | N/A — no JSON seed files |
71
188
 
72
- **Verdict: READY FOR MERGE** (or **NEEDS FIX — N issues**)
189
+ **STRUCTURAL: READY FOR MERGE** (or **STRUCTURAL: NEEDS FIX — N blockers**)
190
+
191
+ ### Drift (12-22) — advisory, refresh before user authorization
192
+
193
+ | # | Pattern | Status | Detail |
194
+ |---|---------|:------:|--------|
195
+ | 12 | P1 PR body test count stale | PASS | matches ticket terminal |
196
+ | 13 | P2 Aspirational Evidence rows | PASS | all rows past-tense |
197
+ | 14 | P3 Post-merge actions logged | PASS | N/A pre-merge |
198
+ | 15 | P4 Remote branch orphan | PASS | not checked pre-merge |
199
+ | 16 | P5 Frozen ticket Status | PASS | 0 frozen |
200
+ | 17 | P6 AC count off-by-N | PASS | claim matches actual |
201
+ | 18 | P7 Intra-ticket test drift | PASS | final sections = terminal |
202
+ | 19 | P8 Completion Log gap | PASS | every [x] step has narrative |
203
+ | 20 | P9 Tracker header stale | PASS | header = detail |
204
+ | 21 | P10 Duplicate log rows | PASS | no duplicates |
205
+ | 22 | P11 Tracker status mismatch | PASS | in-progress for Ready for Merge |
206
+
207
+ **DRIFT: CLEAN** (or **DRIFT: N advisories — refresh before merge**)
208
+
209
+ ### Combined verdict
210
+
211
+ - Both PASS → **READY FOR MERGE** (compliance 11/11, drift clean)
212
+ - Structural fail → **NEEDS FIX — N structural blockers** (any drift noted separately)
213
+ - Structural pass + drift advisories → **READY FOR MERGE PENDING DRIFT CLEANUP — N advisories**
73
214
  ```
74
215
 
75
216
  ### If issues are found
@@ -81,6 +222,19 @@ Fix them directly:
81
222
  - Merge base diverged → `git merge origin/<target-branch>` and resolve conflicts
82
223
  - Data file issues → fix the data
83
224
 
225
+ **Drift advisories (12-22) fixes:**
226
+ - **P1 (PR body test count stale)** → edit PR body "Quality Gates" / "npm test" line to match ticket terminal count; add "(+N new tests)" delta note
227
+ - **P2 (Aspirational Evidence)** → rewrite `[x]` rows with past-tense text + commit SHA + concrete numbers
228
+ - **P3 (Post-merge action unlogged)** → add a Completion Log row documenting the post-merge execution with date + action + empirical result
229
+ - **P4 (Remote branch orphan)** → `git push origin --delete <branch>` after confirming merge succeeded
230
+ - **P5 (Frozen ticket Status)** → update each ticket's `**Status:**` field from "In Progress"/"Ready for Merge" to `Done`; this often belongs in a docs-only tracker-sync PR if the cycle is retroactive
231
+ - **P6 (AC count off-by-N)** → recount AC items; update the Merge Checklist Evidence row 1 claim to match actual
232
+ - **P7 (Intra-ticket test drift)** → refresh AC / DoD / tracker numbers to match the Completion Log terminal entry
233
+ - **P8 (Completion Log gap)** → add a Completion Log row per missing Step with agent verdict + commit SHA
234
+ - **P9 (Tracker header stale)** → update `**Last Updated:**` line step reference to match Active Feature detail
235
+ - **P10 (Duplicate log rows)** → remove duplicate rows
236
+ - **P11 (Tracker status mismatch)** → sync tracker Features row status to ticket header Status
237
+
84
238
  After fixing, re-run the audit to confirm all checks pass.
85
239
 
86
240
  ## Notes
package/template/.gemini/commands/audit-merge-instructions.md CHANGED
@@ -48,13 +48,127 @@ If DIVERGED, flag as FAIL with instruction to merge target branch first.
48
48
 
49
49
  Run only if `git diff origin/<target-branch>..HEAD --name-only` shows `.json` files in seed-data or fixtures directories.
50
50
 
51
+ ### Drift Checks (added v0.18.0) — ADVISORY, not blocking
52
+
53
+ Eleven empirically-validated drift patterns. Failures are NOT blockers for the compliance verdict, but MUST be refreshed before requesting user authorization. Use BSD-grep-compatible regex (no `\K`).
54
+
55
+ **12. P1 — PR body test count stale.** Ratio must co-occur with test/pass/green marker to avoid AC/DoD ratios (14/14, 7/7).
56
+ ```bash
57
+ PR_BODY=$(gh pr view --json body -q .body)
58
+ PR_TESTS=$(echo "$PR_BODY" | grep -iE "(npm test|tests?.*(pass|green))" | grep -oE "[0-9]+/[0-9]+" | head -1)
59
+ TICKET_TESTS=$(grep -iE "(npm test|tests?.*(pass|green))" "$TICKET" | grep -oE "[0-9]+/[0-9]+" | tail -1)
60
+ [ -n "$PR_TESTS" ] && [ -n "$TICKET_TESTS" ] && [ "$PR_TESTS" != "$TICKET_TESTS" ] && flag "P1: PR body $PR_TESTS vs ticket $TICKET_TESTS"
61
+ ```
62
+
63
+ **13. P2 — Merge Checklist Evidence aspirational.** `[x]` rows with future-tense text.
64
+ ```bash
65
+ awk '/^## Merge Checklist Evidence/,/^## /' "$TICKET" \
66
+ | grep -E '^\|.*\[x\].*(to be |will |pending|TBD|Will be |to be created|next commit|aspirational)' \
67
+ && flag "P2: aspirational row(s)"
68
+ ```
69
+
70
+ **14. P3 — Post-merge actions not logged** (post-merge only).
71
+ ```bash
72
+ grep -E "^- \[ \].*(post-merge|operator|prod rollout|pending verification)" "$TICKET" \
73
+ | sed -E 's/^- \[ \] //' > /tmp/pm_items.txt
74
+ COMPLETION=$(awk '/^## Completion Log/,/^## Merge Checklist/' "$TICKET")
75
+ while IFS= read -r item; do
76
+ [ -z "$item" ] && continue
77
+ KEY=$(echo "$item" | cut -c1-40)
78
+ echo "$COMPLETION" | grep -Fq "$KEY" || flag "P3: '$item' not logged"
79
+ done < /tmp/pm_items.txt
80
+ ```
81
+
82
+ **15. P4 — Remote branch orphan.**
83
+ ```bash
84
+ BRANCH=$(grep -E "^\*\*[Bb]ranch:\*\*" "$TICKET" | head -1 | sed -E 's/^\*\*[Bb]ranch:\*\*[[:space:]]*([^[:space:]|]+).*/\1/')
85
+ git fetch origin --prune --quiet
86
+ git ls-remote --heads origin "$BRANCH" 2>/dev/null | grep -q refs/heads && flag "P4: branch $BRANCH still on origin"
87
+ ```
88
+
89
+ **16. P5 — Frozen ticket Status post-merge.** Multi-word status via sed char class, not `\w+`.
90
+ ```bash
91
+ FROZEN_COUNT=0
92
+ for t in docs/tickets/*.md; do
93
+ status=$(grep -E "^\*\*Status:\*\*" "$t" | head -1 | sed -E 's/^\*\*Status:\*\*[[:space:]]*([A-Za-z ]+)[[:space:]]*\|.*/\1/' | sed -E 's/[[:space:]]+$//')
94
+ [ "$status" = "Done" ] && continue
95
+ ticket_id=$(basename "$t" .md | sed -E 's/-[a-z].*//')
96
+ git log --all --oneline --grep="$ticket_id" | grep -q . && FROZEN_COUNT=$((FROZEN_COUNT+1))
97
+ done
98
+ [ "$FROZEN_COUNT" -ge 2 ] && flag "P5 SYSTEMIC: $FROZEN_COUNT frozen tickets"
99
+ [ "$FROZEN_COUNT" -eq 1 ] && flag "P5: 1 frozen ticket"
100
+ ```
101
+
102
+ **17. P6 — AC count off-by-N.**
103
+ ```bash
104
+ ACTUAL=$(awk '/^## Acceptance Criteria/,/^## Definition of Done/' "$TICKET" | grep -cE "^- \[[x ]\]")
105
+ CLAIMED=$(grep -oE 'all [0-9]+ marked|AC: [0-9]+/[0-9]+' "$TICKET" | head -1 | grep -oE "[0-9]+" | head -1)
106
+ [ -n "$CLAIMED" ] && [ "$CLAIMED" != "$ACTUAL" ] && [ $((ACTUAL - CLAIMED)) -ge 2 -o $((CLAIMED - ACTUAL)) -ge 2 ] \
107
+ && flag "P6: claim $CLAIMED vs actual $ACTUAL"
108
+ ```
109
+
110
+ **18. P7 — Test count drift within ticket (final-sections only).**
111
+ ```bash
112
+ TERMINAL=$(awk '/^## Completion Log/,/^## Merge Checklist/' "$TICKET" | grep -iE "(test|pass|green)" | grep -oE "[0-9]+/[0-9]+" | tail -1)
113
+ AC=$(awk '/^## Acceptance Criteria/,/^## Definition of Done/' "$TICKET")
114
+ DOD=$(awk '/^## Definition of Done/,/^## Workflow Checklist/' "$TICKET")
115
+ for n in $(printf '%s\n%s\n' "$AC" "$DOD" | grep -iE "(test|pass|green)" | grep -oE "[0-9]+/[0-9]+" | sort -u); do
116
+ [ -n "$TERMINAL" ] && [ "$n" != "$TERMINAL" ] && flag "P7: final $n vs terminal $TERMINAL"
117
+ done
118
+ ```
119
+
120
+ **19. P8 — Completion Log gap vs Workflow Checklist.**
121
+ ```bash
122
+ WORKFLOW=$(awk '/^## Workflow Checklist/,/^## Completion Log/' "$TICKET")
123
+ COMPLETION=$(awk '/^## Completion Log/,/^## Merge Checklist/' "$TICKET")
124
+ CHECKED_STEPS=$(echo "$WORKFLOW" | grep -E "^- \[x\] Step [0-9]+:" | sed -E 's/^- \[x\] Step ([0-9]+):.*/\1/' | sort -u)
125
+ while read -r step_num; do
126
+ [ -z "$step_num" ] && continue
127
+ echo "$COMPLETION" | grep -qE "Step[[:space:]]+$step_num([^0-9]|$)" || flag "P8: Step $step_num [x] but no log entry"
128
+ done <<< "$CHECKED_STEPS"
129
+ ```
130
+
131
+ **20. P9 — Tracker header stale.**
132
+ ```bash
133
+ TRACKER=docs/project_notes/product-tracker.md
134
+ HEADER_STEP=$(grep -oE 'Step [0-9]+/6' "$TRACKER" | head -1)
135
+ DETAIL_STEP=$(grep -A 1 '^\*\*Active Feature:\*\*' "$TRACKER" | grep -oE 'Step [0-9]+/6' | head -1)
136
+ [ -n "$HEADER_STEP" ] && [ -n "$DETAIL_STEP" ] && [ "$HEADER_STEP" != "$DETAIL_STEP" ] \
137
+ && flag "P9: header $HEADER_STEP vs detail $DETAIL_STEP"
138
+ ```
139
+
140
+ **21. P10 — Duplicate Completion Log rows.**
141
+ ```bash
142
+ awk -F'|' '/^\| [0-9]{4}-[0-9]{2}-[0-9]{2}/ {
143
+ key = $2 "|" $3 "|" substr($4, 1, 80)
144
+ gsub(/^[[:space:]]+|[[:space:]]+$/, "", key)
145
+ print key
146
+ }' "$TICKET" | sort | uniq -d | while read -r dup; do flag "P10: duplicate row: $dup"; done
147
+ ```
148
+
149
+ **22. P11 — Tracker Features table status vs ticket Status mismatch.**
150
+ ```bash
151
+ TICKET_STATUS=$(grep -E "^\*\*Status:\*\*" "$TICKET" | head -1 | sed -E 's/^\*\*Status:\*\*[[:space:]]*([A-Za-z ]+)[[:space:]]*\|.*/\1/' | sed -E 's/[[:space:]]+$//')
152
+ FEATURE_ID=$(basename "$TICKET" .md | sed -E 's/-[a-z].*//')
153
+ TRACKER_STATUS=$(grep -F "$FEATURE_ID" docs/project_notes/product-tracker.md | grep -oE "\| (in-progress|done|pending|blocked) \|" | head -1 | sed -E 's/\| ([a-z-]+) \|/\1/')
154
+ case "$TICKET_STATUS" in
155
+ "Ready for Merge"|"Review"|"In Progress"|"Planning"|"Spec") EXPECTED="in-progress" ;;
156
+ "Done") EXPECTED="done" ;;
157
+ *) EXPECTED="" ;;
158
+ esac
159
+ [ -n "$EXPECTED" ] && [ -n "$TRACKER_STATUS" ] && [ "$TRACKER_STATUS" != "$EXPECTED" ] \
160
+ && flag "P11: Status='$TICKET_STATUS' expects tracker='$EXPECTED' but tracker='$TRACKER_STATUS'"
161
+ ```
162
+
51
163
  ### Output Format
52
164
 
53
- Report as a compliance table:
165
+ Report two tables — one for **structural (blocking)** compliance, one for **drift (advisory)**. Emit two verdicts plus a combined summary line.
54
166
 
55
167
  ```
56
168
  ## Merge Compliance Audit — [FEATURE-ID]
57
169
 
170
+ ### Structural (1-11) — blocking merge gate
171
+
58
172
  | # | Check | Status | Detail |
59
173
  |---|-------|:------:|--------|
60
174
  | 1 | Ticket Status | PASS | "Ready for Merge" |
@@ -69,7 +183,31 @@ Report as a compliance table:
69
183
  | 10 | Working Tree | PASS | Clean |
70
184
  | 11 | Data Files | PASS | N/A — no JSON seed files |
71
185
 
72
- **Verdict: READY FOR MERGE** (or **NEEDS FIX — N issues**)
186
+ **STRUCTURAL: READY FOR MERGE** (or **STRUCTURAL: NEEDS FIX — N blockers**)
187
+
188
+ ### Drift (12-22) — advisory, refresh before user authorization
189
+
190
+ | # | Pattern | Status | Detail |
191
+ |---|---------|:------:|--------|
192
+ | 12 | P1 PR body test count stale | PASS | matches ticket terminal |
193
+ | 13 | P2 Aspirational Evidence rows | PASS | all past-tense |
194
+ | 14 | P3 Post-merge actions logged | PASS | N/A pre-merge |
195
+ | 15 | P4 Remote branch orphan | PASS | not checked pre-merge |
196
+ | 16 | P5 Frozen ticket Status | PASS | 0 frozen |
197
+ | 17 | P6 AC count off-by-N | PASS | claim matches actual |
198
+ | 18 | P7 Intra-ticket test drift | PASS | final = terminal |
199
+ | 19 | P8 Completion Log gap | PASS | every [x] step has narrative |
200
+ | 20 | P9 Tracker header stale | PASS | header = detail |
201
+ | 21 | P10 Duplicate log rows | PASS | no duplicates |
202
+ | 22 | P11 Tracker status mismatch | PASS | status consistent |
203
+
204
+ **DRIFT: CLEAN** (or **DRIFT: N advisories — refresh before merge**)
205
+
206
+ ### Combined verdict
207
+
208
+ - Both PASS → **READY FOR MERGE**
209
+ - Structural fail → **NEEDS FIX — N blockers**
210
+ - Structural pass + drift advisories → **READY FOR MERGE PENDING DRIFT CLEANUP — N advisories**
73
211
  ```
74
212
 
75
213
  ### If issues are found
@@ -81,6 +219,19 @@ Fix them directly:
81
219
  - Merge base diverged → `git merge origin/<target-branch>` and resolve conflicts
82
220
  - Data file issues → fix the data
83
221
 
222
+ **Drift advisories (12-22) fixes:**
223
+ - **P1** → edit PR body npm test line to match ticket terminal count
224
+ - **P2** → rewrite `[x]` rows with past-tense + commit SHA
225
+ - **P3** → add Completion Log row for each post-merge execution
226
+ - **P4** → `git push origin --delete <branch>` after merge
227
+ - **P5** → update ticket Status from "In Progress"/"Ready for Merge" to `Done`
228
+ - **P6** → recount ACs and update Merge Checklist row 1 claim
229
+ - **P7** → sync AC/DoD/tracker numbers to Completion Log terminal
230
+ - **P8** → add Completion Log row per missing Step with agent verdict + commit SHA
231
+ - **P9** → refresh `**Last Updated:**` step reference
232
+ - **P10** → remove duplicate rows
233
+ - **P11** → sync tracker Features row status to ticket header Status
234
+
84
235
  After fixing, re-run the audit to confirm all checks pass.
85
236
 
86
237
  ## Notes