@snipcodeit/mgw 0.1.2 → 0.1.3

package/commands/issue.md

@@ -287,16 +287,15 @@ MISSING_FIELDS_LIST = gate_result.missing_fields formatted as "- ${field}" list
 ```
 
 Use the "Gate Blocked Comment" template from @~/.claude/commands/mgw/workflows/github.md.
-Post comment and apply label:
+Post comment and apply label using the highest-severity blocker (security > detail > validity):
 ```bash
-# Use remove_mgw_labels_and_apply pattern from github.md
-# For validity failures:
-#   pipeline_stage = "needs-info", label = "mgw:needs-info"
-# For security failures:
-#   pipeline_stage = "needs-security-review", label = "mgw:needs-security-review"
-# For detail failures:
-#   pipeline_stage = "needs-info", label = "mgw:needs-info"
-# If multiple blockers, use the highest-severity label (security > detail > validity)
+# For validity or detail failures:
+remove_mgw_labels_and_apply ${ISSUE_NUMBER} "mgw:needs-info"
+
+# For security failures (highest severity — takes precedence over needs-info):
+remove_mgw_labels_and_apply ${ISSUE_NUMBER} "mgw:needs-security-review"
+
+# If multiple blockers, apply security label if security gate failed; otherwise needs-info.
 ```
 
 **If gates passed (gate_result.status == "passed"):**
@@ -316,7 +315,7 @@ ROUTE_REASONING = triage reasoning
 
 Post comment and apply label:
 ```bash
-gh issue edit ${ISSUE_NUMBER} --add-label "mgw:triaged" 2>/dev/null
+remove_mgw_labels_and_apply ${ISSUE_NUMBER} "mgw:triaged"
 ```
 </step>
 

package/commands/milestone.md

@@ -417,6 +417,7 @@ FAILED_ISSUES=()
 FAILED_ISSUES_WITH_CLASS=()  # Entries: "issue_number:failure_class" for results display
 BLOCKED_ISSUES=()
 SKIPPED_ISSUES=()
+LABEL_DRIFT_ISSUES=()         # Issues where label reconciliation detected drift
 ISSUES_RUN=0
 ```
 
@@ -562,6 +563,43 @@ COMMENTEOF
     description="Run pipeline for #${ISSUE_NUMBER}"
   )
 
+  # ── POST-WORK: Post-subagent label verification ──
+  # Read the pipeline_stage from the issue's active state file after Task() returns
+  ISSUE_STAGE=$(node -e "
+const { loadActiveIssue } = require('./lib/state.cjs');
+const state = loadActiveIssue(${ISSUE_NUMBER});
+console.log((state && state.pipeline_stage) ? state.pipeline_stage : 'unknown');
+" 2>/dev/null || echo "unknown")
+
+  # Determine the expected MGW label for this pipeline stage
+  EXPECTED_LABEL=$(python3 -c "
+stage_to_label = {
+  'done': '',
+  'pr-created': '',
+  'verifying': 'mgw:in-progress',
+  'executing': 'mgw:in-progress',
+  'planning': 'mgw:in-progress',
+  'blocked': 'mgw:blocked',
+  'failed': '',
+}
+print(stage_to_label.get('${ISSUE_STAGE}', ''))
+")
+
+  # Compare expected label against live GitHub labels
+  LIVE_LABELS=$(gh issue view ${ISSUE_NUMBER} --json labels --jq '[.labels[].name] | join(",")' 2>/dev/null || echo "")
+
+  if [ -n "$EXPECTED_LABEL" ] && ! echo "$LIVE_LABELS" | grep -q "$EXPECTED_LABEL"; then
+    echo "MGW WARNING: label drift on #${ISSUE_NUMBER} — expected $EXPECTED_LABEL, live: $LIVE_LABELS" >&2
+    LABEL_DRIFT="drift"
+  else
+    LABEL_DRIFT="ok"
+  fi
+
+  # Track drifted issues for milestone summary
+  if [ "$LABEL_DRIFT" = "drift" ]; then
+    LABEL_DRIFT_ISSUES+=("$ISSUE_NUMBER")
+  fi
+
   # ── POST-WORK: Detect result and post completion comment ──
   # Check if PR was created by looking for state file or PR
   PR_NUMBER=$(gh pr list --head "issue/${ISSUE_NUMBER}-*" --json number -q '.[0].number' 2>/dev/null || echo "")
@@ -712,18 +750,19 @@ Every comment posted during milestone orchestration includes:
 <details>
 <summary>Milestone Progress ({done}/{total} complete)</summary>
 
-| # | Issue | Status | PR | Failure Class |
-|---|-------|--------|----|---------------|
-| N | title | ✓ Done | #PR | — |
-| M | title | ✗ Failed | — | `permanent` |
-| K | title | ○ Pending | — | — |
-| J | title | ◆ Running | — | — |
-| L | title | ⊘ Blocked | — | — |
+| # | Issue | Status | PR | Failure Class | Label Drift |
+|---|-------|--------|----|---------------|-------------|
+| N | title | ✓ Done | #PR | — | ok |
+| M | title | ✗ Failed | — | `permanent` | — |
+| K | title | ○ Pending | — | — | — |
+| J | title | ◆ Running | — | — | ok |
+| L | title | ⊘ Blocked | — | — | — |
 
 </details>
 ```
 
 The **Failure Class** column surfaces `last_failure_class` from the active issue state file.
+The **Label Drift** column shows the result of post-subagent label reconciliation: `ok` (labels matched expected), `drift` (label mismatch detected — MGW WARNING logged), or `—` (not checked / issue not run).
 Values: `transient` (retried and exhausted), `permanent` (unrecoverable), `needs-info` (ambiguous issue), `unknown` (no state file or pre-retry issue), `—` (not failed).
 </step>
 
@@ -1067,6 +1106,9 @@ gh issue comment ${FIRST_ISSUE_NUMBER} --body "$FINAL_RESULTS_COMMENT"
 - [ ] Retry option calls resetRetryState() then re-invokes /mgw:run --retry for failed issues
 - [ ] FAILED_ISSUES_WITH_CLASS tracks "number:class" for display in results table
 - [ ] Progress table in every GitHub comment
+- [ ] Post-subagent label reconciliation run per issue after Task() returns
+- [ ] LABEL_DRIFT tracked per issue (ok/drift) and shown in progress table Label Drift column
+- [ ] Label drift issues logged as MGW WARNING to stderr
 - [ ] Milestone close + draft release on full completion
 - [ ] current_milestone pointer advanced on completion
 - [ ] --interactive flag pauses between issues

package/commands/run.md

@@ -418,9 +418,7 @@ Add cross-ref (at `${REPO_ROOT}/.mgw/cross-refs.json`): issue → branch.
 
 **Apply in-progress label:**
 ```bash
-# Use remove_mgw_labels_and_apply pattern from github.md
-gh issue edit ${ISSUE_NUMBER} --remove-label "mgw:triaged" 2>/dev/null
-gh issue edit ${ISSUE_NUMBER} --add-label "mgw:in-progress" 2>/dev/null
+remove_mgw_labels_and_apply ${ISSUE_NUMBER} "mgw:in-progress"
 ```
 
 **PATH CONVENTION for remaining steps:**
@@ -531,8 +529,7 @@ fi
 
 **When blocking comment detected — apply label:**
 ```bash
-gh issue edit ${ISSUE_NUMBER} --remove-label "mgw:in-progress" 2>/dev/null
-gh issue edit ${ISSUE_NUMBER} --add-label "mgw:blocked" 2>/dev/null
+remove_mgw_labels_and_apply ${ISSUE_NUMBER} "mgw:blocked"
 ```
 
 If no new comments detected, continue normally.
@@ -949,8 +946,7 @@ PHASE_COUNT="TBD (determined by roadmapper)"
 
 Set pipeline_stage to "discussing" and apply "mgw:discussing" label:
 ```bash
-gh issue edit ${ISSUE_NUMBER} --remove-label "mgw:in-progress" 2>/dev/null
-gh issue edit ${ISSUE_NUMBER} --add-label "mgw:discussing" 2>/dev/null
+remove_mgw_labels_and_apply ${ISSUE_NUMBER} "mgw:discussing"
 ```
 
 Present to user:
@@ -1461,9 +1457,38 @@ rmdir "${REPO_ROOT}/.worktrees/issue" 2>/dev/null
 rmdir "${REPO_ROOT}/.worktrees" 2>/dev/null
 ```
 
-Remove in-progress label at completion:
+Clear MGW labels at completion:
 ```bash
-gh issue edit ${ISSUE_NUMBER} --remove-label "mgw:in-progress" 2>/dev/null
+# Pass empty string — removes all mgw: labels without applying a new one
+remove_mgw_labels_and_apply ${ISSUE_NUMBER} ""
+```
+
+Post-completion label reconciliation:
+```bash
+# Post-completion label reconciliation — verify no stray MGW labels remain
+LIVE_LABELS=$(gh issue view ${ISSUE_NUMBER} --json labels --jq '[.labels[].name]' 2>/dev/null || echo "[]")
+STRAY_MGW=$(echo "$LIVE_LABELS" | python3 -c "
+import json, sys
+labels = json.load(sys.stdin)
+stray = [l for l in labels if l.startswith('mgw:')]
+print('\n'.join(stray))
+" 2>/dev/null || echo "")
+
+if [ -n "$STRAY_MGW" ]; then
+  echo "MGW WARNING: unexpected MGW labels still on issue after completion: $STRAY_MGW" >&2
+fi
+
+# Sync live labels back to .mgw/active state file
+LIVE_LABELS_LIST=$(gh issue view ${ISSUE_NUMBER} --json labels --jq '[.labels[].name]' 2>/dev/null || echo "[]")
+# Update labels field in ${REPO_ROOT}/.mgw/active/${STATE_FILE} using python3 json patch:
+python3 -c "
+import json, sys
+path = sys.argv[1]
+live = json.loads(sys.argv[2])
+with open(path) as f: state = json.load(f)
+state['labels'] = live
+with open(path, 'w') as f: json.dump(state, f, indent=2)
+" "${REPO_ROOT}/.mgw/active/${STATE_FILE}" "$LIVE_LABELS_LIST" 2>/dev/null || true
 ```
 
 Extract one-liner summary for concise comment:

package/commands/sync.md

@@ -464,6 +464,81 @@ Classify each issue into:
 - **Unreviewed comments:** COMMENT_DELTA > 0 — new comments posted since triage that haven't been classified
 </step>
 
+<step name="label_drift_detection">
+**Label Drift Detection:**
+
+For each active issue state file in `.mgw/active/`, compare the stored `labels` field
+against the live GitHub labels to detect MGW pipeline label drift:
+
+```python
+label_drift = []
+
+for each state_file in .mgw/active/*.json:
+  stored_labels = state['labels']  # list stored at last pipeline write
+  live_labels_json = subprocess.run(
+    ['gh', 'issue', 'view', str(issue_number), '--json', 'labels', '--jq', '[.labels[].name]'],
+    capture_output=True, text=True
+  ).stdout.strip()
+  live_labels = json.loads(live_labels_json or '[]')
+
+  # Find MGW labels in stored vs live
+  stored_mgw = [l for l in stored_labels if l.startswith('mgw:')]
+  live_mgw = [l for l in live_labels if l.startswith('mgw:')]
+
+  if set(stored_mgw) != set(live_mgw):
+    label_drift.append({
+      'issue': issue_number,
+      'stored': stored_mgw,
+      'live': live_mgw,
+      'pipeline_stage': state['pipeline_stage']
+    })
+```
+
+If label drift detected, include in the drift report output:
+
+```
+Label drift detected for ${COUNT} issue(s):
+  #N: stored=[mgw:in-progress], live=[] — pipeline_stage=${STAGE}
+```
+
+**Offer repair:**
+```
+AskUserQuestion(
+  header: "Label Drift Detected",
+  question: "Live GitHub labels don't match .mgw state for ${COUNT} issue(s). Repair?",
+  options: [
+    { label: "Repair all", description: "Re-apply correct label for each issue's pipeline_stage via remove_mgw_labels_and_apply" },
+    { label: "Skip", description: "Log drift only — no changes" }
+  ]
+)
+```
+
+If "Repair all":
+```bash
+# For each drifted issue, determine correct label from pipeline_stage and re-apply
+CORRECT_LABEL=$(python3 -c "
+stage_to_label = {
+  'triaged': 'mgw:triaged',
+  'needs-info': 'mgw:needs-info',
+  'needs-security-review': 'mgw:needs-security-review',
+  'discussing': 'mgw:discussing',
+  'approved': 'mgw:approved',
+  'planning': 'mgw:in-progress',
+  'executing': 'mgw:in-progress',
+  'verifying': 'mgw:in-progress',
+  'blocked': 'mgw:blocked',
+  'done': '',
+  'pr-created': '',
+  'failed': '',
+}
+print(stage_to_label.get('${PIPELINE_STAGE}', ''))
+")
+remove_mgw_labels_and_apply ${ISSUE_NUMBER} "${CORRECT_LABEL}"
+```
+
+Log repair actions: "Repaired label for #N: applied ${CORRECT_LABEL} (pipeline_stage=${STAGE})"
+</step>
+
 <step name="health_check">
 **GSD health check (if .planning/ exists):**
 
@@ -570,5 +645,7 @@ ${gsd_milestone_consistency ? 'GSD Milestone Links:\n' + gsd_milestone_consisten
 - [ ] Lingering worktrees cleaned up for completed items
 - [ ] Branch deletion offered for completed items
 - [ ] Stale/orphaned/drift items flagged (including comment drift and milestone inconsistencies)
+- [ ] Label drift detected between .mgw/active labels field and live GitHub labels
+- [ ] Repair offered for drifted issues via remove_mgw_labels_and_apply
 - [ ] Summary presented
 </success_criteria>

package/commands/workflows/github.md

@@ -95,12 +95,15 @@ Seven labels for pipeline stage tracking. Created by init.md, managed by issue.m
 | `mgw:blocked` | `b60205` | Pipeline blocked by stakeholder comment |
 
 ### Remove MGW Labels and Apply New
-Used when transitioning pipeline stages. Removes all `mgw:*` pipeline labels, then applies the target label.
+Used when transitioning pipeline stages. Removes all `mgw:*` pipeline labels, then applies the target label. Returns non-zero if any gh operation failed.
 ```bash
-# Remove all mgw: pipeline labels from issue, then apply new one
+# Remove all mgw: pipeline labels from issue, then apply new one.
+# Pass empty string as NEW_LABEL to remove all MGW labels without applying a new one.
+# Returns non-zero if any label operation failed.
 remove_mgw_labels_and_apply() {
   local ISSUE_NUMBER="$1"
   local NEW_LABEL="$2"
+  local LABEL_FAILED=0
 
   # Get current labels
   CURRENT_LABELS=$(gh issue view "$ISSUE_NUMBER" --json labels --jq '.labels[].name' 2>/dev/null)
@@ -109,15 +112,27 @@ remove_mgw_labels_and_apply() {
   for LABEL in $CURRENT_LABELS; do
     case "$LABEL" in
       mgw:triaged|mgw:needs-info|mgw:needs-security-review|mgw:discussing|mgw:approved|mgw:in-progress|mgw:blocked)
-        gh issue edit "$ISSUE_NUMBER" --remove-label "$LABEL" 2>/dev/null
+        gh issue edit "$ISSUE_NUMBER" --remove-label "$LABEL"
+        RC=$?
+        if [ $RC -ne 0 ]; then
+          echo "MGW WARNING: failed to remove label $LABEL from issue $ISSUE_NUMBER (exit $RC)" >&2
+          LABEL_FAILED=1
+        fi
         ;;
     esac
   done
 
   # Apply new label
   if [ -n "$NEW_LABEL" ]; then
-    gh issue edit "$ISSUE_NUMBER" --add-label "$NEW_LABEL" 2>/dev/null
+    gh issue edit "$ISSUE_NUMBER" --add-label "$NEW_LABEL"
+    RC=$?
+    if [ $RC -ne 0 ]; then
+      echo "MGW WARNING: failed to add label $NEW_LABEL to issue $ISSUE_NUMBER (exit $RC)" >&2
+      LABEL_FAILED=1
+    fi
   fi
+
+  return $LABEL_FAILED
 }
 ```
 

package/dist/bin/mgw.cjs

@@ -9,7 +9,7 @@ var require$$0$1 = require('child_process');
 
 var mgw$1 = {};
 
-var version = "0.1.2";
+var version = "0.1.3";
 var require$$8 = {
 	version: version};
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snipcodeit/mgw",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "GitHub-native issue-to-PR automation for Claude Code, powered by Get Shit Done",
   "bin": {
     "mgw": "./dist/bin/mgw.cjs"