Fix sync drift: mark every Contact edit as locally edited + filter merged-away from iMessage lookup

[mayeack]

Summary

Three sync divergences reported by the user, two root causes:

Cause 1 — silent edits (17 sites): Across the iOS/macOS app, contact mutations were writing contact.updatedAt = Date() (or just changing a field) without flipping syncStatus to .pending. The next push filters by syncStatus != .synced, so silently-edited records never left the device. The server stayed stale; the other device pulled the stale version. Audit on the user's macOS store found 643 contacts with updatedAt > lastSyncedAt && syncStatus = .synced — silently-edited but never pushed. Hugo Dooner (lastName=Dooner, priority=1 on macOS, blank/correct-priority on server) and Kail Walker (priority=0 on macOS, priority=1 on server) are two examples.

Cause 2 — iMessage handle lookup picks merged-away duplicates: IMessageSyncService.buildHandleLookup fetched every Contact including merged-away ones. With a live duplicate and a merged-away version sharing a phone or email, the dict-assignment order can pick the merged-away one and attach the incoming iMessage to a hidden record. Confirmed on the master store: 4 Hugo iMessages were attached to merged-away Z_PK 1210 instead of live Z_PK 313, so Hugo Dooner's detail showed zero.

Changes

• 17 edit sites updated to call markLocallyEdited() instead of bare updatedAt = Date() / unmarked field writes:
  • ContactDetailView (hide/unhide, metVia picker, metVia backlinks bulk)
  • ContactListView (hide alert + 3 quick-add bulk pickers)
  • ContactFormView (form save)
  • AddNoteView, LogInteractionView
  • ContactTagPickerView, ContactGroupPickerView, ContactLocationPickerView
  • DashboardView (priority chip x-button, prioritize picker pin)
  • SettingsView (unhide, restore merged, bulk hide)
  • ContactSyncService (system contact import update)
  • SocialEnrichmentService (enrichment write)
  • ContactMergeService (primary + secondary post-merge)
• BlackbookServer/App/IMessageSyncService.swift — fetches contacts with #Predicate<Contact> { !$0.isMergedAway && !$0.isHidden } before building the handle lookup.

One-time server SQL heal (already applied)

While the BlackbookServer daemon was stopped, the user's master store at ~/Library/Application Support/Blackbook/Server/default.store was patched directly:

UPDATE ZINTERACTION SET ZCONTACT=313, ZUPDATEDAT=<now> WHERE ZCONTACT=1210;
UPDATE ZCONTACT SET ZLASTNAME='Dooner', ZUPDATEDAT=<now> WHERE Z_PK=313;
UPDATE ZCONTACT SET ZUPDATEDAT=<now> WHERE Z_PK=1197;

Server restarted (epoch preserved, no client bootstrap triggered). Clients will pull these heals within 5 min.

Post-merge action

1. CI deploys iOS build 119 + macOS build 100119 to TestFlight (~5 min after merge).
2. Local: rebuild + reinstall /Applications/BlackbookServer.app from main so the iMessage-lookup fix is live (BlackbookServer is not on TestFlight).
3. Existing 643-record backlog clears as the user naturally touches each contact (deliberately not auto-flipped — a bulk macOS-wins migration would overwrite iOS edits for any field where the two devices disagree, like Kail Walker's priority).

Test plan

• iOS Simulator (iPhone 17) clean build
• macOS clean build
• BlackbookServer clean build
• 13 Swift Testing tests pass
• Manual on build 119: edit any contact on macOS (e.g. add tag) → within 5 min the change shows on iOS
• Manual on build 119: toggle priority via DashboardView x-button on macOS → next sync propagates
• Manual after BlackbookServer reinstall: send a fresh iMessage to a contact who has both a live and a merged-away duplicate → only the live contact gets the interaction

🤖 Generated with Claude Code