Resolve PR conflicts while preserving route-scoped diff rendering and _chat desktop menu action handling.

Co-authored-by: codex <codex@users.noreply.github.com>