sync conflict: upstream v3.2.0

[NotCavnfox]

The nightly upstream sync cannot rebase our patch-overlay onto the safe release v3.2.0 cleanly — manual resolution needed (conflict in pnpm-lock.yaml; develop is ~70 commits behind v3.2.0).

Reproduce locally:

git fetch upstream --tags
git checkout -B sync/upstream-v3.2.0 origin/develop
git rebase v3.2.0
# resolve conflicts (regenerate pnpm-lock.yaml), then open a PR against develop

[NotCavnfox]

Working alongside @Copilot on this. I'm reproducing the rebase of our develop patch-overlay onto v3.2.0 in a clean clone to confirm the conflict scope and produce a verified pnpm-lock.yaml resolution. Will post concrete findings (which commits conflict, lockfile regen result) on #8 so they can be adopted there rather than opening a competing PR.

[github-actions]

Still conflicting as of 2026-06-01.