Already implemented
#346 removed the workflow's file-scope restriction, encourages concurrent dispatch and assigns parallel-deliverable integration/conflict resolution to the lead. There is no request here to remove that restriction again.
Remaining proposal
Allow the lead to assign the integration of parallel deliverables—including conflicting edits—as an explicit execution task, with its own brief, inputs and result evidence. The lead retains decisions about intended behavior and independent acceptance of the integrated result.
The existing dispatch mechanism may already be sufficient. Start by defining the workflow and proving it with a realistic run; introduce a specialized tool or task type only if the existing contract cannot express the needed lifecycle.
Scope and acceptance criteria
- An integration brief identifies the relevant worker results, branches/commits or shared-workspace state, intended behavior, conflicting areas and checks required for the combined result.
- The integrator preserves both accepted task outcomes, resolves conflicts, reports semantic decisions and supplies evidence for the combined change. Unresolved intent questions return to the lead.
- Define when integration can start and how writers hand off the affected state so an integration attempt does not consume a half-written result. Preserve concurrent work wherever dependencies permit it.
- Exercise two workers whose changes overlap and then delegate their integration. Cover both clean textual merging and a semantic conflict that requires judgment; report the actual artifacts and checks.
- Keep the lead's independent acceptance of the combined result. A child report or conflict-free merge alone is not sufficient evidence of completion.
This is a follow-up to the shipped parallel workflow, not a new blanket prohibition on workers editing overlapping files.
Code context
Reviewed against main at b4c549787da6 (2026-09-08).
Already implemented
#346 removed the workflow's file-scope restriction, encourages concurrent dispatch and assigns parallel-deliverable integration/conflict resolution to the lead. There is no request here to remove that restriction again.
Remaining proposal
Allow the lead to assign the integration of parallel deliverables—including conflicting edits—as an explicit execution task, with its own brief, inputs and result evidence. The lead retains decisions about intended behavior and independent acceptance of the integrated result.
The existing
dispatchmechanism may already be sufficient. Start by defining the workflow and proving it with a realistic run; introduce a specialized tool or task type only if the existing contract cannot express the needed lifecycle.Scope and acceptance criteria
This is a follow-up to the shipped parallel workflow, not a new blanket prohibition on workers editing overlapping files.
Code context
Reviewed against
mainatb4c549787da6(2026-09-08).