Scoped adaptation from PR #3088. Keep the canonical atomic writer and dispatcher; exclude the broader provider/tool changes. Co-authored-by: Geronimo <varungore1@gmail.com>