Generalizes the previous merge_task fix: the WaitingForReview->Done transition now lives in TaskMergeService.MergeAsync/ContinueMergeAsync, so the UI Merge button (WorkerHub.MergeTask), conflict-merge, continue-merge and the external MCP all land a merged task in Done. ApproveAndMergeAsync no longer double-approves. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>