fix: clean up remaining file differences and update dependencies

- Remove __mocks__/remotes/index.js that was inadvertently restored
- Update pnpm-lock.yaml with latest dependency resolutions
- Final cleanup to ensure branches are properly synchronized

🤖 Generated with [Claude Code](https://claude.ai/code)

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

Author: ScriptedAlchemy