Adopt a mail account the profile already holds instead of adding it twice (issue 345, ADR 0317) #323

Merged
mesh-admin merged 3 commits from feat/345-adopt-existing-accounts into main 2026-10-12 10:55:13 +00:00
Contributor

Issue 345, the operator's point of 2026-10-12: the operator's accounts already exist in the active profiles, so ADR 0316 §11/§12 would show each twice.

To-be 56 §4 gains, naming ADR 0317 (proposed, needs-operator; it changes ADR 0316 §10, §11, §12):

  • a declared account is matched by address: held once → adopted (its keys taken under the module's ownership, recorded per node, declared values win only where they differ, mail and folder settings never touched, released without deletion on leaving); absent → created under mesh_<name>; twice or Owl's → refused with the remedy, and an optional per-node key settles a duplicate;
  • the value is derived by betterbird_accounts from the active profile and proposed for the operator's Approve; the ask shows addresses in shape with the fingerprint, the whole read at the desk;
  • the order: derived on a node that holds the accounts, adopted elsewhere, created on a fresh node; nothing applied before the Approve.

Also the index row and a check bullet. merge-check.sh passes. Merge once ADR 0317 is accepted.

Issue 345, the operator's point of 2026-10-12: the operator's accounts already exist in the active profiles, so ADR 0316 §11/§12 would show each twice. To-be 56 §4 gains, naming ADR 0317 (proposed, needs-operator; it changes ADR 0316 §10, §11, §12): - a declared account is matched by address: held once → adopted (its keys taken under the module's ownership, recorded per node, declared values win only where they differ, mail and folder settings never touched, released without deletion on leaving); absent → created under `mesh_<name>`; twice or Owl's → refused with the remedy, and an optional per-node `key` settles a duplicate; - the value is derived by `betterbird_accounts` from the active profile and proposed for the operator's Approve; the ask shows addresses in shape with the fingerprint, the whole read at the desk; - the order: derived on a node that holds the accounts, adopted elsewhere, created on a fresh node; nothing applied before the Approve. Also the index row and a check bullet. `merge-check.sh` passes. Merge once ADR 0317 is accepted.
mesh-admin added 2 commits 2026-10-12 10:43:37 +00:00
Name the optional key that settles an ambiguous match, and how the ask shows the accounts (ADR 0317)
mesh/repo-check pass: its merge-check.sh passed
mesh/delivery superseded: a newer head of the same pull request
mesh/merge-gate pass: the change touches no module of the mesh's graph
ef452a7219
Author
Contributor

Delivery novox/hq@953038833c81 — delivered since 2026-10-12T10:55:28Z

Delivery plan — builds nothing: the change touches no module of the mesh's graph

Transitions

  • 2026-10-12 10:45 (new) → proposed (announced): novox/hq#323's head announced
  • 2026-10-12 10:46 proposed → checked (checked): the verdict names this commit
  • 2026-10-12 10:46 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail
  • 2026-10-12 10:55 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move
  • 2026-10-12 10:55 published → delivered (done): nothing for a walk to move

The commit's note under refs/notes/mesh-plan keeps every transition: git log --notes=mesh-plan.

<!-- mesh-delivery:view --> **Delivery** `novox/hq@953038833c81` — **delivered** since 2026-10-12T10:55:28Z **Delivery plan** — builds nothing: the change touches no module of the mesh's graph **Transitions** - 2026-10-12 10:45 (new) → proposed (announced): novox/hq#323's head announced - 2026-10-12 10:46 proposed → checked (checked): the verdict names this commit - 2026-10-12 10:46 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail - 2026-10-12 10:55 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move - 2026-10-12 10:55 published → delivered (done): nothing for a walk to move The commit's note under `refs/notes/mesh-plan` keeps every transition: `git log --notes=mesh-plan`.
jschoubben added 1 commit 2026-10-12 10:45:05 +00:00
Keep recorded accounts by their keys, and name them by place, never by name (ADR 0317 review)
mesh/merge-gate pass: the change touches no module of the mesh's graph
mesh/repo-check pass: its merge-check.sh passed
mesh/delivery delivered
953038833c
Author
Contributor

Verdict: approve at 953038833c

Checked §4 of to-be 56 against ADR 0317 clause by clause, at the accepted record (version 8):

  • §1 (match by address, recorded-kept, mesh_ creation) — reflected in the opening paragraph, matching the final wording after the version-4 review fixed the rebuild-on-loss ambiguity.
  • §2/§4/§5 (adopt takes existing keys, declared values win only where they differ by preference name, mail/folder/sign-in untouched) — the table row and the following paragraph ("keeps its mail, its folder, filter and cache preferences, and its kept sign-in").
  • §3 (status never names an address/host/name) — present verbatim in sense, consistent with ADR 0316 §16 (the version-4 review's contradiction is resolved).
  • §6 (release drops keys, never deletes; created account removed from the list) — "its keys are released … Only an account the module created is removed from the list."
  • §7/§8 (ambiguous match refused with remedy; optional per-node key) — table's third row plus the following paragraph, including the field's scope ("given only in that node's layer").
  • §9 (betterbird_accounts derives and proposes under ADR 0277, counts-only answer, ‹address› shape, fingerprint read at the desk) — "The value is derived, not retyped" paragraph matches ADR 0277 §6 rather than promising addresses in the ask, which was the version-2 review's objection.
  • §10 (order: derive-first node, adopt elsewhere, create fresh, nothing applied before Approve) — "The order" paragraph.

Frontmatter lists both ADR 0316 and ADR 0317; the to-be index row and its decisions column are updated too. Prose and a table only, no code. Nothing in the diff names a node, an address, a domain, an absolute path or a mail address — it stays at the level of "the profile", "that node's layer", "‹address›". No glossary word is misused or retired. The tests bullet added ("The adoption's tests, on profile fixtures: …") gives a checked-by for every new rule, consistent with (if more compact than) ADR 0317's own "How it is checked".

Ran merge-check.sh on this head in an isolated worktree: records, index, cycle and words all pass (index notes MESH_CATALOG_DIR unset, which is expected outside the catalogue repo). This matches the forge's own mesh/repo-check (pass), mesh/merge-gate (pass: touches no module of the mesh's graph) and mesh/delivery (success) on this commit.

Verdict: approve at 953038833c815504d98c1f0309ce828def142742 Checked §4 of to-be 56 against ADR 0317 clause by clause, at the accepted record (version 8): - §1 (match by address, recorded-kept, mesh_ creation) — reflected in the opening paragraph, matching the final wording after the version-4 review fixed the rebuild-on-loss ambiguity. - §2/§4/§5 (adopt takes existing keys, declared values win only where they differ by preference name, mail/folder/sign-in untouched) — the table row and the following paragraph ("keeps its mail, its folder, filter and cache preferences, and its kept sign-in"). - §3 (status never names an address/host/name) — present verbatim in sense, consistent with ADR 0316 §16 (the version-4 review's contradiction is resolved). - §6 (release drops keys, never deletes; created account removed from the list) — "its keys are released … Only an account the module created is removed from the list." - §7/§8 (ambiguous match refused with remedy; optional per-node `key`) — table's third row plus the following paragraph, including the field's scope ("given only in that node's layer"). - §9 (betterbird_accounts derives and proposes under ADR 0277, counts-only answer, ‹address› shape, fingerprint read at the desk) — "The value is derived, not retyped" paragraph matches ADR 0277 §6 rather than promising addresses in the ask, which was the version-2 review's objection. - §10 (order: derive-first node, adopt elsewhere, create fresh, nothing applied before Approve) — "The order" paragraph. Frontmatter lists both ADR 0316 and ADR 0317; the to-be index row and its decisions column are updated too. Prose and a table only, no code. Nothing in the diff names a node, an address, a domain, an absolute path or a mail address — it stays at the level of "the profile", "that node's layer", "‹address›". No glossary word is misused or retired. The tests bullet added ("The adoption's tests, on profile fixtures: …") gives a checked-by for every new rule, consistent with (if more compact than) ADR 0317's own "How it is checked". Ran merge-check.sh on this head in an isolated worktree: records, index, cycle and words all pass (index notes MESH_CATALOG_DIR unset, which is expected outside the catalogue repo). This matches the forge's own mesh/repo-check (pass), mesh/merge-gate (pass: touches no module of the mesh's graph) and mesh/delivery (success) on this commit.
mesh-admin merged commit ca9d11ea60 into main 2026-10-12 10:55:13 +00:00
mesh-admin deleted branch feat/345-adopt-existing-accounts 2026-10-12 10:55:14 +00:00
Sign in to join this conversation.
No Reviewers
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: novox/hq#323