Paul HittandClaude Opus 5
b005993b95
14 conflict hunks across 8 files. Wave 2 landed on main while this branch sat, and the two sides rewrote the same send path in different directions. Routes.swift and RoutesFederation.swift: wave 2 extracted the write, the wake and the push into `Delivery.write`, and this branch still had the inline version plus one thing wave 2 had no idea about, the `announced` column. The extraction is kept; `Delivery.Item` gains `announced`, defaulting false as `Envelope.init` does, and `Delivery.insert` writes it. Without that the model, the migration and `badgeCount` would all have merged cleanly and every badge would have read zero, because nothing on the surviving path ever set the column. The submit route passes `!silent`; a federated deposit passes false, since nothing announced it. docs/CONFIGURATION.md: the union. Main lists six outbound connections with the setting that enables each; this branch added the Today fetch and dropped the other five. Seven are listed now. PostgresMigrationTests: both sides' tests, with the `LockedRows` actor left last in the file. .e2e-ref moves to d0274ca0, the current flamenet-e2e main. The old pin was 310c315, which was a branch head and not on main at all. The three generated doc pages were not resolved by hand. `check-doc-pages.py` reported spec, audit, engine and self-hosting all stale against their sources, so `Scripts/build-doc-pages.sh` ran against the new pin and all nine pages now match. That also fixes the spec page's section numbers: flamenet-e2e moved anonymous reads and contact links to 8.13 and 8.14 to make room for the push token and the Today file. Eight more references renumbered by hand, in Wire, RoutesAnonymous, RoutesDiscovery, ContactLinkPageTests and AnonymousReadsTests. The remaining 8.11 and 8.12 references are about push and the Today file and are correct. `swift build` is clean on Swift 6.4. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2 lines
41 B
Plaintext
2 lines
41 B
Plaintext
d0274ca05ea904d50b6f855aab3267c61cf45f6c
|