Sync local main with upstream/main

[ShlomoStept]

Goal

Bring local main up to date with upstream/main while preserving fork history.

Recommended Strategy (merge)

git checkout main
git fetch upstream
git merge upstream/main
uv run python -m pytest
git push origin main

Alternative (rebase)

git checkout main
git fetch upstream
git rebase upstream/main
uv run python -m pytest
git push origin main --force-with-lease

Acceptance Criteria

• main contains upstream changes
• Tests pass
• origin/main updated