fromc566311533e90ad7601867a85d6bd312d0ea1f694609eff800bd5a6c07780666 → c5663115
to1a26ff0a139dded040a5e10b0b37e6015eeca8c26f54714ac370ffc15489a2c4 → 1a26ff0a

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