Why: Synchronize the approved policy candidate with the active simplified merge-window rules now on origin/main.
Evidence: Resolved the two semantic conflicts by preserving upstream queue simplification and this task's goal-first/cursor-per-unit contract; focused task-card regression and cached diff checks passed.
Impact: Retains the active single-window delivery process while replacing mechanical stage approvals with necessary decisions and preserving Cursor-per-unit execution.
Refs: .task/feature-goal-first-delivery.md
weichen
86c8d715af