docs(worker): Task 4 = full approve/merge UX consolidation

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
mika kuns
2026-06-09 11:27:35 +02:00
parent 12732d6dc9
commit 803c04d9e0
2 changed files with 37 additions and 13 deletions

View File

@@ -39,9 +39,12 @@ UX is explicitly out of scope.
- **All parents get review.** A planning parent now surfaces in `WaitingForReview`
after its children finish, instead of auto-completing to `Done`.
- **Approve merges the whole unit.** Approving a parent merges the parent worktree
(if any) + all `Done` children in order, reusing `PlanningMergeOrchestrator`. The
standalone `MergeAllPlanning` button is retired (folded into approve).
- **Approve merges the whole unit — full UX consolidation.** Approve is the single
entry for reviewing *and* merging any task. For a parent with children it drives the
existing `PlanningMergeOrchestrator` (unit merge + parent→`Done` + conflict
continue/abort, all already implemented); the standalone "Merge All" button is
removed and the orchestrator's conflict dialog + combined-diff preview are reused
in-place. Childless tasks keep `ApproveAndMergeAsync`.
- **Scope = state model + code paths.** Internal refactor; authoring UX and child
base-commit resolution are unchanged.