from7ff4ef4d5263ee3613c5cc3bfc7e44f4ae0b490afd5c0553c6992b693da08b03 → 7ff4ef4d
to0ec3069fccd8bc58d46c5f16328d9e3397d3a4c7bf944439c09d99dc84b402dc → 0ec3069f

+3 −2

11 # loot
22
33 A from-scratch source-control system.
44
55 **Thesis:** visibility and permissions belong to *content and changes*, not to
66 the *repository*. Commit your `.env`. Keep files private inside a shared repo.
77 Embargo a security fix: merge it, cut the release, reveal the source later.
88
99 This is the unsolved problem in modern version control. Ergonomics (jj already
1010 nails them) are a layer for later.
1111
1212 ## Security
1313
1414 loot's cryptography is written from scratch and has never been independently
1515 reviewed. What each reader — a relay, a forge, a collaborator, the anonymous
1616 internet, the git mirror, and anyone holding your `.loot/` directory — can
1717 actually read is stated tier by tier at
1818 **<https://loot.millerbyte.com/trust>**. Read it before you put anything in a
1919 loot repo whose disclosure would hurt you. Two things it says that the pitch
2020 does not: the default tier is one a relay reads by design, and path names are
2121 never encrypted at any tier.
2222
2323 **Report a vulnerability to <security@millerbyte.com>** — not to the public
2424 Discord. One maintainer, best effort, expect days rather than hours. ⚠ This
2525 file is not the published route: the GitHub repo is permanently private
2626 (ADR 0045/0064), so a `SECURITY.md` here and GitHub's private-advisory button
2727 both reach nobody. `/trust` is the route; this section exists for whoever
2828 already has repo access.
2929
3030 ## What works today
3131
3232 The full loop from first init to relay-based collaboration is functional. This
33−block is the CLI's **full verb list** — all 79 verbs, regenerated from
33+block is the CLI's **full verb list** — all 80 verbs, regenerated from
3434 `loot --help` rather than curated (a guard test pins it to the dispatch table,
3535 so it cannot drift again; #1107):
3636
3737 ```text
3838 abandon absorb adopt apply apply-patch archive attest bisect blame bundle buoy
3939 burn cat
4040 cherry-pick clean clone completions config conflicts converge count-objects
4141 describe diff doctor duplicate edit embargo-status evolog explain ferry
4242 fetch format-patch gates gc grant grant-status grants grep heads id init keygen
43−lane lanes lock log manifest maroon merge migrate move new op peer propose pull
43+lane lanes lock log manifest maroon merge migrate move new notes op peer
44+propose pull
4445 pull-grants purges push rehome relay remote resolve restore revert serve
4546 shortlog show split squash status surface tag tutorial undo unlock verify
4647 view whoami
4748 ```
4849
4950 `loot <verb> --help` prints any verb's own usage block without running it.
5051
5152 ### Try it: private `.env` in a shared repo
5253
5354 ```bash
5455 cargo build --release
5556 export PATH="$PWD/target/release:$PATH"
5657
5758 cd $(mktemp -d)
5859 printf 'TOKEN=supersecret\n' > .env
5960 printf '# My Project\n' > README.md
6061 printf '.env restricted=alice\n*.md public\n' > .lootattributes
6162
6263 loot init --identity alice
6364 loot status -m "initial work"
6465 loot surface # alice: restores both README.md and .env
6566
6667 # switch to a non-keyholder to prove it
6768 printf mallory > .loot/identity
6869 rm -f .env README.md
6970 loot surface # mallory: README.md appears; .env stays sealed
7071 ```
7172
7273 The `.env` ciphertext lives in `.loot/` the whole time. Mallory cannot decrypt
7374 it, and if she snapshots and re-syncs, the sealed file is carried forward
7475 untouched — snapshot is visibility-aware.
7576
7677 ### Sync over a relay
7778
7879 A relay stores and forwards ciphertext it cannot read. Restricted keys never
7980 travel in a sync bundle (ADR 0003), so the relay's zero-knowledge property is
8081 enforced at the wire level, not by policy.
8182
8283 ```bash
8384 # Terminal 1: run a relay
8485 loot serve --dir /tmp/relay --addr 127.0.0.1:4000
8586
8687 # Terminal 2: alice pushes
8788 loot remote add origin http://127.0.0.1:4000
8889 loot push
8990
9091 # Terminal 3: bob pulls (bob only sees public content)
9192 loot clone http://127.0.0.1:4000 ./bob-repo --identity bob
9293 ```
9394
9495 ### Grants: sharing a content key
9596
9697 ```bash
9798 # alice knows bob's public key (from `loot whoami` on bob's machine)
9899 loot peer add bob "ssh-ed25519 AAAA..."
99100
100101 # deliver a sealed grant via the relay
101102 loot grant --relay origin .env bob
102103
103104 # bob fetches and applies it
104105 loot pull-grants # verifies alice's signature, checks peer registry
105106 loot surface # now bob can read .env
106107 ```
107108
108109 ### Embargo: timed reveals
109110
110111 ```bash
111112 # mark a file as embargoed until unix timestamp 1800000000
112113 echo "VULN_DETAILS=CVE-2025-XXXX" > security-fix.txt
113114 printf 'security-fix.txt embargoed=1800000000\n' >> .lootattributes
114115
115116 loot status -m "patch for CVE-2025-XXXX"
116117 loot push # relay holds the ciphertext; key withheld until reveal_at
117118 ```
118119
119120 At `reveal_at`, the next read promotes the key out of escrow, so anyone who
120121 pulls can read it.
121122 The seam for a third-party key custodian (network escrow) is designed and ready.
122123
123124 ## Architecture
124125
125126 ```text
126127 crates/
127128 loot-core canonical engine: encrypted DAG, per-content visibility, convergence
128129 loot-identity ed25519 keypairs, x25519 ECIES, signed push envelopes, peer registry
129130 loot-net relay HTTP server + sync client (stow/negotiate/grant mailbox)
130131 loot-cli the `loot` binary — commands are thin verbs over Workspace
131132 loot-bench shared 50k-file benchmark workload
132133 spike-dag thin shim re-exporting loot-core (bake-off compat)
133134 spike-crdt non-canonical CRDT model (retained so the bake-off is reproducible)
134135 ```
135136
136137 ### Key modules
137138
138139 | Module | What it owns |
139140 | --- | --- |
140141 | `loot-core::sealed` | Per-content encryption, key custody, embargo, public-content compression (ADR 0003, 0007, 0020) |
141142 | `loot-core::converge` | Merger/relay convergence rule — decrypt-then-merge (ADR 0001) |
142143 | `loot-core::engine` | Encrypted content-addressed DAG: put/get/record/surface/bundle/apply |
143144 | `loot-core::manifest` | Grant audit trail: grantee, grantor pubkeys, timestamps |
144145 | `loot-identity` | ed25519 sign/verify, x25519 derive, ECIES seal/unseal, push envelope |
145146 | `loot-net::mailbox` | Relay grant mailbox: pubkey-addressed, content-addressed loose blobs |
146147 | `loot-cli::workspace` | Ambient repo: identity, clock, persistence, idempotent snapshot |
147148
148149 ### ADRs (docs/adr/)
149150
150151 | # | Decision |
151152 | --- | --- |
152153 | 0001 | Per-content decrypt-then-merge convergence |
153154 | 0002 | Encrypted DAG as the canonical foundation (bake-off winner) |
154155 | 0003 | Sealed content module + keyring custody (restricted keys never travel) |
155156 | 0004 | Drop plaintext dedup equality oracle |
156157 | 0005 | CLI slice, persistence, .lootattributes |
157158 | 0006 | JJ-style workspace auto-snapshot |
158159 | 0007 | Embargo escrow module |
159160 | 0008 | Grant log and targeted key bundles |
160161 | 0009 | Two-level revocation |
161162 | 0010 | Forward-maroon implementation |
162163 | 0011 | Relay stow append-only |
163164 | 0012 | Per-object loose storage |
164165 | 0013 | Named remotes and grant bundle delivery |
165166 | 0014 | Identity keypairs: ed25519 OpenSSH, signed push envelopes |
166167 | 0015 | Grant authentication and trust (grantor signs, peer-registry gate) |
167168 | 0016 | Identity portability: export/import with passphrase wrapping |
168169 | 0017 | RepoStore: one home for the `.loot/` layout |
169170 | 0018 | Signed changes: author in id + validity enforcement |
170171 | 0019 | Format versioning + compatibility gate (newer reads older) |
171172 | 0020 | Compress public content (Zstd); format major → 2 |
172173 | 0021 | Object-level "wants" negotiation on push/pull |
173174 | 0022 | Concurrent-agent model: docks, harbor, optimistic convergence |
174175 | 0023 | Agent-facing machine output: porcelain-first, reconciliation verbs |
175176 | 0024 | Resumable transfer via batched, negotiated sync |
176177
177178 See [CONTEXT.md](CONTEXT.md) for the full domain glossary.
178179
179180 ## Build & test
180181
181182 ```bash
182183 cargo build
183184 cargo test # ~25s — includes HTTP relay integration tests
184185 cargo test -p loot-core # fast, no I/O, 67 tests
185186 ```
186187
187188 ## Command reference
188189
189190 ```text
190191 loot init [--identity <name>] initialize a repo (identity from global config if omitted)
191192 loot clone <url> <dir> clone a relay or forge repo into <dir>; ends with a materialized working tree
192193 loot config [--local] set <key> <val> set a config value; bare writes the global file (~/.config/loot/config), --local writes this repo's (.loot/config.local, never tracked)
193194 loot config --get <key> print one effective value (local over global); exits non-zero when unset
194195 loot status [-m <message>] snapshot the working tree into the working change (idempotent)
195196 loot describe -m <message> name the working change
196197 loot new finalize the working change; start a fresh one
197198 loot surface materialize what the current identity may see
198199 loot lane new [--name <n>] spawn a sealed lane (isolated tree + tip) over the shared store
199200 loot lanes list lanes with their tip, in-flight PR, and status
200201 loot log show change history with visibility hints
201202 loot gc [--dry-run] prune loose objects no change references
202203 loot verify [--accept-loss] [--unreachable] integrity-check the object store (exits 1 on corrupt/missing; --accept-loss records unrecoverable losses; --unreachable also lists objects that are PRESENT and referenced by nothing — deletes nothing, names `loot gc` as the remedy, and never changes the exit status)
203204 loot bundle <file> write a sync bundle (ciphertext, no keys)
204205 loot apply <file> merge a peer's bundle (idempotent)
205206 loot apply-patch <file> [--check] apply a TEXT patch `loot format-patch` wrote — strict, with an ADR 0044 three-way fallback that stops on conflict like `loot apply` does; a path this identity cannot open refuses the whole run, and CRLF on either side is refused (ADR 0082). --check reports applicability and writes nothing
206207 loot grant <path> <identity> <file> write a targeted grant bundle (file delivery)
207208 loot grant --relay <remote> <path> <id> seal and deliver a grant via relay mailbox
208209 loot grants [<url>] peek pending grant count (no download)
209210 loot pull-grants [<url>] fetch, verify, and apply sealed grants from relay
210211 loot maroon [--hard] <path> <identity> cut off <identity> from future access
211212 loot migrate <path> <vis-spec> change a path's visibility
212213 loot manifest show the grant audit trail
213214 loot conflicts list paths needing resolution
214215 loot resolve <path> <file> resolve a conflict
215216 loot remote add <name> <url> register a relay URL
216217 loot push [<url>] publish changes to a relay
217218 loot pull [<url>] fetch and merge changes from a relay
218219 loot fetch [<url>] ingest from a relay and stop — no merge, no converge, no tree write
219220 loot serve [--addr <host:port>] run a relay
220221 loot keygen generate an identity keypair
221222 loot whoami show identity and public key
222223 loot id export <file> export keypair, passphrase-encrypted
223224 loot id import <file> import keypair from passphrase-encrypted file
224225 loot peer add <name> <pubkey> register a peer's public key
225226 loot peer list list known peers
226227 ```
227228