chore: merge staging and remove unrelated copilot/tmp changes

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: waleedlatif1