Upstream main advanced significantly (merged codebestia#330, codebestia#333, codebestia#337, plus codebestia#398 which independently added a systemPayload column with a looser constraint that never got wired up to any producer/consumer). This merge: - Drops the now-redundant systemPayload-adding migration from this branch and keeps codebestia#398's instead; adds a new migration (0002) that backfills legacy ciphertext-JSON system rows and replaces the loose `content_type = 'system' OR system_payload IS NULL` constraint with the stronger `content_type <> 'system' OR (ciphertext IS NULL AND system_payload IS NOT NULL)` this issue asked for. - Keeps this branch's emitDeviceChangeEvent/serializeMessage/web wiring, since codebestia#398 added the column but never wrote or read it anywhere. - Fixes unrelated pre-existing corruption in file.messages.test.ts (duplicate const declarations, a dropped `basePayload` helper, and test payloads missing the `envelopes` field the current send_file_message handler requires) discovered because it blocked this branch's own test run — confirmed via a clean checkout of origin/main that this breakage predates and is unrelated to this branch.

Commits

Commits on Jul 27, 2026

feat(messages): dedicated systemPayload column for system messages

fix(messages): satisfy prettier formatting in systemMessages.test.ts

Commits on Jul 30, 2026

merge main: reconcile systemPayload with #398, fix pre-existing test corruption

Merge branch 'main' into claude/issue-334-system-message-payload