From 8f0fd1d0ccc1f52c8d7cf5bae0b01bc237e6bdf7 Mon Sep 17 00:00:00 2001 From: "Michael K. Darling" Date: Fri, 17 Jul 2026 19:06:03 -0400 Subject: [PATCH] Clarify six-pack QA merge instructions Describe the QA return as a merge operation in natural language instead of repeating the command-shaped merge_and_process pseudo-code. Fix 2 of 2 for #29. Co-authored-by: GPT-5.6-sol (high) via Codex --- swarmforge/constitution/articles/local-workflow.prompt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swarmforge/constitution/articles/local-workflow.prompt b/swarmforge/constitution/articles/local-workflow.prompt index c0a75f69..eaa7bff0 100644 --- a/swarmforge/constitution/articles/local-workflow.prompt +++ b/swarmforge/constitution/articles/local-workflow.prompt @@ -2,4 +2,4 @@ ## QA Handoffs - A QA handoff does not interrupt current work. If a QA wake-up arrives while working, ignore it and let `done_with_current.sh` deliver the next queued task or batch after the current work is complete. -- When a helper-delivered task is from QA, merge the sender commit identified by the printed `PAYLOAD` (`merge_and_process QA `). Every agent except the specifier must run unit tests and acceptance tests and fix any failures. Then run `done_with_current.sh`. Do not send a `git_handoff` downstream. Apart from merge, verification, and any QA-completion steps in your role prompt, do not apply other role-specific work to that QA handoff. +- When a helper-delivered task is from QA, merge the sender commit identified by the printed `PAYLOAD` into your assigned branch. Every agent except the specifier must run unit tests and acceptance tests and fix any failures. Then run `done_with_current.sh`. Do not send a `git_handoff` downstream. Apart from merge, verification, and any QA-completion steps in your role prompt, do not apply other role-specific work to that QA handoff.