Compare commits

...

3 Commits

Author SHA1 Message Date
Oneby Wang 4a3bd4cb6b
Merge 6c29b3300b into 242dc6ef75 2026-06-14 18:21:25 -03:00
Brian 6c29b3300b
Merge branch 'main' into fix-dev-story-code-review 2026-06-08 22:43:48 -05:00
Oneby Wang 13fa255750 Fix dev-story and code-review bug 2026-06-02 20:09:22 +08:00
3 changed files with 31 additions and 36 deletions

View File

@ -42,7 +42,7 @@ Otherwise add: `Findings are listed above. No story file was provided, so nothin
### 4. Resolve decision-needed findings ### 4. Resolve decision-needed findings
If `decision_needed` findings exist, present each one with its detail and the options available. The user must decide — the correct fix is ambiguous without their input. Walk through each finding (or batch related ones) and get the user's call. Once resolved, each becomes a `patch`, `defer`, or is dismissed. If `decision-needed` findings exist, present each one with its detail and the options available. The user must decide — the correct fix is ambiguous without their input. Walk through each finding (or batch related ones) and get the user's call. Once resolved, each becomes a `patch`, `defer`, or is dismissed.
If the user chooses to defer, ask: Quick one-line reason for deferring this item? (helps future reviews): — then append that reason to both the story file bullet and the `{deferred_work_file}` entry. If the user chooses to defer, ask: Quick one-line reason for deferring this item? (helps future reviews): — then append that reason to both the story file bullet and the `{deferred_work_file}` entry.
@ -87,7 +87,7 @@ Skip this section if `{spec_file}` is not set.
#### Determine new status based on review outcome #### 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 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 `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`. - If `patch` findings were left as action items, or unresolved issues remain: set `{new_status}` = `ready-for-dev`. Update the story file Status section to `ready-for-dev`.
Save the story file. Save the story file.
@ -119,7 +119,7 @@ If `{sprint_status}` file does not exist, note that story status was updated in
Present the user with follow-up options: Present the user with follow-up options:
> **What would you like to do next?** > **What would you like to do next?**
> 1. **Start the next story** — run `dev-story` to pick up the next `ready-for-dev` story > 1. **Continue development** — run `dev-story` to pick up the reviewed story or the next `ready-for-dev` story
> 2. **Re-run code review** — address findings and review again > 2. **Re-run code review** — address findings and review again
> 3. **Done** — end the workflow > 3. **Done** — end the workflow

View File

@ -10,7 +10,7 @@ description: 'Execute story implementation following a context filled story spec
**Your Role:** Developer implementing the story. **Your Role:** Developer implementing the story.
- Communicate all responses in {communication_language} and language MUST be tailored to {user_skill_level} - Communicate all responses in {communication_language} and language MUST be tailored to {user_skill_level}
- Generate all documents in {document_output_language} - Generate all documents in {document_output_language}
- Only modify the story file in these areas: YAML frontmatter `baseline_commit`, Tasks/Subtasks checkboxes, Dev Agent Record (Debug Log, Completion Notes), File List, Change Log, and Status - Only modify the story file in these areas: YAML frontmatter `baseline_commit`, Tasks/Subtasks checkboxes, Review Findings checkboxes, Dev Agent Record (Debug Log, Completion Notes), File List, Change Log, and Status
- Execute ALL steps in exact order; do NOT skip steps - Execute ALL steps in exact order; do NOT skip steps
- Absolutely DO NOT stop because of "milestones", "significant progress", or "session boundaries". Continue in a single execution until the story is COMPLETE (all ACs satisfied and all tasks/subtasks checked) UNLESS a HALT condition is triggered or the USER gives other instruction. - Absolutely DO NOT stop because of "milestones", "significant progress", or "session boundaries". Continue in a single execution until the story is COMPLETE (all ACs satisfied and all tasks/subtasks checked) UNLESS a HALT condition is triggered or the USER gives other instruction.
- Do NOT schedule a "next session" or request review pauses unless a HALT condition applies. Only Step 9 decides completion. - Do NOT schedule a "next session" or request review pauses unless a HALT condition applies. Only Step 9 decides completion.
@ -76,7 +76,7 @@ Activation is complete. If `activation_steps_prepend` or `activation_steps_appen
<workflow> <workflow>
<critical>Communicate all responses in {communication_language} and language MUST be tailored to {user_skill_level}</critical> <critical>Communicate all responses in {communication_language} and language MUST be tailored to {user_skill_level}</critical>
<critical>Generate all documents in {document_output_language}</critical> <critical>Generate all documents in {document_output_language}</critical>
<critical>Only modify the story file in these areas: YAML frontmatter `baseline_commit`, Tasks/Subtasks checkboxes, Dev Agent Record (Debug Log, Completion Notes), File List, <critical>Only modify the story file in these areas: YAML frontmatter `baseline_commit`, Tasks/Subtasks checkboxes, Review Findings checkboxes, Dev Agent Record (Debug Log, Completion Notes), File List,
Change Log, and Status</critical> Change Log, and Status</critical>
<critical>Execute ALL steps in exact order; do NOT skip steps</critical> <critical>Execute ALL steps in exact order; do NOT skip steps</critical>
<critical>Absolutely DO NOT stop because of "milestones", "significant progress", or "session boundaries". Continue in a single execution <critical>Absolutely DO NOT stop because of "milestones", "significant progress", or "session boundaries". Continue in a single execution
@ -223,31 +223,33 @@ Activation is complete. If `activation_steps_prepend` or `activation_steps_appen
<step n="3" goal="Detect review continuation and extract review context"> <step n="3" goal="Detect review continuation and extract review context">
<critical>Determine if this is a fresh start or continuation after code review</critical> <critical>Determine if this is a fresh start or continuation after code review</critical>
<action>Check if "Senior Developer Review (AI)" section exists in the story file</action> <action>Check if a "Review Findings" subsection exists under Tasks/Subtasks</action>
<action>Check if "Review Follow-ups (AI)" subsection exists under Tasks/Subtasks</action> <action>Count unchecked [ ] items marked "[Review][Decision]" in "Review Findings"</action>
<action>Count unchecked [ ] items marked "[Review][Patch]" in "Review Findings"</action>
<check if="Senior Developer Review section exists"> <check if="unchecked [Review][Decision] items exist">
<output>⚠️ **Review Decision Required**
This story still has unresolved `[Review][Decision]` findings. These require user/code-review workflow decisions before development can continue.
Return to `code-review` or resolve the decision items into patch, defer, or dismiss outcomes before running `dev-story` again.
</output>
<action>HALT - unresolved review decisions must be resolved before development</action>
</check>
<check if="unchecked [Review][Patch] items exist">
<action>Set review_continuation = true</action> <action>Set review_continuation = true</action>
<action>Extract from "Senior Developer Review (AI)" section: <action>Store list of unchecked [Review][Patch] items as {{pending_review_items}}</action>
- Review outcome (Approve/Changes Requested/Blocked)
- Review date
- Total action items with checkboxes (count checked vs unchecked)
- Severity breakdown (High/Med/Low counts)
</action>
<action>Count unchecked [ ] review follow-up tasks in "Review Follow-ups (AI)" subsection</action>
<action>Store list of unchecked review items as {{pending_review_items}}</action>
<output>⏯️ **Resuming Story After Code Review** ({{review_date}}) <output>⏯️ **Resuming Story After Code Review**
**Review Outcome:** {{review_outcome}} **Review Findings:** {{unchecked_review_count}} remaining to address
**Action Items:** {{unchecked_review_count}} remaining to address
**Priorities:** {{high_count}} High, {{med_count}} Medium, {{low_count}} Low
**Strategy:** Will prioritize review follow-up tasks (marked [AI-Review]) before continuing with regular tasks. **Strategy:** Will prioritize Review Findings tasks marked `[Review][Patch]` before continuing with regular tasks.
</output> </output>
</check> </check>
<check if="Senior Developer Review section does NOT exist"> <check if="no unchecked [Review][Patch] items exist">
<action>Set review_continuation = false</action> <action>Set review_continuation = false</action>
<action>Set {{pending_review_items}} = empty</action> <action>Set {{pending_review_items}} = empty</action>
@ -366,24 +368,17 @@ Activation is complete. If `activation_steps_prepend` or `activation_steps_appen
<action>Validate that ALL acceptance criteria related to this task are satisfied</action> <action>Validate that ALL acceptance criteria related to this task are satisfied</action>
<action>Run full test suite to ensure NO regressions introduced</action> <action>Run full test suite to ensure NO regressions introduced</action>
<!-- REVIEW FOLLOW-UP HANDLING --> <!-- REVIEW FINDINGS HANDLING -->
<check if="task is review follow-up (has [AI-Review] prefix)"> <check if="task is a review finding (has [Review][Patch] marker)">
<action>Extract review item details (severity, description, related AC/file)</action> <action>Extract review item details (description and related file/line if present)</action>
<action>Add to resolution tracking list: {{resolved_review_items}}</action> <action>Add to resolution tracking list: {{resolved_review_items}}</action>
<action>Prepare review finding completion note: "✅ Resolved review finding: {{description}}"</action>
<!-- Mark task in Review Follow-ups section -->
<action>Mark task checkbox [x] in "Tasks/Subtasks → Review Follow-ups (AI)" section</action>
<!-- CRITICAL: Also mark corresponding action item in review section -->
<action>Find matching action item in "Senior Developer Review (AI) → Action Items" section by matching description</action>
<action>Mark that action item checkbox [x] as resolved</action>
<action>Add to Dev Agent Record → Completion Notes: "✅ Resolved review finding [{{severity}}]: {{description}}"</action>
</check> </check>
<!-- ONLY MARK COMPLETE IF ALL VALIDATION PASS --> <!-- ONLY MARK COMPLETE IF ALL VALIDATION PASS -->
<check if="ALL validation gates pass AND tests ACTUALLY exist and pass"> <check if="ALL validation gates pass AND tests ACTUALLY exist and pass">
<action>ONLY THEN mark the task (and subtasks) checkbox with [x]</action> <action>ONLY THEN mark the task (and subtasks) checkbox with [x]</action>
<action>If this is a review finding task, this marks the item in "Tasks/Subtasks → Review Findings" and records the prepared review finding completion note</action>
<action>Update File List section with ALL new, modified, or deleted files (paths relative to repo root)</action> <action>Update File List section with ALL new, modified, or deleted files (paths relative to repo root)</action>
<action>Add completion notes to Dev Agent Record summarizing what was ACTUALLY implemented and tested</action> <action>Add completion notes to Dev Agent Record summarizing what was ACTUALLY implemented and tested</action>
</check> </check>

View File

@ -12,7 +12,7 @@ optional-inputs:
- 'CI logs' - 'CI logs'
- 'Linting reports' - 'Linting reports'
validation-rules: validation-rules:
- 'Only permitted story sections modified: Tasks/Subtasks checkboxes, Dev Agent Record, File List, Change Log, Status' - 'Only permitted story sections modified: Tasks/Subtasks checkboxes, Review Findings checkboxes, Dev Agent Record, File List, Change Log, Status'
- 'All implementation requirements from story Dev Notes must be satisfied' - 'All implementation requirements from story Dev Notes must be satisfied'
- 'Definition of Done checklist must pass completely' - 'Definition of Done checklist must pass completely'
- 'Enhanced story context must contain sufficient technical guidance' - 'Enhanced story context must contain sufficient technical guidance'
@ -52,7 +52,7 @@ validation-rules:
- [ ] **File List Complete:** File List includes EVERY new, modified, or deleted file (paths relative to repo root) - [ ] **File List Complete:** File List includes EVERY new, modified, or deleted file (paths relative to repo root)
- [ ] **Dev Agent Record Updated:** Contains relevant Implementation Notes and/or Debug Log for this work - [ ] **Dev Agent Record Updated:** Contains relevant Implementation Notes and/or Debug Log for this work
- [ ] **Change Log Updated:** Change Log includes clear summary of what changed and why - [ ] **Change Log Updated:** Change Log includes clear summary of what changed and why
- [ ] **Review Follow-ups:** All review follow-up tasks (marked [AI-Review]) completed and corresponding review items marked resolved (if applicable) - [ ] **Review Findings:** All review findings tasks (marked [Review][Patch]) completed and corresponding review items marked resolved (if applicable)
- [ ] **Story Structure Compliance:** Only permitted sections of story file were modified - [ ] **Story Structure Compliance:** Only permitted sections of story file were modified
## 🔚 Final Status Verification ## 🔚 Final Status Verification