diff --git a/.story_kit/work/1_upcoming/205_bug_mergemaster_marks_stories_as_done_without_squash_merging_code.md b/.story_kit/work/1_upcoming/205_bug_mergemaster_marks_stories_as_done_without_squash_merging_code.md index 6b3059b..6f2ef46 100644 --- a/.story_kit/work/1_upcoming/205_bug_mergemaster_marks_stories_as_done_without_squash_merging_code.md +++ b/.story_kit/work/1_upcoming/205_bug_mergemaster_marks_stories_as_done_without_squash_merging_code.md @@ -51,3 +51,4 @@ Mergemaster should squash-merge feature branch code onto master before marking s - [ ] If the squash merge results in conflicts, the story is NOT moved to done — it stays in 4_merge with an error reported - [ ] If the squash merge results in an empty diff (code already on master), the story is moved to done but the feature branch is cleaned up - [ ] Stale .story_kit/merge_workspace directories are cleaned up before attempting a new merge +- [ ] The mergemaster agent must use MCP actions (merge_agent_work, move_story_to_merge, etc.) to drive its process — it should never manually move story files between pipeline stages or mark stories as done by direct file manipulation