Merge 44796ab116 into 6ff74ba662

package.json

@@ -44,7 +44,7 @@
     "test": "npm run test:refs && npm run test:install && npm run test:channels && npm run lint && npm run lint:md && npm run format:check",
     "test:channels": "node test/test-installer-channels.js",
     "test:install": "node test/test-installation-components.js",
-    "test:refs": "node test/test-file-refs-csv.js",
+    "test:refs": "node test/test-file-refs-csv.js && node test/test-closeout-reconciliation.js",
     "validate:refs": "node tools/validate-file-refs.js --strict",
     "validate:skills": "node tools/validate-skills.js --strict"
   },

src/bmm-skills/4-implementation/bmad-code-review/steps/step-04-present.md

@@ -86,7 +86,8 @@ Skip this section if `{spec_file}` is not set.
 
 #### Determine new status based on review outcome
 
-- If all `decision-needed` and `patch` findings were resolved (fixed or dismissed) AND no unresolved HIGH/MEDIUM issues remain: set `{new_status}` = `done`. Update the story file Status section to `done`.
+- If the live journey release-gate closeout above found missing evidence, red gates, skipped gates, blocked gates, environment-blocked gates, or incomplete/expired product-owner deferrals: keep `{new_status}` = `in-progress` regardless of resolved findings. Update the story file Status section to `in-progress` and record the blocker in the story file.
+- If all `decision-needed` and `patch` findings were resolved (fixed or dismissed) AND no unresolved HIGH/MEDIUM issues remain AND live-gate blockers are cleared (or have complete, unexpired product-owner deferral): set `{new_status}` = `done`. Update the story file Status section to `done`.
 - If `patch` findings were left as action items, or unresolved issues remain: set `{new_status}` = `in-progress`. Update the story file Status section to `in-progress`.
 
 Save the story file.
@@ -104,6 +105,16 @@ If `{sprint_status}` file exists:
 
 If `{sprint_status}` file does not exist, note that story status was updated in the story file only.
 
+#### Final reconciliation
+
+Re-open the story file after saving and verify the top-level `Status:` field equals `{new_status}`.
+
+Set `{reconciliation_result}` = `story file verified; sprint tracker verification skipped`.
+
+If `{sprint_status}` exists and `{story_key}` was found, re-open `{sprint_status}` after saving and verify `development_status[{story_key}]` also equals `{new_status}`. If it matches, set `{reconciliation_result}` = `story markdown and sprint tracker agree on {new_status}`.
+
+If the story file does not match `{new_status}`, or if `{sprint_status}` was verified and `development_status[{story_key}]` does not match `{new_status}`, HALT with a closeout reconciliation failure instead of reporting completion.
+
 #### Completion summary
 
 > **Review Complete!**
@@ -113,12 +124,14 @@ If `{sprint_status}` file does not exist, note that story status was updated in
 > **Action Items Created:** <action_count>
 > **Deferred:** <W>
 > **Dismissed:** <R>
+> **Reconciled:** `{reconciliation_result}`
 
 ### 7. Next steps
 
 Present the user with follow-up options:
 
 > **What would you like to do next?**
+>
 > 1. **Start the next story** — run `dev-story` to pick up the next `ready-for-dev` story
 > 2. **Re-run code review** — address findings and review again
 > 3. **Done** — end the workflow

src/bmm-skills/4-implementation/bmad-sprint-status/SKILL.md

@@ -64,9 +64,9 @@ Activation is complete. Begin the workflow below.
 
 ## Input Files
 
-| Input | Path | Load Strategy |
+| Input         | Path                   | Load Strategy |
-|-------|------|---------------|
+| ------------- | ---------------------- | ------------- |
-| Sprint status | `{sprint_status_file}` | FULL_LOAD |
+| Sprint status | `{sprint_status_file}` | FULL_LOAD     |
 
 ## Execution
 
@@ -148,6 +148,7 @@ Enter corrections (e.g., "1=in-progress, 2=backlog") or "skip" to continue witho
 
 - IF any story has status "review": suggest `/bmad:bmm:workflows:code-review`
 - IF any story has status "in-progress" AND no stories have status "ready-for-dev": recommend staying focused on active story
+- IF any story markdown file top-level `Status:` does not match its `development_status` entry: warn "story/tracker status drift detected"
 - IF all epics have status "backlog" AND no stories have status "ready-for-dev": prompt `/bmad:bmm:workflows:create-story`
 - IF `last_updated` timestamp is more than 7 days old (or `last_updated` is missing, fall back to `generated`): warn "sprint-status.yaml may be stale"
 - IF any story key doesn't match an epic pattern (e.g., story "5-1-..." but no "epic-5"): warn "orphaned story detected"
@@ -289,6 +290,20 @@ If the command targets a story, set `story_key={{next_story_id}}` when prompted.
   <action>Return</action>
   </check>
 
+<action>For each story entry in development_status where the tracker status is `review` or `done`:</action>
+
+- Resolve the story path from `story_location` using `{project-root}` as the base for relative paths.
+- Open the matching story markdown file and read the top-level `Status:` value.
+- If the file is missing, unreadable, or the top-level `Status:` value is missing, record a drift entry with the path and reason.
+- Compare the markdown `Status:` value with the tracker status and record mismatches as drift entries.
+
+<check if="any drift_entries were recorded for review/done stories">
+<template-output>is_valid = false</template-output>
+<template-output>error = "Story/tracker status drift detected: {{drift_entries}}"</template-output>
+<template-output>suggestion = "Reconcile story markdown Status fields with sprint-status.yaml before closeout"</template-output>
+<action>Return</action>
+</check>
+
 <template-output>is_valid = true</template-output>
 <template-output>message = "sprint-status.yaml valid: metadata complete, all statuses recognized"</template-output>
 <action>Run: `python3 {project-root}/_bmad/scripts/resolve_customization.py --skill {skill-root} --key workflow.on_complete` — if the resolved value is non-empty, follow it as the final terminal instruction before exiting.</action>

test/test-closeout-reconciliation.js

@@ -0,0 +1,95 @@
+/**
+ * Closeout reconciliation workflow tests
+ *
+ * Ensures the implementation workflows explicitly enforce reconciliation
+ * between story markdown Status fields and sprint-status.yaml before closeout.
+ *
+ * Usage: node test/test-closeout-reconciliation.js
+ */
+
+const fs = require('node:fs');
+
+const colors = {
+  reset: '\u001B[0m',
+  green: '\u001B[32m',
+  red: '\u001B[31m',
+  cyan: '\u001B[36m',
+  dim: '\u001B[2m',
+};
+
+let passed = 0;
+let failed = 0;
+
+function assert(condition, testName, errorMessage = '') {
+  if (condition) {
+    console.log(`${colors.green}✓${colors.reset} ${testName}`);
+    passed++;
+  } else {
+    console.log(`${colors.red}✗${colors.reset} ${testName}`);
+    if (errorMessage) {
+      console.log(`  ${colors.dim}${errorMessage}${colors.reset}`);
+    }
+    failed++;
+  }
+}
+
+const codeReview = fs.readFileSync('src/bmm-skills/4-implementation/bmad-code-review/steps/step-04-present.md', 'utf8');
+const sprintStatus = fs.readFileSync('src/bmm-skills/4-implementation/bmad-sprint-status/SKILL.md', 'utf8');
+
+console.log(`\n${colors.cyan}Closeout Reconciliation Tests${colors.reset}\n`);
+
+assert(
+  codeReview.includes('Re-open the story file after saving and verify the top-level `Status:` field equals `{new_status}`.'),
+  'code-review reopens the story file to verify final status reconciliation',
+);
+
+assert(
+  codeReview.includes(
+    'If the story file does not match `{new_status}`, or if `{sprint_status}` was verified and `development_status[{story_key}]` does not match `{new_status}`, HALT with a closeout reconciliation failure instead of reporting completion.',
+  ),
+  'code-review halts when closeout reconciliation fails',
+);
+
+assert(codeReview.includes('development_status[{story_key}]'), 'code-review verifies the sprint tracker entry during reconciliation');
+
+assert(
+  codeReview.includes('Set `{reconciliation_result}` = `story file verified; sprint tracker verification skipped`.'),
+  'code-review records when sprint tracker verification is skipped',
+);
+
+assert(
+  codeReview.includes(
+    'If the live journey release-gate closeout above found missing evidence, red gates, skipped gates, blocked gates, environment-blocked gates, or incomplete/expired product-owner deferrals: keep `{new_status}` = `in-progress` regardless of resolved findings.',
+  ),
+  'code-review keeps live-gate blockers from being overwritten during final status selection',
+);
+
+assert(
+  codeReview.includes('> **Reconciled:** `{reconciliation_result}`'),
+  'code-review reports reconciliation status conditionally in the completion summary',
+);
+
+assert(
+  sprintStatus.includes('Resolve the story path from `story_location` using `{project-root}` as the base for relative paths.'),
+  'sprint-status defines how story_location is resolved during validate mode',
+);
+
+assert(
+  sprintStatus.includes(
+    'If the file is missing, unreadable, or the top-level `Status:` value is missing, record a drift entry with the path and reason.',
+  ),
+  'sprint-status treats missing story artifacts or missing Status values as validation failures',
+);
+
+assert(
+  sprintStatus.includes('any drift_entries were recorded for review/done stories'),
+  'sprint-status fails validate mode on any recorded reconciliation drift entries',
+);
+
+assert(
+  sprintStatus.includes('story markdown Status fields with sprint-status.yaml before closeout'),
+  'sprint-status reports reconciliation guidance when drift is detected',
+);
+
+console.log(`\n${passed} passed, ${failed} failed\n`);
+process.exit(failed > 0 ? 1 : 0);