Upstream sync needs a human

Upstream is 41 commits ahead. The weekly rebase of our 52 commits onto upstream/master conflicted and was aborted. main is untouched.

Conflicted files:

packages/shared/lib/services/proxy/utils.ts

git fetch upstream --no-tags
git checkout -B chore/sync-upstream main && git rebase upstream/master

See .agents/skills/syncing-with-upstream. Re-run this workflow once resolved and merged.