merge: reconcile the rebased local branch with its pushed head (#4586)

The predecessor session rebased this branch onto a newer `main` locally, which
left the pushed head unreachable. Force-pushing is banned (AGENTS.md Prime
Directive #3), so the two are joined by a merge instead: the change itself is
identical on both sides, only the base differs.

# Conflicts:
#	packages/qa/dogfood/test/membership-actor-attribution.dogfood.test.ts

Author: claude