dave/storkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

story-kit: create 142_bug_quality_gates_run_after_fast_forward_to_master_instead_of_before

Browse Source
This commit is contained in:
Dave
2026-02-24 13:31:31 +00:00
parent fabf2789b4
commit a62fe82b54
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.story_kit/work/1_upcoming/142_bug_quality_gates_run_after_fast_forward_to_master_instead_of_before.md
View File

@@ -22,8 +22,9 @@ The `merge_agent_work` function in `server/src/agents.rs` runs quality gates AFT
1. `run_squash_merge()` creates merge-queue branch + temp worktree 1. `run_squash_merge()` creates merge-queue branch + temp worktree
2. Squash merge + conflict resolution in temp worktree 2. Squash merge + conflict resolution in temp worktree
3. **Run quality gates in the merge-queue worktree BEFORE fast-forward** 3. **Run quality gates in the merge-queue worktree BEFORE fast-forward**
4. If gates fail: tear down temp worktree + branch, leave master untouched, report failure 4. If gates fail: report failure back to mergemaster with the temp worktree still intact, so mergemaster can attempt fixes there (up to 2 attempts per story 135's prompt)
5. If gates pass: fast-forward master, clean up 5. If gates still fail after mergemaster's retry attempts: tear down temp worktree + branch, leave master untouched, report to human
6. If gates pass: fast-forward master, clean up
### Key Files ### Key Files
- `server/src/agents.rs` line 1013: `merge_agent_work()` — orchestrator - `server/src/agents.rs` line 1013: `merge_agent_work()` — orchestrator