Merge pages and notices: prove both, choose survivor with preview, undo, notice feed (dark by default) #87

Merged

heimdall merged 22 commits from heimdall/merge-notices into main 2026-11-14 13:18:19 +00:00

Conversation 0 Commits 22 Files changed 45 +4137 -34

heimdall commented 2026-11-14 13:18:15 +00:00

Member

Copy link

Merge pages and notices (merge design cuts: proofs, status and undo, merge page, notice feed), plus the fix batch for Soul verdict cut-merge-notices.s1.

• Proof of both accounts by Heimdall account id only; no email or name matching; the other account is named only after both proofs; survivor chosen against a preview; consent for both; undo with fresh proof inside the grace window.
• Derived notice feed (merged/undone/final) with idempotent acks, bearer-gated pull routes, migration AddAccountMergeNoticeAcks.
• Dark by default: AccountMerge:Enabled false. Not deployed.
• Soul: s1 (no Blocker/High), fixes at 63b9596, delta verdict s2 clean (one Low: stale login list drives the conflict block).

Co-Authored-By: Claude Sonnet 5.5 noreply@anthropic.com

🤖 Generated with Claude Code

Merge pages and notices (merge design cuts: proofs, status and undo, merge page, notice feed), plus the fix batch for Soul verdict cut-merge-notices.s1. - Proof of both accounts by Heimdall account id only; no email or name matching; the other account is named only after both proofs; survivor chosen against a preview; consent for both; undo with fresh proof inside the grace window. - Derived notice feed (merged/undone/final) with idempotent acks, bearer-gated pull routes, migration `AddAccountMergeNoticeAcks`. - Dark by default: `AccountMerge:Enabled` false. Not deployed. - Soul: s1 (no Blocker/High), fixes at 63b9596, delta verdict s2 clean (one Low: stale login list drives the conflict block). Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> 🤖 Generated with [Claude Code](https://claude.com/claude-code)

heimdall added 22 commits 2026-11-14 13:18:15 +00:00

Test: a 307 from Heimdall is not followed by the auth and member clients (red) ... 0599aedf08

AddHeimdallClients gathers the three Heimdall client registrations so the test
exercises the registrations Program uses. The auth and member clients still
follow redirects here; the mover already does not.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

Auth and member clients follow no redirect: one WithoutRedirects for all three ... 8175f6f61e

The mover's inline no-redirect handler becomes the shared extension; the
app-secret auth client and the member-bearer client use it too.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

Test: MergeProofs holder (red; type is a skeleton) ... 5fbb673c55

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

MergeProofs: in-memory per-actor holder of merge proofs ... 3907259cb3

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

Test: merge-proof sign-ins complete into MergeProofs (red; completion cases are stubs) ... 7bf284876a

Adds the two attempt purposes, their start methods, the four outcomes, the step's
return path and the MergeProofs registration; the completion switch cases throw
until the next commit.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

Complete merge-proof sign-ins into MergeProofs; refusals return to the starting page ... 1924433af2

Self redeems as the session's account; Other redeems a verified different account
that has a member account found by Heimdall account id. Every refusal precedes the
identity list, and the bearer is held only by MergeProofs.Put.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

Test: first undefined attempt purpose is now 11 (9 and 10 are the merge proofs) ... e9a2e29c61

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

Test: a sign-in through a moved login lands on the survivor's account (saga rig opens to page tests) ... 24a880ad4c

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

Test: merge status page, notice, wording and undo by fresh proof (red; page, component and wording are skeletons) ... 8175e5ed99

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

MergeWording: the closed words of the merge pages ... ec28dffba1

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

MergeStatus page: the member's merges and undo by fresh proof of every moved login ... 5ddfca9b55

Test files: the bearer list is kept apart from the surface it is checked against; wording tests use the Razor encoder.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

MergeNotice in the layout and a Merge status link on Membership status ... ed3645e048

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

Test: an ended merge shows no notice even with its grace date ahead ... a1ee88cdbb

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

Test: merge page, preview wording and the AccountMerge flag (red; page, preview and confirm words are skeletons) ... 817363e366

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

MergeAccounts page: prove both accounts, choose the survivor against a preview, consent for both, confirm through the saga ... c0b7b6a857

Dark behind AccountMerge:Enabled. MergePreview is the one wording of the plan, MergeWording.Confirm the closed refusal words.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

Docs: merge page, its flag and deploy order ... a8c489b0d0

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

Schema: AddAccountMergeNoticeAcks, the ack row a notice reader adds (notices themselves are derived, nothing stored) ... 6bd3ce4371

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

Test: the plan digest binds the survivor id (two memberless survivors with identical records digest differently) ... ca726c057a

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

Test: merge notice feed and its bearer (red; the feed is a skeleton and the routes do not exist) ... 6606f8e6e6

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

Merge notice feed: derived merged/undone/final notices, idempotent acks, bearer-gated pull routes ... a92638511c

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

Test: provider-overlap block, grace clauses, proof provider mismatch, requested-undo wording, no passkey promise, bearer prune (red where the code is wrong) ... e60953e469

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

Merge page blocks a shared provider before consent; requested-undo notice, no passkey promise, every access prunes bearers ... 63b9596ff1

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

heimdall merged commit b688fec8e0 into main 2026-11-14 13:18:19 +00:00

heimdall referenced this pull request from a commit 2026-11-14 13:18:21 +00:00

Merge pull request 'Merge pages and notices: prove both, choose survivor with preview, undo, notice feed (dark by default)' (#87) from heimdall/merge-notices into main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

GameCult/Bifrost!87

No description provided.