Claude 983b86b016 Merge branch 'main' into claude/happy-mccarthy-kdhg2s ...

Four conflicts, all from main's `e4dc1c52` moving `EncryptedAppendLog`
out of `commons.marmot` into a new neutral `commons.storage` package so
cordn could use it. Git read that single-file move as a rename of the
whole jvmAndroid `marmot/` directory and proposed dragging this branch's
four new Marmot stores into `storage/` with it.

Kept them in `commons.marmot` instead. Main's stated reason for the move
was that the append log is feature-neutral — "nothing in it knows what
Marmot is ... used by both, owned by neither". These four are the
opposite: they implement quartz's Marmot store interfaces and are
Marmot-only. Moving them would also have weakened the guard in
CordnIndependenceTest, which scans by package name: three of the four
(MlsGroupState, KeyPackageBundle, PublishObligation) carry no "marmot"
substring, so under `storage` they would have dropped out of the "Marmot
does not reach into cordn" scan and become silently importable from
cordn.

Both of main's import changes are taken: `commons.marmot.
EncryptedAppendLog` -> `commons.storage.EncryptedAppendLog`, and the
quartz rename `marmot.mls.group` -> `marmot.groups`. No stale reference
to either old path remains in the tree.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AXvKXakvup4inNFfAhhr4L

2026-09-26 17:10:31 +00:00

..

main

Merge branch 'main' into claude/happy-mccarthy-kdhg2s

2026-09-26 17:10:31 +00:00

test/kotlin/com/vitorpamplona/amethyst/cli

fix(marmot): wire the disband fix through to Android

2026-09-11 01:17:23 +00:00