from44d4869a1b1778d420ea5ece03a406ac7a3608c162161ae93e6053ee846c41c8 → 44d4869a
to83c5afa565ddf70b82074a472c0e271c66849a21858409ab483434e8c2bc7369 → 83c5afa5

+4 −4

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 71 verbs, regenerated from
33+block is the CLI's **full verb list** — all 72 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 archive attest bisect blame bundle buoy burn cat
3939 cherry-pick clone completions config conflicts converge describe diff doctor
4040 duplicate edit embargo-status evolog explain ferry gates gc grant grant-status
4141 grants grep heads id init keygen lane lanes lock log manifest maroon migrate
42−new op peer pull pull-grants purges push rehome relay remote resolve restore
43−revert serve shortlog show split squash status surface tag tutorial undo
44−unlock verify view whoami
42+new op peer propose pull pull-grants purges push rehome relay remote resolve
43+restore revert serve shortlog show split squash status surface tag tutorial
44+undo unlock verify view whoami
4545 ```
4646
4747 `loot <verb> --help` prints any verb's own usage block without running it.
4848
4949 ### Try it: private `.env` in a shared repo
5050
5151 ```bash
5252 cargo build --release
5353 export PATH="$PWD/target/release:$PATH"
5454
5555 cd $(mktemp -d)
5656 printf 'TOKEN=supersecret\n' > .env
5757 printf '# My Project\n' > README.md
5858 printf '.env restricted=alice\n*.md public\n' > .lootattributes
5959
6060 loot init --identity alice
6161 loot status -m "initial work"
6262 loot surface # alice: restores both README.md and .env
6363
6464 # switch to a non-keyholder to prove it
6565 printf mallory > .loot/identity
6666 rm -f .env README.md
6767 loot surface # mallory: README.md appears; .env stays sealed
6868 ```
6969
7070 The `.env` ciphertext lives in `.loot/` the whole time. Mallory cannot decrypt
7171 it, and if she snapshots and re-syncs, the sealed file is carried forward
7272 untouched — snapshot is visibility-aware.
7373
7474 ### Sync over a relay
7575
7676 A relay stores and forwards ciphertext it cannot read. Restricted keys never
7777 travel in a sync bundle (ADR 0003), so the relay's zero-knowledge property is
7878 enforced at the wire level, not by policy.
7979
8080 ```bash
8181 # Terminal 1: run a relay
8282 loot serve --dir /tmp/relay --addr 127.0.0.1:4000
8383
8484 # Terminal 2: alice pushes
8585 loot remote add origin http://127.0.0.1:4000
8686 loot push
8787
8888 # Terminal 3: bob pulls (bob only sees public content)
8989 loot clone http://127.0.0.1:4000 ./bob-repo --identity bob
9090 ```
9191
9292 ### Grants: sharing a content key
9393
9494 ```bash
9595 # alice knows bob's public key (from `loot whoami` on bob's machine)
9696 loot peer add bob "ssh-ed25519 AAAA..."
9797
9898 # deliver a sealed grant via the relay
9999 loot grant --relay origin .env bob
100100
101101 # bob fetches and applies it
102102 loot pull-grants # verifies alice's signature, checks peer registry
103103 loot surface # now bob can read .env
104104 ```
105105
106106 ### Embargo: timed reveals
107107
108108 ```bash
109109 # mark a file as embargoed until unix timestamp 1800000000
110110 echo "VULN_DETAILS=CVE-2025-XXXX" > security-fix.txt
111111 printf 'security-fix.txt embargoed=1800000000\n' >> .lootattributes
112112
113113 loot status -m "patch for CVE-2025-XXXX"
114114 loot push # relay holds the ciphertext; key withheld until reveal_at
115115 ```
116116
117117 At `reveal_at`, the next read promotes the key out of escrow, so anyone who
118118 pulls can read it.
119119 The seam for a third-party key custodian (network escrow) is designed and ready.
120120
121121 ## Architecture
122122
123123 ```text
124124 crates/
125125 loot-core canonical engine: encrypted DAG, per-content visibility, convergence
126126 loot-identity ed25519 keypairs, x25519 ECIES, signed push envelopes, peer registry
127127 loot-net relay HTTP server + sync client (stow/negotiate/grant mailbox)
128128 loot-cli the `loot` binary — commands are thin verbs over Workspace
129129 loot-bench shared 50k-file benchmark workload
130130 spike-dag thin shim re-exporting loot-core (bake-off compat)
131131 spike-crdt non-canonical CRDT model (retained so the bake-off is reproducible)
132132 ```
133133
134134 ### Key modules
135135
136136 | Module | What it owns |
137137 | --- | --- |
138138 | `loot-core::sealed` | Per-content encryption, key custody, embargo, public-content compression (ADR 0003, 0007, 0020) |
139139 | `loot-core::converge` | Merger/relay convergence rule — decrypt-then-merge (ADR 0001) |
140140 | `loot-core::engine` | Encrypted content-addressed DAG: put/get/record/surface/bundle/apply |
141141 | `loot-core::manifest` | Grant audit trail: grantee, grantor pubkeys, timestamps |
142142 | `loot-identity` | ed25519 sign/verify, x25519 derive, ECIES seal/unseal, push envelope |
143143 | `loot-net::mailbox` | Relay grant mailbox: pubkey-addressed, content-addressed loose blobs |
144144 | `loot-cli::workspace` | Ambient repo: identity, clock, persistence, idempotent snapshot |
145145
146146 ### ADRs (docs/adr/)
147147
148148 | # | Decision |
149149 | --- | --- |
150150 | 0001 | Per-content decrypt-then-merge convergence |
151151 | 0002 | Encrypted DAG as the canonical foundation (bake-off winner) |
152152 | 0003 | Sealed content module + keyring custody (restricted keys never travel) |
153153 | 0004 | Drop plaintext dedup equality oracle |
154154 | 0005 | CLI slice, persistence, .lootattributes |
155155 | 0006 | JJ-style workspace auto-snapshot |
156156 | 0007 | Embargo escrow module |
157157 | 0008 | Grant log and targeted key bundles |
158158 | 0009 | Two-level revocation |
159159 | 0010 | Forward-maroon implementation |
160160 | 0011 | Relay stow append-only |
161161 | 0012 | Per-object loose storage |
162162 | 0013 | Named remotes and grant bundle delivery |
163163 | 0014 | Identity keypairs: ed25519 OpenSSH, signed push envelopes |
164164 | 0015 | Grant authentication and trust (grantor signs, peer-registry gate) |
165165 | 0016 | Identity portability: export/import with passphrase wrapping |
166166 | 0017 | RepoStore: one home for the `.loot/` layout |
167167 | 0018 | Signed changes: author in id + validity enforcement |
168168 | 0019 | Format versioning + compatibility gate (newer reads older) |
169169 | 0020 | Compress public content (Zstd); format major → 2 |
170170 | 0021 | Object-level "wants" negotiation on push/pull |
171171 | 0022 | Concurrent-agent model: docks, harbor, optimistic convergence |
172172 | 0023 | Agent-facing machine output: porcelain-first, reconciliation verbs |
173173 | 0024 | Resumable transfer via batched, negotiated sync |
174174
175175 See [CONTEXT.md](CONTEXT.md) for the full domain glossary.
176176
177177 ## Build & test
178178
179179 ```bash
180180 cargo build
181181 cargo test # ~25s — includes HTTP relay integration tests
182182 cargo test -p loot-core # fast, no I/O, 67 tests
183183 ```
184184
185185 ## Command reference
186186
187187 ```text
188188 loot init [--identity <name>] initialize a repo (identity from global config if omitted)
189189 loot clone <url> <dir> clone a relay or forge repo into <dir>; ends with a materialized working tree
190190 loot config set <key> <val> set a global config value (~/.config/loot/config)
191191 loot status [-m <message>] snapshot the working tree into the working change (idempotent)
192192 loot describe -m <message> name the working change
193193 loot new finalize the working change; start a fresh one
194194 loot surface materialize what the current identity may see
195195 loot lane new [--name <n>] spawn a sealed lane (isolated tree + tip) over the shared store
196196 loot lanes list lanes with their tip, in-flight PR, and status
197197 loot log show change history with visibility hints
198198 loot gc [--dry-run] prune loose objects no change references
199199 loot verify [--accept-loss] integrity-check the object store (exits 1 on corrupt/missing; --accept-loss records unrecoverable losses)
200200 loot bundle <file> write a sync bundle (ciphertext, no keys)
201201 loot apply <file> merge a peer's bundle (idempotent)
202202 loot grant <path> <identity> <file> write a targeted grant bundle (file delivery)
203203 loot grant --relay <remote> <path> <id> seal and deliver a grant via relay mailbox
204204 loot grants [<url>] peek pending grant count (no download)
205205 loot pull-grants [<url>] fetch, verify, and apply sealed grants from relay
206206 loot maroon [--hard] <path> <identity> cut off <identity> from future access
207207 loot migrate <path> <vis-spec> change a path's visibility
208208 loot manifest show the grant audit trail
209209 loot conflicts list paths needing resolution
210210 loot resolve <path> <file> resolve a conflict
211211 loot remote add <name> <url> register a relay URL
212212 loot push [<url>] publish changes to a relay
213213 loot pull [<url>] fetch and merge changes from a relay
214214 loot serve [--addr <host:port>] run a relay
215215 loot keygen generate an identity keypair
216216 loot whoami show identity and public key
217217 loot id export <file> export keypair, passphrase-encrypted
218218 loot id import <file> import keypair from passphrase-encrypted file
219219 loot peer add <name> <pubkey> register a peer's public key
220220 loot peer list list known peers
221221 ```
222222