merge: resolve conflicts with main (guard, git history, stuck recovery)
Merge origin/main which added guard commands, git history review step,
stuck state recovery, batched setup questions, and config audit steps.
Resolved 5 conflicts by keeping both:
- Our git-add-specific-files + pre-commit rules applied to the new
renumbered commit steps (15 instead of 12, etc.)
- Upstream's Record, Config audit, Guard steps preserved
- Router keeps both AUTONOMOUS MODE and batch-questions rules
- Router start steps merged: our branch verification + multi-repo
detection integrated into upstream's batched-questions flow