[sync] Rebase conflict syncing fork from upstream (2026-05-24)

Auto-sync from `upstream/main` failed due to rebase conflicts.

Run id: 26370944307
Workflow: Sync fork from upstream

Resolve manually:

```
cd ~/EverOS && git fetch upstream && git rebase upstream/main
# resolve conflicts, then:
git push origin main --force-with-lease
```