Have you tried something like beads? Curious if it would help with your setup too. This is also kind of why I built "GuardRails" I got tired of Beads auto-approving tickets or closing them.
I have a custom Mac app that runs a workflow with plan/build/review/test/document subagents in Ralph loops, manages MCPs, etc. that I'm extremely happy with so far.
Beads was a bit of an inspiration for parts, as was Chainlink (https://github.com/dollspace-gay/chainlink).