Refactor batch 2#467

Draft

timcadman wants to merge 19 commits intov7.0-devfrom

refactor-batch-2

Commits on Mar 10, 2026

refactor: batch 1 server functions use shared helpers
timcadman
committed

Commits on Mar 12, 2026

Commits on Mar 13, 2026

Revert whitespace-only changes and fix test assertions
timcadman
committed